ack_rails_admin_settings 1.2.1.3 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44e65f11e42fe108a21c419dc2b291796b18be89
-  data.tar.gz: f711ebbdd3551c06ec781ef36e67db2d3f55b51b
+  metadata.gz: 624635c832be44255141d7ada5d09cc18abf8b89
+  data.tar.gz: d0a9ed54f0ca8df937ac06fbcd51364f58a61c02
 SHA512:
-  metadata.gz: 4660599fd64007b1878537a91cff2067fde22979f1ae34aa3544f78999afc5ce9fe63d3250a67f8e555d44d285817e4686a22b415e87d5558e013d280aa473a7
-  data.tar.gz: 3b25d6f68beabe7d83db4d564c18bf1238cce8204918cbc2f9d0d7f7af9333e3fa2ea73396d52cad0e85a6ca91f0e059709dab2cc09462e27ad473f56acdfa0e
+  metadata.gz: 46e9b4192e3b1b9e83129de9abb34ac8b59abe36d97a2a01cd4484309a3b61fc61948bb4812416152b25e20e2c0e2b7cabc6de4908d3f4442180bb33f65e3931
+  data.tar.gz: 7a0dbcf80aee6d511d2b572caf2af051fdce29628b8a0b987d2e0937a9aa157218e64e4cc2ef1615f4940aae5c61dcc51464e33447c4169892a9e2492924c19b

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.2.2
+- Loadable Settings. You can cancel load some settings for save time, memory, etc. Because of cache, perhaps.
+- DELEGATE :p, :puts and :block_given? for Kernel. Prevent Settings.p and etc
+- Caching improves.
+
 ## 1.2.1
 
 - Remove HancockCMS support (moved into CMS and cache plugin for CMS).

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ack_rails_admin_settings (1.2.1.3)
+    ack_rails_admin_settings (1.2.2)
 
 GEM
   remote: https://rubygems.org/
@@ -65,7 +65,7 @@ GEM
     erubis (2.7.0)
     factory_girl (4.8.0)
       activesupport (>= 3.0.0)
-    geocoder (1.4.1)
+    geocoder (1.4.3)
     glebtv-carrierwave-mongoid (0.7.0)
       carrierwave (~> 0.9.0)
       mongoid (~> 4.0.0.alpha1)
@@ -74,7 +74,7 @@ GEM
       paperclip (~> 5.1.0)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
-    i18n (0.7.0)
+    i18n (0.8.0)
     json (2.0.3)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
@@ -164,7 +164,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4.1)
-    simplecov (0.12.0)
+    simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)

data/app/models/rails_admin_settings/setting.rb

@@ -37,6 +37,10 @@ module RailsAdminSettings
       enabled
     end
 
+    def loadable?
+      loadable
+    end
+
     def name
       label.blank? ? key : label
     end

data/lib/rails_admin_settings/fallback.rb

@@ -2,6 +2,9 @@ module RailsAdminSettings
   # we are inheriting from BasicObject so we don't get a bunch of methods from
   # Kernel or Object
   class Fallback < BasicObject
+
+    DELEGATE = [:puts, :p, :block_given?].freeze
+
     def initialize(ns, fb)
       @ns = ns
       @fb = fb
@@ -11,10 +14,12 @@ module RailsAdminSettings
       "#<RailsAdminSettings::Fallback ns: #{@ns.inspect}, fb: #{@fb.inspect}>".freeze
     end
 
-    def method_missing(*args)
+    def method_missing(name, *args, &block)
+      return ::Kernel.send(name, *args, &block) if DELEGATE.include?(name)
+
       @ns.ns_mutex.synchronize do
         @ns.fallback = @fb
-        @ns.__send__(*args)
+        @ns.__send__(name, *args, &block)
       end
     end
   end

data/lib/rails_admin_settings/mongoid.rb

@@ -12,11 +12,24 @@ module RailsAdminSettings
       field :key, type: String
       field :raw, type: String
       field :label, type: String
-      index({ns: 1, key: 1}, {unique: true, sparse: true})
+      field :loadable, type: Boolean, default: true
+      scope :loadable, -> {
+        where(loadable: true)
+      }
+      index({ns: 1, key: 1, loadable: 1}, {unique: true, sparse: true})
 
       field :cache_keys_str, type: String, default: ""
       def cache_keys
-        cache_keys_str.split(/\s+/).map { |k| k.strip }.reject { |k| k.blank? }
+        @cache_keys ||= cache_keys_str.split(/\s+/).map { |k| k.strip }.reject { |k| k.blank? }
+      end
+      def add_cache_key(_key)
+        unless has_cache_key?(_key)
+          self.cache_keys_str = (cache_keys + [_key]).uniq.join(" ")
+          @cache_key = nil
+        end
+      end
+      def has_cache_key?(_key)
+        cache_keys.include?(_key)
       end
 
       after_touch :clear_cache

data/lib/rails_admin_settings/namespaced.rb

@@ -2,6 +2,9 @@ module RailsAdminSettings
   # we are inheriting from BasicObject so we don't get a bunch of methods from
   # Kernel or Object
   class Namespaced < BasicObject
+
+    DELEGATE = [:puts, :p, :block_given?].freeze
+
     attr_accessor :settings, :fallback
     attr_reader :loaded, :mutex, :ns_mutex, :name
 
@@ -29,7 +32,7 @@ module RailsAdminSettings
         return if loaded
         @loaded = true
         @settings = {}
-        ::RailsAdminSettings::Setting.ns(@name).each do |setting|
+        ::RailsAdminSettings::Setting.ns(@name).loadable.each do |setting|
           @settings[setting.key] = setting
         end
       end
@@ -43,18 +46,63 @@ module RailsAdminSettings
     end
 
     # returns setting object
-    def get(key, options = {})
-      load!
+    def get(key, options = {}, &block)
+      options[:loadable] = true unless options[:loadable] == false
+      load! if options[:loadable]
       key = key.to_s
       mutex.synchronize do
         @locked = true
-        v = @settings[key]
-        if v.nil?
-          unless @fallback.nil? || @fallback == @name
-            v = ::Settings.ns(@fallback).getnc(key)
+        _loadable = options[:loadable]
+        unless _loadable
+          v = ::RailsAdminSettings::Setting.ns(name).where(key: key).first
+          if v
+            unless options[:cache_keys_str].present?
+              _cache_keys = options.delete(:cache_keys)
+              _cache_keys ||= options.delete(:cache_key)
+
+              if _cache_keys.nil?
+                # if _cache
+                #   options[:cache_keys_str] = name.underscore
+                # end
+              else
+                if _cache_keys.is_a?(::Array)
+                  options[:cache_keys_str] = _cache_keys.map { |k| k.to_s.strip }.join(" ")
+                else
+                  options[:cache_keys_str] = _cache_keys.to_s.strip
+                end
+              end
+            end
+            options.delete(:cache_keys)
+            options.delete(:cache_key)
+
+            _old_cache_keys = options[:cache_keys_str].strip.split(" ")
+            # options[:cache_keys_str] = ("#{v.cache_keys_str} #{(options[:cache_keys_str] || "")}".strip.split(" ")).uniq
+            # options[:cache_keys_str] = ("#{v.cache_keys_str.join(" ")} #{(options[:cache_keys_str] || "")}".strip.split(" ")).uniq
+            options[:cache_keys_str] = (_old_cache_keys + v.cache_keys).uniq
+            options[:overwrite] = true if (options[:cache_keys_str] - _old_cache_keys).blank?
+            options[:cache_keys_str] = options[:cache_keys_str].map { |k| k.to_s.strip }.join(" ")
           end
+        else
+          v = @settings[key]
+        end
+        _overwrite = options[:overwrite]
+        if v.nil? or _overwrite
           if v.nil?
-            v = set(key, options[:default], options)
+            unless @fallback.nil? || @fallback == @name
+              v = ::Settings.ns(@fallback).getnc(key)
+            end
+          end
+          if v.nil? or _overwrite
+            if block
+              begin
+                v = set(key, yield, options)
+              rescue Exception => ex
+                # puts "WTF"
+                # puts ex.inspect
+              end
+            else
+              v = set(key, options[:default], options)
+            end
           end
         end
         @locked = false
@@ -65,13 +113,17 @@ module RailsAdminSettings
     # returns setting object
     def getnc(key)
       load!
-      mutex.synchronize do
+      ret = mutex.synchronize do
         self.settings[key]
       end
+      unless ret
+        ret = ::RailsAdminSettings::Setting.ns(name).where(key: key).first
+      end
+      ret
     end
 
     def set(key, value = nil, options = {})
-      load! unless @locked
+      load! unless @locked if options[:loadable]
       key = key.to_s
       options.symbolize_keys!
       if options.key?(:cache)
@@ -87,8 +139,8 @@ module RailsAdminSettings
       end
 
       unless options[:cache_keys_str].present?
-        options[:cache_keys] ||= options.delete :cache_key
-        _cache_keys = options.delete :cache_keys
+        _cache_keys = options.delete(:cache_keys)
+        _cache_keys ||= options.delete(:cache_key)
 
         if _cache_keys.nil?
           # if _cache
@@ -96,21 +148,24 @@ module RailsAdminSettings
           # end
         else
           if _cache_keys.is_a?(::Array)
-            options[:cache_keys_str] = _cache_keys.map { |k| k.to_s }.join(" ")
+            options[:cache_keys_str] = _cache_keys.map { |k| k.to_s.strip }.join(" ")
           else
-            options[:cache_keys_str] = _cache_keys.to_s
+            options[:cache_keys_str] = _cache_keys.to_s.strip
           end
         end
       end
+      options.delete(:cache_keys)
+      options.delete(:cache_key)
 
       options.merge!(value: value)
       if @locked
-        write_to_database(key, options)
+        ret = write_to_database(key, options)
       else
         mutex.synchronize do
-          write_to_database(key, options)
+          ret = write_to_database(key, options)
         end
       end
+      ret
     end
 
     def enabled?(key, options = {})
@@ -142,7 +197,8 @@ module RailsAdminSettings
     end
 
     # returns processed setting value
-    def method_missing(key, *args)
+    def method_missing(key, *args, &block)
+      return ::Kernel.send(key, *args, &block) if DELEGATE.include?(key)
       key = key.to_s
       if key.end_with?('_enabled?')
         key = key[0..-10]
@@ -172,7 +228,7 @@ module RailsAdminSettings
         value = args.first
         set(key, value, options).val
       else
-        v = get(key, args.first || {})
+        v = get(key, args.first || {}, &block)
         if v.nil?
           ''
         else
@@ -187,27 +243,38 @@ module RailsAdminSettings
         options[:raw] = ''
         file = options[:value]
       else
-        options[:raw] = options[:value]
+        options[:raw] = options[:value] if options[:value]
       end
 
       options.delete(:value)
       options.delete(:default)
       options[:ns] = @name
-
       if @settings[key].nil?
-        options.delete(:overwrite)
-        v = ::RailsAdminSettings::Setting.create(options.merge(key: key))
-        if !v.persisted?
-          if v.errors[:key].any?
-            v = ::RailsAdminSettings::Setting.where(key: key).first
-            if v.nil?
-              ::Kernel.raise ::RailsAdminSettings::PersistenceException, 'Fatal: error in key and not in DB'
+        if options.delete(:overwrite)
+          v = ::RailsAdminSettings::Setting.ns(options[:ns]).where(key: key).first
+          if v
+            opts = options.dup
+            v.update_attributes!(opts)
+          end
+        end
+        if v.nil?
+          v = ::RailsAdminSettings::Setting.create(options.merge(key: key))
+          if !v.persisted?
+            if v.errors[:key].any?
+              v = ::RailsAdminSettings::Setting.where(key: key).first
+              if v.nil?
+                ::Kernel.raise ::RailsAdminSettings::PersistenceException, 'Fatal: error in key and not in DB'
+              end
+            else
+              ::Kernel.raise ::RailsAdminSettings::PersistenceException, v.errors.full_messages.join(',')
             end
-          else
-            ::Kernel.raise ::RailsAdminSettings::PersistenceException, v.errors.full_messages.join(',')
           end
         end
-        @settings[key] = v
+        if options[:loadable]
+          @settings[key] = v
+        else
+          return v
+        end
       else
         opts = options.dup
         if options[:overwrite] == false && !@settings[key].value.blank?
@@ -218,7 +285,7 @@ module RailsAdminSettings
         opts.delete(:overwrite)
         @settings[key].update_attributes!(opts)
       end
-      if is_file
+      if is_file and options[:loadable] and @settings[key]
         if options[:overwrite] != false || !@settings[key].file?
           @settings[key].file = file
           @settings[key].save!

data/lib/rails_admin_settings/rails_admin_config.rb

@@ -10,8 +10,10 @@ module RailsAdminSettings
           list do
             if Object.const_defined?('RailsAdminToggleable')
               field :enabled, :toggle
+              field :loadable, :toggle
             else
               field :enabled
+              field :loadable
             end
             field :kind do
               searchable true
@@ -50,6 +52,7 @@ module RailsAdminSettings
 
           edit do
             field :enabled
+            field :loadable
             field :ns  do
               read_only true
               help false

data/lib/rails_admin_settings/require_helpers.rb

@@ -47,7 +47,7 @@ module RailsAdminSettings
         require 'geocoder'
         yield
       rescue LoadError => e
-        e.message << " [rails_admin_settings] Please add gem 'validates_email_format_of' to your Gemfile to use email kind settings".freeze
+        e.message << " [rails_admin_settings] Please add gem 'geocoder' to your Gemfile to use geocoder kind settings".freeze
         raise e
       end
     end

data/lib/rails_admin_settings/settings.rb

@@ -3,6 +3,9 @@ require 'thread'
 # we are inheriting from BasicObject so we don't get a bunch of methods from
 # Kernel or Object
 class Settings < BasicObject
+
+  DELEGATE = [:puts, :p, :block_given?].freeze
+
   cattr_accessor :file_uploads_supported, :file_uploads_engine
   @@file_uploads_supported = false
   @@file_uploads_engine = false
@@ -106,8 +109,13 @@ class Settings < BasicObject
       set(key, nil, options.merge(overwrite: false))
     end
 
-    def method_missing(*args)
-      get_default_ns.__send__(*args)
+    def method_missing(name, *args, &block)
+      return ::Kernel.send(name, *args, &block) if DELEGATE.include?(name)
+      get_default_ns.__send__(name, *args, &block)
+    end
+
+    def respond_to_missing?(name, include_private = false)
+      DELEGATE.include?(name) or super
     end
   end
 end

data/lib/rails_admin_settings/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminSettings
-  VERSION = "1.2.1.3".freeze
+  VERSION = "1.2.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ack_rails_admin_settings
 version: !ruby/object:Gem::Version
-  version: 1.2.1.3
+  version: 1.2.2
 platform: ruby
 authors:
 - Alexander Kiseliev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid