Rename color theme as settings and add namespace

Author: rossta

app/controllers/color_themes_controller.rb renamed to app/controllers/settings/color_schemes_controller.rb

@@ -1,10 +1,10 @@
-class ColorThemesController < ApplicationController
+class Settings::ColorSchemesController < ApplicationController
   def show
     @color_scale = selected_color_scale || session_color_scale || ColorScale.cached_default
-    @color_theme = ColorTheme.new(color_scale: @color_scale)
+    @settings = Settings.new(color_scale: @color_scale)
 
-    render ColorThemes::ShowView.new(
-      color_theme: @color_theme,
+    render ColorSchemes::ShowView.new(
+      settings: @settings,
       fallback_color_scale: session_color_scale || ColorScale.cached_default,
       curated_color_scales: ColorScale.cached_curated,
       selected: selected_color_scale_id.present?,
@@ -13,24 +13,24 @@ def show
   end
 
   def update
-    update_params = params[:color_theme] ? params.require(:color_theme).permit(:color_scale_id) : {}
+    update_params = params[:settings] ? params.require(:settings).permit(:color_scale_id) : {}
     color_scale_id = update_params[:color_scale_id]
     @color_scale = ColorScale.find(color_scale_id)
 
-    redirect_to color_theme_path unless @color_scale.present?
+    redirect_to settings_color_scheme_path unless @color_scale.present?
 
     if @color_scale == ColorScale.cached_default
       session.delete(:color_scale_id)
     else
       session[:color_scale_id] = @color_scale.id
     end
 
-    redirect_to color_theme_path, status: :see_other
+    redirect_to settings_color_scheme_path, status: :see_other
   end
 
   private
 
-  def selected_color_scale_id = params.dig(:color_theme, :color_scale_id) || session[:color_scale_id]
+  def selected_color_scale_id = params.dig(:settings, :color_scale_id) || session[:color_scale_id]
 
   def session_color_scale = session[:color_scale_id] && ColorScale.find(session[:color_scale_id])
 

app/models/color_theme.rb renamed to app/models/settings.rb

@@ -1,4 +1,4 @@
-class ColorTheme
+class Settings
   include ActiveModel::Model
 
   attr_accessor :color_scale

app/views/color_themes/show_view.rb renamed to app/views/color_schemes/show_view.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-class ColorThemes::ShowView < ApplicationView
+class ColorSchemes::ShowView < ApplicationView
   include Phlex::Rails::Helpers::FormWith
   include Phlex::Rails::Helpers::LinkTo
   include Phlex::Rails::Helpers::ButtonTo
   include Phlex::Rails::Helpers::ContentFor
 
-  def initialize(color_theme:, fallback_color_scale: nil, curated_color_scales: [], selected: false, saved: false)
-    @color_theme = color_theme
-    @color_scale = color_theme.color_scale
+  def initialize(settings:, fallback_color_scale: nil, curated_color_scales: [], selected: false, saved: false)
+    @settings = settings
+    @color_scale = settings.color_scale
     @fallback_color_scale = fallback_color_scale
     @curated_color_scales = curated_color_scales
     @selected = selected
@@ -38,7 +38,7 @@ def view_template
       div(class: "flex items-center") do
         span(class: "mr-2 text-small") { "Preview" }
 
-        form_with(model: @color_theme, url: url_for, method: :get) do |f|
+        form_with(model: @settings, url: url_for, method: :get) do |f|
           fieldset do
             f.select(
               :color_scale_id,
@@ -58,14 +58,14 @@ def view_template
         span(class: "mr-2 text-small") { "OR" }
 
         link_to "I feel lucky!",
-          color_theme_path(color_theme: {color_scale_id: @curated_color_scales.sample.id}),
+          settings_color_scheme_path(settings: {color_scale_id: @curated_color_scales.sample.id}),
           class: "button secondary mr-2"
 
         if @selected && @color_scale != @fallback_color_scale
           span(class: "mr-2 text-small") { "OR" }
 
           button_to "Reset preview",
-            color_theme_path(color_theme: {color_scale_id: @fallback_color_scale.id}),
+            settings_color_scheme_path(settings: {color_scale_id: @fallback_color_scale.id}),
             method: :patch,
             class: "button tertiary mr-2"
         end
@@ -76,14 +76,14 @@ def view_template
           span(class: "mr-2 text-small") { plain "Save" }
 
           button_to "Save this color scheme",
-            color_theme_path(color_theme: {color_scale_id: @color_scale.id}),
+            settings_color_scheme_path(settings: {color_scale_id: @color_scale.id}),
             method: :patch,
             class: "button primary mr-2"
 
           span(class: "mr-2 text-small") { unsafe_raw "&bull;" }
 
           button_to "Reset to default",
-            color_theme_path(color_theme: {color_scale_id: ColorScale.cached_default.id}),
+            settings_color_scheme_path(settings: {color_scale_id: ColorScale.cached_default.id}),
             method: :patch,
             class: "button tertiary mr-2"
         end

config/routes.rb

@@ -16,22 +16,16 @@
   end
   resources :examples, only: [:index, :show]
 
-  resource :color_theme, only: [:show, :update]
-
   namespace :pwa do
     resource :installation_instructions, only: [:show]
     resources :web_pushes, only: [:create]
   end
 
   resources :feed, only: [:index], format: "atom"
 
-  # Render dynamic PWA files from app/views/pwa/*
-  get "serviceworker" => "rails/pwa#serviceworker", :as => :pwa_serviceworker, :constraints => {format: "js"}
-  get "manifest" => "rails/pwa#manifest", :as => :pwa_manifest, :constraints => {format: "json"}
-
-  # Reveal health status on /up that returns 200 if the app boots with no exceptions, otherwise 500.
-  # Can be used by load balancers and uptime monitors to verify that the app is live.
-  get "up" => "rails/health#show", :as => :rails_health_check
+  namespace :settings do
+    resource :color_scheme, only: [:show, :update]
+  end
 
   namespace :users do
     resource :thank_you, only: [:show]
@@ -80,4 +74,12 @@
       mount Litestream::Engine => "/litestream"
     end
   end
+
+  # Render dynamic PWA files from app/views/pwa/*
+  get "serviceworker" => "rails/pwa#serviceworker", :as => :pwa_serviceworker, :constraints => {format: "js"}
+  get "manifest" => "rails/pwa#manifest", :as => :pwa_manifest, :constraints => {format: "json"}
+
+  # Reveal health status on /up that returns 200 if the app boots with no exceptions, otherwise 500.
+  # Can be used by load balancers and uptime monitors to verify that the app is live.
+  get "up" => "rails/health#show", :as => :rails_health_check
 end

spec/system/color_themes/customize_spec.rb renamed to spec/system/settings/color_schemes_spec.rb

@@ -2,18 +2,18 @@
 
 require "rails_helper"
 
-RSpec.describe "Customize Color Themes", type: :system do
-  it "user can selected a curated color scale" do
+RSpec.describe "Customize Color Scheme", type: :system do
+  it "user can selected a curated color scheme" do
     curated_color_names = YAML.load_file(Rails.root.join("config", "curated_colors.yml")).sample(3)
 
     curated_colors = curated_color_names.map do |name|
       FactoryBot.create(:color_scale, name: name)
     end
 
-    visit color_theme_path
+    visit settings_color_scheme_path
 
     chosen_color = curated_colors.second
-    select chosen_color.display_name, from: "color_theme[color_scale_id]"
+    select chosen_color.display_name, from: "settings[color_scale_id]"
 
     click_button "Save this color scheme"