rails-settings-cached 2.3.5 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23b68e0d113892e9f08e29c3e70e39d79f3ce58aed36a981c55fe81593b8f3a9
-  data.tar.gz: c144240c649762ee4495fee8e2eef504244ae37746e43c294cef3512ea813a4c
+  metadata.gz: 3e423b44c4e49c3d0ffb953ffee50e1b268262a770eba8a9114b23c494458861
+  data.tar.gz: d5997e14e9288ec4c0fdf858a1029ea3a379b1e1aecf05b2ed8bb9158bf45bbb
 SHA512:
-  metadata.gz: f094b5b2485041c04885b1097715bf046e3a5525b88d800242479edaa3190fba4b3f164729840f2b11c519862387893c69ce58085d5867deab74093f75bfee1b
-  data.tar.gz: 20d36398a118661a50d45cbfbc16b416f280ef46376c96acbae2a15226ac1f2c70483adcdaacc56530169d6a96ad1e9ac4f79234766c13e2e80a5faaf5e289f6
+  metadata.gz: edf9eff836688ce1f82d3de681c34a7fd9c782e526e952ac42430d7f559b7aae51c3f73f4a749f167302f31b4b3286dce2d5f21dc504a6735981db6a0d259b6f
+  data.tar.gz: dfcbf34fcbb3f0af4d0161601537db441c8d07632ffc2b964857b10fcaa6af8b88f2cbd2c758d21bf3e9676a7dc8a1ea607230c3e06560fcf65feef2c7fff434

data/README.md

@@ -1,10 +1,10 @@
 # Rails Settings Cached
 
-This a plugin that makes managing a table of
-а global key, value pairs easy. Think of it like a global Hash stored in your database,
-that uses simple ActiveRecord like methods for manipulation. Keep track of any global
-setting that you don't want to hard code into your rails app. You can store any kind
-of object. Strings, numbers, arrays, or any object.
+The best solution for store global settings in Rails applications.
+
+This gem will managing a table of а global key, value pairs easy. Think of it like a global Hash stored in your database, that uses simple ActiveRecord like methods for manipulation. Keep track of any global setting that you don't want to hard code into your rails app.
+
+You can store any kind of object. Strings, numbers, arrays, booleans, or any object.
 
 [![Gem Version](https://badge.fury.io/rb/rails-settings-cached.svg)](https://rubygems.org/gems/rails-settings-cached) [![CI Status](https://travis-ci.org/huacnlee/rails-settings-cached.svg)](http://travis-ci.org/huacnlee/rails-settings-cached) [![codecov.io](https://codecov.io/github/huacnlee/rails-settings-cached/coverage.svg?branch=master)](https://codecov.io/github/huacnlee/rails-settings-cached?branch=master)
 
@@ -30,9 +30,9 @@ You will get `app/models/setting.rb`
 ```rb
 class Setting < RailsSettings::Base
   # cache_prefix { "v1" }
-  field :app_name, default: "Rails Settings"
+  field :app_name, default: "Rails Settings", validates: { presence: true, length: { in: 2..20 } }
   field :host, default: "http://example.com", readonly: true
-  field :default_locale, default: "zh-CN"
+  field :default_locale, default: "zh-CN", validates: { presence: true, inclusion: { in: %w[zh-CN en jp] } }
   field :readonly_item, type: :integer, default: 100, readonly: true
   field :user_limits, type: :integer, default: 20
   field :exchange_rate, type: :float, default: 0.123
@@ -49,11 +49,11 @@ class Setting < RailsSettings::Base
   }
 
   # lambda default value
-  field :welcome_message, type: :string, default: -> { "welcome to #{self.app_name}" }
+  field :welcome_message, type: :string, default: -> { "welcome to #{self.app_name}" }, validates: { length: { maximum: 255 } }
 end
 ```
 
-You must use `field` method to statement the setting keys, otherwise you can't use it.
+You must use the `field` method to statement the setting keys, otherwise you can't use it.
 
 Now just put that migration in the database with:
 
@@ -126,7 +126,6 @@ irb > Setting.notification_options
 }
 ```
 
-
 ### Get defined fields
 
 > version 2.3+
@@ -151,9 +150,56 @@ Setting.get_field("app_name")
 => { key: "app_name", type: :string, default: "Rails Settings", readonly: false }
 ```
 
-## Use Setting in Rails initalizing:
+## Validations
+
+You can use `validates` options to special the [Rails Validation](https://api.rubyonrails.org/classes/ActiveModel/Validations/ClassMethods.html#method-i-validates) for fields.
+
+```rb
+class Setting < RailsSettings::Base
+  # cache_prefix { "v1" }
+  field :app_name, default: "Rails Settings", validates: { presence: true, length: { in: 2..20 } }
+  field :default_locale, default: "zh-CN", validates: { presence: true, inclusion: { in: %w[zh-CN en jp], message: "is not included in [zh-CN, en, jp]" } }
+end
+```
+
+Now validate will work on record save:
 
-In `version 2.3+` we allows you to use Setting before Rails is initialized.
+```rb
+irb> Setting.app_name = ""
+ActiveRecord::RecordInvalid: (Validation failed: App name can't be blank)
+irb> Setting.app_name = "Rails Settings"
+"Rails Settings"
+irb> Setting.default_locale = "zh-TW"
+ActiveRecord::RecordInvalid: (Validation failed: Default locale is not included in [zh-CN, en, jp])
+irb> Setting.default_locale = "en"
+"en"
+```
+
+Validate by `save` / `valid?` method:
+
+```rb
+
+setting = Setting.find_or_initialize_by(var: :app_name)
+setting.value = ""
+setting.valid?
+# => false
+setting.errors.full_messages
+# => ["App name can't be blank", "App name too short (minimum is 2 characters)"]
+
+setting = Setting.find_or_initialize_by(var: :default_locale)
+setting.value = "zh-TW"
+setting.save
+# => false
+setting.errors.full_messages
+# => ["Default locale is not included in [zh-CN, en, jp]"]
+setting.value = "en"
+setting.valid?
+# => true
+```
+
+## Use Setting in Rails initializing:
+
+In `version 2.3+` you can use Setting before Rails is initialized.
 
 For example `config/initializers/devise.rb`
 
@@ -174,10 +220,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 +245,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 +267,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 +292,7 @@ class ActiveSupport::TestCase
 end
 ```
 
------
+---
 
 ## How to manage Settings in the admin interface?
 
@@ -256,19 +306,32 @@ 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
+      @errors = ActiveModel::Errors.new
+      setting_params.keys.each do |key|
+        next if setting_params[key].nil?
+
+        setting = Setting.new(var: key)
+        setting.value = setting_params[key].strip
+        unless setting.valid?
+          @errors.merge!(setting.errors)
+        end
+      end
+
+      if @errors.any?
+        render :new
+      end
+
       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
@@ -284,6 +347,16 @@ app/views/admin/settings/show.html.erb
 
 ```erb
 <%= form_for(Setting.new, url: admin_settings_path) do |f| %>
+  <% if @errors.any? %>
+    <div class="alert alert-block alert-danger">
+      <ul>
+        <% @errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+
   <div class="form-group">
     <label class="control-label">Host</label>
     <%= f.text_field :host, value: Setting.host, class: "form-control", placeholder: "http://localhost"  %>
@@ -349,9 +422,11 @@ end
 - [forem/forem](https://github.com/forem/forem) - 2.x
 - [siwapp/siwapp](https://github.com/siwapp/siwapp) - 2.x
 - [aidewoode/black_candy](https://github.com/aidewoode/black_candy) - 2.x
-- [thebluedoc/bluedoc](https://github.com/thebluedoc/bluedoc/blob/master/app/models/setting.rb) - 2.x
+- [huacnlee/bluedoc](https://github.com/huacnlee/bluedoc) - 2.x
+- [getzealot/zealot](https://github.com/getzealot/zealot) - 2.x
+- [kaishuu0123/rebacklogs](https://github.com/kaishuu0123/rebacklogs) - 2.x
 - [tootsuite/mastodon](https://github.com/tootsuite/mastodon) - 0.6.x
 - [helpyio/helpy](https://github.com/helpyio/helpy) - 0.5.x
-
+- [daqing/rabel](https://github.com/daqing/rabel) - 0.4.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_cache"
 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,12 +23,13 @@ module RailsSettings
 
     class << self
       def clear_cache
-        RequestStore.store[:rails_settings_all_settings] = nil
+        RequestCache.reset
         Rails.cache.delete(cache_key)
       end
 
       def field(key, **opts)
-        _define_field(key, default: opts[:default], type: opts[:type], readonly: opts[:readonly], separator: opts[:separator])
+        _define_field(key, default: opts[:default], type: opts[:type], readonly: opts[:readonly],
+                           separator: opts[:separator], validates: opts[:validates])
       end
 
       def get_field(key)
@@ -61,10 +60,12 @@ module RailsSettings
 
       private
 
-      def _define_field(key, default: nil, type: :string, readonly: false, separator: nil)
+      def _define_field(key, default: nil, type: :string, readonly: false, separator: nil, validates: nil)
+        key = key.to_s
+
         @defined_fields ||= []
         @defined_fields << {
-          key: key.to_s,
+          key: key,
           default: default,
           type: type || :string,
           readonly: readonly.nil? ? false : readonly
@@ -91,7 +92,7 @@ module RailsSettings
           end
 
           define_singleton_method("#{key}=") do |value|
-            var_name = key.to_s
+            var_name = key
 
             record = find_by(var: var_name) || new(var: var_name)
             value = send(:_convert_string_to_typeof_value, type, value, separator: separator)
@@ -101,6 +102,15 @@ module RailsSettings
 
             value
           end
+
+          if validates
+            validates[:if] = proc { |item| item.var.to_s == key }
+            send(:validates, key, **validates)
+
+            define_method(:read_attribute_for_validation) do |_key|
+              self.value
+            end
+          end
         end
 
         if type == :boolean
@@ -115,19 +125,19 @@ module RailsSettings
 
         case type
         when :boolean
-          value == "true" || value == "1" || value == 1 || value == true
+          ["true", "1", 1, true].include?(value)
         when :array
           value.split(separator || SEPARATOR_REGEXP).reject { |str| str.empty? }.map(&:strip)
         when :hash
           value = begin
-                    begin
-                      YAML.load(value).to_h
-                    rescue StandardError
-                      eval(value).to_h
-                    end
-                  rescue StandardError
-                    {}
-                  end
+            begin
+              YAML.load(value).to_h
+            rescue StandardError
+              eval(value).to_h
+            end
+          rescue StandardError
+            {}
+          end
           value.deep_stringify_keys!
           ActiveSupport::HashWithIndifferentAccess.new(value)
         when :integer
@@ -148,7 +158,7 @@ module RailsSettings
           return nil
         end
 
-        _all_settings[var_name.to_s]
+        _all_settings[var_name]
       end
 
       def _table_exists?
@@ -162,7 +172,7 @@ module RailsSettings
       end
 
       def _all_settings
-        RequestStore.store[:rails_settings_all_settings] ||= begin
+        RequestCache.settings ||= begin
           Rails.cache.fetch(cache_key, expires_in: 1.week) do
             vars = unscoped.select("var, value")
             result = {}

data/lib/rails-settings/request_cache.rb

@@ -0,0 +1,30 @@
+module RailsSettings
+  if defined? ActiveSupport::CurrentAttributes 
+    # 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 RequestCache < ActiveSupport::CurrentAttributes 
+      attribute :settings
+    end
+  else
+    # https://github.com/steveklabnik/request_store
+    # For Rails 5.0
+    require "request_store"
+
+    class RequestCache
+      class << self
+        def reset
+          self.settings = nil
+        end
+
+        def settings
+          RequestStore.store[:rails_settings_all_settings]
+        end
+
+        def settings=(val)
+          RequestStore.store[:rails_settings_all_settings]
+        end
+      end
+    end
+  end
+end

data/lib/rails-settings/version.rb

@@ -3,7 +3,7 @@
 module RailsSettings
   class << self
     def version
-      "2.3.5"
+      "2.5.2"
     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.5.2
 platform: ruby
 authors:
 - Jason Lee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-17 00:00:00.000000000 Z
+date: 2020-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !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'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -122,11 +108,11 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: "\n  This is improved from rails-settings, added caching.\n  Settings
-  plugin for Rails that makes managing a table of global key,\n  value pairs easy.
-  Think of it like a global Hash stored in you database,\n  that uses simple ActiveRecord
-  like methods for manipulation.\n\n  Keep track of any global setting that you dont
-  want to hard code into your rails app.\n  You can store any kind of object.  Strings,
+description: "\n  The best solution for store global settings in Rails applications.\n\n
+  \ This gem will managing a table of а global key, value pairs easy. Think of it
+  like a \n  global Hash stored in your database, that uses simple ActiveRecord like
+  methods for manipulation.\n\n  Keep track of any global setting that you dont want
+  to hard code into your rails app.\n  You can store any kind of object.  Strings,
   numbers, arrays, or any object.\n  "
 email: huacnlee@gmail.com
 executables: []
@@ -142,6 +128,7 @@ files:
 - lib/rails-settings-cached.rb
 - lib/rails-settings/base.rb
 - lib/rails-settings/railtie.rb
+- lib/rails-settings/request_cache.rb
 - lib/rails-settings/version.rb
 homepage: https://github.com/huacnlee/rails-settings-cached
 licenses:
@@ -162,8 +149,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
-summary: Settings plugin for Rails that makes managing a table of global keys.
+summary: The best solution for store global settings in Rails applications.
 test_files: []