rails_admin_settings 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c76a7a81140fa4baee9e1db13602f538721af8d
-  data.tar.gz: 1dad9922dc2068e681ff5661996759aea13802b5
+  metadata.gz: 47d3f93294e3ae605d3c32140ba23450c262a89f
+  data.tar.gz: ba5887e77196c8e4f1b3d3c7944e3248ffe99442
 SHA512:
-  metadata.gz: a4426f48c52e7fb3dcc74e141a5064a0e3932a58578482c8fa3258b98b0d6876f8b244bd13ab63c267f512f01cb91ba1fea5ba3fadf44133960a81fd540fbbf8
-  data.tar.gz: f5935ca8276eb71bd5514f6c239215271f3f556cc704af2edaffb4996b292d3a4a6240d68de6127d6206522facecf94e81fd2f6bb7a46308ec857dbc35bf5c04
+  metadata.gz: 0db473dcb00deb425abffbf1cccaf6745c113f265a9931313993fd50d830bbb3496929fb9ae55652abc2adce08181053560ecc6caba2b3be5e7e5ab056af14e0
+  data.tar.gz: e9360ca3b45ecc6b02e6c2563b842952697ceda330fbc2cb02252db57af14abe61301d4effa9089e9045e2db38c25b2923c80a712856f4264507d7e6c1720378

data/Gemfile.lock

@@ -1,166 +1,189 @@
 PATH
   remote: .
   specs:
-    rails_admin_settings (1.1.3)
+    rails_admin_settings (1.1.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.22)
-      actionpack (= 3.2.22)
-      mail (~> 2.5.4)
-    actionpack (3.2.22)
-      activemodel (= 3.2.22)
-      activesupport (= 3.2.22)
-      builder (~> 3.0.0)
+    actioncable (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      nio4r (~> 1.2)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.0.1)
+      actionview (= 5.0.0.1)
+      activesupport (= 5.0.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.0.1)
+      activesupport (= 5.0.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)
-      activesupport (= 3.2.22)
-      builder (~> 3.0.0)
-    activerecord (3.2.22)
-      activemodel (= 3.2.22)
-      activesupport (= 3.2.22)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.22)
-      activemodel (= 3.2.22)
-      activesupport (= 3.2.22)
-    activesupport (3.2.22)
-      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.0.1)
+      activesupport (= 5.0.0.1)
+      globalid (>= 0.3.6)
+    activemodel (5.0.0.1)
+      activesupport (= 5.0.0.1)
+    activerecord (5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      arel (~> 7.0)
+    activesupport (5.0.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
     addressable (2.4.0)
-    arel (3.0.3)
-    builder (3.0.4)
-    carrierwave (0.10.0)
+    arel (7.1.4)
+    bson (4.1.1)
+    builder (3.2.2)
+    carrierwave (0.11.2)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       json (>= 1.7)
       mime-types (>= 1.16)
+      mimemagic (>= 0.3.0)
+    carrierwave-mongoid (0.10.0)
+      carrierwave (>= 0.8.0, < 0.12.0)
+      mongoid (>= 3.0, < 7.0)
+      mongoid-grid_fs (>= 1.3, < 3.0)
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
-    coderay (1.1.0)
+    coderay (1.1.1)
+    concurrent-ruby (1.0.2)
     crass (1.0.2)
-    database_cleaner (1.5.1)
+    database_cleaner (1.5.3)
     diff-lcs (1.2.5)
     docile (1.1.5)
     erubis (2.7.0)
-    factory_girl (4.5.0)
+    factory_girl (4.7.0)
       activesupport (>= 3.0.0)
-    geocoder (1.2.12)
-    glebtv-carrierwave-mongoid (0.8.0)
-      carrierwave (>= 0.8.0, < 0.11.0)
-      mongoid (>= 3.0, < 5.0)
-    glebtv-mongoid-paperclip (0.4.0)
-      mongoid (>= 3.0, < 6.0)
-      paperclip (~> 4.3.1)
-    hike (1.2.3)
+    geocoder (1.4.0)
+    glebtv-mongoid-paperclip (0.5.0)
+      mongoid (>= 3.0, < 6.1)
+      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.2)
+    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)
-    mini_portile2 (2.0.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)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mimemagic (0.3.2)
+    mini_portile2 (2.1.0)
+    minitest (5.9.1)
+    mongo (2.3.0)
+      bson (~> 4.1)
+    mongoid (6.0.0)
+      activemodel (~> 5.0)
+      mongo (~> 2.3)
+    mongoid-grid_fs (2.3.0)
+      mime-types (>= 1.0, < 4.0)
+      mongoid (>= 3.0, < 7.0)
+    mongoid-rspec (1.10.0)
+      mongoid (>= 3.0.1)
       rake
-      rspec (~> 3.1)
-    moped (1.5.3)
-    multi_json (1.11.2)
-    nokogiri (1.6.7)
-      mini_portile2 (~> 2.0.0.rc2)
-    nokogumbo (1.4.6)
+      rspec (>= 2.14)
+    nio4r (1.2.1)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    nokogumbo (1.4.9)
       nokogiri
-    origin (1.1.0)
-    paperclip (4.3.2)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.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)
-    pry (0.10.3)
+      mimemagic (~> 0.3.0)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.4.7)
-    rack-cache (1.5.1)
-      rack (>= 0.4)
-    rack-ssl (1.3.4)
-      rack
+    rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.22)
-      actionmailer (= 3.2.22)
-      actionpack (= 3.2.22)
-      activerecord (= 3.2.22)
-      activeresource (= 3.2.22)
-      activesupport (= 3.2.22)
-      bundler (~> 1.0)
-      railties (= 3.2.22)
-    railties (3.2.22)
-      actionpack (= 3.2.22)
-      activesupport (= 3.2.22)
-      rack-ssl (~> 1.3.2)
+    rails (5.0.0.1)
+      actioncable (= 5.0.0.1)
+      actionmailer (= 5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activerecord (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 5.0.0.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.1)
+      activesupport (>= 4.2.0, < 6.0)
+      nokogiri (~> 1.6.0)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      method_source
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.4.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+      thor (>= 0.18.1, < 2.0)
+    rake (11.3.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     russian_phone (0.5.3)
     safe_yaml (1.0.4)
-    sanitize (4.0.1)
+    sanitize (4.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4.1)
-    simplecov (0.11.1)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       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.0)
+      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.1)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.46)
+    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
@@ -168,12 +191,12 @@ PLATFORMS
 DEPENDENCIES
   addressable
   bundler
+  carrierwave-mongoid
   database_cleaner
   factory_girl
   geocoder
-  glebtv-carrierwave-mongoid
   glebtv-mongoid-paperclip
-  mongoid (>= 3.0, < 6.0)
+  mongoid (~> 6.0)
   mongoid-rspec
   pry
   rails
@@ -187,4 +210,4 @@ DEPENDENCIES
   validates_email_format_of
 
 BUNDLED WITH
-   1.10.6
+   1.13.1

data/lib/rails_admin_settings/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminSettings
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 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", '~> 6.0'
   spec.add_development_dependency "rails"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "validates_email_format_of"
   spec.add_development_dependency "geocoder"
   spec.add_development_dependency "addressable"
-  spec.add_development_dependency "glebtv-carrierwave-mongoid"
+  spec.add_development_dependency "carrierwave-mongoid"
   spec.add_development_dependency "glebtv-mongoid-paperclip"
   spec.add_development_dependency "pry"
 end

data/spec/migration_spec.rb

@@ -4,7 +4,12 @@ require 'spec_helper'
 
 describe 'Migrating from old versions' do
   it 'sets ns' do
-    RailsAdminSettings::Setting.collection.insert({enabled: true, key: 'test', raw: '9060000000', type: 'phone'})
+    coll = RailsAdminSettings::Setting.collection
+    if coll.respond_to?(:insert_one)
+      coll.insert_one({enabled: true, key: 'test', raw: '9060000000', type: 'phone'})
+    else
+      coll.insert({enabled: true, key: 'test', raw: '9060000000', type: 'phone'})
+    end
     RailsAdminSettings.migrate!
     RailsAdminSettings::Setting.first.key.should eq 'test'
     RailsAdminSettings::Setting.first.raw.should eq '9060000000'

data/spec/spec_helper.rb

@@ -20,7 +20,7 @@ require 'mongoid-rspec'
 
 require "glebtv-mongoid-paperclip" if ENV['UPLOADS'] == 'paperclip'
 if ENV['UPLOADS'] == 'carrierwave'
-  require "glebtv-carrierwave-mongoid"
+  require "carrierwave/mongoid"
   CarrierWave.configure do |config|
     config.asset_host = proc do |file|
       "http://localhost"

data/spec/support/mongoid.yml

@@ -1,5 +1,5 @@
 test:
-  sessions:
+  clients:
     default:
       database: rails_admin_settings
       hosts:

metadata

@@ -1,33 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_settings
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Gleb Tv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-12 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
@@ -227,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: glebtv-carrierwave-mongoid
+  name: carrierwave-mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -352,7 +346,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: ''