rails-settings-cached 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85279c41b179aa65d668a48d4d18e73b5fe886be9cd8235dc2acdb54c3beb5da
-  data.tar.gz: 516991953aa7698cf86511512d863b7903d1ec5ad648a69c386501413a75ac86
+  metadata.gz: 99a035f272fc7a299f74e25017cd4d1d453bc5b45c79a4ba0fd68555249087e5
+  data.tar.gz: 91b56df8857355fbd0bcc9178eda065714ab5da4bf9436dde4a8a340bde2809b
 SHA512:
-  metadata.gz: 742596dc7e47c3d31ea64ecf54d96cae5885938076c2704aebe5f3e94701627631d19a8480f24ef97dc1861a8e1a1cab33c6f3aefd56ff755f88ef47c1380401
-  data.tar.gz: aa7b9a3ba2443a7ac6cb12150c196247bfd543e086b4eea1199f83eca1035ddefc1bcb32ae5d01cf9c3448dcd2f5c651dd9a73c8dab22600d28f202ef7d1f4a6
+  metadata.gz: cc1e140b6ec1e2f0ed687de9a699d8bb1a87a41048784928b79b419623c19263c7aecf7d199c752e2ca5d3bfdc9de063e825032d3787ced6b9297ebaa2852275
+  data.tar.gz: 88dafb8efac6cb93566aa6dbded820723afd539a7ab24b96421d51cf5fda7afe268eae3fca10ec4645a571507ce10bcfae2f6ff749f94b2a08e722798e12b021

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,;]+/.freeze
     self.table_name = table_name_prefix + "settings"
 
     # get the value field, YAML decoded
@@ -26,12 +26,19 @@ module RailsSettings
     class << self
       def clear_cache
         RequestStore.store[:rails_settings_all_settings] = nil
-        Rails.cache.delete(self.cache_key)
+        Rails.cache.delete(cache_key)
       end
 
       def field(key, **opts)
         @keys ||= []
+        @readonly_keys ||= []
+        @editable_keys ||= []
         @keys << key.to_s
+        if opts[:readonly]
+          @readonly_keys << key.to_s
+        else
+          @editable_keys << key.to_s
+        end
         _define_field(key, default: opts[:default], type: opts[:type], readonly: opts[:readonly], separator: opts[:separator])
       end
 
@@ -45,97 +52,106 @@ module RailsSettings
         scope.join("/")
       end
 
-      def keys
-        @keys
-      end
+      attr_reader :keys
+      attr_reader :readonly_keys
+      attr_reader :editable_keys
 
       private
 
-        def _define_field(key, default: nil, type: :string, readonly: false, separator: nil)
-          if readonly
-            define_singleton_method(key) do
-              self.send(:_convert_string_to_typeof_value, type, default, separator: separator)
-            end
-          else
-            define_singleton_method(key) do
-              val = self.send(:_value_of, key)
-              result = nil
-              if !val.nil?
-                result = val
-              else
-                result = default
-                result = default.call if default.is_a?(Proc)
-              end
-
-              result = self.send(:_convert_string_to_typeof_value, type, result, separator: separator)
-
-              result
+      def _define_field(key, default: nil, type: :string, readonly: false, separator: nil)
+        if readonly
+          define_singleton_method(key) do
+            send(:_convert_string_to_typeof_value, type, default, separator: separator)
+          end
+        else
+          define_singleton_method(key) do
+            val = send(:_value_of, key)
+            result = nil
+            if !val.nil?
+              result = val
+            else
+              result = default
+              result = default.call if default.is_a?(Proc)
             end
 
-            define_singleton_method("#{key}=") do |value|
-              var_name = key.to_s
+            result = send(:_convert_string_to_typeof_value, type, result, separator: separator)
 
-              record = find_by(var: var_name) || new(var: var_name)
-              value = self.send(:_convert_string_to_typeof_value, type, value, separator: separator)
+            result
+          end
 
-              record.value = value
-              record.save!
+          define_singleton_method("#{key}=") do |value|
+            var_name = key.to_s
 
-              value
-            end
-          end
+            record = find_by(var: var_name) || new(var: var_name)
+            value = send(:_convert_string_to_typeof_value, type, value, separator: separator)
 
-          if type == :boolean
-            define_singleton_method("#{key}?") do
-              self.send(key)
-            end
-          end
-        end
+            record.value = value
+            record.save!
 
-        def _convert_string_to_typeof_value(type, value, separator: nil)
-          return value unless [String, Integer, Float, BigDecimal].include?(value.class)
-
-          case type
-          when :boolean
-            value == "true" || value == "1" || value == 1 || value == true
-          when :array
-            value.split(separator || SEPARATOR_REGEXP).reject { |str| str.empty? }.map(&:strip)
-          when :hash
-            value = YAML.load(value).to_h rescue eval(value).to_h rescue {}
-            value.deep_stringify_keys!
-            value
-          when :integer
-            value.to_i
-          when :float
-            value.to_f
-          when :big_decimal
-            value.to_d
-          else
             value
           end
         end
 
-        def _value_of(var_name)
-          raise "#{self.table_name} does not exist." unless table_exists?
-
-          _all_settings[var_name.to_s]
+        if type == :boolean
+          define_singleton_method("#{key}?") do
+            send(key)
+          end
         end
+      end
 
-        def rails_initialized?
-          Rails.application && Rails.application.initialized?
+      def _convert_string_to_typeof_value(type, value, separator: nil)
+        return value unless [String, Integer, Float, BigDecimal].include?(value.class)
+
+        case type
+        when :boolean
+          value == "true" || value == "1" || value == 1 || value == true
+        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
+          value.deep_stringify_keys!
+          value
+        when :integer
+          value.to_i
+        when :float
+          value.to_f
+        when :big_decimal
+          value.to_d
+        else
+          value
         end
+      end
 
-        def _all_settings
-          raise "You cannot use settings before Rails initialize." unless rails_initialized?
-          RequestStore.store[:rails_settings_all_settings] ||= begin
-            Rails.cache.fetch(self.cache_key, expires_in: 1.week) do
-              vars = unscoped.select("var, value")
-              result = {}
-              vars.each { |record| result[record.var] = record.value }
-              result.with_indifferent_access
-            end
+      def _value_of(var_name)
+        raise "#{table_name} does not exist." unless table_exists?
+
+        _all_settings[var_name.to_s]
+      end
+
+      def rails_initialized?
+        Rails.application&.initialized?
+      end
+
+      def _all_settings
+        raise "You cannot use settings before Rails initialize." unless rails_initialized?
+
+        RequestStore.store[:rails_settings_all_settings] ||= begin
+          Rails.cache.fetch(cache_key, expires_in: 1.week) do
+            vars = unscoped.select("var, value")
+            result = {}
+            vars.each { |record| result[record.var] = record.value }
+            result.with_indifferent_access
           end
         end
+      end
     end
   end
 end

data/lib/rails-settings/version.rb

@@ -3,7 +3,7 @@
 module RailsSettings
   class << self
     def version
-      "2.2.1"
+      "2.3.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-settings-cached
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Jason Lee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-14 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails