@@ -77,7 +77,7 @@ module DefaultValueForPlugin end end self.class._default_attribute_values.each do |attribute, container| - if safe_attribute_names.nil? || !safe_attribute_names.include?(attribute) + if safe_attribute_names.nil? || safe_attribute_names.none? { |attr_name| attr_name =~ /^#{attribute}($|\()/ } __send__("#{attribute}=", container.evaluate(self)) changed_attributes.delete(attribute) end init.rb @@ -46,6 +46,7 @@ ActiveRecord::Base.connection.create_table(:numbers, :force => true) do |t| t.integer :number t.integer :count, :null => false, :default => 1 t.integer :user_id + t.timestamp :timestamp end class User < ActiveRecord::Base @@ -113,6 +114,15 @@ class DefaultValuePluginTest < Test::Unit::TestCase object = TestClass.new(:number => 1, :count => 2) assert_equal 1, object.number end + + def test_doesnt_overwrite_values_provided_by_multiparameter_assignment + define_model_class do + default_value_for :timestamp, Time.mktime(2000, 1, 1) + end + timestamp = Time.mktime(2009, 1, 1) + object = TestClass.new('timestamp(1i)' => '2009', 'timestamp(2i)' => '1', 'timestamp(3i)' => '1') + assert_equal timestamp, object.timestamp + end def test_doesnt_overwrite_values_provided_by_constructor_block define_model_class do test.rb accb6b4679c30862c5edd0816a77e2946d5336b8 Hendy Tanata htanata@gmail.com http://github.com/FooBarWidget/default_value_for/commit/1ae4bf83baff1c33d85e45d7c7db0f239345c029 1ae4bf83baff1c33d85e45d7c7db0f239345c029 2009-05-17T05:20:07-07:00 2009-04-22T02:19:04-07:00 Should not overwrite multiparameter assignment. 69399bdc2a5bbaf6155b8428ed3f03b59cab20fb Hongli Lai (Phusion) hongli@phusion.nl