ack_rails_admin_settings 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d087838734945c883c25cc53738e4722d73851c
-  data.tar.gz: 36b4b5de1c9d4f3e0309d1de9945836465c3791b
+  metadata.gz: 1939049fc8ee3a45380834fb5a189636d1edc9ac
+  data.tar.gz: 20a4e16a772ba5050eae5eaa7cd0664ec332a38f
 SHA512:
-  metadata.gz: cad7bce8c0a6f37e7f7ec8ab0be59514f7f82f0b579c5d1bf8401b3c678404abac9808958ec7058705401a2d03c640c3681f81c52ebf50f2ef449d4724ceb0c6
-  data.tar.gz: 3a681269e2b9f5519928462276a2129bc97ab5a075168bfae8a17b91f5795b2f4ae1dcff9e5a56e42ec8202839d6d2601e764ff3380df346440cddf9f723a15d
+  metadata.gz: 372df93203fef4b55af2eaf404e942d3475f9a07d3c455884c9af377b7babaaac50f5ab374fe6a723cfe293b03ea8b41e0eb0e0834bad73dc574a420c434aa54
+  data.tar.gz: 4a9ebaccdd75eda63ac802986a755d8eb75607288520b814efa4ea6b5f700dbd7f0b722235601214362c9f9f0c7b254b2030c8ddf3353b7219ee45ca238b09cc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ack_rails_admin_settings (1.1.4)
+    ack_rails_admin_settings (1.1.5)
 
 GEM
   remote: https://rubygems.org/
@@ -53,7 +53,7 @@ GEM
     erubis (2.7.0)
     factory_girl (4.7.0)
       activesupport (>= 3.0.0)
-    geocoder (1.3.7)
+    geocoder (1.4.0)
     glebtv-carrierwave-mongoid (0.8.0)
       carrierwave (>= 0.8.0, < 0.11.0)
       mongoid (>= 3.0, < 5.0)

data/app/models/rails_admin_settings/setting.rb

@@ -12,6 +12,16 @@ module RailsAdminSettings
       include RailsAdminSettings::Mongoid
     end
 
+    if defined?(Hancock)
+      include Hancock::RailsAdminPatch
+      def self.manager_can_default_actions
+        [:show, :read, :edit, :update]
+      end
+      def manager_cannot_actions
+        [:new, :create, :delete, :destroy]
+      end
+    end
+
     if RailsAdminSettings.active_record?
       self.table_name = "rails_admin_settings".freeze
     end

data/lib/generators/rails_admin_settings/migration_generator.rb

@@ -6,10 +6,9 @@ module RailsAdminSettings
     include ActiveRecord::Generators::Migration
     source_root File.expand_path('../templates', __FILE__)
 
-    desc 'RocketCMS migration generator'
+    desc 'RailsAdminSettings migration generator'
     def install
       migration_template "migration.rb", "db/migrate/create_rails_admin_settings.rb"
     end
   end
 end
-

data/lib/rails_admin_settings/mongoid.rb

@@ -16,7 +16,7 @@ module RailsAdminSettings
 
       field :cache_keys_str, type: String, default: ""
       def cache_keys
-        cache_keys_str.split(" ").map { |k| k.strip }.reject { |k| k.blank? }
+        cache_keys_str.split(/\s+/).map { |k| k.strip }.reject { |k| k.blank? }
       end
 
       after_save :clear_cache

data/lib/rails_admin_settings/storage/carrierwave.rb

@@ -2,8 +2,8 @@ module RailsAdminSettings
   module Uploads
     class CarrierWave < CarrierWave::Uploader::Base
       def extension_white_list
-        %w(jpg jpeg gif png tiff psd ai txt rtf doc docx xls xlsx ppt pptx odt odx zip rar 7z pdf)
+        %w(jpg jpeg gif png tiff psd ai txt rtf doc docx xls xlsx ppt pptx odt odx zip rar 7z pdf).freeze
       end
     end
   end
-end
+end

data/lib/rails_admin_settings/version.rb

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

data/lib/rails_admin_settings.rb

@@ -55,11 +55,30 @@ module RailsAdminSettings
       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
       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
       else
         puts "[rails_admin_settings] WARN unable to track_history: Mongoid::Userstamp not loaded!".freeze
       end

data/rails_admin_settings.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['i43ack@gmail.com', "glebtv@gmail.com"]
   spec.description   = %q{Mongoid / ActiveRecord + RailsAdmin App Settings management}
   spec.summary       = %q{}
-  spec.homepage      = "https://github.com/ack43/rails_admin_settings"
+  spec.homepage      = "https://github.com/red-rocks/rails_admin_settings"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ack_rails_admin_settings
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Alexander Kiseliev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-05 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -336,7 +336,7 @@ files:
 - spec/support/mongoid.rb
 - spec/support/mongoid.yml
 - spec/types_spec.rb
-homepage: https://github.com/ack43/rails_admin_settings
+homepage: https://github.com/red-rocks/rails_admin_settings
 licenses:
 - MIT
 metadata: {}