ledermann-rails-settings 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71d258f55435ac0936befafa014944f3a3ae72da
-  data.tar.gz: 0f9f767391fad56c4ff44a7ff44494ad4b6c09b6
+  metadata.gz: 0b32592febac17831f730dd18e33ef0af56c1251
+  data.tar.gz: 6c4c04520451889bf5ad7ca407d53530415aa7e6
 SHA512:
-  metadata.gz: d621905d20eab2e0962c943242286d0eb9097731f3eb4f7d23edb3102494ce774e5eaf64cff455ff2c7f49461050976f4c44b6af4550888955f39ed8d83feac6
-  data.tar.gz: 378399bc595e654aa79323d51cdc963b778024427713332f9c93aff0a25595146be562604299681f931fd644fbb230208c07ca7e6164ebde5b64c0d8dea9d895
+  metadata.gz: 71033242a7e5ff5cc1d6c1da91fc968aae2df1513e83678cd7fb7d199b71fa6f42b4354dd35cfaa8c70671a552adff2041cb7cb65920878b61e42ba0e83f9398
+  data.tar.gz: dcb7360d13a853702e90efe91329ae3db9c052c8c4062164b68a170a9d97411fc8136c8ced228fad2d30bde7e871c36c257d456cb67bfb579b90ba93b8d738c8

data/.travis.yml

@@ -2,15 +2,22 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1.5
+  - 2.2.1
 gemfile:
   - ci/Gemfile-rails-3-1
   - ci/Gemfile-rails-3-2
   - ci/Gemfile-rails-4-0
   - ci/Gemfile-rails-4-1
-env:
-  - DB=sqlite
-  - DB=mysql
-before_script:
-  - "mysql -e 'create database rails_settings_test;' >/dev/null"
+  - ci/Gemfile-rails-4-2
+matrix:
+  include:
+    - rvm: 2.2.1
+      gemfile: ci/Gemfile-rails-4-2
+      env: PROTECTED_ATTRIBUTES=true
+  exclude:
+    - rvm: 2.2.1
+      gemfile: ci/Gemfile-rails-3-1
+    - rvm: 2.2.1
+      gemfile: ci/Gemfile-rails-3-2
 before_install: gem update bundler

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Georg Ledermann
+Copyright (c) 2012-2015 Georg Ledermann
 
 MIT License
 

data/README.md

@@ -140,6 +140,6 @@ See https://github.com/ledermann/rails-settings/releases
 
 MIT License
 
-Copyright (c) 2013 [Georg Ledermann](http://www.georg-ledermann.de)
+Copyright (c) 2012-2015 [Georg Ledermann](http://www.georg-ledermann.de)
 
 This gem is a complete rewrite of [rails-settings](https://github.com/Squeegy/rails-settings) by [Alex Wayne](https://github.com/Squeegy)

data/ci/Gemfile-rails-3-1

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'activerecord', '~> 3.1.12'
-gem 'sqlite3', '~> 1.3'
-gem 'mysql2', '>= 0.3.6'
-gem 'rake', '~> 10.0'
-gem 'rspec', '~> 2.13'
+gem 'sqlite3'
+gem 'rake'
+gem 'rspec'

data/ci/Gemfile-rails-3-2

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'activerecord', '~> 3.2.17'
-gem 'sqlite3', '~> 1.3'
-gem 'mysql2', '>= 0.3.6'
-gem 'rake', '~> 10.0'
-gem 'rspec', '~> 2.13'
+gem 'sqlite3'
+gem 'rake'
+gem 'rspec'

data/ci/Gemfile-rails-4-0

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 4.0.4'
-gem 'sqlite3', '~> 1.3'
-gem 'mysql2', '>= 0.3.6'
-gem 'rake', '~> 10.0'
-gem 'rspec', '~> 2.13'
+gem 'activerecord', '~> 4.0.13'
+gem 'protected_attributes' if ENV['PROTECTED_ATTRIBUTES'] == 'true'
+gem 'sqlite3'
+gem 'rake'
+gem 'rspec'

data/ci/Gemfile-rails-4-1

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 4.1.0'
-gem 'sqlite3', '~> 1.3'
-gem 'mysql2', '>= 0.3.6'
-gem 'rake', '~> 10.0'
-gem 'rspec', '~> 2.13'
+gem 'activerecord', '~> 4.1.10'
+gem 'protected_attributes' if ENV['PROTECTED_ATTRIBUTES'] == 'true'
+gem 'sqlite3'
+gem 'rake'
+gem 'rspec'

data/ci/Gemfile-rails-4-2

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 4.2.1'
+gem 'protected_attributes' if ENV['PROTECTED_ATTRIBUTES'] == 'true'
+gem 'sqlite3'
+gem 'rake'
+gem 'rspec'

data/lib/generators/rails_settings/migration/templates/migration.rb

@@ -4,7 +4,7 @@ class RailsSettingsMigration < ActiveRecord::Migration
       t.string     :var,    :null => false
       t.text       :value
       t.references :target, :null => false, :polymorphic => true
-      t.timestamps
+      t.timestamps :null => true
     end
     add_index :settings, [ :target_type, :target_id, :var ], :unique => true
   end

data/lib/rails-settings/base.rb

@@ -12,7 +12,7 @@ module RailsSettings
           raise ArgumentError unless var.is_a?(Symbol)
           raise ArgumentError.new("Unknown key: #{var}") unless self.class.default_settings[var]
 
-          if ActiveRecord::VERSION::MAJOR < 4
+          if defined?(ProtectedAttributes)
             setting_objects.detect { |s| s.var == var.to_s } || setting_objects.build({ :var => var.to_s }, :without_protection => true)
           else
             setting_objects.detect { |s| s.var == var.to_s } || setting_objects.build(:var => var.to_s, :target => self)

data/lib/rails-settings/setting_object.rb

@@ -15,9 +15,9 @@ module RailsSettings
 
     serialize :value, Hash
 
-    # attr_protected can not be here used because it touches the database which is not connected yet.
+    # attr_protected can not be used here because it touches the database which is not connected yet.
     # So allow no attributes and override <tt>#sanitize_for_mass_assignment</tt>
-    if ActiveRecord::VERSION::MAJOR < 4
+    if defined?(ProtectedAttributes)
       attr_accessible
     end
 
@@ -45,7 +45,7 @@ module RailsSettings
     end
 
   protected
-    if ActiveRecord::VERSION::MAJOR < 4
+    if defined?(ProtectedAttributes)
       # Simulate attr_protected by removing all regular attributes
       def sanitize_for_mass_assignment(attributes, role = nil)
         attributes.except('id', 'var', 'value', 'target_id', 'target_type', 'created_at', 'updated_at')
@@ -76,18 +76,5 @@ module RailsSettings
     def _target_class
       target_type.constantize
     end
-
-    # Patch ActiveRecord to save serialized attributes only if they are changed
-    if ActiveRecord::VERSION::MAJOR < 4
-      # https://github.com/rails/rails/blob/3-2-stable/activerecord/lib/active_record/attribute_methods/dirty.rb#L70
-      def update(*)
-        super(changed) if changed?
-      end
-    else
-      # https://github.com/rails/rails/blob/4-0-stable/activerecord/lib/active_record/attribute_methods/dirty.rb#L73
-      def update_record(*)
-        super(keys_for_partial_write) if changed?
-      end
-    end
   end
 end

data/lib/rails-settings/version.rb

@@ -1,3 +1,3 @@
 module RailsSettings
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 end

data/rails-settings.gemspec

@@ -21,6 +21,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'sqlite3'
-  gem.add_development_dependency 'mysql2'
   gem.add_development_dependency 'rspec'
 end

data/spec/configuration_spec.rb

@@ -8,28 +8,28 @@ module RailsSettings
     it "should define single key" do
       Configuration.new(Dummy, :dashboard)
 
-      Dummy.default_settings.should == { :dashboard => {} }
-      Dummy.setting_object_class_name.should == 'RailsSettings::SettingObject'
+      expect(Dummy.default_settings).to eq({ :dashboard => {} })
+      expect(Dummy.setting_object_class_name).to eq('RailsSettings::SettingObject')
     end
 
     it "should define multiple keys" do
       Configuration.new(Dummy, :dashboard, :calendar)
 
-      Dummy.default_settings.should == { :dashboard => {}, :calendar => {} }
-      Dummy.setting_object_class_name.should == 'RailsSettings::SettingObject'
+      expect(Dummy.default_settings).to eq({ :dashboard => {}, :calendar => {} })
+      expect(Dummy.setting_object_class_name).to eq('RailsSettings::SettingObject')
     end
 
     it "should define single key with class_name" do
       Configuration.new(Dummy, :dashboard, :class_name => 'MyClass')
-      Dummy.default_settings.should == { :dashboard => {} }
-      Dummy.setting_object_class_name.should == 'MyClass'
+      expect(Dummy.default_settings).to eq({ :dashboard => {} })
+      expect(Dummy.setting_object_class_name).to eq('MyClass')
     end
 
     it "should define multiple keys with class_name" do
       Configuration.new(Dummy, :dashboard, :calendar, :class_name => 'MyClass')
 
-      Dummy.default_settings.should == { :dashboard => {}, :calendar => {} }
-      Dummy.setting_object_class_name.should == 'MyClass'
+      expect(Dummy.default_settings).to eq({ :dashboard => {}, :calendar => {} })
+      expect(Dummy.setting_object_class_name).to eq('MyClass')
     end
 
     it "should define using block" do
@@ -38,8 +38,8 @@ module RailsSettings
         c.key :calendar
       end
 
-      Dummy.default_settings.should == { :dashboard => {}, :calendar => {} }
-      Dummy.setting_object_class_name.should == 'RailsSettings::SettingObject'
+      expect(Dummy.default_settings).to eq({ :dashboard => {}, :calendar => {} })
+      expect(Dummy.setting_object_class_name).to eq('RailsSettings::SettingObject')
     end
 
     it "should define using block with defaults" do
@@ -48,8 +48,8 @@ module RailsSettings
         c.key :calendar, :defaults => { :scope => 'all' }
       end
 
-      Dummy.default_settings.should == { :dashboard => { 'theme' => 'red' }, :calendar => { 'scope' => 'all'} }
-      Dummy.setting_object_class_name.should == 'RailsSettings::SettingObject'
+      expect(Dummy.default_settings).to eq({ :dashboard => { 'theme' => 'red' }, :calendar => { 'scope' => 'all'} })
+      expect(Dummy.setting_object_class_name).to eq('RailsSettings::SettingObject')
     end
 
     it "should define using block and class_name" do
@@ -58,8 +58,8 @@ module RailsSettings
         c.key :calendar
       end
 
-      Dummy.default_settings.should == { :dashboard => {}, :calendar => {} }
-      Dummy.setting_object_class_name.should == 'MyClass'
+      expect(Dummy.default_settings).to eq({ :dashboard => {}, :calendar => {} })
+      expect(Dummy.setting_object_class_name).to eq('MyClass')
     end
   end
 

data/spec/database.yml

@@ -1,8 +1,3 @@
 sqlite:
   adapter: sqlite3
   database: ":memory:"
-mysql:
-  adapter: mysql2
-  database: rails_settings_test
-  username:
-  encoding: utf8

data/spec/queries_spec.rb

@@ -97,12 +97,5 @@ describe 'Queries performed' do
         user.settings(:dashboard).update_attributes! :foo => 'bar'
       }.to perform_queries(1)
     end
-
-    it "should not touch database if there are no changes made" do
-      expect {
-        user.settings(:dashboard).update_attributes :theme => 'pink'
-        user.settings(:calendar).update_attributes :scope => 'all'
-      }.to perform_queries(0)
-    end
   end
 end

data/spec/scopes_spec.rb

@@ -5,21 +5,21 @@ describe 'scopes' do
   let!(:user2) { User.create! :name => 'Mr. Blue' }
 
   it "should find objects with existing settings" do
-    User.with_settings.should eq([user1])
+    expect(User.with_settings).to eq([user1])
   end
 
   it "should find objects with settings for key" do
-    User.with_settings_for(:dashboard).should eq([user1])
-    User.with_settings_for(:foo).should eq([])
+    expect(User.with_settings_for(:dashboard)).to eq([user1])
+    expect(User.with_settings_for(:foo)).to eq([])
   end
 
   it "should records without settings" do
-    User.without_settings.should eq([user2])
+    expect(User.without_settings).to eq([user2])
   end
 
   it "should records without settings for key" do
-    User.without_settings_for(:foo).should eq([user1, user2])
-    User.without_settings_for(:dashboard).should eq([user2])
+    expect(User.without_settings_for(:foo)).to eq([user1, user2])
+    expect(User.without_settings_for(:dashboard)).to eq([user2])
   end
 
   it "should require symbol as key" do

data/spec/serialize_spec.rb

@@ -15,11 +15,11 @@ describe "Serialization" do
       dashboard_settings = user.setting_objects.where(:var => 'dashboard').first
       calendar_settings = user.setting_objects.where(:var => 'calendar').first
 
-      dashboard_settings.var.should == 'dashboard'
-      dashboard_settings.value.should eq({'theme' => 'white'})
+      expect(dashboard_settings.var).to eq('dashboard')
+      expect(dashboard_settings.value).to eq({'theme' => 'white'})
 
-      calendar_settings.var.should == 'calendar'
-      calendar_settings.value.should eq({'scope' => 'all'})
+      expect(calendar_settings.var).to eq('calendar')
+      expect(calendar_settings.value).to eq({'scope' => 'all'})
     end
   end
 
@@ -30,11 +30,11 @@ describe "Serialization" do
       dashboard_settings = user.setting_objects.where(:var => 'dashboard').first
       calendar_settings = user.setting_objects.where(:var => 'calendar').first
 
-      dashboard_settings.var.should == 'dashboard'
-      dashboard_settings.value.should eq({'theme' => 'white', 'smart' => true})
+      expect(dashboard_settings.var).to eq('dashboard')
+      expect(dashboard_settings.value).to eq({'theme' => 'white', 'smart' => true})
 
-      calendar_settings.var.should == 'calendar'
-      calendar_settings.value.should eq({'scope' => 'all'})
+      expect(calendar_settings.var).to eq('calendar')
+      expect(calendar_settings.value).to eq({'scope' => 'all'})
     end
   end
 end

data/spec/setting_object_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe RailsSettings::SettingObject do
   let(:user) { User.create! :name => 'Mr. Pink' }
 
-  if ActiveRecord::VERSION::MAJOR < 4
+  if defined?(ProtectedAttributes)
     let(:new_setting_object) { user.setting_objects.build({ :var => 'dashboard'}, :without_protection => true) }
     let(:saved_setting_object) { user.setting_objects.create!({ :var => 'dashboard', :value => { 'theme' => 'pink', 'filter' => false}}, :without_protection => true) }
   else
@@ -13,15 +13,15 @@ describe RailsSettings::SettingObject do
 
   describe "serialization" do
     it "should have a hash default" do
-      RailsSettings::SettingObject.new.value.should == {}
+      expect(RailsSettings::SettingObject.new.value).to eq({})
     end
   end
 
   describe "Getter and Setter" do
     context "on unsaved settings" do
       it "should respond to setters" do
-        new_setting_object.should respond_to(:foo=)
-        new_setting_object.should respond_to(:bar=)
+        expect(new_setting_object).to respond_to(:foo=)
+        expect(new_setting_object).to respond_to(:bar=)
       end
 
       it "should not respond to some getters" do
@@ -42,14 +42,14 @@ describe RailsSettings::SettingObject do
       end
 
       it "should return nil for unknown attribute" do
-        new_setting_object.foo.should eq(nil)
-        new_setting_object.bar.should eq(nil)
+        expect(new_setting_object.foo).to eq(nil)
+        expect(new_setting_object.bar).to eq(nil)
       end
 
       it "should return defaults" do
-        new_setting_object.theme.should eq('blue')
-        new_setting_object.view.should eq('monthly')
-        new_setting_object.filter.should eq(true)
+        expect(new_setting_object.theme).to eq('blue')
+        expect(new_setting_object.view).to eq('monthly')
+        expect(new_setting_object.filter).to eq(true)
       end
 
       it "should store different objects to value hash" do
@@ -59,7 +59,7 @@ describe RailsSettings::SettingObject do
         new_setting_object.array   = [ 1,2,3 ]
         new_setting_object.symbol  = :foo
 
-        new_setting_object.value.should eq('integer' => 42,
+        expect(new_setting_object.value).to eq('integer' => 42,
                                            'float'   => 1.234,
                                            'string'  => 'Hello, World!',
                                            'array'   => [ 1,2,3 ],
@@ -71,53 +71,53 @@ describe RailsSettings::SettingObject do
         new_setting_object.foo = 42
         new_setting_object.bar = 'hello'
 
-        new_setting_object.theme.should eq('pink')
-        new_setting_object.foo.should eq(42)
-        new_setting_object.bar.should eq('hello')
+        expect(new_setting_object.theme).to eq('pink')
+        expect(new_setting_object.foo).to eq(42)
+        expect(new_setting_object.bar).to eq('hello')
       end
 
       it "should set dirty trackers on change" do
         new_setting_object.theme = 'pink'
-        new_setting_object.should be_value_changed
-        new_setting_object.should be_changed
+        expect(new_setting_object).to be_value_changed
+        expect(new_setting_object).to be_changed
       end
     end
 
     context "on saved settings" do
       it "should not set dirty trackers on setting same value" do
         saved_setting_object.theme = 'pink'
-        saved_setting_object.should_not be_value_changed
-        saved_setting_object.should_not be_changed
+        expect(saved_setting_object).not_to be_value_changed
+        expect(saved_setting_object).not_to be_changed
       end
 
       it "should delete key on assigning nil" do
         saved_setting_object.theme = nil
-        saved_setting_object.value.should == { 'filter' => false }
+        expect(saved_setting_object.value).to eq({ 'filter' => false })
       end
     end
   end
 
   describe "update_attributes" do
     it 'should save' do
-      new_setting_object.update_attributes(:foo => 42, :bar => 'string').should be_true
+      expect(new_setting_object.update_attributes(:foo => 42, :bar => 'string')).to be_truthy
       new_setting_object.reload
 
-      new_setting_object.foo.should eq(42)
-      new_setting_object.bar.should eq('string')
-      new_setting_object.should_not be_new_record
-      new_setting_object.id.should_not be_zero
+      expect(new_setting_object.foo).to eq(42)
+      expect(new_setting_object.bar).to eq('string')
+      expect(new_setting_object).not_to be_new_record
+      expect(new_setting_object.id).not_to be_zero
     end
 
     it 'should not save blank hash' do
-      new_setting_object.update_attributes({}).should be_true
+      expect(new_setting_object.update_attributes({})).to be_truthy
     end
 
-    if ActiveRecord::VERSION::MAJOR < 4
+    if defined?(ProtectedAttributes)
       it 'should not allow changing protected attributes' do
         new_setting_object.update_attributes!(:var => 'calendar', :foo => 42)
 
-        new_setting_object.var.should eq('dashboard')
-        new_setting_object.foo.should eq(42)
+        expect(new_setting_object.var).to eq('dashboard')
+        expect(new_setting_object.foo).to eq(42)
       end
     end
   end
@@ -126,13 +126,13 @@ describe RailsSettings::SettingObject do
     it "should save" do
       new_setting_object.foo = 42
       new_setting_object.bar = 'string'
-      new_setting_object.save.should be_true
+      expect(new_setting_object.save).to be_truthy
       new_setting_object.reload
 
-      new_setting_object.foo.should eq(42)
-      new_setting_object.bar.should eq('string')
-      new_setting_object.should_not be_new_record
-      new_setting_object.id.should_not be_zero
+      expect(new_setting_object.foo).to eq(42)
+      expect(new_setting_object.bar).to eq('string')
+      expect(new_setting_object).not_to be_new_record
+      expect(new_setting_object.id).not_to be_zero
     end
   end
 
@@ -140,8 +140,8 @@ describe RailsSettings::SettingObject do
     it "should not validate for unknown var" do
       new_setting_object.var = "unknown-var"
 
-      new_setting_object.should_not be_valid
-      new_setting_object.errors[:var].should be_present
+      expect(new_setting_object).not_to be_valid
+      expect(new_setting_object.errors[:var]).to be_present
     end
   end
 end

data/spec/settings_spec.rb

@@ -2,16 +2,16 @@ require 'spec_helper'
 
 describe "Defaults" do
   it "should be stored for simple class" do
-    Account.default_settings.should eq(:portal => {})
+    expect(Account.default_settings).to eq(:portal => {})
   end
 
   it "should be stored for parent class" do
-    User.default_settings.should eq(:dashboard => { 'theme' => 'blue', 'view' => 'monthly', 'filter' => true },
+    expect(User.default_settings).to eq(:dashboard => { 'theme' => 'blue', 'view' => 'monthly', 'filter' => true },
                                     :calendar => { 'scope' => 'company'})
   end
 
   it "should be stored for child class" do
-    GuestUser.default_settings.should eq(:dashboard => { 'theme' => 'red', 'view' => 'monthly', 'filter' => true })
+    expect(GuestUser.default_settings).to eq(:dashboard => { 'theme' => 'red', 'view' => 'monthly', 'filter' => true })
   end
 end
 
@@ -22,12 +22,12 @@ describe "Getter/Setter" do
     account.settings(:portal).enabled = true
     account.settings(:portal).template = 'black'
 
-    account.settings(:portal).enabled.should eq(true)
-    account.settings(:portal).template.should eq('black')
+    expect(account.settings(:portal).enabled).to eq(true)
+    expect(account.settings(:portal).template).to eq('black')
   end
 
   it "should return nil for not existing key" do
-    account.settings(:portal).foo.should eq(nil)
+    expect(account.settings(:portal).foo).to eq(nil)
   end
 end
 
@@ -36,12 +36,12 @@ describe 'Objects' do
     let(:account) { Account.new :subdomain => 'foo' }
 
     it 'should have blank settings' do
-      account.settings(:portal).value.should eq({})
+      expect(account.settings(:portal).value).to eq({})
     end
 
     it 'should allow saving a blank value' do
       account.save!
-      account.settings(:portal).save.should be_true
+      expect(account.settings(:portal).save).to be_truthy
     end
 
     it 'should allow removing all values' do
@@ -50,15 +50,15 @@ describe 'Objects' do
       account.save!
 
       account.settings(:portal).premium = nil
-      account.save.should be_true
+      expect(account.save).to be_truthy
 
       account.settings(:portal).fee = nil
-      account.save.should be_true
+      expect(account.save).to be_truthy
     end
 
     it 'should not add settings on saving' do
       account.save!
-      RailsSettings::SettingObject.count.should eq(0)
+      expect(RailsSettings::SettingObject.count).to eq(0)
     end
 
     it "should save object with settings" do
@@ -67,11 +67,11 @@ describe 'Objects' do
       account.save!
 
       account.reload
-      account.settings(:portal).premium.should eq(true)
-      account.settings(:portal).fee.should eq(42.5)
+      expect(account.settings(:portal).premium).to eq(true)
+      expect(account.settings(:portal).fee).to eq(42.5)
 
-      RailsSettings::SettingObject.count.should eq(1)
-      RailsSettings::SettingObject.first.value.should == { 'premium' => true, 'fee' => 42.5 }
+      expect(RailsSettings::SettingObject.count).to eq(1)
+      expect(RailsSettings::SettingObject.first.value).to eq({ 'premium' => true, 'fee' => 42.5 })
     end
 
     it "should save settings separated" do
@@ -83,8 +83,8 @@ describe 'Objects' do
       settings.save!
 
       account.reload
-      account.settings(:portal).enabled.should eq(true)
-      account.settings(:portal).template.should eq('black')
+      expect(account.settings(:portal).enabled).to eq(true)
+      expect(account.settings(:portal).template).to eq('black')
     end
   end
 
@@ -92,19 +92,19 @@ describe 'Objects' do
     let(:user) { User.new :name => 'Mr. Brown' }
 
     it 'should have default settings' do
-      user.settings(:dashboard).theme.should eq('blue')
-      user.settings(:dashboard).view.should eq('monthly')
-      user.settings(:dashboard).filter.should eq(true)
-      user.settings(:calendar).scope.should eq('company')
+      expect(user.settings(:dashboard).theme).to eq('blue')
+      expect(user.settings(:dashboard).view).to eq('monthly')
+      expect(user.settings(:dashboard).filter).to eq(true)
+      expect(user.settings(:calendar).scope).to eq('company')
     end
 
     it 'should have default settings after changing one' do
       user.settings(:dashboard).theme = 'gray'
 
-      user.settings(:dashboard).theme.should eq('gray')
-      user.settings(:dashboard).view.should eq('monthly')
-      user.settings(:dashboard).filter.should eq(true)
-      user.settings(:calendar).scope.should eq('company')
+      expect(user.settings(:dashboard).theme).to eq('gray')
+      expect(user.settings(:dashboard).view).to eq('monthly')
+      expect(user.settings(:dashboard).filter).to eq(true)
+      expect(user.settings(:calendar).scope).to eq('company')
     end
 
     it "should overwrite settings" do
@@ -113,10 +113,10 @@ describe 'Objects' do
       user.save!
 
       user.reload
-      user.settings(:dashboard).theme.should eq('brown')
-      user.settings(:dashboard).filter.should eq(false)
-      RailsSettings::SettingObject.count.should eq(1)
-      RailsSettings::SettingObject.first.value.should == { 'theme' => 'brown', 'filter' => false }
+      expect(user.settings(:dashboard).theme).to eq('brown')
+      expect(user.settings(:dashboard).filter).to eq(false)
+      expect(RailsSettings::SettingObject.count).to eq(1)
+      expect(RailsSettings::SettingObject.first.value).to eq({ 'theme' => 'brown', 'filter' => false })
     end
 
     it "should merge settings with defaults" do
@@ -124,10 +124,10 @@ describe 'Objects' do
       user.save!
 
       user.reload
-      user.settings(:dashboard).theme.should eq('brown')
-      user.settings(:dashboard).filter.should eq(true)
-      RailsSettings::SettingObject.count.should eq(1)
-      RailsSettings::SettingObject.first.value.should == { 'theme' => 'brown' }
+      expect(user.settings(:dashboard).theme).to eq('brown')
+      expect(user.settings(:dashboard).filter).to eq(true)
+      expect(RailsSettings::SettingObject.count).to eq(1)
+      expect(RailsSettings::SettingObject.first.value).to eq({ 'theme' => 'brown' })
     end
   end
 end
@@ -136,19 +136,19 @@ describe "Object without settings" do
   let!(:user) { User.create! :name => 'Mr. White' }
 
   it "should respond to #settings?" do
-    user.settings?.should eq(false)
-    user.settings?(:dashboard).should eq(false)
+    expect(user.settings?).to eq(false)
+    expect(user.settings?(:dashboard)).to eq(false)
   end
 
   it "should have no setting objects" do
-    RailsSettings::SettingObject.count.should eq(0)
+    expect(RailsSettings::SettingObject.count).to eq(0)
   end
 
   it "should add settings" do
     user.settings(:dashboard).update_attributes! :smart => true
 
     user.reload
-    user.settings(:dashboard).smart.should eq(true)
+    expect(user.settings(:dashboard).smart).to eq(true)
   end
 
   it "should not save settings if assigned nil" do
@@ -168,23 +168,23 @@ describe "Object with settings" do
   end
 
   it "should respond to #settings?" do
-    user.settings?.should eq(true)
+    expect(user.settings?).to eq(true)
 
-    user.settings?(:dashboard).should eq(true)
-    user.settings?(:calendar).should eq(true)
+    expect(user.settings?(:dashboard)).to eq(true)
+    expect(user.settings?(:calendar)).to eq(true)
   end
 
   it "should have two setting objects" do
-    RailsSettings::SettingObject.count.should eq(2)
+    expect(RailsSettings::SettingObject.count).to eq(2)
   end
 
   it "should update settings" do
     user.settings(:dashboard).update_attributes! :smart => true
     user.reload
 
-    user.settings(:dashboard).smart.should eq(true)
-    user.settings(:dashboard).theme.should eq('white')
-    user.settings(:calendar).scope.should eq('all')
+    expect(user.settings(:dashboard).smart).to eq(true)
+    expect(user.settings(:dashboard).theme).to eq('white')
+    expect(user.settings(:calendar).scope).to eq('all')
   end
 
   it "should update settings by saving object" do
@@ -192,7 +192,7 @@ describe "Object with settings" do
     user.save!
 
     user.reload
-    user.settings(:dashboard).smart.should eq(true)
+    expect(user.settings(:dashboard).smart).to eq(true)
   end
 
   it "should destroy settings with nil" do
@@ -201,7 +201,7 @@ describe "Object with settings" do
       user.save!
     }.to change(RailsSettings::SettingObject, :count).by(-2)
 
-    user.settings?.should == false
+    expect(user.settings?).to eq(false)
   end
 end
 
@@ -210,15 +210,15 @@ describe "Customized SettingObject" do
 
   it "should not accept invalid attributes" do
     project.settings(:info).owner_name = 42
-    project.settings(:info).should_not be_valid
+    expect(project.settings(:info)).not_to be_valid
 
     project.settings(:info).owner_name = ''
-    project.settings(:info).should_not be_valid
+    expect(project.settings(:info)).not_to be_valid
   end
 
   it "should accept valid attributes" do
     project.settings(:info).owner_name = 'Mr. Brown'
-    project.settings(:info).should be_valid
+    expect(project.settings(:info)).to be_valid
   end
 end
 
@@ -232,10 +232,10 @@ describe "to_settings_hash" do
   end
 
   it "should return defaults" do
-    User.new.to_settings_hash.should == {:dashboard=>{"theme"=>"blue", "view"=>"monthly", "filter"=>true}, :calendar=>{"scope"=>"company"}}
+    expect(User.new.to_settings_hash).to eq({:dashboard=>{"theme"=>"blue", "view"=>"monthly", "filter"=>true}, :calendar=>{"scope"=>"company"}})
   end
 
   it "should return merged settings" do
-    user.to_settings_hash.should ==  {:dashboard=>{"theme"=>"green", "view"=>"monthly", "filter"=>true, "sound" => 11}, :calendar=>{"scope"=>"some"}}
+    expect(user.to_settings_hash).to eq({:dashboard=>{"theme"=>"green", "view"=>"monthly", "filter"=>true, "sound" => 11}, :calendar=>{"scope"=>"some"}})
   end
 end

data/spec/spec_helper.rb

@@ -21,6 +21,7 @@ RSpec.configure do |config|
 end
 
 require 'active_record'
+require 'protected_attributes' if ENV['PROTECTED_ATTRIBUTES'] == 'true'
 require 'rails-settings'
 
 if I18n.respond_to?(:enforce_available_locales=)
@@ -58,10 +59,9 @@ end
 
 def setup_db
   ActiveRecord::Base.configurations = YAML.load_file(File.dirname(__FILE__) + '/database.yml')
-  db_name = ENV['DB'] || 'sqlite'
-  ActiveRecord::Base.establish_connection(db_name.to_sym)
+  ActiveRecord::Base.establish_connection(:sqlite)
   ActiveRecord::Migration.verbose = false
-  puts "Testing on #{db_name} with ActiveRecord #{ActiveRecord::VERSION::STRING}"
+  puts "Testing with ActiveRecord #{ActiveRecord::VERSION::STRING} #{defined?(ProtectedAttributes) ? 'with' : 'without'} protected_attributes"
 
   require File.expand_path('../../lib/generators/rails_settings/migration/templates/migration.rb', __FILE__)
   RailsSettingsMigration.migrate(:up)

data/spec/support/matchers/perform_queries.rb

@@ -3,7 +3,7 @@ RSpec::Matchers.define :perform_queries do |expected|
     query_count(&block) == expected
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     "Expected to run #{expected} queries, got #{@counter.query_count}"
   end
 
@@ -15,4 +15,8 @@ RSpec::Matchers.define :perform_queries do |expected|
 
     @counter.query_count
   end
+
+  def supports_block_expectations?
+    true
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ledermann-rails-settings
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Georg Ledermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +83,7 @@ files:
 - ci/Gemfile-rails-3-2
 - ci/Gemfile-rails-4-0
 - ci/Gemfile-rails-4-1
+- ci/Gemfile-rails-4-2
 - lib/generators/rails_settings/migration/migration_generator.rb
 - lib/generators/rails_settings/migration/templates/migration.rb
 - lib/ledermann-rails-settings.rb
@@ -136,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby gem to handle settings for ActiveRecord instances by storing them as