ack_rails_admin_settings 1.1.5 → 1.2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1939049fc8ee3a45380834fb5a189636d1edc9ac
-  data.tar.gz: 20a4e16a772ba5050eae5eaa7cd0664ec332a38f
+  metadata.gz: 09bb3fe9edf0872d0d56881a50a7a7a6f18b4a0b
+  data.tar.gz: 99c870b54f86b4101334d659092f1b43381abab3
 SHA512:
-  metadata.gz: 372df93203fef4b55af2eaf404e942d3475f9a07d3c455884c9af377b7babaaac50f5ab374fe6a723cfe293b03ea8b41e0eb0e0834bad73dc574a420c434aa54
-  data.tar.gz: 4a9ebaccdd75eda63ac802986a755d8eb75607288520b814efa4ea6b5f700dbd7f0b722235601214362c9f9f0c7b254b2030c8ddf3353b7219ee45ca238b09cc
+  metadata.gz: 03bf3e5b6c51ee5de9a840320ef22621e4132624114e3ba0e804b0e4da084defbf33a83e30b004ad0e504918be3f0bb6635a0870186a550cf3521f65df7b665f
+  data.tar.gz: b4452f40f596c265688475bdb877e768e02cedbacb165af2dee63c119a8b0e516fe913c91fe2650d3e14671086a64c199b38083164acac3af3bdd6c0a8ca461f

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 1.2.0
+
+- Default cache key is underscored namespace. Not work for default namespace without {cache: true}.
+
+## 1.1.5
+
+- HancockCMS support.
+- Caching.
+
+## 1.1.4
+
+- Fork from rs-pro repo.
+
 ## 1.1.3
 
 - Fix for namespace tabs when database table does not exist yet.

data/Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    ack_rails_admin_settings (1.1.5)
+    ack_rails_admin_settings (1.2.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.22.4)
-      actionpack (= 3.2.22.4)
+    actionmailer (3.2.22.5)
+      actionpack (= 3.2.22.5)
       mail (~> 2.5.4)
-    actionpack (3.2.22.4)
-      activemodel (= 3.2.22.4)
-      activesupport (= 3.2.22.4)
+    actionpack (3.2.22.5)
+      activemodel (= 3.2.22.5)
+      activesupport (= 3.2.22.5)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -19,18 +19,18 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.22.4)
-      activesupport (= 3.2.22.4)
+    activemodel (3.2.22.5)
+      activesupport (= 3.2.22.5)
       builder (~> 3.0.0)
-    activerecord (3.2.22.4)
-      activemodel (= 3.2.22.4)
-      activesupport (= 3.2.22.4)
+    activerecord (3.2.22.5)
+      activemodel (= 3.2.22.5)
+      activesupport (= 3.2.22.5)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.22.4)
-      activemodel (= 3.2.22.4)
-      activesupport (= 3.2.22.4)
-    activesupport (3.2.22.4)
+    activeresource (3.2.22.5)
+      activemodel (= 3.2.22.5)
+      activesupport (= 3.2.22.5)
+    activesupport (3.2.22.5)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.4.0)
@@ -82,9 +82,8 @@ GEM
       rspec (~> 3.1)
     moped (1.5.3)
     multi_json (1.12.1)
-    nokogiri (1.6.8)
+    nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
     nokogumbo (1.4.9)
       nokogiri
     origin (1.1.0)
@@ -94,7 +93,6 @@ GEM
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (= 0.3.0)
-    pkg-config (1.1.7)
     polyglot (0.3.5)
     pry (0.10.4)
       coderay (~> 1.1.0)
@@ -107,29 +105,29 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.22.4)
-      actionmailer (= 3.2.22.4)
-      actionpack (= 3.2.22.4)
-      activerecord (= 3.2.22.4)
-      activeresource (= 3.2.22.4)
-      activesupport (= 3.2.22.4)
+    rails (3.2.22.5)
+      actionmailer (= 3.2.22.5)
+      actionpack (= 3.2.22.5)
+      activerecord (= 3.2.22.5)
+      activeresource (= 3.2.22.5)
+      activesupport (= 3.2.22.5)
       bundler (~> 1.0)
-      railties (= 3.2.22.4)
-    railties (3.2.22.4)
-      actionpack (= 3.2.22.4)
-      activesupport (= 3.2.22.4)
+      railties (= 3.2.22.5)
+    railties (3.2.22.5)
+      actionpack (= 3.2.22.5)
+      activesupport (= 3.2.22.5)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (11.2.2)
+    rake (11.3.0)
     rdoc (3.12.2)
       json (~> 1.4)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
       rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.3)
+    rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -140,7 +138,7 @@ GEM
     rspec-support (3.5.0)
     russian_phone (0.5.3)
     safe_yaml (1.0.4)
-    sanitize (4.2.0)
+    sanitize (4.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4.1)

data/app/models/rails_admin_settings/setting.rb

@@ -10,15 +10,40 @@ module RailsAdminSettings
     #binding.pry
     if RailsAdminSettings.mongoid?
       include RailsAdminSettings::Mongoid
+
+      if defined?(RailsAdminComments)
+        include RailsAdminComments::Commentable
+        include RailsAdminComments::ModelCommentable
+      end
     end
 
     if defined?(Hancock)
-      include Hancock::RailsAdminPatch
-      def self.manager_can_default_actions
-        [:show, :read, :edit, :update]
+      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
-      def manager_cannot_actions
-        [:new, :create, :delete, :destroy]
+
+      if defined?(Hancock::Cacheable)
+        include Hancock::Cacheable
       end
     end
 

data/lib/rails_admin_settings.rb

@@ -53,32 +53,32 @@ module RailsAdminSettings
 
     if mongoid?
       if ::Mongoid.const_defined?('History')
-        RailsAdminSettings::Setting.send(:include, ::Mongoid::History::Trackable)
-        RailsAdminSettings::Setting.send(:track_history, {track_create: true, track_destroy: true})
-        if Gem::Version.new(Rails.version) >= Gem::Version.new('5.0.0')
-          RailsAdminSettings::Setting.send(:belongs_to,
-            :modifier,
-            class_name: ::Mongoid::History.modifier_class_name,
-            optional: true
-          )
-        end
+        # RailsAdminSettings::Setting.send(:include, ::Mongoid::History::Trackable)
+        # RailsAdminSettings::Setting.send(:track_history, {track_create: true, track_destroy: true})
+        # if Gem::Version.new(Rails.version) >= Gem::Version.new('5.0.0')
+        #   RailsAdminSettings::Setting.send(:belongs_to,
+        #     :modifier,
+        #     class_name: ::Mongoid::History.modifier_class_name,
+        #     optional: true
+        #   )
+        # end
       else
         puts "[rails_admin_settings] WARN unable to track_history: Mongoid::History not loaded!".freeze
       end
       if ::Mongoid.const_defined?('Userstamp')
-        RailsAdminSettings::Setting.send(:include, ::Mongoid::Userstamp)
-        if Gem::Version.new(Rails.version) >= Gem::Version.new('5.0.0')
-          RailsAdminSettings::Setting.send(:belongs_to,
-            ::Mongoid::Userstamp.config.creator_field,
-            class_name: ::Mongoid::Userstamp.config.user_model_name,
-            optional: true
-          )
-          RailsAdminSettings::Setting.send(:belongs_to,
-            ::Mongoid::Userstamp.config.updater_field,
-            class_name: ::Mongoid::Userstamp.config.user_model_name,
-            optional: true
-          )
-        end
+        # RailsAdminSettings::Setting.send(:include, ::Mongoid::Userstamp)
+        # if Gem::Version.new(Rails.version) >= Gem::Version.new('5.0.0')
+        #   RailsAdminSettings::Setting.send(:belongs_to,
+        #     ::Mongoid::Userstamp.config.creator_field,
+        #     class_name: ::Mongoid::Userstamp.config.user_model_name,
+        #     optional: true
+        #   )
+        #   RailsAdminSettings::Setting.send(:belongs_to,
+        #     ::Mongoid::Userstamp.config.updater_field,
+        #     class_name: ::Mongoid::Userstamp.config.user_model_name,
+        #     optional: true
+        #   )
+        # end
       else
         puts "[rails_admin_settings] WARN unable to track_history: Mongoid::Userstamp not loaded!".freeze
       end

data/lib/rails_admin_settings/mongoid.rb

@@ -14,15 +14,18 @@ module RailsAdminSettings
       field :label, type: String
       index({ns: 1, key: 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? }
-      end
+      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
 
-      after_save :clear_cache
-      def clear_cache
-        cache_keys.each do |k|
-          Rails.cache.delete(k)
+        after_save :clear_cache
+        after_destroy :clear_cache
+        def clear_cache
+          cache_keys.each do |k|
+            Rails.cache.delete(k)
+          end
         end
       end
 

data/lib/rails_admin_settings/namespaced.rb

@@ -74,6 +74,12 @@ module RailsAdminSettings
       load! unless @locked
       key = key.to_s
       options.symbolize_keys!
+      if options[:cache].present?
+        _cache = options.delete(:cache)
+      else
+        _cache = (name != ::Settings.ns_default)
+      end
+
 
       if !options[:type].nil? && options[:type] == 'yaml' && !value.nil?
         if value.class.name != 'String'
@@ -81,7 +87,11 @@ module RailsAdminSettings
         end
       end
 
-      unless options[:cache_keys].nil?
+      if options[:cache_keys].nil?
+        if _cache
+          options[:cache_keys_str] = name.underscore
+        end
+      else
         if options[:cache_keys].class.name == 'String'
           options[:cache_keys_str] = options.delete(:cache_keys)
         elsif options[:cache_keys].class.name == 'Array'

data/lib/rails_admin_settings/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminSettings
-  VERSION = "1.1.5".freeze
+  VERSION = "1.2.0.1".freeze
 end

data/release.sh

@@ -2,5 +2,5 @@
 bundle update
 git add --all .
 git commit -am "${*:1}"
-git push
+git push -u origin master
 rake release

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ack_rails_admin_settings
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0.1
 platform: ruby
 authors:
 - Alexander Kiseliev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid