rails-settings-cached 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f952983987531a930ac0f603d37aed4938648f4e858297182b4039987fc6c975
-  data.tar.gz: ecbfbf363e6c67519ced21e25966ebb0339bc7dae2e3171d95ab2d04675b5b7e
+  metadata.gz: 765057576ddcdb19d9f394f1844950f03e8c70944abd9b104e70824f60f7e0e5
+  data.tar.gz: 0d2a2c4aa7560d96bee3a0c1a0d50f7cb89bffd5c650ae47f2bd6169c0d12b6e
 SHA512:
-  metadata.gz: d78651e359e244a155e1e743dd391494f0792504b816dc8bd0d3cdbfd1d7103a16c020895f7b751007f5f5b3a04d4d94398e5a7df4cc09ad07ff1166b0d05ed2
-  data.tar.gz: 2320d0950d5a9b9090f5b5df27f42df1b7a74553104e584728146ac5cd41cd567b58e450e9121dc764be4c534209d988b2b1b516b1e948913806f1b4c5850961
+  metadata.gz: 908f7ae3d8e01710f9df4cb32a77b2302129107bcd34254cb5237fc5f5b98f2e4007fe315751ab3fd7e2212e14a0db133f796f994b0bd6a1cee48768717a01a9
+  data.tar.gz: fe611e7af4ac5ca72a98040c63b0475833878ac6f11b82953fd80458bb6b96311fff7fc174f890171f466f724be809cd334bc184b0cb0c8c7b3ae94f5fbee28f

data/README.md

@@ -50,6 +50,7 @@ class Setting < RailsSettings::Base
   field :host, default: "http://example.com"
   field :readonly_item, type: :integer, default: 100, readonly: true
   field :user_limits, type: :integer, default: 20
+  field :exchange_rate, type: :float, default: 0.123
   field :admin_emails, type: :array, default: %w[admin@rubyonrails.org]
   # Override array separator, default: /[\n,]/ split with \n or comma.
   field :tips, type: :array, separator: /[\n]+/
@@ -212,18 +213,13 @@ module Admin
   class SettingsController < ApplicationController
     before_action :get_setting, only: [:edit, :update]
 
-    def show
-    end
-
     def create
       setting_params.keys.each do |key|
-        next if key.to_s == "site_logo"
         Setting.send("#{key}=", setting_params[key].strip) unless setting_params[key].nil?
       end
-      redirect_to admin_settings_path(notice: "Setting was successfully updated.")
+      redirect_to settings_path, notice: "Setting was successfully updated."
     end
 
-
     private
       def setting_params
         params.require(:setting).permit(:host, :user_limits, :admin_emails,
@@ -259,7 +255,8 @@ app/views/admin/settings/show.html.erb
     <%= f.text_area :notification_options, value: YAML.dump(Setting.notification_options), class: "form-control", style: "height: 180px;"  %>
     <div class="form-text">
       Use YAML format to config the SMTP_html
-    </details>
+    </div>
+  </div>
 <% end %>
 ```
 
@@ -331,8 +328,7 @@ Same values will fetch from the `settings` table.
 
 ## Use cases:
 
-- [ruby-china/ruby-china](https://github.com/ruby-china/ruby-china)
+- [ruby-china/homeland](https://github.com/ruby-china/homeland)
 - [thebluedoc/bluedoc](https://github.com/thebluedoc/bluedoc/blob/master/app/models/setting.rb)
 - [tootsuite/mastodon](https://github.com/tootsuite/mastodon)
 - [helpyio/helpy](https://github.com/helpyio/helpy)
-

data/lib/rails-settings/base.rb

@@ -6,7 +6,7 @@ module RailsSettings
   class Base < ActiveRecord::Base
     class SettingNotFound < RuntimeError; end
 
-    SEPARATOR_REGEXP = /[\n,]+/
+    SEPARATOR_REGEXP = /[\n,;]+/
     self.table_name = table_name_prefix + "settings"
 
     # get the value field, YAML decoded
@@ -30,6 +30,8 @@ module RailsSettings
       end
 
       def field(key, **opts)
+        @keys ||= []
+        @keys << key.to_s
         _define_field(key, default: opts[:default], type: opts[:type], readonly: opts[:readonly], separator: opts[:separator])
       end
 
@@ -43,11 +45,16 @@ module RailsSettings
         scope.join("/")
       end
 
+      def keys
+        @keys
+      end
+
       private
+
         def _define_field(key, default: nil, type: :string, readonly: false, separator: nil)
           if readonly
             define_singleton_method(key) do
-              self.send(:_covert_string_to_typeof_value, type, default, separator: separator)
+              self.send(:_convert_string_to_typeof_value, type, default, separator: separator)
             end
           else
             define_singleton_method(key) do
@@ -60,7 +67,7 @@ module RailsSettings
                 result = default.call if default.is_a?(Proc)
               end
 
-              result = self.send(:_covert_string_to_typeof_value, type, result, separator: separator)
+              result = self.send(:_convert_string_to_typeof_value, type, result, separator: separator)
 
               result
             end
@@ -69,7 +76,7 @@ module RailsSettings
               var_name = key.to_s
 
               record = find_by(var: var_name) || new(var: var_name)
-              value = self.send(:_covert_string_to_typeof_value, type, value, separator: separator)
+              value = self.send(:_convert_string_to_typeof_value, type, value, separator: separator)
 
               record.value = value
               record.save!
@@ -85,20 +92,24 @@ module RailsSettings
           end
         end
 
-        def _covert_string_to_typeof_value(type, value, separator: nil)
-          return value unless value.is_a?(String) || value.is_a?(Integer)
+        def _convert_string_to_typeof_value(type, value, separator: nil)
+          return value unless [String, Integer, Float, BigDecimal].include?(value.class)
 
           case type
           when :boolean
-            return value == "true" || value == "1" || value == 1 || value == true
+            value == "true" || value == "1" || value == 1 || value == true
           when :array
-            return value.split(separator || SEPARATOR_REGEXP).reject { |str| str.empty? }
+            value.split(separator || SEPARATOR_REGEXP).reject { |str| str.empty? }.map(&:strip)
           when :hash
-            value = YAML.load(value).to_hash rescue {}
+            value = YAML.load(value).to_h rescue eval(value).to_h rescue {}
             value.deep_stringify_keys!
-            return value
+            value
           when :integer
-            return value.to_i
+            value.to_i
+          when :float
+            value.to_f
+          when :big_decimal
+            value.to_d
           else
             value
           end

data/lib/rails-settings/version.rb

@@ -3,7 +3,7 @@
 module RailsSettings
   class << self
     def version
-      "2.1.1"
+      "2.2.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-settings-cached
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-07 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codecov
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="