Merge branch 'stable' into develop

Changelog.md

@@ -72,6 +72,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
 * Refactor ApplicationController#after\_sign\_out\_path\_for [#6258](https://github.com/diaspora/diaspora/pull/6258)
 * Extract StatusMessageService from StatusMessagesController [#6280](https://github.com/diaspora/diaspora/pull/6280)
 * Refactor HomeController#toggle\_mobile [#6260](https://github.com/diaspora/diaspora/pull/6260)
+* Extract CommentService from CommentsController [#6307](https://github.com/diaspora/diaspora/pull/6307)
 
 ## Bug fixes
 * Fix indentation and a link title on the default home page [#6212](https://github.com/diaspora/diaspora/pull/6212)

app/controllers/comments_controller.rb

@@ -3,73 +3,71 @@
 #   the COPYRIGHT file.
 
 class CommentsController < ApplicationController
-  include ApplicationHelper
+  before_action :authenticate_user!, except: :index
-  before_action :authenticate_user!, :except => [:index]
 
-  respond_to :html,
+  respond_to :html, :mobile, :json
-             :mobile,
-             :json
 
   rescue_from ActiveRecord::RecordNotFound do
-    render :nothing => true, :status => 404
+    render nothing: true, status: 404
   end
 
   def create
-    post = current_user.find_visible_shareable_by_id(Post, params[:post_id])
+    @comment = CommentService.new(post_id: params[:post_id], text: params[:text], user: current_user).create_comment
-    @comment = current_user.comment!(post, params[:text]) if post
-
     if @comment
-      respond_to do |format|
+      respond_create_success
-        format.json{ render :json => CommentPresenter.new(@comment), :status => 201 }
-        format.html{ render :nothing => true, :status => 201 }
-        format.mobile{ render :partial => 'comment', :locals => {:post => @comment.post, :comment => @comment} }
-      end
     else
-      render :nothing => true, :status => 422
+      render nothing: true, status: 404
     end
   end
 
   def destroy
-    @comment = Comment.find(params[:id])
+    service = CommentService.new(comment_id: params[:id], user: current_user)
-    if current_user.owns?(@comment) || current_user.owns?(@comment.parent)
+    if service.destroy_comment
-      current_user.retract(@comment)
+      respond_destroy_success
-      respond_to do |format|
-        format.js { render :nothing => true, :status => 204 }
-        format.json { render :nothing => true, :status => 204 }
-        format.mobile{ redirect_to :back }
-      end
     else
-      respond_to do |format|
+      respond_destroy_error
-        format.mobile { redirect_to :back }
-        format.any(:js, :json) {render :nothing => true, :status => 403}
-      end
     end
   end
 
   def new
     respond_to do |format|
-      format.mobile { render :layout => false }
+      format.mobile { render layout: false }
     end
   end
 
   def index
-    find_post
+    service = CommentService.new(post_id: params[:post_id], user: current_user)
-    raise(ActiveRecord::RecordNotFound.new) unless @post
+    @post = service.post
-
+    @comments = service.comments
-    @comments = @post.comments.for_a_stream
     respond_with do |format|
-      format.json  { render :json => CommentPresenter.as_collection(@comments), :status => 200 }
+      format.json  { render json: CommentPresenter.as_collection(@comments), status: 200 }
-      format.mobile{render :layout => false}
+      format.mobile { render layout: false }
     end
   end
 
   private
 
-  def find_post
+  def respond_create_success
-    if user_signed_in?
+    respond_to do |format|
-      @post = current_user.find_visible_shareable_by_id(Post, params[:post_id])
+      format.json { render json: CommentPresenter.new(@comment), status: 201 }
-    else
+      format.html { render nothing: true, status: 201 }
-      @post = Post.find_by_id_and_public(params[:post_id], true)
+      format.mobile { render partial: "comment", locals: {post: @comment.post, comment: @comment} }
+    end
+  end
+
+  def respond_destroy_success
+    respond_to do |format|
+      format.mobile { redirect_to :back }
+      format.js { render nothing: true, status: 204 }
+      format.json { render nothing: true, status: 204 }
+    end
+  end
+
+  def respond_destroy_error
+    respond_to do |format|
+      format.mobile { redirect_to :back }
+      format.js { render nothing: true, status: 403 }
+      format.json { render nothing: true, status: 403 }
     end
   end
 end

app/services/comment_service.rb

@@ -0,0 +1,43 @@
+class CommentService
+  attr_reader :post, :comments
+
+  def initialize(params)
+    @user = params[:user]
+    @post_id = params[:post_id]
+    @comment_id = params[:comment_id]
+    @text = params[:text]
+
+    @post = find_post! if @post_id
+    @comments = @post.comments.for_a_stream if @post
+  end
+
+  def create_comment
+    @user.comment!(post, @text) if @post
+  end
+
+  def destroy_comment
+    @comment = Comment.find(@comment_id)
+    if @user.owns?(@comment) || @user.owns?(@comment.parent)
+      @user.retract(@comment)
+      true
+    else
+      false
+    end
+  end
+
+  private
+
+  def find_post!
+    find_post.tap do |post|
+      raise(ActiveRecord::RecordNotFound) unless post
+    end
+  end
+
+  def find_post
+    if @user
+      @user.find_visible_shareable_by_id(Post, @post_id)
+    else
+      Post.find_by_id_and_public(@post_id, true)
+    end
+  end
+end

config/routes.rb

@@ -30,16 +30,13 @@ Diaspora::Application.routes.draw do
 
   resources :posts do
     member do
-      get :next
-      get :previous
       get :interactions
     end
 
-    resources :poll_participations, :only => [:create]
+    resource :participation, only: %i(create destroy)
-
+    resources :poll_participations, only: :create
-    resources :likes, :only => [:create, :destroy, :index ]
+    resources :likes, only: %i(create destroy index)
-    resource :participation, :only => [:create, :destroy]
+    resources :comments, only: %i(new create destroy index)
-    resources :comments, :only => [:new, :create, :destroy, :index]
   end
 
 

spec/controllers/comments_controller_spec.rb

@@ -66,7 +66,7 @@ describe CommentsController, :type => :controller do
 
       expect(alice).not_to receive(:comment)
       post :create, comment_hash
-      expect(response.code).to eq('422')
+      expect(response.code).to eq("404")
     end
   end