@@ -8,16 +8,24 @@ module ActiveRecord #:nodoc: end module ClassMethods - def money(name, options = {}) + allow_nil = options.has_key?(:allow_nil) ? options.delete(:allow_nil) : true options = {:precision => 2, :cents => "#{name}_in_cents".to_sym }.merge(options) mapping = [[options[:cents], 'cents']] mapping << [options[:currency].to_s, 'currency'] if options[:currency] - composed_of name, :class_name => 'Money', :mapping => mapping, :allow_nil => true, - :converter => lambda{ |m| m.to_money(options[:precision]) }, + composed_of name, :class_name => 'Money', :mapping => mapping, :allow_nil => allow_nil, + :converter => lambda{ |m| + if !allow_nil && m.nil? + currency = options[:currency] || ::Money.default_currency + m = ::Money.new(0, currency, options[:precision]) + end + m.to_money(options[:precision]) + }, :constructor => lambda{ |*args| cents, currency = args - ::Money.new(cents, (currency || ::Money.default_currency), options[:precision]) + cents ||= 0 + currency ||= ::Money.default_currency + ::Money.new(cents, currency, options[:precision]) } define_method "#{name}_with_cleanup=" do |amount| lib/money/rails.rb @@ -23,6 +23,13 @@ class OtherMoneyExample < ActiveRecord::Base money :precise_amount, :cents => "credit_amount_in_cents", :precision => 3 end +class YetAnotherMoneyExample < ActiveRecord::Base + set_table_name "money_examples" + + money :amount, :allow_nil => false + money :precise_amount, :allow_nil => false, :precision => 3 +end + describe Money, "using the money declaration in an ActiveRecord model" do it "should allow dynamic finders to work the same as composed_of" do record = MoneyExample.create!(:debit_amount => 100.to_money) @@ -75,6 +82,19 @@ describe Money, "using the money declaration in an ActiveRecord model" do ome = OtherMoneyExample.new(:credit_amount_in_cents => 535) ome.precise_amount.should == Money.new(535, 'USD', 3) end - + end + + describe "defaulting to $0" do + context "when the amount is nil" do + it "should default to $0" do + YetAnotherMoneyExample.new(:amount => nil).amount.should == Money.new(0, 'USD', 2) + end + end + + context "when the precision is configured" do + it "should default to $0 with the right precision" do + YetAnotherMoneyExample.new(:precise_amount => nil).amount.should == Money.new(0, 'USD', 3) + end + end end end \ No newline at end of file spec/money/rails/rails_spec.rb 37f5d4b3cfaba04569147af14bb41a2cd6996aa7 Zach Dennis zach.dennis@gmail.com http://github.com/collectiveidea/money/commit/04e2ecb07eefe4e0c2a1621281ecc0c0ceec8a71 04e2ecb07eefe4e0c2a1621281ecc0c0ceec8a71 2009-07-22T12:23:26-07:00 2009-07-22T12:23:26-07:00 Added the ability for :allow_nil to be set to false when declaring a money field, and it now properly defaults to -bash rather than nil 67746cec74dbdd6ec42b46b40c8407e9c54a4004 Zach Dennis zach.dennis@gmail.com