Removed rails-settings-ui but kept rails-settings-cached

openstax · Oct 4, 2024 · df4a172 · df4a172
1 parent 861e54f
commit df4a172
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 47 deletions.
diff --git a/Gemfile b/Gemfile
@@ -151,10 +151,7 @@ gem 'awesome_print'
 gem 'whenever', require: false
 
 # Admin toggles
-# gem 'rails-settings-ui', '1.3.4'
-
-# gem 'rails-settings-cached', '0.7.2'
-# gem 'dry-validation'
+gem 'rails-settings-cached'
 
 # Respond to ELB healthchecks in /ping and /ping/
 gem 'openstax_healthcheck'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -585,6 +585,9 @@ GEM
     rails-i18n (7.0.9)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
+    rails-settings-cached (2.9.4)
+      activerecord (>= 5.0.0)
+      railties (>= 5.0.0)
     railties (6.0.6.1)
       actionpack (= 6.0.6.1)
       activesupport (= 6.0.6.1)
@@ -867,6 +870,7 @@ DEPENDENCIES
   rails-controller-testing
   rails-erd
   rails-i18n
+  rails-settings-cached
   redis-rails
   render_anywhere
   representable (~> 3.0.0)

diff --git a/config/initializers/3-settings.rb b/config/initializers/3-settings.rb
@@ -1,4 +1,4 @@
 # We need to require settings here so we guarantee they are available
 # before other initialization code.
 
-#require 'settings'
+require 'settings'
diff --git a/config/initializers/rails_settings_ui.rb_ b/config/initializers/rails_settings_ui.rb_
diff --git a/config/routes.rb b/config/routes.rb
@@ -310,8 +310,6 @@
     resources :external_ids, only: [:destroy]
 
     mount Blazer::Engine, at: "blazer", as: 'blazer_admin'
-
-    #mount RailsSettingsUi::Engine, at: 'settings'
   end
 
   namespace 'dev' do

diff --git a/lib/settings.rb_ → lib/settings.rb b/lib/settings.rb_ → lib/settings.rb
@@ -16,16 +16,6 @@
 module Settings
   module Db
     class Store < RailsSettings::Base
-      source Rails.root.join("config/app.yml")
-      namespace Rails.env
-
-      # Workaround (this method missing in current implementation, but RailsSettings-UI
-      # expects it -- doesn't really need to use it any more b/c RailsSettingsCached
-      # deals with defaults internally)
-      def self.defaults
-        result = RailsSettings::Default.enabled? ? RailsSettings::Default.instance : {}
-        result.with_indifferent_access
-      end
     end
 
     mattr_accessor :store