ack_rails_admin_settings 1.2.1.2 → 1.2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b13bafa47596e52734635fa0c11fad17df62f733
-  data.tar.gz: 8b2dbfc4e5a4235cd504a79c1cf056f73b9ef93b
+  metadata.gz: 44e65f11e42fe108a21c419dc2b291796b18be89
+  data.tar.gz: f711ebbdd3551c06ec781ef36e67db2d3f55b51b
 SHA512:
-  metadata.gz: 2f02b37b4b569bf9292cf65ea347868a6320f421a40137985027310a2e34b00282aac3fed4c35aefeeef92f1853b156dc6d574b47eff3596a10edf887cc6b0f2
-  data.tar.gz: 79af9165cb7fd402ded4bcf9389d8d5c73abdef0086e62bea6a781338b9cabfc51f6464c779a5eea7c7c439d8e2795cfa15f659cf50a39574462d9323ec5d8a7
+  metadata.gz: 4660599fd64007b1878537a91cff2067fde22979f1ae34aa3544f78999afc5ce9fe63d3250a67f8e555d44d285817e4686a22b415e87d5558e013d280aa473a7
+  data.tar.gz: 3b25d6f68beabe7d83db4d564c18bf1238cce8204918cbc2f9d0d7f7af9333e3fa2ea73396d52cad0e85a6ca91f0e059709dab2cc09462e27ad473f56acdfa0e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ack_rails_admin_settings (1.2.1.2)
+    ack_rails_admin_settings (1.2.1.3)
 
 GEM
   remote: https://rubygems.org/
@@ -183,7 +183,7 @@ GEM
       thread_safe (~> 0.1)
     validates_email_format_of (1.6.3)
       i18n
-    websocket-driver (0.6.4)
+    websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
 

data/lib/rails_admin_settings/namespaced.rb

@@ -86,18 +86,20 @@ module RailsAdminSettings
         end
       end
 
-      options[:cache_keys] ||= options.delete :cache_key
-      _cache_keys = options.delete :cache_keys
-
-      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 }.join(" ")
+      unless options[:cache_keys_str].present?
+        options[:cache_keys] ||= options.delete :cache_key
+        _cache_keys = options.delete :cache_keys
+
+        if _cache_keys.nil?
+          # if _cache
+          #   options[:cache_keys_str] = name.underscore
+          # end
         else
-          options[:cache_keys_str] = _cache_keys.to_s
+          if _cache_keys.is_a?(::Array)
+            options[:cache_keys_str] = _cache_keys.map { |k| k.to_s }.join(" ")
+          else
+            options[:cache_keys_str] = _cache_keys.to_s
+          end
         end
       end
 

data/lib/rails_admin_settings/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminSettings
-  VERSION = "1.2.1.2".freeze
+  VERSION = "1.2.1.3".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.2
+  version: 1.2.1.3
 platform: ruby
 authors:
 - Alexander Kiseliev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid