rails_admin_settings 0.7.8 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd16660cea383a32cd805db157efda4ef49f683b
-  data.tar.gz: cac1819b31e438da7b346d82e41d8d5bf5e29103
+  metadata.gz: 8ce97b11e2293752dd5d9ed40d1131007eb075a5
+  data.tar.gz: 032aa4f2f688f79693520122ed3e07482a32e1d3
 SHA512:
-  metadata.gz: 101322a46a4f6eccbe92c1bff4dc8720fad4fa0971451f55a1a607dee4d95b1394742960fefb5bc5b1b7f3126b59b5afeb98d18cd162581dea03d217a9d4f205
-  data.tar.gz: dcc80c566af973e6bd23f6836086669e513f943c5a23333a27fea64bbb611de1e8085aa318739695b19ff92aeb6b20eacfec58af30b174d7572e1a116984e14b
+  metadata.gz: 89fbb7b656fcb7eedde0c17971ed25486e0d52a4866a1c994c68529badf8d90880f437fa9e92f764bfc582f8e3616f0c3052e9a6a2dff060377867bab605e5d8
+  data.tar.gz: 7c774324d9fa3a61de6c17591521e857d98cb1d42a87320cadba75885a52e0ed5675f0f9dfdd0c31774e34b156db591d82d39b171587be3393ca477246fa36ba

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
@@ -16,4 +15,4 @@ test/tmp
 test/version_tmp
 tmp
 .idea
-/uploads
+/uploads

data/.travis.yml

@@ -5,10 +5,8 @@ notifications:
   email: false
 
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.0
-  - jruby-20mode
+  - 2.1.2
   
 env:
   - "UPLOADS=paperclip"

data/Gemfile.lock

@@ -0,0 +1,120 @@
+PATH
+  remote: .
+  specs:
+    rails_admin_settings (0.8.0)
+      mongoid (>= 3.0, < 4.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (3.2.19)
+      activesupport (= 3.2.19)
+      builder (~> 3.0.0)
+    activesupport (3.2.19)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    addressable (2.3.6)
+    builder (3.0.4)
+    carrierwave (0.10.0)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+      json (>= 1.7)
+      mime-types (>= 1.16)
+    climate_control (0.0.3)
+      activesupport (>= 3.0)
+    cocaine (0.5.4)
+      climate_control (>= 0.0.3, < 1.0)
+    coderay (1.1.0)
+    crass (0.2.1)
+    database_cleaner (1.3.0)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    factory_girl (4.4.0)
+      activesupport (>= 3.0.0)
+    geocoder (1.2.3)
+    glebtv-carrierwave-mongoid (0.8.0)
+      carrierwave (>= 0.8.0, < 0.11.0)
+      mongoid (>= 3.0, < 5.0)
+    glebtv-mongoid-paperclip (0.2.4)
+      mongoid (>= 3.0, < 5.0)
+      paperclip (>= 2.3.6)
+    i18n (0.6.11)
+    json (1.8.1)
+    method_source (0.8.2)
+    mime-types (2.3)
+    mini_portile (0.6.0)
+    mongoid (3.1.6)
+      activemodel (~> 3.2)
+      moped (~> 1.4)
+      origin (~> 1.0)
+      tzinfo (~> 0.3.29)
+    mongoid-rspec (1.11.0)
+      mongoid (~> 3.1.6)
+      rake
+      rspec (>= 2.14)
+    moped (1.5.2)
+    multi_json (1.10.1)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    nokogumbo (1.1.9)
+      nokogiri
+    origin (1.1.0)
+    paperclip (4.2.0)
+      activemodel (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (~> 0.5.3)
+      mime-types
+    pry (0.10.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rake (10.3.2)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.3)
+    russian_phone (0.4.1)
+      mongoid (>= 3.0.0)
+    safe_yaml (1.0.3)
+    sanitize (3.0.0)
+      crass (~> 0.2.0)
+      nokogiri (>= 1.4.4)
+      nokogumbo (= 1.1.9)
+    simplecov (0.9.0)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.6.0)
+    tzinfo (0.3.41)
+    validates_email_format_of (1.5.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  addressable
+  bundler
+  database_cleaner
+  factory_girl
+  geocoder
+  glebtv-carrierwave-mongoid
+  glebtv-mongoid-paperclip
+  mongoid-rspec
+  pry
+  rails_admin_settings!
+  rake
+  rspec
+  russian_phone
+  safe_yaml
+  sanitize
+  simplecov
+  validates_email_format_of

data/README.md

@@ -1,7 +1,7 @@
 # RailsAdminSettings
 
 [![Build Status](https://secure.travis-ci.org/rs-pro/rails_admin_settings.png?branch=master)](http://travis-ci.org/rs-pro/rails_admin_settings)
-[![Dependency Status](https://gemnasium.com/rs-pro/rails_admin_settings.png)](https://gemnasium.com/rs-pro/rails_admin_settings)
+[![Dependency Status](https://www.versioneye.com/user/projects/53e73e2735080d9f08000134/badge.svg?style=flat)](https://www.versioneye.com/user/projects/53e73e2735080d9f08000134)
 
 Note: This gem currently supports Mongoid 3/4 only, as I don't need AR support.
 

data/app/models/rails_admin_settings/setting.rb

@@ -5,11 +5,6 @@ module RailsAdminSettings
     include ::Mongoid::Timestamps::Short
 
     store_in collection: "rails_admin_settings"
-
-    if Object.const_defined?('Mongoid') && Mongoid.const_defined?('Audit')
-      include ::Mongoid::Audit::Trackable
-      track_history track_create: true, track_destroy: true
-    end
     
     field :enabled, type: Mongoid::VERSION.to_i < 4 ? Boolean : Mongoid::Boolean, default: true
     scope :enabled, -> { where(enabled: true) }

data/lib/rails_admin_settings/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminSettings
-  VERSION = "0.7.8"
+  VERSION = "0.8.0"
 end

data/lib/rails_admin_settings.rb

@@ -13,6 +13,11 @@ module RailsAdminSettings
   autoload :Uploads,           "rails_admin_settings/uploads"
   autoload :HexColorValidator, "rails_admin_settings/hex_color_validator"
   autoload :Dumper,            "rails_admin_settings/dumper"
+
+  def self.track_history!
+    RailsAdminSettings::Setting.send(:include, ::Mongoid::History::Trackable)
+    RailsAdminSettings::Setting.send(:track_history, {track_create: true, track_destroy: true})
+  end
 end
 
 require "rails_admin_settings/types"

data/rails_admin_settings.gemspec

@@ -18,23 +18,21 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "mongoid", ">= 3.1"
+  spec.add_runtime_dependency "mongoid", [">= 3.0", "< 4.1"]
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 10.1.1"
-  spec.add_development_dependency "rspec", "~> 2.14.1"
-  spec.add_development_dependency "mongoid-rspec", "~> 1.10.0"
-  spec.add_development_dependency "simplecov", "~> 0.8.2"
-  spec.add_development_dependency "database_cleaner", "~> 1.2.0"
-  spec.add_development_dependency "factory_girl", "~> 4.3.0"
-
-  spec.add_development_dependency "safe_yaml", "~> 1.0.0"
-  spec.add_development_dependency "russian_phone", "~> 0.3.2"
-  spec.add_development_dependency "sanitize", "~> 2.1.0"
-  spec.add_development_dependency "validates_email_format_of", "~> 1.5.3"
-  spec.add_development_dependency "geocoder", "~> 1.1.6"
-  spec.add_development_dependency "addressable", "~> 2.3.3"
-
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "mongoid-rspec"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "database_cleaner"
+  spec.add_development_dependency "factory_girl"
+  spec.add_development_dependency "safe_yaml"
+  spec.add_development_dependency "russian_phone"
+  spec.add_development_dependency "sanitize"
+  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 "glebtv-mongoid-paperclip"
   spec.add_development_dependency "pry"

data/spec/advanced_usage_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe 'Settings advanced usage' do
   it 'with defaults' do
     s = Settings.email(default: 'test@example.com')
-    s.should eq 'test@example.com'
-    Settings.get(:email).to_s.should eq 'test@example.com'
+    expect(s).to eq 'test@example.com'
+    expect(Settings.get(:email).to_s).to eq 'test@example.com'
   end
 end

data/spec/carrierwave_spec.rb

@@ -16,9 +16,9 @@ describe "Uploads" do
       # because we're not inside Rails
       Settings.get(:file).file.root = '/'
 
-      Settings.get(:file).file.file.file.should eq "#{File.dirname(__FILE__).gsub('/spec', '/')}uploads/1024x768.gif"
+      expect(Settings.get(:file).file.file.file).to eq "#{File.dirname(__FILE__).gsub('/spec', '/')}uploads/1024x768.gif"
 
-      File.exists?(Settings.root_file_path.join("uploads/1024x768.gif")).should be_true
+      expect(File.exists?(Settings.root_file_path.join("uploads/1024x768.gif"))).to be_truthy
     end
 
     it 'supports image type' do
@@ -27,14 +27,14 @@ describe "Uploads" do
       # because we're not inside Rails
       Settings.get(:file).file.root = '/'
 
-      Settings.get(:file).file.file.file.should eq "#{File.dirname(__FILE__).gsub('/spec', '/')}uploads/1024x768.gif"
+      expect(Settings.get(:file).file.file.file).to eq "#{File.dirname(__FILE__).gsub('/spec', '/')}uploads/1024x768.gif"
 
-      File.exists?(Settings.root_file_path.join("uploads/1024x768.gif")).should be_true
+      expect(File.exists?(Settings.root_file_path.join("uploads/1024x768.gif"))).to be_truthy
     end
 
     it 'supports defaults' do
       Settings.apply_defaults!(File.join(File.dirname(__FILE__), 'support/defaults_w_file.yml'))
-      File.exists?(Settings.root_file_path.join("uploads/1024x768.gif")).should be_true
+      expect(File.exists?(Settings.root_file_path.join("uploads/1024x768.gif"))).to be_truthy
     end
   end
 end

data/spec/database_trickery_spec.rb

@@ -10,39 +10,39 @@ describe 'Database trickery' do
     email = "my@mail.ru"
     email2 = "my2@mail.ru"
     Settings.email = email
-    Settings.email.should == email
+    expect(Settings.email).to eq(email)
     RailsAdminSettings::Setting.destroy_all
     # settings are still cached
-    Settings.email.should == email
+    expect(Settings.email).to eq(email)
 
     Settings.email = email2
-    Settings.email.should == email2
+    expect(Settings.email).to eq(email2)
   end
 
   it "should handle settings appearing in DB when settings are loaded" do
-    Settings.tst2.should == ''
+    expect(Settings.tst2).to eq('')
     RailsAdminSettings::Setting.create!(key: 'tst', raw: 'tst')
     # settings are still cached, but when we try to create a setting it sees updated value in DB
-    Settings.tst.should == 'tst'
+    expect(Settings.tst).to eq('tst')
   end
 
   it "should handle settings appearing in DB when settings are not loaded" do
     RailsAdminSettings::Setting.create(key: 'tst', raw: 'tst')
     Settings.tst = 'str'
-    Settings.tst.should == 'str'
+    expect(Settings.tst).to eq('str')
   end
 
   it "#destroy_all!" do
     Settings.tst = 'str'
     Settings.destroy_all!
-    Settings.tst.should == ''
+    expect(Settings.tst).to eq('')
   end
 
   it "#destroy!" do
     Settings.tst = 'str'
     Settings.tst2 = 'str2'
     Settings.destroy!(:tst)
-    Settings.tst.should == ''
-    Settings.tst2.should == 'str2'
+    expect(Settings.tst).to eq('')
+    expect(Settings.tst2).to eq('str2')
   end
 end

data/spec/defaults_spec.rb

@@ -13,67 +13,67 @@ describe 'Settings loading defaults' do
   end
 
   it 'sets value' do
-    Settings.footer.should eq 'test <b></b>'
-    Settings.get(:footer).type.should eq 'html'
+    expect(Settings.footer).to eq 'test <b></b>'
+    expect(Settings.get(:footer).type).to eq 'html'
   end
 
   it 'sets type' do
-    Settings.get(:phone).phone_type?.should be_true
-    Settings.get(:phone).val.city.should eq '906'
-    Settings.get(:phone).val.formatted_subscriber.should eq '111-11-11'
+    expect(Settings.get(:phone).phone_type?).to be_truthy
+    expect(Settings.get(:phone).val.city).to eq '906'
+    expect(Settings.get(:phone).val.formatted_subscriber).to eq '111-11-11'
   end
 
   it 'sets enabled' do
-    Settings.phone_enabled?.should eq true
-    Settings.disabled_enabled?.should eq false
-    Settings.enabled?(:disabled).should eq false
+    expect(Settings.phone_enabled?).to eq true
+    expect(Settings.disabled_enabled?).to eq false
+    expect(Settings.enabled?(:disabled)).to eq false
   end
 
   it 'works with namespace' do
-    Settings.ns(:main).phone.should eq '906 1111111'
-    Settings.ns(:other).footer.should eq 'zzz'
-    Settings.footer.should eq 'test <b></b>'
-    Settings.ns(:main).footer.should eq 'test <b></b>'
+    expect(Settings.ns(:main).phone).to eq '906 1111111'
+    expect(Settings.ns(:other).footer).to eq 'zzz'
+    expect(Settings.footer).to eq 'test <b></b>'
+    expect(Settings.ns(:main).footer).to eq 'test <b></b>'
   end
 
   it 'works with fallback' do
-    Settings.ns(:etc, fallback: :main).phone.should eq '906 1111111'
-    Settings.ns(:etc, fallback: :main).footer.should eq 'test <b></b>'
-    Settings.ns(:other, fallback: :main).footer.should eq 'zzz'
-    Settings.ns(:etc, fallback: :other).footer.should eq 'zzz'
+    expect(Settings.ns(:etc, fallback: :main).phone).to eq '906 1111111'
+    expect(Settings.ns(:etc, fallback: :main).footer).to eq 'test <b></b>'
+    expect(Settings.ns(:other, fallback: :main).footer).to eq 'zzz'
+    expect(Settings.ns(:etc, fallback: :other).footer).to eq 'zzz'
   end
 
   it 'works with custom default namespace' do
     Settings.ns_default = 'other'
     Settings.ns_fallback = 'other'
-    Settings.ns(:main).phone.should eq '906 1111111'
-    Settings.ns(:other).footer.should eq 'zzz'
-    Settings.ns(:main).footer.should eq 'test <b></b>'
-    Settings.footer.should eq 'zzz'
+    expect(Settings.ns(:main).phone).to eq '906 1111111'
+    expect(Settings.ns(:other).footer).to eq 'zzz'
+    expect(Settings.ns(:main).footer).to eq 'test <b></b>'
+    expect(Settings.footer).to eq 'zzz'
 
-    Settings.ns(:etc, fallback: :main).phone.should eq '906 1111111'
-    Settings.ns(:etc, fallback: :main).footer.should eq 'test <b></b>'
-    Settings.ns(:other, fallback: :main).footer.should eq 'zzz'
-    Settings.ns(:etc, fallback: :other).footer.should eq 'zzz'
+    expect(Settings.ns(:etc, fallback: :main).phone).to eq '906 1111111'
+    expect(Settings.ns(:etc, fallback: :main).footer).to eq 'test <b></b>'
+    expect(Settings.ns(:other, fallback: :main).footer).to eq 'zzz'
+    expect(Settings.ns(:etc, fallback: :other).footer).to eq 'zzz'
 
     Settings.ns_default = :etc
     Settings.ns_fallback = :main
-    Settings.phone.should eq '906 1111111'
-    Settings.footer.should eq 'test <b></b>'
+    expect(Settings.phone).to eq '906 1111111'
+    expect(Settings.footer).to eq 'test <b></b>'
 
     Settings.ns_fallback = :other
-    Settings.footer.should eq 'zzz'
+    expect(Settings.footer).to eq 'zzz'
 
     Settings.ns_default = :other
     Settings.ns_fallback = :main
-    Settings.footer.should eq 'zzz'
+    expect(Settings.footer).to eq 'zzz'
   end
 
   it "doesn't overwrite" do
     Settings.ns(:main).phone = '906 2222222'
     Settings.ns(:other).footer = 'xxx'
     Settings.apply_defaults!(File.join(File.dirname(__FILE__), 'support/defaults.yml'))
-    Settings.ns(:main).phone.should eq '906 2222222'
-    Settings.ns(:other).footer.should eq 'xxx'
+    expect(Settings.ns(:main).phone).to eq '906 2222222'
+    expect(Settings.ns(:other).footer).to eq 'xxx'
   end
 end

data/spec/enabling_spec.rb

@@ -5,25 +5,25 @@ require 'spec_helper'
 describe 'Settings enabling and disabling' do
   it 'works for name_enabled? and name_enabled =' do
     Settings.zzz = '123'
-    Settings.zzz.should eq '123'
-    Settings.get(:zzz).enabled.should eq true
-    Settings.enabled?(:zzz).should eq true
-    Settings.zzz_enabled?.should eq true
+    expect(Settings.zzz).to eq '123'
+    expect(Settings.get(:zzz).enabled).to eq true
+    expect(Settings.enabled?(:zzz)).to eq true
+    expect(Settings.zzz_enabled?).to eq true
 
-    Settings.zzz.should eq '123'
+    expect(Settings.zzz).to eq '123'
     Settings.zzz_enabled = false
-    Settings.zzz_enabled?.should eq false
-    Settings.get(:zzz).enabled.should eq false
-    Settings.enabled?(:zzz).should eq false
-    Settings.zzz.should eq ''
+    expect(Settings.zzz_enabled?).to eq false
+    expect(Settings.get(:zzz).enabled).to eq false
+    expect(Settings.enabled?(:zzz)).to eq false
+    expect(Settings.zzz).to eq ''
     Settings.unload!
-    Settings.zzz.should eq ''
-    Settings.get(:zzz).raw.should eq '123'
+    expect(Settings.zzz).to eq ''
+    expect(Settings.get(:zzz).raw).to eq '123'
 
     Settings.zzz_enabled = true
-    Settings.zzz.should eq '123'
-    Settings.zzz_enabled?.should eq true
-    Settings.get(:zzz).enabled.should eq true
-    Settings.enabled?(:zzz).should eq true
+    expect(Settings.zzz).to eq '123'
+    expect(Settings.zzz_enabled?).to eq true
+    expect(Settings.get(:zzz).enabled).to eq true
+    expect(Settings.enabled?(:zzz)).to eq true
   end
 end

data/spec/label_spec.rb

@@ -7,12 +7,12 @@ describe 'Settings label' do
   it "should have label" do
     label = "E-Mail"
     Settings.email(label: label, default: "my@mail.ru")
-    Settings.get(:email).name.should == label
+    expect(Settings.get(:email).name).to eq(label)
   end
 
   it "should properly set label as key if blank" do
     Settings.email(default: "my@mail.ru")
-    Settings.get(:email).name.should == 'email'
+    expect(Settings.get(:email).name).to eq('email')
   end
 
 end

data/spec/model_spec.rb

@@ -3,43 +3,43 @@
 require 'spec_helper'
 
 describe RailsAdminSettings::Setting do
-  it { should have_fields(:enabled, :key, :type, :raw) }
+  it { is_expected.to have_fields(:enabled, :key, :type, :raw) }
 
   it "correctly return content when enabled" do
     setting = FactoryGirl.create(:setting)
-    setting.to_s.should eq "Контент 1"
+    expect(setting.to_s).to eq "Контент 1"
   end
 
   it "return empty string when disabled" do
     setting = FactoryGirl.create(:setting, enabled: false)
-    setting.to_s.should eq ""
+    expect(setting.to_s).to eq ""
   end
 
   it "correctly process {{year}}" do
     setting = FactoryGirl.create(:setting, raw: '© {{year}} company')
-    setting.val.should eq "© #{Time.now.strftime('%Y')} company"
+    expect(setting.val).to eq "© #{Time.now.strftime('%Y')} company"
   end
 
   it "correctly process {{year|2010}}" do
     setting = FactoryGirl.create(:setting, raw: '© {{year|2010}} company')
-    setting.val.should eq "© 2010-#{Time.now.strftime('%Y')} company"
+    expect(setting.val).to eq "© 2010-#{Time.now.strftime('%Y')} company"
   end
 
   it "correctly process {{year|current_year}}" do
     setting = FactoryGirl.create(:setting, raw: '© {{year|' + Time.now.strftime('%Y') + '}} company')
-    setting.val.should eq "© #{Time.now.strftime('%Y')} company"
-    setting.val.class.name.should_not eq "ActiveSupport::SafeBuffer"
+    expect(setting.val).to eq "© #{Time.now.strftime('%Y')} company"
+    expect(setting.val.class.name).not_to eq "ActiveSupport::SafeBuffer"
   end
 
   it 'return html_safe string when in html mode' do
     setting = FactoryGirl.create(:setting, raw: '© {{year}} company', type: 'html')
-    setting.val.should eq "© #{Time.now.strftime('%Y')} company"
-    setting.val.class.name.should eq "ActiveSupport::SafeBuffer"
+    expect(setting.val).to eq "© #{Time.now.strftime('%Y')} company"
+    expect(setting.val.class.name).to eq "ActiveSupport::SafeBuffer"
   end
 
   it 'sanitize html when in sanitized mode' do
     setting = FactoryGirl.create(:setting, raw: '&copy; {{year}} company <a href="javascript:alert()">test</a>', type: 'sanitized')
-    setting.val.should eq "© #{Time.now.strftime('%Y')} company <a>test</a>"
-    setting.val.class.name.should eq "ActiveSupport::SafeBuffer"
+    expect(setting.val).to eq "© #{Time.now.strftime('%Y')} company <a>test</a>"
+    expect(setting.val.class.name).to eq "ActiveSupport::SafeBuffer"
   end
 end

data/spec/namespaced_spec.rb

@@ -10,18 +10,18 @@ describe 'Namespaced settings' do
   it 'reads namespaced from cache' do
     ns = Settings.ns(:other)
     ns.test = 'test'
-    ns.test.should eq 'test'
+    expect(ns.test).to eq 'test'
   end
 
   it 'reads namespaced from db' do
     Settings.ns(:other).test = 'test'
-    Settings.ns(:other).test.should eq 'test'
+    expect(Settings.ns(:other).test).to eq 'test'
   end
 
   it 'destroys' do
     Settings.ns(:other).test = 'test'
     Settings.ns(:other).destroy_all!
-    Settings.ns(:other).test.should eq ''
+    expect(Settings.ns(:other).test).to eq ''
   end
 
   it 'sets type' do
@@ -29,22 +29,22 @@ describe 'Namespaced settings' do
       Settings.ns(:other).set(:phone, 'test', type: 'phone')
     }.to raise_error
     Settings.ns(:other).set(:phone, '906 111 11 11', type: 'phone')
-    Settings.get(:phone, ns: 'other').phone_type?.should be_true
-    Settings.get(:phone, ns: 'other').val.city.should eq '906'
-    Settings.get(:phone, ns: 'other').val.formatted_subscriber.should eq '111-11-11'
+    expect(Settings.get(:phone, ns: 'other').phone_type?).to be_truthy
+    expect(Settings.get(:phone, ns: 'other').val.city).to eq '906'
+    expect(Settings.get(:phone, ns: 'other').val.formatted_subscriber).to eq '111-11-11'
 
     ns = Settings.ns(:other)
-    ns.get(:phone).phone_type?.should be_true
-    ns.get(:phone).val.city.should eq '906'
-    ns.get(:phone).val.formatted_subscriber.should eq '111-11-11'
+    expect(ns.get(:phone).phone_type?).to be_truthy
+    expect(ns.get(:phone).val.city).to eq '906'
+    expect(ns.get(:phone).val.formatted_subscriber).to eq '111-11-11'
   end
 
   it 'works with custom defaults' do
     Settings.ns_default = 'hitfood'
     Settings.ns_fallback = 'main'
-    Settings.test.should eq ''
+    expect(Settings.test).to eq ''
     Settings.test = 'zzz'
-    Settings.get(:test, ns: 'hitfood').raw.should eq 'zzz'
-    Settings.get(:test, ns: 'main').raw.should eq ''
+    expect(Settings.get(:test, ns: 'hitfood').raw).to eq 'zzz'
+    expect(Settings.get(:test, ns: 'main').raw).to eq ''
   end
 end

data/spec/paperclip_spec.rb

@@ -14,25 +14,25 @@ describe "Uploads" do
     end
     it 'supports file type' do
       Settings.set('file', File.open("#{File.dirname(__FILE__)}/support/1024x768.gif"), type: 'file')
-      Settings.get(:file).file_file_name.should eq '1024x768.gif'
-      Settings.get(:file).file_file_size.should eq 4357
-      Settings.file[0..21].should eq '/uploads/1024x768.gif?'
+      expect(Settings.get(:file).file_file_name).to eq '1024x768.gif'
+      expect(Settings.get(:file).file_file_size).to eq 4357
+      expect(Settings.file[0..21]).to eq '/uploads/1024x768.gif?'
 
-      File.exists?("#{File.dirname(__FILE__)}/../uploads/1024x768.gif").should be_true
+      expect(File.exists?("#{File.dirname(__FILE__)}/../uploads/1024x768.gif")).to be_truthy
     end
 
     it 'supports image type' do
       Settings.set('file', File.open("#{File.dirname(__FILE__)}/support/1024x768.gif"), type: 'image')
-      Settings.get(:file).file_file_name.should eq '1024x768.gif'
-      Settings.get(:file).file_file_size.should eq 4357
-      Settings.file[0..21].should eq '/uploads/1024x768.gif?'
+      expect(Settings.get(:file).file_file_name).to eq '1024x768.gif'
+      expect(Settings.get(:file).file_file_size).to eq 4357
+      expect(Settings.file[0..21]).to eq '/uploads/1024x768.gif?'
 
-      File.exists?("#{File.dirname(__FILE__)}/../uploads/1024x768.gif").should be_true
+      expect(File.exists?("#{File.dirname(__FILE__)}/../uploads/1024x768.gif")).to be_truthy
     end
 
     it 'supports defaults' do
       Settings.apply_defaults!(File.join(File.dirname(__FILE__), 'support/defaults_w_file.yml'))
-      File.exists?(Settings.root_file_path.join("uploads/1024x768.gif")).should be_true
+      expect(File.exists?(Settings.root_file_path.join("uploads/1024x768.gif"))).to be_truthy
     end
   end
 end

data/spec/settings_spec.rb

@@ -8,19 +8,19 @@ describe 'Settings' do
 
     email = "my@mail.ru"
     Settings.email = email
-    Settings.email.should == email
+    expect(Settings.email).to eq(email)
   end
 
   it '#get should return new setting when setting does not exist' do
     t = Settings.get(:test)
-    t.class.name.should eq 'RailsAdminSettings::Setting'
-    t.persisted?.should eq true
-    t.value.should eq ''
+    expect(t.class.name).to eq 'RailsAdminSettings::Setting'
+    expect(t.persisted?).to eq true
+    expect(t.value).to eq ''
   end
 
   it '#name should return empty string when setting does not exist' do
-    Settings.test.should eq ''
-    Settings['test'].value.should eq ''
+    expect(Settings.test).to eq ''
+    expect(Settings['test'].value).to eq ''
   end
 
   it "should save default" do
@@ -29,47 +29,47 @@ describe 'Settings' do
     email = "my@mail.ru"
     email2 = "my2@mail.ru"
     Settings.save_default(:email, email)
-    Settings.email.should == email
+    expect(Settings.email).to eq(email)
     Settings.email = email2
-    Settings.email.should == email2
+    expect(Settings.email).to eq(email2)
     Settings.save_default(:email, email)
-    Settings.email.should == email2
+    expect(Settings.email).to eq(email2)
   end
 
   it 'should properly unload' do
     Settings.load!
-    Settings.loaded.should eq true
+    expect(Settings.loaded).to eq true
     Settings.unload!
-    Settings.loaded.should eq false
+    expect(Settings.loaded).to eq false
   end
 
   it 'should work with type and default' do
-    Settings.phone(type: 'phone', default: '906 111 11 11').should eq '+7 (906) 111-11-11'
+    expect(Settings.phone(type: 'phone', default: '906 111 11 11')).to eq '+7 (906) 111-11-11'
     Settings.phone = '906 222 22 22'
-    Settings.phone(type: 'phone', default: '906 111 11 11').should eq '+7 (906) 222-22-22'
+    expect(Settings.phone(type: 'phone', default: '906 111 11 11')).to eq '+7 (906) 222-22-22'
   end
   
   it 'should properly store settings to DB' do
     Settings.unload!
-    Settings.loaded.should eq false
+    expect(Settings.loaded).to eq false
     Settings.temp = '123'
-    Settings.loaded.should eq true
+    expect(Settings.loaded).to eq true
     Settings.unload!
-    Settings.loaded.should eq false
-    Settings.temp.should eq '123'
-    Settings.loaded.should eq true
+    expect(Settings.loaded).to eq false
+    expect(Settings.temp).to eq '123'
+    expect(Settings.loaded).to eq true
   end
 
   it 'should support yaml type' do
     Settings.tdata(type: 'yaml')
     Settings.tdata = ['one', 'two', 'three']
-    YAML.safe_load(Settings.get(:tdata).raw).should eq ['one', 'two', 'three']
-    Settings.tdata.should eq ['one', 'two', 'three']
+    expect(YAML.safe_load(Settings.get(:tdata).raw)).to eq ['one', 'two', 'three']
+    expect(Settings.tdata).to eq ['one', 'two', 'three']
   end
 
   it '#enabled? sets defaults' do
-    Settings.enabled?(:phone, type: 'phone').should eq true
-    Settings.get(:phone).type.should eq 'phone'
+    expect(Settings.enabled?(:phone, type: 'phone')).to eq true
+    expect(Settings.get(:phone).type).to eq 'phone'
   end
 
 end

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ SimpleCov.start
 
 require 'pry'
 require 'bundler/setup'
+require 'active_support'
 require 'active_support/core_ext'
 require 'mongoid'
 require 'database_cleaner'

data/spec/types_spec.rb

@@ -4,74 +4,74 @@ require 'spec_helper'
 
 describe 'Settings types' do
   it 'html' do
-    Settings.get(:email, type: 'html', default: 'test@example.com').to_s.should eq 'test@example.com'
+    expect(Settings.get(:email, type: 'html', default: 'test@example.com').to_s).to eq 'test@example.com'
   end
 
   it 'integer' do
-    Settings.get(:testint, type: 'integer').value.should eq 0
-    Settings.get(:testint, default: 5, type: 'integer').value.should eq 0
-    Settings.get(:testint2, default: 5, type: 'integer').value.should eq 5
-    Settings.testint2.should eq 5
+    expect(Settings.get(:testint, type: 'integer').value).to eq 0
+    expect(Settings.get(:testint, default: 5, type: 'integer').value).to eq 0
+    expect(Settings.get(:testint2, default: 5, type: 'integer').value).to eq 5
+    expect(Settings.testint2).to eq 5
   end
 
   it 'yaml' do
     Settings.set(:data, '[one, two, three]', type: 'yaml')
-    Settings.get(:data).raw.should eq '[one, two, three]'
-    Settings.data.should eq ['one', 'two', 'three']
+    expect(Settings.get(:data).raw).to eq '[one, two, three]'
+    expect(Settings.data).to eq ['one', 'two', 'three']
   end
 
   it 'phone' do
     Settings.set(:tphone, '906 111 11 11', type: 'phone')
-    Settings.get(:tphone).val.class.name.should eq 'RussianPhone::Number'
-    Settings.tphone.class.name.should eq 'RussianPhone::Number'
-    Settings.tphone.should eq '906 111 11 11'
-    Settings.get(:tphone).phone_type?.should be_true
-    Settings.get(:tphone).val.city.should eq '906'
-    Settings.get(:tphone).val.formatted_subscriber.should eq '111-11-11'
+    expect(Settings.get(:tphone).val.class.name).to eq 'RussianPhone::Number'
+    expect(Settings.tphone.class.name).to eq 'RussianPhone::Number'
+    expect(Settings.tphone).to eq '906 111 11 11'
+    expect(Settings.get(:tphone).phone_type?).to be_truthy
+    expect(Settings.get(:tphone).val.city).to eq '906'
+    expect(Settings.get(:tphone).val.formatted_subscriber).to eq '111-11-11'
   end
 
   it 'supports phones type' do
     Settings.set(:tphone, ['906 111 11 11', '907 111 11 11'] * "\n", type: 'phones')
-    Settings.get(:tphone).val.class.name.should eq 'Array'
-    Settings.tphone.class.name.should eq 'Array'
-    Settings.get(:tphone).val.first.class.name.should eq 'RussianPhone::Number'
-    Settings.tphone.first.class.name.should eq 'RussianPhone::Number'
-    Settings.tphone.first.should eq '906 111 11 11'
-    Settings.get(:tphone).phones_type?.should be_true
-    Settings.get(:tphone).val.first.city.should eq '906'
-    Settings.get(:tphone).val.last.city.should eq '907'
-    Settings.get(:tphone).val.first.formatted_subscriber.should eq '111-11-11'
+    expect(Settings.get(:tphone).val.class.name).to eq 'Array'
+    expect(Settings.tphone.class.name).to eq 'Array'
+    expect(Settings.get(:tphone).val.first.class.name).to eq 'RussianPhone::Number'
+    expect(Settings.tphone.first.class.name).to eq 'RussianPhone::Number'
+    expect(Settings.tphone.first).to eq '906 111 11 11'
+    expect(Settings.get(:tphone).phones_type?).to be_truthy
+    expect(Settings.get(:tphone).val.first.city).to eq '906'
+    expect(Settings.get(:tphone).val.last.city).to eq '907'
+    expect(Settings.get(:tphone).val.first.formatted_subscriber).to eq '111-11-11'
   end
 
   it 'defaults for phone' do
     Settings.dphone(type: 'phone')
-    Settings.get(:dphone).phone_type?.should be_true
-    Settings.dphone.formatted_area.should eq ''
-    Settings.dphone.formatted_subscriber.should eq ''
+    expect(Settings.get(:dphone).phone_type?).to be_truthy
+    expect(Settings.dphone.formatted_area).to eq ''
+    expect(Settings.dphone.formatted_subscriber).to eq ''
   end
 
   it 'email validates' do
     Settings.eml(type: 'email')
-    Settings.get(:eml).email_type?.should be_true
+    expect(Settings.get(:eml).email_type?).to be_truthy
     expect { Settings.eml = '1' }.to raise_error
     Settings.eml = 'test@example.com'
-    Settings.eml.should eq 'test@example.com'
+    expect(Settings.eml).to eq 'test@example.com'
   end
 
   it 'url processing' do
     Settings.url(type: 'url')
-    Settings.get(:url).url_type?.should be_true
-    Settings.get(:url).color_type?.should be_false
+    expect(Settings.get(:url).url_type?).to be_truthy
+    expect(Settings.get(:url).color_type?).to be_falsey
     Settings.url = 'test.ru'
-    Settings.url.should eq 'http://test.ru'
+    expect(Settings.url).to eq 'http://test.ru'
   end
 
   it 'color' do
     Settings.col(type: 'color')
-    Settings.get(:col).color_type?.should be_true
+    expect(Settings.get(:col).color_type?).to be_truthy
     expect { Settings.col = 'test'}.to raise_error
     Settings.col = 'ffffff'
-    Settings.col.should eq 'ffffff'
+    expect(Settings.col).to eq 'ffffff'
     expect {
       Settings.col = 'zzzzzz'
     }.to raise_error

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_settings
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.8.0
 platform: ruby
 authors:
 - Gleb Tv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -42,170 +48,170 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mongoid-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: russian_phone
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: validates_email_format_of
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: geocoder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: glebtv-carrierwave-mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +268,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile