refactoring commentable concern

This commit is contained in:
rgarcia
2015-09-28 20:14:38 +02:00
parent 708a41ee1c
commit 066606f901

View File

@@ -33,7 +33,7 @@ module Commentable
if @commentable.save_with_captcha if @commentable.save_with_captcha
track_event track_event
redirect_to @commentable, notice: t('flash.actions.create.notice', resource_name: "#{controller_name.singularize.capitalize}") redirect_to @commentable, notice: t('flash.actions.create.notice', resource_name: "#{commentable_name.capitalize}")
else else
load_featured_tags load_featured_tags
set_commentable_instance set_commentable_instance
@@ -48,7 +48,7 @@ module Commentable
def update def update
commentable.assign_attributes(strong_params) commentable.assign_attributes(strong_params)
if commentable.save_with_captcha if commentable.save_with_captcha
redirect_to commentable, notice: t('flash.actions.update.notice', resource_name: "#{controller_name.singularize.capitalize}") redirect_to commentable, notice: t('flash.actions.update.notice', resource_name: "#{commentable_name.capitalize}")
else else
load_featured_tags load_featured_tags
set_commentable_instance set_commentable_instance
@@ -58,35 +58,39 @@ module Commentable
private private
def commentable def commentable
@commentable ||= instance_variable_get("@#{controller_name.singularize}") @commentable ||= instance_variable_get("@#{commentable_name}")
end end
def commentable_model def commentable_model
@commentable_model ||= controller_name.singularize.capitalize.constantize @commentable_model ||= commentable_name.capitalize.constantize
end
def commentable_name
controller_name.singularize
end end
def set_commentable_instance def set_commentable_instance
instance_variable_set("@#{controller_name.singularize}", @commentable) instance_variable_set("@#{commentable_name}", @commentable)
end end
def set_commentables_instance def set_commentables_instance
instance_variable_set("@#{controller_name}", @commentables) instance_variable_set("@#{commentable_name.pluralize}", @commentables)
end end
def set_commentable_votes(instance) def set_commentable_votes(instance)
send("set_#{controller_name.singularize}_votes", instance) send("set_#{commentable_name}_votes", instance)
end end
def strong_params def strong_params
send("#{controller_name.singularize}_params") send("#{commentable_name}_params")
end end
def track_event def track_event
ahoy.track "#{controller_name.singularize}_created".to_sym, "#{controller_name.singularize}_id": commentable.id ahoy.track "#{commentable_name}_created".to_sym, "#{commentable_name}_id": commentable.id
end end
def tag_cloud def tag_cloud
commentable_model.tag_counts.order("#{controller_name}_count": :desc, name: :asc).limit(20) commentable_model.tag_counts.order("#{commentable_name.pluralize}_count": :desc, name: :asc).limit(20)
end end
def load_featured_tags def load_featured_tags