dm-money 0.1.1 → 0.1.2

data/Gemfile

@@ -1,4 +1,5 @@
 # vim: syntax=ruby
+# Bundler 0.8.1 Gemfile. I will remove bundler when I get the chance.
 bundle_path 'gems'
 disable_rubygems
 disable_system_gems

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/dm-money.rb

@@ -53,12 +53,12 @@ module DataMapper
         name_amount            = "#{name}_amount"
         name_currency          = "#{name}_currency"
 
-        options_amount = options.only(:required, :length, :offset).merge(:accessor => :private)
+        options_amount = options.only(:required, :precision, :scale).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
+        options_currency.merge!(:default => default.currency.to_s) if default
         self.property name_currency.to_sym, String, options_currency
 
         # TODO: Access amount, currency via readers or properties?

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, :default => BigMoney.new(0, :aud)
+        money    :price, :default => BigMoney.new(1, :aud)
       end # Cake
     end
 
@@ -28,10 +28,18 @@ class TestMoney < Test::Unit::TestCase
       end
     end
 
-    should 'have BigMoney default' do
-      price = BigMoney.new(0, :aud)
+    should 'have default' do
+      price = BigMoney.new(1, :aud)
       cake  = Cake.create(:type => 'banana')
       assert_equal price, cake.price
     end
+
+    should 'have default currency' do
+      assert_equal BigMoney.currency(:aud).to_s, Cake.properties[:price_currency].default
+    end
+
+    should 'have default amount' do
+      assert_equal BigDecimal.new('1'), Cake.properties[:price_amount].default
+    end
   end
 end # TestMoney

metadata

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