rails-settings-cached 2.3.5 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23b68e0d113892e9f08e29c3e70e39d79f3ce58aed36a981c55fe81593b8f3a9
-  data.tar.gz: c144240c649762ee4495fee8e2eef504244ae37746e43c294cef3512ea813a4c
+  metadata.gz: 603b7101883a17d76bfb33682ce421b7259101bfc7d3b0fea450d02466adcb03
+  data.tar.gz: '088348b905fba8727569b052468ca194c74fcde740976e0d4cfe6b780063144f'
 SHA512:
-  metadata.gz: f094b5b2485041c04885b1097715bf046e3a5525b88d800242479edaa3190fba4b3f164729840f2b11c519862387893c69ce58085d5867deab74093f75bfee1b
-  data.tar.gz: 20d36398a118661a50d45cbfbc16b416f280ef46376c96acbae2a15226ac1f2c70483adcdaacc56530169d6a96ad1e9ac4f79234766c13e2e80a5faaf5e289f6
+  metadata.gz: eeaed942036ec6c70fbd0f8a687000032e87cbef17324eca6329c32e1f7b69b6f38a7d295ec00441ec1fd1601f53c8cbe162df33e0f5d4f518658f6cb3236835
+  data.tar.gz: 13f87d6cac9234fcf48b50b3e67723aac4977d4a9e8fb71528bf8d12fd29eb27372d9b5705a496f694550ad988dba613f9dc3bf069fa699a910ebd1f4c5b8506

data/README.md

@@ -126,7 +126,6 @@ irb > Setting.notification_options
 }
 ```
 
-
 ### Get defined fields
 
 > version 2.3+
@@ -151,7 +150,7 @@ Setting.get_field("app_name")
 => { key: "app_name", type: :string, default: "Rails Settings", readonly: false }
 ```
 
-## Use Setting in Rails initalizing:
+## Use Setting in Rails initializing:
 
 In `version 2.3+` we allows you to use Setting before Rails is initialized.
 
@@ -174,10 +173,9 @@ end
 
 ## Readonly field
 
-You may also want use Setting in these locations:
+You may also want use Setting before Rails initialize:
 
 ```
-config/application.rb
 config/environments/*.rb
 ```
 
@@ -200,14 +198,19 @@ class Setting < RailsSettings::Base
 end
 ```
 
+config/environments/production.rb
+
 ```rb
+# You must require_relative directly in Rails 6.1+ in config/environments/production.rb
+require_relative "../../app/models/setting"
+
 Rails.application.configure do
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.smtp_settings = Setting.mailer_options.deep_symbolize_keys
 end
 ```
 
-### Caching flow:
+## Caching flow:
 
 ```
 Setting.host -> Check Cache -> Exist - Get value of key for cache -> Return
@@ -217,7 +220,7 @@ Setting.host -> Check Cache -> Exist - Get value of key for cache -> Return
                 Return default value or nil
 ```
 
-In each Setting keys call, we will load the cache/db and save in [RequestStore](https://github.com/steveklabnik/request_store) to avoid hit cache/db.
+In each Setting keys call, we will load the cache/db and save in [ActiveSupport::CurrentAttributes](https://api.rubyonrails.org/classes/ActiveSupport/CurrentAttributes.html) to avoid hit cache/db.
 
 Each key update will expire the cache, so do not add some frequent update key.
 
@@ -242,7 +245,7 @@ class ActiveSupport::TestCase
 end
 ```
 
------
+---
 
 ## How to manage Settings in the admin interface?
 
@@ -256,19 +259,16 @@ namespace :admin do
 end
 ```
 
-
 app/controllers/admin/settings_controller.rb
 
 ```rb
 module Admin
   class SettingsController < ApplicationController
-    before_action :get_setting, only: [:edit, :update]
-
     def create
       setting_params.keys.each do |key|
         Setting.send("#{key}=", setting_params[key].strip) unless setting_params[key].nil?
       end
-      redirect_to settings_path, notice: "Setting was successfully updated."
+      redirect_to admin_settings_path, notice: "Setting was successfully updated."
     end
 
     private
@@ -353,5 +353,4 @@ end
 - [tootsuite/mastodon](https://github.com/tootsuite/mastodon) - 0.6.x
 - [helpyio/helpy](https://github.com/helpyio/helpy) - 0.5.x
 
-
 And more than [1K repositories](https://github.com/huacnlee/rails-settings-cached/network/dependents) used.

data/lib/rails-settings-cached.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "rails-settings/base"
+require_relative "rails-settings/request_store"
 require_relative "rails-settings/railtie"
 require_relative "rails-settings/version"
 

data/lib/rails-settings/base.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "request_store"
-
 module RailsSettings
   class Base < ActiveRecord::Base
     class SettingNotFound < RuntimeError; end
@@ -25,7 +23,7 @@ module RailsSettings
 
     class << self
       def clear_cache
-        RequestStore.store[:rails_settings_all_settings] = nil
+        RequestStore.reset
         Rails.cache.delete(cache_key)
       end
 
@@ -162,7 +160,7 @@ module RailsSettings
       end
 
       def _all_settings
-        RequestStore.store[:rails_settings_all_settings] ||= begin
+        RequestStore.settings ||= begin
           Rails.cache.fetch(cache_key, expires_in: 1.week) do
             vars = unscoped.select("var, value")
             result = {}

data/lib/rails-settings/request_store.rb

@@ -0,0 +1,8 @@
+module RailsSettings
+  # For storage all settings in Current, it will reset after per request completed.
+  # Base on ActiveSupport::CurrentAttributes
+  # https://api.rubyonrails.org/classes/ActiveSupport/CurrentAttributes.html
+  class RequestStore < ActiveSupport::CurrentAttributes 
+    attribute :settings
+  end
+end

data/lib/rails-settings/version.rb

@@ -3,7 +3,7 @@
 module RailsSettings
   class << self
     def version
-      "2.3.5"
+      "2.4.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-settings-cached
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.4.0
 platform: ruby
 authors:
 - Jason Lee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-17 00:00:00.000000000 Z
+date: 2020-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-- !ruby/object:Gem::Dependency
-  name: request_store
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +128,7 @@ files:
 - lib/rails-settings-cached.rb
 - lib/rails-settings/base.rb
 - lib/rails-settings/railtie.rb
+- lib/rails-settings/request_store.rb
 - lib/rails-settings/version.rb
 homepage: https://github.com/huacnlee/rails-settings-cached
 licenses:
@@ -162,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Settings plugin for Rails that makes managing a table of global keys.