money 3.0.4 → 3.0.5

data/CHANGELOG.rdoc

@@ -1,3 +1,16 @@
+== Money 3.0.5
+ * Added Money#abs
+ * Updated Currency#subunit_to_unit documentation (it's an integer not a
+ string)
+ * Fixed issue when exchanging currencies with different :subunit_to_unit
+ values
+ * Added ability to pass a block to VariableExchangeBank#new or #exchange,
+ specifying a custom truncation method
+ * Added optional currency argument to Numeric#to_money
+ * Added optional currency argument to String#to_money
+ * Numeric#to_money now respects :subunit_to_unit
+ * Use '¤' as the default currency symbol
+
 == Money 3.0.4
  * Updated #exchange to avoid floating point rounding errors
  * Use :subunit_to_unit in #to_s, #to_f and #format

data/README.rdoc

@@ -19,6 +19,15 @@ Resources:
 - RDoc API: http://money.rubyforge.org
 - Git repository: http://github.com/FooBarWidget/money
 
+== Attention
+
+Starting in v3.1.0 we will be making two changes to the exchange process. First
+a new `Bank::Base` class will be available. This will allow users to more
+easily create custom `Bank` classes. Secondly the default `#exchange` method
+will be depreciated and a new `#exchange_with` method will be used. Currently
+`#exchange` passes the `cents` attribute. `#exchange_with` will pass the
+actual `Money` object instead.
+
 == Download
 
 Install stable releases with the following command:
@@ -73,9 +82,9 @@ containing all the currency attributes.
     :name     => "United States Dollar",
     :symbol   => "$",
     :subunit  => "Cent"
-    :subunit_to_unit => "100",
+    :subunit_to_unit => 100,
     :separator => ".",
-    :delimiter =? ","
+    :delimiter => ","
   }
 
 The pre-defined set of attributes includes:

data/VERSION

@@ -1 +1 @@
-3.0.4
+3.0.5

data/lib/money/core_extensions.rb

@@ -6,8 +6,9 @@ class Numeric
   #   100.37.to_money => #<Money @cents=10037>
   #   require 'bigdecimal'
   #   BigDecimal.new('100').to_money => #<Money @cents=10000>
-  def to_money
-    Money.new((self * 100).to_int)
+  def to_money(currency = Money.default_currency)
+    currency = Money::Currency.new(currency) unless currency.is_a?(Money::Currency)
+    Money.new((self * currency.subunit_to_unit).to_int, currency)
   end
 end
 
@@ -22,10 +23,23 @@ class String
   #   'USD 100'.to_money   # => #<Money @cents=10000, @currency="USD">
   #   '$100 USD'.to_money  # => #<Money @cents=10000, @currency="USD">
   #   'hello 2000 world'.to_money   # => #<Money @cents=200000 @currency="USD")>
-  def to_money
+  def to_money(currency = nil)
     # Get the currency.
     matches = scan /([A-Z]{2,3})/
-    currency = matches[0] ? matches[0][0] : Money.default_currency
+    _currency_ = matches[0] ? matches[0][0] : nil
+    
+    # check that currency passed and embedded currency are the same, or only
+    # one or the other is present.
+    if currency.nil? and _currency_.nil?
+      currency = Money.default_currency
+    elsif currency.nil?
+      currency = _currency_
+    elsif _currency_.nil?
+      currency = currency
+    elsif currency != _currency_
+      raise "mismatching currencies"
+    end
+    
     cents = calculate_cents(self)
     Money.new(cents, currency)
   end

data/lib/money/defaults.rb

@@ -41,7 +41,7 @@ class Money
     "SEK" => "kr",
     "GHC" => "¢",
     "BRL" => "R$ ",
-    # Everything else defaults to '$'
+    # Everything else defaults to '¤'
   }, "Money::SYMBOLS has no longer effect. See Money::Currency#symbol.")
 
   SEPARATORS = DeprecatedHash.new({

data/lib/money/money.rb

@@ -218,6 +218,11 @@ class Money
     a.modulo(b) - (b.is_a?(Money) ? b : Money.new(b, a.currency))
   end
 
+  # Return absolute value of self as a new Money object
+  def abs
+    Money.new(self.cents.abs, self.currency)
+  end
+
   # Test if the money amount is zero
   def zero?
     cents == 0
@@ -232,9 +237,9 @@ class Money
   # Attempts to pick a symbol that's suitable for the given currency
   # looking up the Currency::TABLE hashtable.
   # If the symbol for the given currency isn't known,
-  # then it will default to "$".
+  # then it will default to "¤".
   def symbol
-    currency.symbol || "$"
+    currency.symbol || "¤"
   end
 
   # Uses :delimiter from the Currency hash. If it is not specified defaults to
@@ -303,9 +308,9 @@ class Money
   #
   #
   # If the symbol for the given currency isn't known, then it will default
-  # to "$" as symbol:
+  # to "¤" as symbol:
   #
-  #   Money.new(100, "AWG").format(:symbol => true)  => "$1.00"
+  #   Money.new(100, "AWG").format(:symbol => true)  => "¤1.00"
   #
   # You can specify a string as value to enforce using a particular symbol:
   #

data/lib/money/variable_exchange_bank.rb

@@ -27,9 +27,10 @@ class Money
       @@singleton
     end
 
-    def initialize
+    def initialize(&block)
       @rates = {}
       @mutex = Mutex.new
+      @rounding_method = block
     end
 
     # Registers a conversion rate. +from+ and +to+ are both currency names.
@@ -60,12 +61,20 @@ class Money
     # Returns the amount of cents in +to_currency+ as an integer, rounded down.
     #
     # If the conversion rate is unknown, then Money::UnknownRate will be raised.
-    def exchange(cents, from_currency, to_currency)
+    def exchange(cents, from_currency, to_currency, &block)
       rate = get_rate(from_currency, to_currency)
       if !rate
         raise Money::UnknownRate, "No conversion rate known for '#{from_currency}' -> '#{to_currency}'"
       end
-      (cents * rate).to_s.to_i
+      _from_currency_ = Currency.wrap(from_currency)
+      _to_currency_   = Currency.wrap(to_currency)
+
+      _cents_ = cents / (_from_currency_.subunit_to_unit.to_f / _to_currency_.subunit_to_unit.to_f)
+
+      ex = _cents_ * rate
+      return block.call(ex) if block_given?
+      return @rounding_method.call(ex) unless @rounding_method.nil?
+      ex.to_s.to_i
     end
 
     @@singleton = VariableExchangeBank.new

data/money.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{money}
-  s.version = "3.0.4"
+  s.version = "3.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Luetke", "Hongli Lai", "Jeremy McNevin", "Shane Emmons"]
-  s.date = %q{2010-06-24}
+  s.date = %q{2010-07-16}
   s.description = %q{Money and currency exchange support library.}
   s.email = %q{hongli@phusion.nl}
   s.extra_rdoc_files = [

data/test/core_extensions_spec.rb

@@ -17,6 +17,17 @@ describe "Money core extensions" do
     money.cents.should == 1234_00
     money.currency.should == Money.default_currency
   end
+  
+  specify "Numeric#to_money accepts optional currency" do
+    1234.to_money('USD').should == Money.new(123400, 'USD')
+    1234.to_money('EUR').should == Money.new(123400, 'EUR')
+  end
+
+  specify "Numeric#to_money should respect :subunit_to_unit" do
+    10.to_money('USD').should == Money.new(10_00, 'USD')
+    10.to_money('TND').should == Money.new(10_000, 'TND')
+    10.to_money('CLP').should == Money.new(10, 'CLP')
+  end
 
   specify "String#to_money works" do
     "20.15".to_money.should == Money.new(20_15)
@@ -73,6 +84,13 @@ describe "Money core extensions" do
     "$1.99000 USD".to_money.should == Money.new(1_99, "USD")
   end
 
+  specify "String#to_money should accept optional currency" do
+    "10.10".to_money('USD').should == Money.new(1010, 'USD')
+    "10.10".to_money('EUR').should == Money.new(1010, 'EUR')
+    "10.10 USD".to_money('USD').should == Money.new(1010, 'USD')
+    lambda{"10.10 USD".to_money('EUR')}.should raise_error
+  end
+
   specify "String#to_money ignores unrecognized data" do
     "hello 2000 world".to_money.should == Money.new(2000_00)
   end

data/test/exchange_bank_spec.rb

@@ -57,5 +57,45 @@ describe Money::VariableExchangeBank do
         @bank.exchange(10000, 'USD', 'EUR').should == 8600
       end
     end
+
+    context 'TND to USD using a rate of 0.67138' do
+      it 'returns the correct amount' do
+        @bank.add_rate('TND', 'USD', 0.67138)
+        @bank.exchange(1000, 'TND', 'USD').should == 67
+      end
+    end
+
+    context 'USD to TND using a rate of 1.32862' do
+      it 'returns the correct amount' do
+        @bank.add_rate('USD', 'TND', 1.32862)
+        @bank.exchange(1000, 'USD', 'TND').should == 13286
+      end
+    end
+  end
+
+  context 'using custom rounding methods' do
+    describe 'passing a rounding method to #new' do
+      before :each do
+        mth   = Proc.new{|ex| ex.ceil }
+        @bank = Money::VariableExchangeBank.new(&mth)
+      end
+
+      it 'should use @rounding_method' do
+        @bank.add_rate('USD', 'EUR', 0.86)
+        @bank.exchange(10, 'USD', 'EUR').should == 9
+      end
+    end
+
+    describe 'passing a rounding method to #exchange' do
+      it 'should use &block' do
+        @bank.add_rate('USD', 'EUR', 0.86)
+        @bank.exchange(10, 'USD', 'EUR').should == 8
+
+        mth = Proc.new{|ex| ex.ceil }
+        @bank.exchange(10, 'USD', 'EUR', &mth).should == 9
+
+        @bank.exchange(10, 'USD', 'EUR'){|ex| ex.ceil }.should == 9
+      end
+    end
   end
 end

data/test/money_spec.rb

@@ -430,6 +430,12 @@ describe Money do
     end
   end
 
+  specify "#abs correctly returns the absolute value as a new Money object" do
+    n = Money.new(-1, :USD)
+    n.abs.should == Money.new( 1, :USD)
+    n.should     == Money.new(-1, :USD)
+  end
+
   specify "Money.empty creates a new Money object of 0 cents" do
     Money.empty.should == Money.new(0)
   end
@@ -556,7 +562,7 @@ describe Money do
 
       currency = Money::Currency.new("EUR")
       currency.should_receive(:symbol).and_return(nil)
-      Money.empty(currency).symbol.should == "$"
+      Money.empty(currency).symbol.should == "¤"
     end
 
     specify "#delimiter works as documented" do
@@ -647,7 +653,7 @@ describe Money do
     specify "#format(:symbol => true) returns $ when currency code is not recognized" do
       currency = Money::Currency.new("EUR")
       currency.should_receive(:symbol).and_return(nil)
-      Money.new(100, currency).format(:symbol => true).should == "$1.00"
+      Money.new(100, currency).format(:symbol => true).should == "¤1.00"
     end
 
     specify "#format(:symbol => some non-Boolean value that evaluates to true) returs symbol based on the given currency code" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: money
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 3
   - 0
-  - 4
-  version: 3.0.4
+  - 5
+  version: 3.0.5
 platform: ruby
 authors: 
 - Tobias Luetke
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-24 00:00:00 -04:00
+date: 2010-07-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency