default_value_for 2.0.0 → 2.0.1

data/default_value_for.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{default_value_for}
-  s.version = "2.0.0"
+  s.version = "2.0.1"
   s.summary = %q{Provides a way to specify default values for ActiveRecord models}
   s.description = %q{The default_value_for plugin allows one to define default values for ActiveRecord models in a declarative manner}
   s.email = %q{info@phusion.nl}

data/lib/default_value_for.rb

@@ -74,8 +74,11 @@ module DefaultValueFor
         
         extend(DelayedClassMethods)
         init_hash = true
+      else
+        methods = singleton_methods(false)
+        init_hash = !methods.include?("_default_attribute_values") && !methods.include?(:_default_attribute_values)
       end
-      if init_hash || !singleton_methods(false).to_s.include?("_default_attribute_values")
+      if init_hash
         self._default_attribute_values = ActiveSupport::OrderedHash.new
         self._default_attribute_values_not_allowing_nil = []
       end
@@ -111,7 +114,9 @@ module DefaultValueFor
     
     def _all_default_attribute_values_not_allowing_nil
       return _default_attribute_values_not_allowing_nil unless superclass.respond_to?(:_default_attribute_values_not_allowing_nil)
-      superclass._all_default_attribute_values_not_allowing_nil.merge(_default_attribute_values_not_allowing_nil)
+      result = superclass._all_default_attribute_values_not_allowing_nil.concat(_default_attribute_values_not_allowing_nil)
+      result.uniq!
+      result
     end
   end
 

data/test.rb

@@ -424,4 +424,13 @@ class DefaultValuePluginTest < Test::Unit::TestCase
     object = TestClass.new(options)
     assert_equal(options_dup, options)
   end
+
+  def test_subclass_find
+    define_model_class do
+      default_value_for :number, 5678
+    end
+    define_model_class("SpecialNumber", "TestClass")
+    n = SpecialNumber.create
+    assert_nothing_raised { SpecialNumber.find(n.id) }
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: default_value_for
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Hongli Lai
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-27 00:00:00 Z
+date: 2012-06-04 00:00:00 Z
 dependencies: []
 
 description: The default_value_for plugin allows one to define default values for ActiveRecord models in a declarative manner