default_value_for 1.0.5 → 1.0.6

data/default_value_for.gemspec

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

@@ -79,27 +79,26 @@ module DefaultValueFor
 	end
 
 	module InstanceMethods
-		def initialize_with_defaults(attrs = nil, *args)
-			initialize_without_defaults(attrs, *args) do
-				if attrs
-					stringified_attrs = attrs.stringify_keys
-					safe_attrs = if respond_to? :sanitize_for_mass_assignment
-						sanitize_for_mass_assignment(stringified_attrs)
-					else
-						remove_attributes_protected_from_mass_assignment(stringified_attrs)
-					end
-					safe_attribute_names = safe_attrs.keys.map do |x|
-						x.to_s
-					end
+		def initialize_with_defaults(attrs = nil, *args, &block)
+			initialize_without_defaults(attrs, *args, &block)
+			if attrs
+				stringified_attrs = attrs.stringify_keys
+				safe_attrs = if respond_to? :sanitize_for_mass_assignment
+					sanitize_for_mass_assignment(stringified_attrs)
+				else
+					remove_attributes_protected_from_mass_assignment(stringified_attrs)
+				end
+				safe_attribute_names = safe_attrs.keys.map do |x|
+					x.to_s
 				end
-				self.class._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)
-					end
+			end
+			self.class._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)
 				end
-				yield(self) if block_given?
 			end
+			yield(self) if block_given?
 		end
 	end
 end

data/test.rb

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-want_rails_version = '~> 3.1.0.rc1'
+want_rails_version = '~> 3.1.0'
 
 require 'rubygems'
 gem 'rails', want_rails_version
@@ -220,19 +220,18 @@ class DefaultValuePluginTest < Test::Unit::TestCase
 		assert_same object, $instance
 	end
 
-	# This is no longer supported starting from Rails 3.1 thanks to ActiveRecord changes.
-	# def test_can_specify_default_value_via_association
-	# 	user = User.create(:username => 'Kanako', :default_number => 123)
-	# 	define_model_class do
-	# 		belongs_to :user
-	# 
-	# 		default_value_for :number do |n|
-	# 			n.user.default_number
-	# 		end
-	# 	end
-	# 	object = user.numbers.create
-	# 	assert_equal 123, object.number
-	# end
+	def test_can_specify_default_value_via_association
+		user = User.create(:username => 'Kanako', :default_number => 123)
+		define_model_class do
+			belongs_to :user
+
+			default_value_for :number do |n|
+				n.user.default_number
+			end
+		end
+		object = user.numbers.create
+		assert_equal 123, object.number
+	end
 
 	def test_default_values
 		define_model_class do

metadata

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