sevenwire-money 2.2.0 → 2.3.0

data/lib/money/core_extensions.rb

@@ -6,14 +6,32 @@ class Numeric
   #   100.to_money => #<Money @cents=10000>
   #   100.37.to_money => #<Money @cents=10037>
   #   1000.to_money(:millicents) => #<Money @cents=1>
-  def to_money(units=:cents)
+  def to_money(units=:dollars)
     if units == :millicents
-      Money.new(self, :units => :millicents)
+      MicroMoney.new(self)
+    elsif units == :cents
+      Money.new(self)
     else
       Money.new(self * 100)
     end
   end
 
+
+  def millicents
+    MicroMoney.new(self).to_money
+  end
+  alias :millicent :millicents
+
+  def cents
+    Money.new(self)
+  end
+  alias :cent :cents
+
+  def dollars
+    Money.new(self * 100)
+  end
+  alias :dollar :dollars
+
 end
 
 
@@ -28,7 +46,7 @@ class String
   #   'USD 100'.to_money   # => #<Money @cents=10000, @currency="USD">
   #   '$100 USD'.to_money   # => #<Money @cents=10000, @currency="USD">
   #   '1000'.to_money(:millicents)  # => #<Money @cents=1, @currency="USD">
-  def to_money(units=:cents)
+  def to_money(units=:dollars)
     # Get the currency.
     matches = scan /([A-Z]{2,3})/
     currency = matches[0] ? matches[0][0] : Money.default_currency
@@ -44,7 +62,9 @@ class String
             end
 
     if units == :millicents
-      Money.new(money, currency, :units => :millicents)
+      MicroMoney.new(money, currency)
+    elsif units == :cents
+      Money.new(money, currency)
     else
       Money.new(money * 100, currency)
     end

data/money.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "money"
-  s.version = "2.2.0"
+  s.version = "2.3.0"
   s.summary = "Money and MicroMoney with currency exchange support library"
   s.email = "brandon@sevenwire.com"
   s.homepage = "http://github.com/sevenwire/money"

data/test/core_extensions_spec.rb

@@ -1,9 +1,12 @@
 $LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/../lib")
 require 'money/core_extensions'
+require 'money/variable_exchange_bank'
+require 'money/money'
+require 'money/micro_money'
 
-describe "Money core extensions" do
+describe "to_money core extensions for" do
 
-  specify "Numeric#to_money works" do
+  specify "Numeric works" do
     money = 1234.to_money
     money.cents.should == 1234_00
     money.currency.should == Money.default_currency
@@ -13,7 +16,7 @@ describe "Money core extensions" do
     money.currency.should == Money.default_currency
   end
 
-  specify "String#to_money works" do
+  specify "String works" do
     "100".to_money.should == Money.new(100_00)
     "100.37".to_money.should == Money.new(100_37)
     "100,37".to_money.should == Money.new(100_37)
@@ -36,3 +39,32 @@ describe "Money core extensions" do
   end
 
 end
+
+
+describe "Convenience methods on Numeric and String should return" do
+
+  specify "1.millicent" do
+    1.millicent.should == MicroMoney.new(1)
+  end
+
+  specify "100.millcents" do
+    100.millicents.should == MicroMoney.new(100)
+  end
+
+  specify "1.cent" do
+    1.cent.should == Money.new(1)
+  end
+
+  specify "100.cents" do
+    100.cents.should == Money.new(100)
+  end
+
+  specify "1.dollar" do
+    1.dollar.should == Money.new(100)
+  end
+
+  specify "100.dollars" do
+    100.dollars.should == Money.new(10000)
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sevenwire-money
 version: !ruby/object:Gem::Version 
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Tobias Luetke