setting_accessors 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b94565258ae7fce43922281d6b76f20d300c623
-  data.tar.gz: 20a552250f28acc7de4709ad9aa0bdd2d9686ab4
+  metadata.gz: 69528301e4ae518a751b5e58de3a286a5ae19eb8
+  data.tar.gz: 77578f0cf78c80f461ff55053fcc998df702cc5b
 SHA512:
-  metadata.gz: 94f79c3276a678e92ea28b2b557b98ab3d926cb04bf14033359cd7a91ad7038db756fd452d542ba53597b883deba0ad545484a396fd98813a2392de06dd3d776
-  data.tar.gz: eaa0a4c1a96dd730525dd753e6347fb28d06d31bca26dcfebbfb6619dc60af5b77c83dcae2f85d7a22b0542425c9b6cff075df79f28db46bb440ddd40a12b133
+  metadata.gz: d8160afa3694ad0da94ab265f8b43b61a37aac05eb543dcca2fd4586cab6efabfb2241d375105c9c3a2a98d03092b0e919b37fcd9f7d6909571d4cf5e19d26c0
+  data.tar.gz: 3e56a6f1b6a989f165b7584df75acb4906be2bf9948403ca2d21e0a369945f2d78b32e1baa989e9ef4c4481d62826e043855cadb52b896db32d41b3e69a662a4

data/lib/setting_accessors/accessor.rb

@@ -16,6 +16,18 @@ class SettingAccessors::Accessor
     has_key?(key) ? @temp_settings[key.to_sym] : SettingAccessors.setting_class.get(key, @record)
   end
 
+  #
+  # Tries to fetch a setting value using the provided key and #[].
+  # It will only return the +default+ value if there is
+  #   - no temporary setting with the given key AND
+  #   - no already persisted setting (see #[])
+  #
+  def fetch(key, default = nil)
+    result = self[key]
+    return default if result.nil? && !has_key?(key)
+    result
+  end
+
   def has_key?(key)
     @temp_settings.has_key?(key.to_sym)
   end
@@ -34,7 +46,7 @@ class SettingAccessors::Accessor
   # specified in the setting config file.
   #
   def get_or_default(key)
-    self[key] || SettingAccessors.setting_class.get_or_default(key, @record)
+    fetch key, SettingAccessors.setting_class.get_or_default(key, @record)
   end
 
   #
@@ -42,7 +54,7 @@ class SettingAccessors::Accessor
   # If none is found, tries to find a global setting with the same name
   #
   def get_or_global(key)
-    self[key] || SettingAccessors.setting_class.get(key)
+    fetch key, SettingAccessors.setting_class.get(key)
   end
 
   #
@@ -50,7 +62,7 @@ class SettingAccessors::Accessor
   # if none is found, it will return the given value instead.
   #
   def get_or_value(key, value)
-    self.has_key?(key) ? self[key] : value
+    fetch key, value
   end
 
   def get_with_fallback(key, fallback = nil)

data/lib/setting_accessors/version.rb

@@ -1,3 +1,3 @@
 module SettingAccessors
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/test/dummy/app/models/user.rb

@@ -8,6 +8,8 @@ class User < ActiveRecord::Base
 
   setting_accessor :a_boolean, :fallback => false
 
+  setting_accessor :class_wise_truthy_boolean, :type => :boolean, :default => true, :fallback => :default
+
   setting_accessor :class_wise_with_value_fallback, :type => :string, :fallback => 'Oiski Poiski!'
 
   setting_accessor :class_wise_with_default_fallback, :type => :string, :fallback => :default, :default => 'Kapitanski'

data/test/dummy/test/models/setting_test.rb

@@ -128,4 +128,16 @@ class SettingTest < ActiveSupport::TestCase
       assert_equal 'Kapitanski', User.new.class_wise_with_default_fallback
     end
   end
+
+  context 'Boolean settings' do
+    should 'respect temporary settings which are set to `false`' do
+      user = User.new(:class_wise_truthy_boolean => false)
+      assert_equal user.class_wise_truthy_boolean, false
+    end
+
+    should 'respect temporary settings which are set to `true`' do
+      user = User.new(:a_boolean => true)
+      assert_equal user.a_boolean, true
+    end
+  end
 end

data/test/dummy/test/models/user_test.rb

@@ -17,6 +17,5 @@ class UserTest < ActiveSupport::TestCase
         assert_equal @user.as_json[setting_name.to_s], @user.send(setting_name)
       end
     end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: setting_accessors
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Stefan Exner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler