frivol 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/frivol.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{frivol}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marc Heiligers"]

data/lib/frivol.rb

@@ -13,7 +13,7 @@ module Frivol
   def retrieve(keys_and_defaults)
     Frivol::Helpers.retrieve_hash self
     result = keys_and_defaults.map do |key, default|
-      @frivol_hash[key.to_s] || (respond_to?(default) && send(default)) || default
+      @frivol_hash[key.to_s] || (default.is_a?(Symbol) && respond_to?(default) && send(default)) || default
     end
     return result.first if result.size == 1
     result

data/test/test_frivol.rb

@@ -57,6 +57,32 @@ class TestFrivol < Test::Unit::TestCase
     t.save
     assert_equal [ "value", "value2" ], t.load.sort
   end
+  
+  should "not be naughty and try to respond to nil default" do
+    class DefaultNilTestClass < TestClass
+      def load
+        retrieve :value => nil
+      end
+    end
+  
+    t = DefaultNilTestClass.new
+    assert_equal nil, t.load
+  end
+
+  should "only try respond to symbol defaults" do
+    class DefaultNonSymbolTestClass < TestClass
+      def load
+        retrieve :value => "load", :def_val => :default_value # yes, that's right, we would cause a stack overflow here
+      end
+      
+      def default_value
+        "yay!"
+      end
+    end
+  
+    t = DefaultNonSymbolTestClass.new
+    assert_equal [ "load", "yay!" ], t.load.sort
+  end
 
   should "be able to override the key method" do
     class OverrideKeyTestClass < TestClass

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frivol
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Marc Heiligers