ack_rails_admin_settings 1.2.0.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6705578c23f34d659394620c115f747ae0b8e74
-  data.tar.gz: 071fd7c85126b176c83906b10c11778757c98b62
+  metadata.gz: 9f5ba1a5a4b2cf80275df63c8c0111baaacaa193
+  data.tar.gz: 1bc593c9340226c0cd0cad2a203ee4695194aa14
 SHA512:
-  metadata.gz: bc9011421f9c392f93d72ab587c557ff020dae1d31a02891495baae6a8cb6d2f78a7810b89d6ae53c4c737fa255f86c193a7a2078cc05540837a481891b05bb0
-  data.tar.gz: 1d12f036229c966a43ebf4fa78b4ed8dbef7a72cb8f180edb65e113c0e8c1e2d5321028b9d032020ad357ce57d5e009e7c58e9707321a030bae0f1af5dfc6e61
+  metadata.gz: f114e8e85f5d646c95b47d61ee555ba757755e278bdc5b688e167d816773cfa0fda19241605beace46d8cf9965237a106bca6754dd59ae83cc296db391ab1827
+  data.tar.gz: eae4a9899647f6d1313ba256813121402b021bb9ac06741cfa6234d2e83977970b9d6189f661e076846e6c60d34e563cba243766ff5ff2350f9ba467fd1c5247

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.2.1
+
+- Remove HancockCMS support (moved into CMS and cache plugin for CMS).
+- Cache is still here but only base methods.
+- Options :cache_key and :cache_keys are working (not the same time but both).
+
 ## 1.2.0
 
 - Default cache key is underscored namespace. Not work for default namespace without {cache: true}.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ack_rails_admin_settings (1.2.0.2)
+    ack_rails_admin_settings (1.2.1)
 
 GEM
   remote: https://rubygems.org/
@@ -52,9 +52,9 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.5)
     erubis (2.7.0)
-    factory_girl (4.7.0)
+    factory_girl (4.8.0)
       activesupport (>= 3.0.0)
-    geocoder (1.4.0)
+    geocoder (1.4.1)
     glebtv-carrierwave-mongoid (0.8.0)
       carrierwave (>= 0.8.0, < 0.11.0)
       mongoid (>= 3.0, < 5.0)
@@ -122,7 +122,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (11.3.0)
+    rake (12.0.0)
     rdoc (3.12.2)
       json (~> 1.4)
     rspec (3.5.0)
@@ -155,7 +155,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.19.1)
+    thor (0.19.4)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot

data/app/models/rails_admin_settings/setting.rb

@@ -17,36 +17,6 @@ module RailsAdminSettings
       end
     end
 
-    if defined?(Hancock)
-      if defined?(Hancock::RailsAdminPatch)
-        include Hancock::RailsAdminPatch
-
-        def self.manager_can_default_actions
-          [:show, :read, :edit, :update]
-        end
-        def self.manager_can_add_actions
-          ret = []
-          ret << :model_accesses if defined?(RailsAdminUserAbilities)
-          ret += [:comments, :model_comments] if defined?(RailsAdminComments)
-          ret.freeze
-        end
-        def self.manager_cannot_actions
-          [:new, :create, :delete, :destroy]
-        end
-
-        def self.rails_admin_add_visible_actions
-          ret = []
-          ret << :model_accesses if defined?(RailsAdminUserAbilities)
-          ret += [:comments, :model_comments] if defined?(RailsAdminComments)
-          ret.freeze
-        end
-      end
-
-      if defined?(Hancock::Cacheable)
-        include Hancock::Cacheable
-      end
-    end
-
     if RailsAdminSettings.active_record?
       self.table_name = "rails_admin_settings".freeze
     end

data/lib/rails_admin_settings/mongoid.rb

@@ -14,18 +14,17 @@ module RailsAdminSettings
       field :label, type: String
       index({ns: 1, key: 1}, {unique: true, sparse: true})
 
-      unless defined?(Hancock::Cacheable)
-        field :cache_keys_str, type: String, default: ""
-        def cache_keys
-          cache_keys_str.split(/\s+/).map { |k| k.strip }.reject { |k| k.blank? }
-        end
+      field :cache_keys_str, type: String, default: ""
+      def cache_keys
+        cache_keys_str.split(/\s+/).map { |k| k.strip }.reject { |k| k.blank? }
+      end
 
-        after_save :clear_cache
-        after_destroy :clear_cache
-        def clear_cache
-          cache_keys.each do |k|
-            Rails.cache.delete(k)
-          end
+      after_touch :clear_cache
+      after_save :clear_cache
+      after_destroy :clear_cache
+      def clear_cache
+        cache_keys.each do |k|
+          Rails.cache.delete(k)
         end
       end
 

data/lib/rails_admin_settings/namespaced.rb

@@ -86,6 +86,8 @@ module RailsAdminSettings
         end
       end
 
+      options[:cache_keys] ||= options[:cache_key]
+
       if options[:cache_keys].nil?
         if _cache
           options[:cache_keys_str] = name.underscore

data/lib/rails_admin_settings/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminSettings
-  VERSION = "1.2.0.2".freeze
+  VERSION = "1.2.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ack_rails_admin_settings
 version: !ruby/object:Gem::Version
-  version: 1.2.0.2
+  version: 1.2.1
 platform: ruby
 authors:
 - Alexander Kiseliev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2016-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid