ledermann-rails-settings 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e95ccf650df85deaa3086b12f49c7cf6d10cd13
-  data.tar.gz: 4d2a68fa5cda6250f29440ec426bef760f65a72f
+  metadata.gz: 7ff4a6ba546d2daf89db23836a41e7a4e387afe8
+  data.tar.gz: 1131ffb90652265e634619fe33aa41c492d1b80b
 SHA512:
-  metadata.gz: b6dd9ded21d964802a6a20b01b38a5d9361ce2b8d6d6ac960886504a1db17a3e562b34325351ed7c9684b33f57c872a1b48908e079d199889722401805d33135
-  data.tar.gz: 1cdd6dbf6085d40544b52678ccaeea7cab94dbb6b907f3a10371cac806ea8263bfef230ab393da421b81692a338861dfdc1219e5c11c1fe649b9cc95f9bb52ac
+  metadata.gz: 5713e46631870b7f3f9e6df62893bc1ca6fa43d07f3c4f4dee3100a2c0abed752e68f21b284003a462937ba92704afd8a99651198f16b5d567cb4a8882c0a631
+  data.tar.gz: 8f714acf90e0db2ad9e0786f734c6d87983d4b7af8153e94b368e10185fdf18f85f7db3ccde672b454094184d96999fafebc515cde71b0237c517c7996f43857

data/Changelog.md

@@ -1,4 +1,11 @@
-Version 2.0.2 (2013-03-17)
+# Changelog
+
+## Version 2.0.3 (2013-04-16)
+
+- Fixed bug with setting getter when settings are booleans and default is true (thanks to @mduong)
+
+
+## Version 2.0.2 (2013-03-17)
 
 - Changed database schema to allow NULL for column `value` to fix serialization
   bug with MySQL. Thanks to @steventen for pointing this out in issue #31.
@@ -7,7 +14,6 @@ Version 2.0.2 (2013-03-17)
              you use MySQL it's required to update your database schema like
              this:
 
-             ```ruby
              class FixSettings < ActiveRecord::Migration
                def up
                  change_column :settings, :value, :text, :null => true
@@ -17,15 +23,14 @@ Version 2.0.2 (2013-03-17)
                  change_column :settings, :value, :text, :null => false
                end
              end
-             ```
 
 
-Version 2.0.1 (2013-03-08)
+## Version 2.0.1 (2013-03-08)
 
 - Added mass assignment security by protecting all regular attributes
 
 
-Version 2.0.0 (2013-03-07)
+## Version 2.0.0 (2013-03-07)
 
 - Complete rewrite
 - New DSL (see README.md)
@@ -36,29 +41,29 @@ Version 2.0.0 (2013-03-07)
 - Switched to RSpec for testing
 
 
-Version 1.2.1 (2013-02-09)
+## Version 1.2.1 (2013-02-09)
 
 - Quick and dirty fix for design flaw in target scope implementation (thanks to Yves-Eric Martin)
 - Use Thread.current instead of cattr_accessor to be threadsafe
 - Code cleanup
 
 
-Version 1.2.0 (2012-07-21)
+## Version 1.2.0 (2012-07-21)
 
 - Added model-level settings (thanks to Jim Ryan)
 
 
-Version 1.1.0 (2012-06-01)
+## Version 1.1.0 (2012-06-01)
 
 - Added caching (thanks to Matthew McEachen)
 
 
-Version 1.0.1 (2011-11-05)
+## Version 1.0.1 (2011-11-05)
 
 - Gemspec: Fixed missing dependency
 
 
-Version 1.0.0 (2011-11-05)
+## Version 1.0.0 (2011-11-05)
 
 - Conversion from Plugin to Gem
 - Destroying false values (thanks to @Pavling)

data/lib/rails-settings/setting_object.rb

@@ -46,7 +46,11 @@ module RailsSettings
 
   private
     def _get_value(name)
-      value[name] || _target_class.default_settings[var.to_sym][name]
+      if value[name].nil?
+        _target_class.default_settings[var.to_sym][name]
+      else
+        value[name]
+      end
     end
 
     def _set_value(name, v)

data/lib/rails-settings/version.rb

@@ -1,3 +1,3 @@
 module RailsSettings
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 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' }
   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' => true}}, :without_protection => true) }
+  let(:saved_setting_object) { user.setting_objects.create!({ :var => 'dashboard', :value => { 'theme' => 'pink', 'filter' => false}}, :without_protection => true) }
 
   describe "serialization" do
     it "should have a hash default" do
@@ -43,7 +43,7 @@ describe RailsSettings::SettingObject do
       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(false)
+        new_setting_object.filter.should eq(true)
       end
 
       it "should store different objects to value hash" do
@@ -86,7 +86,7 @@ describe RailsSettings::SettingObject do
 
       it "should delete key on assigning nil" do
         saved_setting_object.theme = nil
-        saved_setting_object.value.should == { 'filter' => true }
+        saved_setting_object.value.should == { 'filter' => false }
       end
     end
   end

data/spec/settings_spec.rb

@@ -6,12 +6,12 @@ describe "Defaults" do
   end
 
   it "should be stored for parent class" do
-    User.default_settings.should eq(:dashboard => { 'theme' => 'blue', 'view' => 'monthly', 'filter' => false },
+    User.default_settings.should 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' => false })
+    GuestUser.default_settings.should eq(:dashboard => { 'theme' => 'red', 'view' => 'monthly', 'filter' => true })
   end
 end
 
@@ -77,7 +77,7 @@ describe 'Objects' do
     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(false)
+      user.settings(:dashboard).filter.should eq(true)
       user.settings(:calendar).scope.should eq('company')
     end
 
@@ -86,20 +86,20 @@ describe 'Objects' do
 
       user.settings(:dashboard).theme.should eq('gray')
       user.settings(:dashboard).view.should eq('monthly')
-      user.settings(:dashboard).filter.should eq(false)
+      user.settings(:dashboard).filter.should eq(true)
       user.settings(:calendar).scope.should eq('company')
     end
 
     it "should overwrite settings" do
       user.settings(:dashboard).theme = 'brown'
-      user.settings(:dashboard).filter = true
+      user.settings(:dashboard).filter = false
       user.save!
 
       user.reload
       user.settings(:dashboard).theme.should eq('brown')
-      user.settings(:dashboard).filter.should eq(true)
+      user.settings(:dashboard).filter.should eq(false)
       RailsSettings::SettingObject.count.should eq(1)
-      RailsSettings::SettingObject.first.value.should == { 'theme' => 'brown', 'filter' => true }
+      RailsSettings::SettingObject.first.value.should == { 'theme' => 'brown', 'filter' => false }
     end
 
     it "should merge settings with defaults" do
@@ -108,7 +108,7 @@ describe 'Objects' do
 
       user.reload
       user.settings(:dashboard).theme.should eq('brown')
-      user.settings(:dashboard).filter.should eq(false)
+      user.settings(:dashboard).filter.should eq(true)
       RailsSettings::SettingObject.count.should eq(1)
       RailsSettings::SettingObject.first.value.should == { 'theme' => 'brown' }
     end

data/spec/spec_helper.rb

@@ -25,14 +25,14 @@ require 'rails-settings'
 
 class User < ActiveRecord::Base
   has_settings do |s|
-    s.key :dashboard, :defaults => { :theme => 'blue', :view => 'monthly', :filter => false }
+    s.key :dashboard, :defaults => { :theme => 'blue', :view => 'monthly', :filter => true }
     s.key :calendar,  :defaults => { :scope => 'company'}
   end
 end
 
 class GuestUser < User
   has_settings do |s|
-    s.key :dashboard, :defaults => { :theme => 'red', :view => 'monthly', :filter => false }
+    s.key :dashboard, :defaults => { :theme => 'red', :view => 'monthly', :filter => true }
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ledermann-rails-settings
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Georg Ledermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord