Extract color scheming controller concern

Author: rossta

app/controllers/application_controller.rb

@@ -1,26 +1,5 @@
 class ApplicationController < ActionController::Base
   include Erroring
   include Authentication
-
-  def custom_color_scheme_params = preview_color_scheme_id ? {settings: {color_scheme_id: preview_color_scheme_id}} : {}
-  helper_method :custom_color_scheme_params
-
-  def custom_color_scheme?
-    preview_color_scheme_id.present? || session_color_scheme_id.present?
-  end
-  helper_method :custom_color_scheme?
-
-  def preview_color_scheme_id = params.dig(:settings, :color_scheme_id)
-
-  def session_color_scheme_id = session[:color_scheme_id]
-
-  def find_color_scheme
-    preview_color_scheme || session_color_scheme || default_color_scheme
-  end
-
-  def preview_color_scheme = preview_color_scheme_id && ColorScheme.find(preview_color_scheme_id)
-
-  def session_color_scheme = session_color_scheme_id && ColorScheme.find(session_color_scheme_id)
-
-  def default_color_scheme = @default_color_scheme ||= ColorScheme.cached_default
+  include ColorScheming
 end

app/controllers/concerns/color_scheming.rb

@@ -0,0 +1,28 @@
+module ColorScheming
+  extend ActiveSupport::Concern
+
+  included do
+    helper_method :custom_color_scheme_params
+    helper_method :custom_color_scheme?
+  end
+
+  def custom_color_scheme_params = preview_color_scheme_id ? {settings: {color_scheme_id: preview_color_scheme_id}} : {}
+
+  def custom_color_scheme?
+    preview_color_scheme_id.present? || session_color_scheme_id.present?
+  end
+
+  def preview_color_scheme_id = params.dig(:settings, :color_scheme_id)
+
+  def session_color_scheme_id = session[:color_scheme_id]
+
+  def find_color_scheme
+    preview_color_scheme || session_color_scheme || default_color_scheme
+  end
+
+  def preview_color_scheme = preview_color_scheme_id && ColorScheme.find(preview_color_scheme_id)
+
+  def session_color_scheme = session_color_scheme_id && ColorScheme.find(session_color_scheme_id)
+
+  def default_color_scheme = @default_color_scheme ||= ColorScheme.cached_default
+end

app/controllers/settings/color_schemes_controller.rb

@@ -33,14 +33,4 @@ def update
 
     redirect_to settings_color_scheme_path, status: :see_other
   end
-
-  private
-
-  def preview_color_scheme_id = params.dig(:settings, :color_scheme_id)
-
-  def default_color_scheme = @default_color_scheme ||= ColorScheme.cached_default
-
-  def session_color_scheme = session[:color_scheme_id] && ColorScheme.find(session[:color_scheme_id])
-
-  def preview_color_scheme = preview_color_scheme_id && ColorScheme.find(preview_color_scheme_id)
 end