test/fixtures/group.rb @@ -1,3 +1,7 @@ +[20 Sep 07] + +* Remove ability to set defaults with defaults instance method. Too easy to override values from parameters. + [25 Jul 07] * Using a symbol as a default value will cause the return value of the method with that name to be the default. CHANGELOG @@ -11,28 +11,16 @@ If you find this plugin useful, please consider a donation to show your support! Allow you to easily specify default values for attributes on new model objects. Eg: class Person < ActiveRecord::Base - defaults :country => 'New Zealand', :type => 'Unknown' + defaults :country => 'New Zealand', :type => 'Unknown', :address => proc { Address.new } default :last_name do |person| person.first_name end end -You can also define a defaults method like so: +The default value is only used if the attribute is not present in the attributes hash. - class Person < ActiveRecord::Base - def defaults - self.first_name = "Jonathan" - end - end - -The default value is only used if the attribute is not present in the attributes hash: - - p = Person.new - p.country # "New Zealand" - - p = Person.new(:country => nil) - p.country # nil +See active_record_defaults.rb for full documentation. == Installation README @@ -95,17 +95,19 @@ module ActiveRecord # Ignore a default value for association_id if association has been specified reflection = self.class.reflections[default.attribute.to_sym] - next if reflection and reflection.macro == :belongs_to and attribute_keys.include?(reflection.primary_key_name) + if reflection and reflection.macro == :belongs_to and attribute_keys.include?(reflection.primary_key_name) + next + end # Ignore a default value for association if association_id has been specified reflection = self.class.reflections.values.find { |r| r.respond_to?(:primary_key_name) && r.primary_key_name == default.attribute } - next if reflection and reflection.macro == :belongs_to and attribute_keys.include?(reflection.name.to_s) + if reflection and reflection.macro == :belongs_to and attribute_keys.include?(reflection.name.to_s) + next + end send("#{default.attribute}=", default.value(self)) end end - - defaults if respond_to?(:defaults) end end lib/active_record_defaults.rb @@ -1,8 +1,7 @@ require 'test/unit' begin - require File.dirname(__FILE__) + '/../../../../config/boot' - Rails::Initializer.run + require File.dirname(__FILE__) + '/../../../../config/environment' rescue LoadError require 'rubygems' require_gem 'activerecord' @@ -10,11 +9,7 @@ end # Search for fixtures first fixture_path = File.dirname(__FILE__) + '/fixtures/' -begin - Dependencies.load_paths.insert(0, fixture_path) -rescue - $LOAD_PATH.unshift(fixture_path) -end +Dependencies.load_paths.insert(0, fixture_path) require 'active_record/fixtures' test/abstract_unit.rb @@ -1,9 +1,4 @@ require File.dirname(__FILE__) + '/abstract_unit' -require File.dirname(__FILE__) + '/fixtures/address' -require File.dirname(__FILE__) + '/fixtures/school' -require File.dirname(__FILE__) + '/fixtures/person' -require File.dirname(__FILE__) + '/fixtures/person_with_default_school_id' -require File.dirname(__FILE__) + '/fixtures/person_with_default_school' class ActiveRecordDefaultsTest < Test::Unit::TestCase fixtures :people, :schools @@ -36,7 +31,7 @@ class ActiveRecordDefaultsTest < Test::Unit::TestCase end def test_default_relying_on_previous_default - assert_equal Date.new(2006, 10, 2), Person.new.birthdate + assert_equal "Red", Person.new(:last_name => 'Carter').favourite_colour end def test_defaults_on_create @@ -50,10 +45,6 @@ class ActiveRecordDefaultsTest < Test::Unit::TestCase assert_equal 'Blue', p.favourite_colour end - def test_defaults_from_method - assert_equal Date.new(2006, 10, 5), Person.new(:lucky_number => 5).birthdate - end - def test_default_belongs_to_association assert_equal School.find(1), PersonWithDefaultSchool.new.school end @@ -69,4 +60,8 @@ class ActiveRecordDefaultsTest < Test::Unit::TestCase def test_specific_belong_to_association_overrides_default_foreign_key_value assert_nil PersonWithDefaultSchoolId.new(:school => nil).school end + + def test_initialize_model_without_any_defaults + assert_nothing_raised { Group.new } + end end test/active_record_defaults_test.rb @@ -1,4 +1,9 @@ class Person < ActiveRecord::Base + belongs_to :school + + # Include an aggregate reflection to check compatibility + composed_of :address, :mapping => [%w(address_suburb suburb), %{address_city city}] + defaults :city => 'Christchurch', :country => Proc.new { 'New Zealand' } default :first_name => 'Sean' @@ -7,18 +12,9 @@ class Person < ActiveRecord::Base 'Fitzpatrick' end - defaults :lucky_number => lambda { 2 }, :favourite_colour => :default_favourite_colour - - def defaults - self.birthdate = Date.new(2006, 10, lucky_number) if lucky_number? - end + defaults :lucky_number => proc { 2 }, :favourite_colour => :default_favourite_colour def default_favourite_colour - "Blue" + last_name == 'Fitzpatrick' ? "Blue" : "Red" end - - # Include an aggregate reflection to check compatibility - composed_of :address, :mapping => [%w(address_suburb suburb), %{address_city city}] - - belongs_to :school end test/fixtures/person.rb 5c8ca5a3de0fb8bd543e7339b9cf2bcdd32ceefb jonathan jonathan@20afb1e0-9c0e-0410-9884-91ed27886737 http://github.com/aussiegeek/active_record_defaults/commit/b7e1977743e9e4462c55849c3e2b26c51be8bf28 b7e1977743e9e4462c55849c3e2b26c51be8bf28 2007-09-20T03:25:16-07:00 2007-09-20T03:25:16-07:00 git-svn-id: http://svn.viney.net.nz/things/rails/plugins/active_record_defaults@313 20afb1e0-9c0e-0410-9884-91ed27886737 3877a0a1ede1b53e5e631c7fec61640b26bc4852 jonathan jonathan@20afb1e0-9c0e-0410-9884-91ed27886737