refactors debate and proposal controllers

app/controllers/proposals_controller.rb

@@ -1,64 +1,16 @@
 class ProposalsController < ApplicationController
+  include Commentable
   include FlagActions
 
-  before_action :parse_tag_filter, only: :index
   before_action :parse_search_terms, only: :index
+  before_action :parse_tag_filter, only: :index
   before_action :authenticate_user!, except: [:index, :show]
+
   has_orders %w{hot_score confidence_score created_at most_commented random}, only: :index
 
   load_and_authorize_resource
   respond_to :html, :js
 
-  def index
-    @proposals = @search_terms.present? ? Proposal.search(@search_terms) : Proposal.all
-    @proposals = @proposals.tagged_with(@tag_filter) if @tag_filter
-    @proposals = @proposals.page(params[:page]).for_render.send("sort_by_#{@current_order}")
-    @tag_cloud = Proposal.tag_counts.order(proposals_count: :desc, name: :asc).limit(20)
-    set_proposal_votes(@proposals)
-  end
-
-  def show
-    set_proposal_votes(@proposal)
-    @commentable = @proposal
-    @root_comments = @proposal.comments.roots.recent.page(params[:page]).per(10).for_render
-    @comments = @root_comments.inject([]){|all, root| all + Comment.descendants_of(root).for_render}
-
-    @all_visible_comments = @root_comments + @comments
-    set_comment_flags(@all_visible_comments)
-  end
-
-  def new
-    @proposal = Proposal.new
-    load_featured_tags
-  end
-
-  def create
-    @proposal = Proposal.new(proposal_params)
-    @proposal.author = current_user
-
-    if @proposal.save_with_captcha
-      ahoy.track :proposal_created, proposal_id: @proposal.id
-      redirect_to @proposal, notice: t('flash.actions.create.notice', resource_name: 'Proposal')
-    else
-      load_featured_tags
-      render :new
-    end
-  end
-
-  def edit
-    load_featured_tags
-  end
-
-  def update
-    @proposal.assign_attributes(proposal_params)
-    if @proposal.save_with_captcha
-      redirect_to @proposal, notice: t('flash.actions.update.notice', resource_name: 'Proposal')
-    else
-      load_featured_tags
-      render :edit
-    end
-  end
-
   def vote
     @proposal.register_vote(current_user, 'yes')
     set_proposal_votes(@proposal)
@@ -70,17 +22,4 @@ class ProposalsController < ApplicationController
       params.require(:proposal).permit(:title, :question, :summary, :description, :external_url, :video_url, :responsible_name, :tag_list, :terms_of_service, :captcha, :captcha_key)
     end
 
-    def load_featured_tags
-      @featured_tags = ActsAsTaggableOn::Tag.where(featured: true)
-    end
-
-    def parse_tag_filter
-      if params[:tag].present?
-        @tag_filter = params[:tag] if ActsAsTaggableOn::Tag.named(params[:tag]).exists?
-      end
-    end
-
-    def parse_search_terms
-      @search_terms = params[:search] if params[:search].present?
-    end
 end