.gitignore @@ -1,3 +1,5 @@ +task :default => :test + task :test do sh "ruby test.rb" end Rakefile @@ -60,8 +60,15 @@ module DefaultValuePlugin module InstanceMethods def initialize_with_defaults(attrs = nil) initialize_without_defaults(attrs) do + if attrs + stringified_attrs = attrs.stringify_keys! + safe_attrs = remove_attributes_protected_from_mass_assignment(stringified_attrs) + safe_attribute_names = safe_attrs.keys.map do |x| + x.to_s + end + end self.class._default_attribute_values.each_pair do |attribute, container| - if attrs.nil? || !attrs.keys.map(&:to_s).include?(attribute) + if safe_attribute_names.nil? || !safe_attribute_names.include?(attribute) __send__("#{attribute}=", container.evaluate) end end init.rb @@ -31,6 +31,8 @@ else end File.unlink('test.sqlite3') rescue nil +ActiveRecord::Base.logger = Logger.new(STDERR) +ActiveRecord::Base.logger.level = Logger::WARN ActiveRecord::Base.establish_connection( :adapter => database_adapter, :database => 'test.sqlite3' @@ -47,12 +49,14 @@ class DefaultValuePluginTest < Test::Unit::TestCase Object.send(:remove_const, name) rescue nil eval("class #{name} < #{parent_class_name}; end", TOPLEVEL_BINDING) klass = eval(name, TOPLEVEL_BINDING) + klass.class_eval do + set_table_name 'numbers' + end klass.class_eval(&block) if block_given? end def test_default_value_can_be_passed_as_argument define_model_class do - set_table_name 'numbers' default_value_for(:number, 1234) end object = TestClass.new @@ -61,7 +65,6 @@ class DefaultValuePluginTest < Test::Unit::TestCase def test_default_value_can_be_passed_as_block define_model_class do - set_table_name 'numbers' default_value_for(:number) { 1234 } end object = TestClass.new @@ -70,7 +73,6 @@ class DefaultValuePluginTest < Test::Unit::TestCase def test_overwrites_db_default define_model_class do - set_table_name 'numbers' default_value_for :count, 1234 end object = TestClass.new @@ -79,7 +81,6 @@ class DefaultValuePluginTest < Test::Unit::TestCase def test_doesnt_overwrite_values_provided_by_mass_assignment define_model_class do - set_table_name 'numbers' default_value_for :number, 1234 end object = TestClass.new(:number => 1, :count => 2) @@ -88,7 +89,6 @@ class DefaultValuePluginTest < Test::Unit::TestCase def test_doesnt_overwrite_values_provided_by_constructor_block define_model_class do - set_table_name 'numbers' default_value_for :number, 1234 end object = TestClass.new do |x| @@ -100,7 +100,6 @@ class DefaultValuePluginTest < Test::Unit::TestCase def test_doesnt_overwrite_explicitly_provided_nil_values_in_mass_assignment define_model_class do - set_table_name 'numbers' default_value_for :number, 1234 end object = TestClass.new(:number => nil) @@ -109,7 +108,6 @@ class DefaultValuePluginTest < Test::Unit::TestCase def test_default_values_are_inherited define_model_class("TestSuperClass") do - set_table_name 'numbers' default_value_for :number, 1234 end define_model_class("TestClass", "TestSuperClass") @@ -119,9 +117,27 @@ class DefaultValuePluginTest < Test::Unit::TestCase def test_doesnt_set_default_on_saved_records define_model_class do - set_table_name 'numbers' default_value_for :number, 1234 end assert_equal 9876, TestClass.find(:first).number end + + def test_also_works_with_attributes_that_arent_database_columns + define_model_class do + default_value_for :hello, "hi" + attr_accessor :hello + end + object = TestClass.new + assert_equal 'hi', object.hello + end + + def test_constructor_ignores_forbidden_mass_assignment_attributes + define_model_class do + default_value_for :number, 1234 + attr_protected :number + end + object = TestClass.new(:number => 5678, :count => 987) + assert_equal 1234, object.number + assert_equal 987, object.count + end end test.rb ed7d6bad31584691a8d56e03be9caba34dcf19de Hongli Lai (Phusion) hongli@phusion.nl http://github.com/FooBarWidget/default_value_for/commit/d5cd9809ec5ab623ce800e91637ff3696e6d168c d5cd9809ec5ab623ce800e91637ff3696e6d168c 2008-09-22T08:50:22-07:00 2008-09-22T08:50:22-07:00 Various improvements. - Clean up some test cases. - Add more test cases. - Always assign default value for attributes that are protected by attr_protected or attr_accessible. 311675816c0136b79fa97eea2a8410d48e6a0753 Hongli Lai (Phusion) hongli@phusion.nl