sevenwire-money 2.1.1 → 2.2.0

data/lib/money/micro_money.rb

@@ -0,0 +1,26 @@
+class MicroMoney < Money
+
+  # Forces the :units => :millicents option.
+  def initialize_with_millicents(money, *args)
+    options = args.last.is_a?(Hash) ? args.pop : {}
+    options.merge!(:units => :millicents)
+    initialize_without_millicents(money, *(args << options))
+  end
+
+  alias :initialize_without_millicents :initialize
+  alias :initialize :initialize_with_millicents
+
+
+  ### OUTPUT/CONVERSIONS
+
+  # Conversion to MicroMoney.
+  def to_micro_money
+    self
+  end
+
+  # Conversion to Money.
+  def to_money
+    Money.new(millicents, currency, bank, :units => :millicents)
+  end
+
+end

data/lib/money/money.rb

@@ -83,7 +83,7 @@ class Money
 
   # Recieve the amount of this money object in another currency.
   def exchange_to(other_currency)
-    self.class.new(@bank.exchange(millicents, currency, other_currency), other_currency, :units => :millicents)
+    MicroMoney.new(@bank.exchange(millicents, currency, other_currency), other_currency).to_money
   end
 
 
@@ -109,29 +109,29 @@ class Money
   # Add two money objects.
   def +(other_money)
     if currency == other_money.currency
-      self.class.new(millicents + other_money.millicents, other_money.currency, :units => :millicents)
+      MicroMoney.new(millicents + other_money.millicents, other_money.currency).to_money
     else
-      self.class.new(millicents + other_money.exchange_to(currency).millicents, currency, :units => :millicents)
+      MicroMoney.new(millicents + other_money.exchange_to(currency).millicents, currency).to_money
     end
   end
 
   # Subtract two money objects.
   def -(other_money)
     if currency == other_money.currency
-      self.class.new(millicents - other_money.millicents, other_money.currency, :units => :millicents)
+      MicroMoney.new(millicents - other_money.millicents, other_money.currency).to_money
     else
-      self.class.new(millicents - other_money.exchange_to(currency).millicents, currency, :units => :millicents)
+      MicroMoney.new(millicents - other_money.exchange_to(currency).millicents, currency).to_money
     end
   end
 
   # Multiply money by fixnum.
   def *(fixnum)
-    self.class.new(millicents * fixnum, currency, :units => :millicents)
+    MicroMoney.new(millicents * fixnum, currency).to_money
   end
 
   # Divide money by fixnum.
   def /(fixnum)
-    self.class.new(millicents / fixnum, currency, :units => :millicents)
+    MicroMoney.new(millicents / fixnum, currency, :units => :millicents).to_money
   end
 
   # Test if the money amount is zero.
@@ -188,9 +188,19 @@ class Money
     sprintf("%.2f", cents.to_f / 100)
   end
 
-  # Conversation to self
+  # Converts to a float value.
+  def to_f
+    to_s.to_f
+  end
+
+  # Conversation to Money.
   def to_money
     self
   end
 
+  # Conversion to MicroMoney.
+  def to_micro_money
+    MicroMoney.new(millicents, currency, bank)
+  end
+
 end

data/lib/money.rb

@@ -4,3 +4,4 @@ require 'money/currencies'
 require 'money/errors'
 require 'money/core_extensions'
 require 'money/money'
+require 'money/micro_money'

data/money.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = "money"
-  s.version = "2.1.1"
-  s.summary = "Money and currency exchange support library"
+  s.version = "2.2.0"
+  s.summary = "Money and MicroMoney with currency exchange support library"
   s.email = "brandon@sevenwire.com"
   s.homepage = "http://github.com/sevenwire/money"
-  s.description = "Money and currency exchange support library."
+  s.description = "Money and MicroMoney with currency exchange support library."
   s.has_rdoc = true
   s.rubyforge_project = "money"
   s.authors = ["Tobias Luetke", "Hongli Lai", "Brandon Arbini"]
@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
       "lib/money/core_extensions.rb",
       "lib/money/currencies.rb",
       "lib/money/errors.rb",
+      "lib/money/micro_money.rb",
       "lib/money/money.rb",
       "lib/money/variable_exchange_bank.rb",
       "test/core_extensions_spec.rb",

data/test/money_spec.rb

@@ -1,5 +1,6 @@
 $LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/../lib")
 require 'money/money'
+require 'money/micro_money'
 require 'money/currencies'
 
 describe Money do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sevenwire-money
 version: !ruby/object:Gem::Version 
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors: 
 - Tobias Luetke
@@ -15,7 +15,7 @@ date: 2008-12-22 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
-description: Money and currency exchange support library.
+description: Money and MicroMoney with currency exchange support library.
 email: brandon@sevenwire.com
 executables: []
 
@@ -32,6 +32,7 @@ files:
 - lib/money/core_extensions.rb
 - lib/money/currencies.rb
 - lib/money/errors.rb
+- lib/money/micro_money.rb
 - lib/money/money.rb
 - lib/money/variable_exchange_bank.rb
 - test/core_extensions_spec.rb
@@ -62,6 +63,6 @@ rubyforge_project: money
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Money and currency exchange support library
+summary: Money and MicroMoney with currency exchange support library
 test_files: []