Handling "false" defaults. Fixes #4

ledermann · Mar 2, 2011 · 6df96d6 · 6df96d6
1 parent 21f4789
commit 6df96d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/settings.rb b/lib/settings.rb
@@ -55,10 +55,8 @@ def self.all(starting_with=nil)
   def self.[](var_name)
     if var = target(var_name)
       var.value
-    elsif @@defaults[var_name.to_s]
-      @@defaults[var_name.to_s]
     else
-      nil
+      @@defaults[var_name.to_s]
     end
   end
 

diff --git a/test/settings_test.rb b/test/settings_test.rb
@@ -23,6 +23,11 @@ def test_defaults
     assert_not_nil Settings.target(:foo)
   end
 
+  def tests_defaults_false
+    Settings.defaults[:foo] = false
+    assert_equal false, Settings.foo
+  end
+
   def test_get
     assert_setting 'foo', :test
     assert_setting 'bar', :test2