ack_rails_admin_settings 1.2.1.1 → 1.2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 883b01f403bc55cf93f0e0cc8651025ab498cdf7
-  data.tar.gz: 5b9f3ba20824903e4e5caba7e3f468d221bb68cd
+  metadata.gz: b13bafa47596e52734635fa0c11fad17df62f733
+  data.tar.gz: 8b2dbfc4e5a4235cd504a79c1cf056f73b9ef93b
 SHA512:
-  metadata.gz: dc4dd4f9033010ddcc65726fbe0163545e37925dd59f4129df13635caee06838e3841814309a599bddee92df4e3fd65b1e92a152bbb00f3d66d7d2b720fee9c9
-  data.tar.gz: da0e9b3409c7c0796e537ff2d11f4727705a974b82e1aa950003ef6ad93741c5a4ee91771b62c05f9d01de24704453aeed262880ba0cc24a211bb7278e8f6a24
+  metadata.gz: 2f02b37b4b569bf9292cf65ea347868a6320f421a40137985027310a2e34b00282aac3fed4c35aefeeef92f1853b156dc6d574b47eff3596a10edf887cc6b0f2
+  data.tar.gz: 79af9165cb7fd402ded4bcf9389d8d5c73abdef0086e62bea6a781338b9cabfc51f6464c779a5eea7c7c439d8e2795cfa15f659cf50a39574462d9323ec5d8a7

data/Gemfile.lock

@@ -1,130 +1,150 @@
 PATH
   remote: .
   specs:
-    ack_rails_admin_settings (1.2.1.1)
+    ack_rails_admin_settings (1.2.1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.22.5)
-      actionpack (= 3.2.22.5)
-      mail (~> 2.5.4)
-    actionpack (3.2.22.5)
-      activemodel (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-      builder (~> 3.0.0)
+    actioncable (5.0.1)
+      actionpack (= 5.0.1)
+      nio4r (~> 1.2)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.1)
+      actionpack (= 5.0.1)
+      actionview (= 5.0.1)
+      activejob (= 5.0.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.1)
+      actionview (= 5.0.1)
+      activesupport (= 5.0.1)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.0.1)
+      activesupport (= 5.0.1)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.22.5)
-      activesupport (= 3.2.22.5)
-      builder (~> 3.0.0)
-    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.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)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (5.0.1)
+      activesupport (= 5.0.1)
+      globalid (>= 0.3.6)
+    activemodel (5.0.1)
+      activesupport (= 5.0.1)
+    activerecord (5.0.1)
+      activemodel (= 5.0.1)
+      activesupport (= 5.0.1)
+      arel (~> 7.0)
+    activesupport (5.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
-    arel (3.0.3)
-    builder (3.0.4)
-    carrierwave (0.10.0)
+    arel (7.1.4)
+    bson (3.2.6)
+    builder (3.2.3)
+    carrierwave (0.9.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       json (>= 1.7)
-      mime-types (>= 1.16)
-    climate_control (0.0.3)
-      activesupport (>= 3.0)
+    climate_control (0.1.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.1)
+    concurrent-ruby (1.0.4)
+    connection_pool (2.2.1)
     crass (1.0.2)
     database_cleaner (1.5.3)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
     erubis (2.7.0)
     factory_girl (4.8.0)
       activesupport (>= 3.0.0)
     geocoder (1.4.1)
-    glebtv-carrierwave-mongoid (0.8.0)
-      carrierwave (>= 0.8.0, < 0.11.0)
-      mongoid (>= 3.0, < 5.0)
-    glebtv-mongoid-paperclip (0.4.1)
+    glebtv-carrierwave-mongoid (0.7.0)
+      carrierwave (~> 0.9.0)
+      mongoid (~> 4.0.0.alpha1)
+    glebtv-mongoid-paperclip (0.5.0)
       mongoid (>= 3.0, < 6.1)
-      paperclip (~> 4.3.1)
-    hike (1.2.3)
+      paperclip (~> 5.1.0)
+    globalid (0.3.7)
+      activesupport (>= 4.1.0)
     i18n (0.7.0)
-    journey (1.0.4)
-    json (1.8.3)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    json (2.0.3)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     method_source (0.8.2)
-    mime-types (1.25.1)
-    mimemagic (0.3.0)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mimemagic (0.3.2)
     mini_portile2 (2.1.0)
-    mongoid (3.1.7)
-      activemodel (~> 3.2)
-      moped (~> 1.4)
-      origin (~> 1.0)
-      tzinfo (~> 0.3.29)
-    mongoid-rspec (1.13.0)
-      mongoid (~> 3.1)
+    minitest (5.10.1)
+    mongoid (4.0.0.beta2)
+      activemodel (>= 4.0.0)
+      moped (~> 2.0.beta6)
+      origin (~> 2.1)
+      tzinfo (>= 0.3.37)
+    mongoid-rspec (1.10.0)
+      mongoid (>= 3.0.1)
       rake
-      rspec (~> 3.1)
-    moped (1.5.3)
-    multi_json (1.12.1)
-    nokogiri (1.6.8.1)
+      rspec (>= 2.14)
+    moped (2.0.7)
+      bson (~> 3.0)
+      connection_pool (~> 2.0)
+      optionable (~> 0.2.0)
+    nio4r (1.2.1)
+    nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
     nokogumbo (1.4.10)
       nokogiri
-    origin (1.1.0)
-    paperclip (4.3.7)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
+    optionable (0.2.0)
+    origin (2.3.0)
+    paperclip (5.1.0)
+      activemodel (>= 4.2.0)
+      activesupport (>= 4.2.0)
       cocaine (~> 0.5.5)
       mime-types
-      mimemagic (= 0.3.0)
-    polyglot (0.3.5)
+      mimemagic (~> 0.3.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    public_suffix (2.0.4)
-    rack (1.4.7)
-    rack-cache (1.6.1)
-      rack (>= 0.4)
-    rack-ssl (1.3.4)
-      rack
+    public_suffix (2.0.5)
+    rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    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.5)
-    railties (3.2.22.5)
-      actionpack (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-      rack-ssl (~> 1.3.2)
+    rails (5.0.1)
+      actioncable (= 5.0.1)
+      actionmailer (= 5.0.1)
+      actionpack (= 5.0.1)
+      actionview (= 5.0.1)
+      activejob (= 5.0.1)
+      activemodel (= 5.0.1)
+      activerecord (= 5.0.1)
+      activesupport (= 5.0.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 5.0.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.2)
+      activesupport (>= 4.2.0, < 6.0)
+      nokogiri (~> 1.6)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.0.1)
+      actionpack (= 5.0.1)
+      activesupport (= 5.0.1)
+      method_source
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
+      thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -150,19 +170,22 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    sprockets (2.2.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     thor (0.19.4)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.52)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
     validates_email_format_of (1.6.3)
       i18n
+    websocket-driver (0.6.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
 
 PLATFORMS
   ruby
@@ -176,7 +199,7 @@ DEPENDENCIES
   geocoder
   glebtv-carrierwave-mongoid
   glebtv-mongoid-paperclip
-  mongoid (>= 3.0, < 6.0)
+  mongoid (>= 3.0, < 7.0)
   mongoid-rspec
   pry
   rails

data/lib/rails_admin_settings/engine.rb

@@ -4,14 +4,15 @@ module RailsAdminSettings
       require File.expand_path('../tasks', __FILE__)
     end
 
-    initializer 'RailsAdminSettings Install after_filter' do |app|
+    initializer 'RailsAdminSettings Install after_action' do |app|
       require File.dirname(__FILE__) + '/../../app/models/rails_admin_settings/setting.rb'
 
       if defined?(ActionController) and defined?(ActionController::Base)
         ActionController::Base.class_eval do
-          after_filter { Settings.unload! }
+          after_action { Settings.unload! }
         end
       end
+
     end
   end
 end

data/lib/rails_admin_settings/namespaced.rb

@@ -87,18 +87,17 @@ module RailsAdminSettings
       end
 
       options[:cache_keys] ||= options.delete :cache_key
+      _cache_keys = options.delete :cache_keys
 
-      if options[:cache_keys].nil?
+      if _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'
-          options[:cache_keys_str] = options.delete(:cache_keys).map { |k| k.to_s }.join(" ")
+        if _cache_keys.is_a?(Array)
+          options[:cache_keys_str] = _cache_keys.map { |k| k.to_s }.join(" ")
         else
-          options[:cache_keys_str] = options.delete(:cache_keys).to_s
+          options[:cache_keys_str] = _cache_keys.to_s
         end
       end
 

data/lib/rails_admin_settings/processing.rb

@@ -99,7 +99,9 @@ module RailsAdminSettings
 
     def process_text
       text = raw.dup
-      text.gsub!('{{year}}', Time.now.strftime('%Y'))
+      text.gsub!'{{year}}' do
+        Time.now.strftime('%Y')
+      end
       text.gsub! /\{\{year\|([\d]{4})\}\}/ do
         if Time.now.strftime('%Y') == $1
           $1

data/lib/rails_admin_settings/rails_admin_config.rb

@@ -13,10 +13,22 @@ module RailsAdminSettings
             else
               field :enabled
             end
-            field :kind
-            field :ns
+            field :kind do
+              searchable true
+            end
+            field :ns do
+              searchable true
+            end
             field :name
+            field :label do
+              visible false
+              searchable true
+            end
+            field :key do
+              searchable true
+            end
             field :raw do
+              searchable true
               pretty_value do
                 if bindings[:object].file_kind?
                   "<a href='#{CGI::escapeHTML(bindings[:object].file.url)}'>#{CGI::escapeHTML(bindings[:object].to_path)}</a>".html_safe.freeze
@@ -27,6 +39,9 @@ module RailsAdminSettings
                 end
               end
             end
+            field :cache_keys_str, :text do
+              searchable true
+            end
             if ::Settings.table_exists?
               nss = ::RailsAdminSettings::Setting.pluck(:ns).uniq.map { |c| "ns_#{c.gsub('-', '_')}".to_sym }
               scopes([nil] + nss)
@@ -35,6 +50,14 @@ module RailsAdminSettings
 
           edit do
             field :enabled
+            field :ns  do
+              read_only true
+              help false
+            end
+            field :key  do
+              read_only true
+              help false
+            end
             field :label do
               read_only true
               help false
@@ -56,12 +79,14 @@ module RailsAdminSettings
                 end
               end
             end
+
             field :cache_keys_str, :text do
               visible do
                 render_object = (bindings[:controller] || bindings[:view])
                 render_object and render_object.current_user.admin?
               end
             end
+
           end
         end
       else

data/lib/rails_admin_settings/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminSettings
-  VERSION = "1.2.1.1".freeze
+  VERSION = "1.2.1.2".freeze
 end

data/rails_admin_settings.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
 
-  spec.add_development_dependency "mongoid", [">= 3.0", "< 6.0"]
+  spec.add_development_dependency "mongoid", [">= 3.0", "< 7.0"]
   spec.add_development_dependency "rails"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ack_rails_admin_settings
 version: !ruby/object:Gem::Version
-  version: 1.2.1.1
+  version: 1.2.1.2
 platform: ruby
 authors:
 - Alexander Kiseliev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-18 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -20,7 +20,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement