dm-money 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/dm-money.rb

@@ -41,14 +41,25 @@ module DataMapper
       def money(name, options = {})
         raise ArgumentError.new('You need to pass at least one argument') if name.empty?
 
+        if default = options.delete(:default)
+          raise TypeError.new("Expected BigMoney +default+ but got #{options[:default].class}") \
+            unless default.is_a?(BigMoney)
+        end
+
+        # TODO: Golf.
         property               = Property.new(self, name, BigDecimal, options)
         name                   = property.name.to_s
         instance_variable_name = property.instance_variable_name
         name_amount            = "#{name}_amount"
         name_currency          = "#{name}_currency"
 
-        self.property name_amount.to_sym,   BigDecimal, property.options.except(:accessor, :reader, :writer).merge(:accessor => :private)
-        self.property name_currency.to_sym, String,     :accessor => :private, :required => property.required, :length => 3
+        options_amount = options.only(:required, :length, :offset).merge(:accessor => :private)
+        options_amount.merge!(:default => default.amount) if default
+        self.property name_amount.to_sym, BigDecimal, options_amount
+
+        options_currency = options.only(:required).merge(:accessor => :private, :length => 3)
+        options_currency.merge!(:default => default.currency) if default
+        self.property name_currency.to_sym, String, options_currency
 
         # TODO: Access amount, currency via readers or properties?
         # TODO: Validations or error message attempting to set with something other than BigMoney?

data/test/test_money.rb

@@ -8,7 +8,7 @@ class TestMoney < Test::Unit::TestCase
         include DataMapper::Resource
         property :id,   Serial
         property :type, String
-        money    :price
+        money    :price, :default => BigMoney.new(0, :aud)
       end # Cake
     end
 
@@ -27,5 +27,11 @@ class TestMoney < Test::Unit::TestCase
         assert_equal price, cake.price
       end
     end
+
+    should 'have BigMoney default' do
+      price = BigMoney.new(0, :aud)
+      cake  = Cake.create(:type => 'banana')
+      assert_equal price, cake.price
+    end
   end
 end # TestMoney

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-money
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Shane Hanna
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-25 00:00:00 +11:00
+date: 2010-02-23 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency