default_value_for 1.0.6 → 1.0.7

data/default_value_for.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{default_value_for}
-  s.version = "1.0.6"
+  s.version = "1.0.7"
   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

@@ -57,6 +57,10 @@ module DefaultValueFor
 				else
 					class_inheritable_accessor :_default_attribute_values
 				end
+				extend(DelayedClassMethods)
+				init_hash = true
+			end
+			if init_hash || !singleton_methods(false).to_s.include?("_default_attribute_values")
 				self._default_attribute_values = ActiveSupport::OrderedHash.new
 			end
 			if block_given?
@@ -78,6 +82,13 @@ module DefaultValueFor
 		end
 	end
 
+	module DelayedClassMethods
+		def _all_default_attribute_values
+			return _default_attribute_values unless superclass.respond_to?(:_default_attribute_values)
+			superclass._all_default_attribute_values.merge(_default_attribute_values)
+		end
+	end
+
 	module InstanceMethods
 		def initialize_with_defaults(attrs = nil, *args, &block)
 			initialize_without_defaults(attrs, *args, &block)
@@ -92,7 +103,7 @@ module DefaultValueFor
 					x.to_s
 				end
 			end
-			self.class._default_attribute_values.each do |attribute, container|
+			self.class._all_default_attribute_values.each do |attribute, container|
 				if safe_attribute_names.nil? || !safe_attribute_names.any? { |attr_name| attr_name =~ /^#{attribute}($|\()/ }
 					__send__("#{attribute}=", container.evaluate(self))
 					changed_attributes.delete(attribute)

data/test.rb

@@ -168,6 +168,68 @@ class DefaultValuePluginTest < Test::Unit::TestCase
 		assert_equal 1234, object.number
 	end
 
+	def test_default_values_in_subclass
+		define_model_class("TestSuperClass") do
+		end
+		define_model_class("TestClass", "TestSuperClass") do
+			default_value_for :number, 5678
+		end
+
+		object = TestClass.new
+		assert_equal 5678, object.number
+
+		object = TestSuperClass.new
+		assert_nil object.number
+	end
+
+	def test_multiple_default_values_in_subclass_with_default_values_in_parent_class
+		define_model_class("TestSuperClass") do
+			default_value_for :other_number, nil
+			attr_accessor :other_number
+		end
+		define_model_class("TestClass", "TestSuperClass") do
+			default_value_for :number, 5678
+
+			# Ensure second call in this class doesn't reset _default_attribute_values,
+			# and also doesn't consider the parent class' _default_attribute_values when
+			# making that check.
+			default_value_for :user_id, 9999
+		end
+
+		object = TestClass.new
+		assert_nil object.other_number
+		assert_equal 5678, object.number
+		assert_equal 9999, object.user_id
+	end
+
+	def test_override_default_values_in_subclass
+		define_model_class("TestSuperClass") do
+			default_value_for :number, 1234
+		end
+		define_model_class("TestClass", "TestSuperClass") do
+			default_value_for :number, 5678
+		end
+
+		object = TestClass.new
+		assert_equal 5678, object.number
+
+		object = TestSuperClass.new
+		assert_equal 1234, object.number
+	end
+
+	def test_default_values_in_subclass_do_not_affect_parent_class
+		define_model_class("TestSuperClass") do
+			default_value_for :number, 1234
+		end
+		define_model_class("TestClass", "TestSuperClass") do
+			default_value_for :hello, "hi"
+			attr_accessor :hello
+		end
+
+		assert_nothing_raised { TestSuperClass.new }
+		assert !TestSuperClass._default_attribute_values.include?(:hello)
+	end
+
 	def test_doesnt_set_default_on_saved_records
 		define_model_class do
 			default_value_for :number, 1234

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: default_value_for
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Hongli Lai
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-08 00:00:00 +02:00
+date: 2011-12-02 00:00:00 +01:00
 default_executable: 
 dependencies: []