money 3.0.5 → 3.1.0.pre1

data/CHANGELOG.rdoc

@@ -1,11 +1,23 @@
+== Money 3.1.0.pre1
+ * Implemented Money::Bank::Base (closes #14)
+ * Added Bank::Base#exchange_with
+ * Deprecated Bank::Base#exchange (removal in 3.2.0)
+ * Implented Money::Bank::VariableExchange
+ * Deprecated Money::VariableExchangeBank (removal in 3.2.0)
+ * Set Money::SYMBOLS, Money::SEPARATORS and Money::DELIMITERS
+   deprecation target to Money 3.2.0. (closes #16)
+ * Fixed rounding error in Numeric#to_money (closes #15)
+ * Implemented #has for Money and Money::Currency
+ * Refactored test suite to conform to RSpec conventions
+ * Moved project from github.com/FooBarWidget to github.com/RubyMoney
+ * Added Simone Carletti to list of authors
+
 == 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
+ * 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
+   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
@@ -20,7 +32,7 @@
 
 == Money 3.0.3
  * Added #currency_as_string and #currency_as_string= for easier integration
- with ActiveRecord/Rails
+   with ActiveRecord/Rails
 
 == Money 3.0.2
  * Added #div, #divmod, #modulo, #% and #remainder methods
@@ -28,12 +40,11 @@
 == Money 3.0.1
  * Added #eql? method
  * Updated Numeric#to_money to work with all children of Numeric
- 	 (BigDecimal, Integer, Fixnum, etc)
+   (BigDecimal, Integer, Fixnum, etc)
 
 == Money 3.0.0
  * Version Bump due to compatibility changes with ActiveRecord. See
-   http://github.com/FooBarWidget/money/issues#issue/4/comment/224880 for more
-	 information.
+   http://github.com/RubyMoney/money/issues#issue/4/comment/224880 for more information.
 
 == Money 2.3.0
  * Currency is now represented by a Currency Object instead of a string.

data/README.rdoc

@@ -4,8 +4,8 @@ This library aids one in handling money and different currencies. Features:
 
 - Provides a <tt>Money</tt> class which encapsulates all information about an certain
   amount of money, such as its value and its currency.
-- Provies a <tt>Money::Currency</tt> class which encapsulates all information about
-  a monerary unit.
+- Provides a <tt>Money::Currency</tt> class which encapsulates all information about
+  a monetary unit.
 - Represents monetary values as integers, in cents. This avoids floating point
   rounding errors.
 - Represents currency as <tt>Money::Currency</tt> instances providing an high level of flexibility.
@@ -17,7 +17,7 @@ Resources:
 
 - Website: http://money.rubyforge.org
 - RDoc API: http://money.rubyforge.org
-- Git repository: http://github.com/FooBarWidget/money
+- Git repository: http://github.com/RubyMoney/money
 
 == Attention
 
@@ -36,7 +36,7 @@ Install stable releases with the following command:
 
 The development version (hosted on Github) can be installed with:
 
-  git clone git://github.com/FooBarWidget/money.git
+  git clone git://github.com/RubyMoney/money.git
   cd money
   rake install
 
@@ -107,7 +107,7 @@ exist to provide a basic API you can take advantage of to build your application
 The priority attribute is an arbitrary numerical value you can assign to the <tt>Money::Currency</tt>
 and use in sorting/grouping operation.
 
-For instance, let's assume your Rails application needs to a currency selector
+For instance, let's assume your Rails application needs to render a currency selector
 like the one available at http://finance.yahoo.com/currency-converter/
 You can create a couple of custom methods to return the list of major_currencies
 and all_currencies as follows:
@@ -183,23 +183,10 @@ Use the +compose_of+ helper to let Active Record deal with embedding the money
 object in your models. The following example requires a +cents+ and a +currency+
 field.
 
-  class ProductUnit < ActiveRecord::Base
-    belongs_to :product
-    composed_of :price,
-      :class_name => "Money",
-      :mapping => [%w(cents cents), %w(currency currency_as_string)],
-      :constructor => Proc.new { |cents, currency| Money.new(cents || 0, currency || Money.default_currency) }
-    
-    private
-      validate :cents_not_zero
-        
-      def cents_not_zero
-        errors.add("cents", "cannot be zero or less") unless cents > 0
-      end
-      
-      validates_presence_of :sku, :currency
-      validates_uniqueness_of :sku
-  end
+  composed_of :price,
+    :class_name => "Money",
+    :mapping => [%w(cents cents), %w(currency currency_as_string)],
+    :constructor => Proc.new { |cents, currency| Money.new(cents || 0, currency || Money.default_currency) }
 
 For Money 2.2.x and previous versions, simply use the following
 <tt>composed_of</tt> definition:
@@ -209,4 +196,4 @@ For Money 2.2.x and previous versions, simply use the following
     :mapping => [%w(cents cents), %w(currency currency)],
     :constructor => Proc.new { |cents, currency| Money.new(cents || 0, currency || Money.default_currency) }
 
-For further details read the full discussion at http://github.com/FooBarWidget/money/issues/4#comment_224880
+For further details read the full discussion at http://github.com/RubyMoney/money/issues/4#comment_224880

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.description = "Money and currency exchange support library."
     gem.email = "hongli@phusion.nl"
     gem.homepage = "http://money.rubyforge.org/"
-    gem.authors = ["Tobias Luetke", "Hongli Lai", "Jeremy McNevin", "Shane Emmons"]
+    gem.authors = ["Tobias Luetke", "Hongli Lai", "Jeremy McNevin", "Shane Emmons", "Simone Carletti"]
     gem.rubyforge_project = "money"
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_development_dependency "hanna", ">= 0.1.12"
@@ -26,10 +26,10 @@ rescue LoadError
 end
 
 require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'test'
-  spec.spec_files = FileList['test/**/*_spec.rb']
-  spec.spec_opts << '--format specdoc'
+Spec::Rake::SpecTask.new(:test) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = Dir['spec/**/*_spec.rb']
+  spec.spec_opts << '--color'
 end
 
 task :spec => :check_dependencies

data/VERSION

@@ -1 +1 @@
-3.0.5
+3.1.0.pre1

data/lib/money.rb

@@ -24,3 +24,4 @@ $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
 require 'money/money'
 require 'money/defaults'
 require 'money/core_extensions'
+require 'money/deprecations'

data/lib/money/bank/base.rb

@@ -0,0 +1,84 @@
+require 'thread'
+
+class Money
+  module Bank
+
+    # The lowest Money::Bank error class.
+    # All Money::Bank errors should inherit from it.
+    class Error < StandardError
+    end
+
+    # Raised when the bank doesn't know about the conversion rate
+    # for specified currencies.
+    class UnknownRate < Error
+    end
+
+
+    #
+    # Money::Bank::Base is the basic interface for creating a money exchange object,
+    # also called Bank.
+    #
+    # A Bank is responsible for storing exchange rates,
+    # take a Money object as input and returns the corresponding Money object
+    # converted into an other currency.
+    #
+    # This class exists for aiding in the creating of other classes to exchange money between
+    # different currencies. When creating a subclass you will need to implement
+    # the following  methods to exchange money between currencies:
+    #
+    # * #exchange_with(Money) # => Money
+    #
+    # See Money::Bank::VariableExchange for a real example.
+    #
+    # Also, you can extend Money::Bank::VariableExchange
+    # instead of Money::Bank::Base if your bank implementation
+    # needs to store rates internally.
+    #
+    class Base
+
+      # Returns the singleton instance of the Base bank.
+      def self.instance
+        @@singleton ||= self.new
+      end
+
+
+      # @deprecated +#exchange+ will be removed in v3.2.0, use +#exchange_with+
+      #
+      # Exchanges the given amount of cents in +from_currency+ to +to_currency+.
+      #
+      # Returns the amount of cents in +to_currency+ as an integer, rounded down.
+      def exchange(cents, from_currency, to_currency, &block)
+        Money.deprecate "`Money::Bank::Base#exchange' will be removed in v3.2.0, use #exchange_with instead"
+        exchange_with(Money.new(cents, from_currency), to_currency, &block).cents
+      end
+
+      # Exchanges the given +Money+ object to a new +Money+ object in
+      # +to_currency+.
+      #
+      # You should implement this in a subclass,
+      # otherwise it will throw a NotImplementedError as a reminder.
+      #
+      # Returns a new +Money+ object.
+      # Raises <tt>NotImplementedError</tt>.
+      def exchange_with(from, to_currency, &block)
+        raise NotImplementedError, "#exchange_with must be implemented"
+      end
+
+
+      # Given two currency strings or object,
+      # checks whether they're both the same currency.
+      #
+      #   same_currency?("usd", "USD")                # => true
+      #   same_currency?("usd", "EUR")                # => false
+      #   same_currency?("usd", Currency.new("USD")   # => true
+      #   same_currency?("usd", "USD")   # => true
+      #
+      # Return +true+ if the currencies are the same, +false+ otherwise.
+      def same_currency?(currency1, currency2)
+        Currency.wrap(currency1) == Currency.wrap(currency2)
+      end
+
+    end
+
+  end
+end

data/lib/money/bank/variable_exchange.rb

@@ -0,0 +1,85 @@
+require 'money/bank/base'
+
+class Money
+  module Bank
+
+    # Class for aiding in exchanging money between different currencies.
+    # By default, the Money class uses an object of this class (accessible through
+    # Money#bank) for performing currency exchanges.
+    #
+    # By default, Bank::VariableExchange has no knowledge about conversion rates.
+    # One must manually specify them with +add_rate+, after which one can perform
+    # exchanges with +exchange+. For example:
+    #
+    #   bank = Money::Bank::VariableExchange.new
+    #   bank.add_rate("USD", "CAD", 1.24515)
+    #   bank.add_rate("CAD", "USD", 0.803115)
+    #
+    #   # Exchange 100 CAD to USD:
+    #   bank.exchange(100_00, "CAD", "USD")  # => 124
+    #   # Exchange 100 USD to CAD:
+    #   bank.exchange(100_00, "USD", "CAD")  # => 80
+    #
+    class VariableExchange < Base
+
+      def initialize(&block)
+        @rates = {}
+        @mutex = Mutex.new
+        @rounding_method = block
+      end
+
+
+      # Exchanges the given +Money+ object to a new +Money+ object in
+      # +to_currency+. Returns a new +Money+ object.
+      #
+      # Raises <tt>Money::Bank::UnknownRate</tt> if the conversion rate is unknown.
+      def exchange_with(from, to_currency, &block)
+        return from if same_currency?(from.currency, to_currency)
+
+        rate = get_rate(from.currency, to_currency)
+        unless rate
+          raise UnknownRate, "No conversion rate known for '#{from.currency.iso_code}' -> '#{to_currency}'"
+        end
+        _to_currency_  = Currency.wrap(to_currency)
+
+        cents = from.cents / (from.currency.subunit_to_unit.to_f / _to_currency_.subunit_to_unit.to_f)
+
+        ex = cents * rate
+        ex = if block_given?
+               block.call(ex)
+             elsif @rounding_method
+               @rounding_method.call(ex)
+             else
+               ex.to_s.to_i
+             end
+        Money.new(ex, _to_currency_)
+      end
+
+
+      # Registers a conversion rate. +from+ and +to+ are both currency names or
+      # +Currency+ objects.
+      def add_rate(from, to, rate)
+        set_rate(from, to, rate)
+      end
+
+      # Set the rate for the given currencies.
+      def set_rate(from, to, rate)
+        @mutex.synchronize { @rates[rate_key_for(from, to)] = rate }
+      end
+
+      # Retrieve the rate for the given currencies.
+      def get_rate(from, to)
+        @mutex.synchronize { @rates[rate_key_for(from, to)] }
+      end
+
+      private
+
+        # Return the rate hashkey for the given currencies.
+        def rate_key_for(from, to)
+          "#{Currency.wrap(from).iso_code}_TO_#{Currency.wrap(to).iso_code}".upcase
+        end
+
+    end
+
+  end
+end

data/lib/money/core_extensions.rb

@@ -8,7 +8,14 @@ class Numeric
   #   BigDecimal.new('100').to_money => #<Money @cents=10000>
   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)
+    amt = self * currency.subunit_to_unit
+    amt = case amt.class.to_s
+          when 'BigDecimal'
+            amt.to_s('F')
+          else
+            amt.to_s
+          end
+    Money.new(amt.to_i, currency)
   end
 end
 

data/lib/money/currency.rb

@@ -217,6 +217,21 @@ class Money
       self.id == other_currency.id
     end
 
+    # synonymous with #==
+    def eql?(other_currency)
+      self == other_currency
+    end
+
+    # Returns a Fixnum hash value based on the <tt>id</tt> attribute
+    # in order to use functions like & (intersection), group_by, etc.
+    #
+    #   [Currency.new(:usd), Currency.new(:eur)] & [Currency.new(:usd)]
+    #   # => [Currency.new(:usd)]
+    #
+    def hash
+      id.hash
+    end
+
     # Returns a string representation
     # corresponding to the upcase <tt>id</tt> attribute.
     #
@@ -242,7 +257,7 @@ class Money
 
 
     def method_missing(method, *args, &block)
-      warn "DEPRECATION MESSAGE: `currency' is now a Currency instance. Call `currency.to_s.#{method}' instead."
+      Money.deprecate "`currency' is now a Currency instance. Call `currency.to_s.#{method}' instead."
       iso_code.send(method, *args, &block)
     end
 

data/lib/money/defaults.rb

@@ -10,21 +10,15 @@ class Money
     end
 
     def [](key)
-      deprecate
+      Money.deprecate(@message)
       super
     end
 
     def []=(value)
-      deprecate
+      Money.deprecate(@message)
       super
     end
 
-    private
-
-      def deprecate
-        warn "DEPRECATION MESSAGE: #{@message}"
-      end
-
   end
 
   # @deprecated See Money::Currency#symbol
@@ -42,16 +36,16 @@ class Money
     "GHC" => "¢",
     "BRL" => "R$ ",
     # Everything else defaults to '¤'
-  }, "Money::SYMBOLS has no longer effect. See Money::Currency#symbol.")
+  }, "Money::SYMBOLS has no longer effect and will be removed in v3.2.0. See Money::Currency#symbol.")
 
   SEPARATORS = DeprecatedHash.new({
     "BRL" => ",",
     # Everything else defaults to '.'
-  }, "Money::SEPARATORS is deprecated. See Money::Currency#separator.")
+  }, "Money::SEPARATORS is deprecated and will be removed in v3.2.0. See Money::Currency#separator.")
 
   DELIMITERS = DeprecatedHash.new({
     "BRL" => ".",
     # Everything else defaults to ","
-  }, "Money::DELIMITERS is deprecated. See Money::Currency#delimiter.")
+  }, "Money::DELIMITERS is deprecated and will be removed in Money v3.2.0. See Money::Currency#delimiter.")
 
 end

data/lib/money/deprecations.rb

@@ -0,0 +1,21 @@
+class Money
+
+  def self.deprecate(message)
+    warn "DEPRECATION WARNING: #{message}"
+  end
+
+
+  # Money::VariableExchangeBank is the legacy default bank
+  # shipped with Money. The class has been superseded by
+  # Money::Bank::VariableExchange.
+  #
+  # @deprecate Use Money::Bank::VariableExchange instead. 
+  class VariableExchangeBank < Bank::VariableExchange # :nodoc:
+    def initialize(*args)
+      Money.deprecate "Money::VariableExchangeBank is deprecated and will be removed in v3.2.0. " +
+                      "Use Money::Bank::VariableExchange instead."
+      super
+    end
+  end
+
+end

data/lib/money/money.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 require 'money/currency'
-require 'money/variable_exchange_bank'
+require 'money/bank/variable_exchange'
 
 # Represents an amount of money in a certain currency.
 class Money
@@ -25,7 +25,7 @@ class Money
     #   money2.bank  # => bank2
     #   money1.bank  # => bank1
     #
-    # The default value for this property is an instance if VariableExchangeBank.
+    # The default value for this property is an instance if Bank::VariableExchange.
     # It allows one to specify custom exchange rates:
     #
     #   Money.default_bank.add_rate("USD", "CAD", 1.24515)
@@ -40,7 +40,7 @@ class Money
     attr_accessor :default_currency
   end
 
-  self.default_bank = VariableExchangeBank.instance
+  self.default_bank = Bank::VariableExchange.instance
   self.default_currency = Currency.new("USD")
 
 
@@ -106,7 +106,7 @@ class Money
   def ==(other_money)
     if other_money.respond_to?(:to_money)
       other_money = other_money.to_money
-      cents == other_money.cents && bank.same_currency?(currency, other_money.currency)
+      cents == other_money.cents && self.currency == other_money.currency
     else
       false
     end
@@ -117,6 +117,17 @@ class Money
     self == other_money
   end
 
+  # Returns a Fixnum hash value based on the <tt>cents</tt> and
+  # <tt>currency</tt> attributes in order to use functions like
+  # & (intersection), group_by, etc.
+  #
+  #   [Money.new(1_00, :eur), Money.new(2_00, :usd)] & [Money.new(1_00, :eur)]
+  #   # => [Money.new(1_00, :eur)]
+  #
+  def hash
+    [cents.hash, currency.hash].hash
+  end
+
   # Compares this money object against another object. +other_money+ must respond
   # to #to_money.
   #
@@ -128,7 +139,7 @@ class Money
   def <=>(other_money)
     if other_money.respond_to?(:to_money)
       other_money = other_money.to_money
-      if bank.same_currency?(currency, other_money.currency)
+      if self.currency == other_money.currency
         cents <=> other_money.cents
       else
         cents <=> other_money.exchange_to(currency).cents
@@ -444,7 +455,7 @@ class Money
   #
   def exchange_to(other_currency)
     other_currency = Currency.wrap(other_currency)
-    Money.new(@bank.exchange(self.cents, currency, other_currency), other_currency)
+    @bank.exchange_with(self, other_currency)
   end
 
   # Receive a money object with the same amount as the current Money object
@@ -484,4 +495,5 @@ class Money
     end
     rules
   end
+
 end

data/money.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{money}
-  s.version = "3.0.5"
+  s.version = "3.1.0.pre1"
 
-  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-07-16}
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Tobias Luetke", "Hongli Lai", "Jeremy McNevin", "Shane Emmons", "Simone Carletti"]
+  s.date = %q{2010-08-03}
   s.description = %q{Money and currency exchange support library.}
   s.email = %q{hongli@phusion.nl}
   s.extra_rdoc_files = [
@@ -26,17 +26,21 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "lib/money.rb",
+     "lib/money/bank/base.rb",
+     "lib/money/bank/variable_exchange.rb",
      "lib/money/core_extensions.rb",
      "lib/money/currency.rb",
      "lib/money/defaults.rb",
-     "lib/money/errors.rb",
+     "lib/money/deprecations.rb",
      "lib/money/money.rb",
-     "lib/money/variable_exchange_bank.rb",
      "money.gemspec",
-     "test/core_extensions_spec.rb",
-     "test/currency_spec.rb",
-     "test/exchange_bank_spec.rb",
-     "test/money_spec.rb"
+     "spec/bank/base_spec.rb",
+     "spec/bank/variable_exchange_spec.rb",
+     "spec/core_extensions_spec.rb",
+     "spec/currency_spec.rb",
+     "spec/deprecations_spec.rb",
+     "spec/money_spec.rb",
+     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://money.rubyforge.org/}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -45,10 +49,13 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Money and currency exchange support library}
   s.test_files = [
-    "test/core_extensions_spec.rb",
-     "test/currency_spec.rb",
-     "test/exchange_bank_spec.rb",
-     "test/money_spec.rb"
+    "spec/bank/base_spec.rb",
+     "spec/bank/variable_exchange_spec.rb",
+     "spec/core_extensions_spec.rb",
+     "spec/currency_spec.rb",
+     "spec/deprecations_spec.rb",
+     "spec/money_spec.rb",
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/spec/bank/base_spec.rb

@@ -0,0 +1,57 @@
+require "spec_helper"
+
+describe Money::Bank::Base do
+
+  before :each do
+    @bank = Money::Bank::Base.new
+  end
+
+  describe '#exchange' do
+    it 'should raise NotImplementedError' do
+      lambda { @bank.exchange(100, 'USD', 'EUR') }.should raise_exception(NotImplementedError)
+    end
+  end
+
+  describe '#exchange_with' do
+    it 'should raise NotImplementedError' do
+      lambda { @bank.exchange_with(Money.new(100, 'USD'), 'EUR') }.should raise_exception(NotImplementedError)
+    end
+  end
+
+  describe '#same_currency?' do
+    it 'should accept str/str' do
+      lambda{@bank.send(:same_currency?, 'USD', 'EUR')}.should_not raise_exception
+    end
+
+    it 'should accept currency/str' do
+      lambda{@bank.send(:same_currency?, Money::Currency.wrap('USD'), 'EUR')}.should_not raise_exception
+    end
+
+    it 'should accept str/currency' do
+      lambda{@bank.send(:same_currency?, 'USD', Money::Currency.wrap('EUR'))}.should_not raise_exception
+    end
+
+    it 'should accept currency/currency' do
+      lambda{@bank.send(:same_currency?, Money::Currency.wrap('USD'), Money::Currency.wrap('EUR'))}.should_not raise_exception
+    end
+
+    it 'should return `true` when currencies match' do
+      @bank.send(:same_currency?, 'USD', 'USD').should == true
+      @bank.send(:same_currency?, Money::Currency.wrap('USD'), 'USD').should == true
+      @bank.send(:same_currency?, 'USD', Money::Currency.wrap('USD')).should == true
+      @bank.send(:same_currency?, Money::Currency.wrap('USD'), Money::Currency.wrap('USD')).should == true
+    end
+
+    it 'should return `false` when currencies do not match' do
+      @bank.send(:same_currency?, 'USD', 'EUR').should == false
+      @bank.send(:same_currency?, Money::Currency.wrap('USD'), 'EUR').should == false
+      @bank.send(:same_currency?, 'USD', Money::Currency.wrap('EUR')).should == false
+      @bank.send(:same_currency?, Money::Currency.wrap('USD'), Money::Currency.wrap('EUR')).should == false
+    end
+
+    it 'should raise an UnknownCurrency exception when an unknown currency is passed' do
+      lambda{@bank.send(:same_currency?, 'AAA', 'BBB')}.should raise_exception(Money::Currency::UnknownCurrency)
+    end
+  end
+
+end

data/spec/bank/variable_exchange_spec.rb

@@ -0,0 +1,230 @@
+require "spec_helper"
+
+describe Money::Bank::VariableExchange do
+
+  describe '#new without block' do
+    before :each do
+      @bank = Money::Bank::VariableExchange.new
+    end
+
+    describe '#exchange' do
+      before :each do
+        @bank.send(:set_rate, 'USD', 'EUR', 1.33)
+      end
+
+      it 'should accept str/str' do
+        lambda{@bank.exchange(100, 'USD', 'EUR')}.should_not raise_exception
+      end
+
+      it 'should accept currency/str' do
+        lambda{@bank.exchange(100, Money::Currency.wrap('USD'), 'EUR')}.should_not raise_exception
+      end
+
+      it 'should accept str/currency' do
+        lambda{@bank.exchange(100, 'USD', Money::Currency.wrap('EUR'))}.should_not raise_exception
+      end
+
+      it 'should accept currency/currency' do
+        lambda{@bank.exchange(100, Money::Currency.wrap('USD'), Money::Currency.wrap('EUR'))}.should_not raise_exception
+      end
+
+      it 'should exchange one currency to another' do
+        @bank.exchange(100, 'USD', 'EUR').should == 133
+      end
+
+      it 'should truncate extra digits' do
+        @bank.exchange(10, 'USD', 'EUR').should == 13
+      end
+
+      it 'should raise an UnknownCurrency exception when an unknown currency is requested' do
+        lambda{@bank.exchange(100, 'AAA', 'BBB')}.should raise_exception(Money::Currency::UnknownCurrency)
+      end
+
+      it 'should raise an UnknownRate exception when an unknown rate is requested' do
+        lambda{@bank.exchange(100, 'USD', 'JPY')}.should raise_exception(Money::Bank::UnknownRate)
+      end
+
+      it 'should round the exchanged result down' do
+        @bank.add_rate("USD", "EUR", 0.788332676)
+        @bank.add_rate("EUR", "YEN", 122.631477)
+        @bank.exchange(10_00, "USD", "EUR").should == 788
+        @bank.exchange(500_00, "EUR", "YEN").should == 6131573
+      end
+
+      it 'should accept a custom truncation method' do
+        proc = Proc.new { |n| n.ceil }
+        @bank.exchange(10, 'USD', 'EUR', &proc).should == 14
+      end
+
+
+      context 'sterling to euros using a rate of 1.39' do
+        it 'returns the correct amount' do
+          @bank.add_rate('GBP', 'EUR', 1.38)
+          @bank.exchange(10000, 'GBP', 'EUR').should == 13800
+        end
+      end
+
+      context 'dollars to euros using a rate of 0.86' do
+        it 'returns the correct amount' do
+          @bank.add_rate('USD', 'EUR', 0.86)
+          @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
+
+    describe '#exchange_with' do
+      before :each do
+        @bank.send(:set_rate, 'USD', 'EUR', 1.33)
+      end
+
+      it 'should accept str' do
+        lambda{@bank.exchange_with(Money.new(100, 'USD'), 'EUR')}.should_not raise_exception
+      end
+
+      it 'should accept currency' do
+        lambda{@bank.exchange_with(Money.new(100, 'USD'), Money::Currency.wrap('EUR'))}.should_not raise_exception
+      end
+
+      it 'should exchange one currency to another' do
+        @bank.exchange_with(Money.new(100, 'USD'), 'EUR').should == Money.new(133, 'EUR')
+      end
+
+      it 'should truncate extra digits' do
+        @bank.exchange_with(Money.new(10, 'USD'), 'EUR').should == Money.new(13, 'EUR')
+      end
+
+      it 'should raise an UnknownCurrency exception when an unknown currency is requested' do
+        lambda{@bank.exchange_with(Money.new(100, 'USD'), 'BBB')}.should raise_exception(Money::Currency::UnknownCurrency)
+      end
+
+      it 'should raise an UnknownRate exception when an unknown rate is requested' do
+        lambda{@bank.exchange_with(Money.new(100, 'USD'), 'JPY')}.should raise_exception(Money::Bank::UnknownRate)
+      end
+
+      #it 'should round the exchanged result down' do
+      #  @bank.add_rate("USD", "EUR", 0.788332676)
+      #  @bank.add_rate("EUR", "YEN", 122.631477)
+      #  @bank.exchange_with(Money.new(10_00,  "USD"), "EUR").should == Money.new(788, "EUR")
+      #  @bank.exchange_with(Money.new(500_00, "EUR"), "YEN").should == Money.new(6131573, "YEN")
+      #end
+
+      it 'should accept a custom truncation method' do
+        proc = Proc.new { |n| n.ceil }
+        @bank.exchange_with(Money.new(10, 'USD'), 'EUR', &proc).should == Money.new(14, 'EUR')
+      end
+    end
+
+    describe "#add_rate" do
+      it "should add rates correctly" do
+        @bank.add_rate("USD", "EUR", 0.788332676)
+        @bank.add_rate("EUR", "YEN", 122.631477)
+
+        @bank.instance_variable_get(:@rates)['USD_TO_EUR'].should == 0.788332676
+        @bank.instance_variable_get(:@rates)['EUR_TO_JPY'].should == 122.631477
+      end
+
+      it "should treat currency names case-insensitively" do
+        @bank.add_rate("usd", "eur", 1)
+        @bank.instance_variable_get(:@rates)['USD_TO_EUR'].should == 1
+      end
+    end
+
+    describe '#set_rate' do
+      it 'should set a rate' do
+        @bank.set_rate('USD', 'EUR', 1.25)
+        @bank.instance_variable_get(:@rates)['USD_TO_EUR'].should == 1.25
+      end
+
+      it 'should raise an UnknownCurrency exception when an unknown currency is passed' do
+        lambda{ @bank.set_rate('AAA', 'BBB', 1.25) }.should raise_exception(Money::Currency::UnknownCurrency)
+      end
+    end
+
+    describe '#get_rate' do
+      it 'should return a rate' do
+        @bank.set_rate('USD', 'EUR', 1.25)
+        @bank.get_rate('USD', 'EUR').should == 1.25
+      end
+
+      it 'should raise an UnknownCurrency exception when an unknown currency is requested' do
+        lambda{ @bank.get_rate('AAA', 'BBB') }.should raise_exception(Money::Currency::UnknownCurrency)
+      end
+    end
+
+    describe '#rate_key_for' do
+      it 'should accept str/str' do
+        lambda{@bank.send(:rate_key_for, 'USD', 'EUR')}.should_not raise_exception
+      end
+
+      it 'should accept currency/str' do
+        lambda{@bank.send(:rate_key_for, Money::Currency.wrap('USD'), 'EUR')}.should_not raise_exception
+      end
+
+      it 'should accept str/currency' do
+        lambda{@bank.send(:rate_key_for, 'USD', Money::Currency.wrap('EUR'))}.should_not raise_exception
+      end
+
+      it 'should accept currency/currency' do
+        lambda{@bank.send(:rate_key_for, Money::Currency.wrap('USD'), Money::Currency.wrap('EUR'))}.should_not raise_exception
+      end
+
+      it 'should return a hashkey based on the passed arguments' do
+        @bank.send(:rate_key_for, 'USD', 'EUR').should == 'USD_TO_EUR'
+        @bank.send(:rate_key_for, Money::Currency.wrap('USD'), 'EUR').should == 'USD_TO_EUR'
+        @bank.send(:rate_key_for, 'USD', Money::Currency.wrap('EUR')).should == 'USD_TO_EUR'
+        @bank.send(:rate_key_for, Money::Currency.wrap('USD'), Money::Currency.wrap('EUR')).should == 'USD_TO_EUR'
+      end
+
+      it 'should raise an UnknownCurrency exception when an unknown currency is passed' do
+        lambda{@bank.send(:rate_key_for, 'AAA', 'BBB')}.should raise_exception(Money::Currency::UnknownCurrency)
+      end
+    end
+
+  end
+
+
+  describe '#new with &block' do
+    before :each do
+      proc = Proc.new { |n| n.ceil }
+      @bank = Money::Bank::VariableExchange.new(&proc)
+      @bank.add_rate('USD', 'EUR', 1.33)
+    end
+
+    describe '#exchange' do
+      it 'should use a stored truncation method' do
+        @bank.exchange(10, 'USD', 'EUR').should == 14
+      end
+
+      it 'should use a custom truncation method over a stored one' do
+        proc = Proc.new { |n| n.ceil + 1 }
+        @bank.exchange(10, 'USD', 'EUR', &proc).should == 15
+      end
+    end
+
+    describe '#exchange_with' do
+      it 'should use a stored truncation method' do
+        @bank.exchange_with(Money.new(10, 'USD'), 'EUR').should == Money.new(14, 'EUR')
+      end
+
+      it 'should use a custom truncation method over a stored one' do
+        proc = Proc.new { |n| n.ceil + 1 }
+        @bank.exchange_with(Money.new(10, 'USD'), 'EUR', &proc).should == Money.new(15, 'EUR')
+      end
+    end
+  end
+
+end

data/{test → spec}/core_extensions_spec.rb

@@ -1,6 +1,4 @@
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
-
-require 'money/core_extensions'
+require "spec_helper"
 
 describe "Money core extensions" do
   specify "Numberic#to_money works" do
@@ -17,6 +15,11 @@ describe "Money core extensions" do
     money.cents.should == 1234_00
     money.currency.should == Money.default_currency
   end
+
+  specify "#issue/15" do
+    amount = 555.55.to_money
+    amount.should == Money.new(55555)
+  end
   
   specify "Numeric#to_money accepts optional currency" do
     1234.to_money('USD').should == Money.new(123400, 'USD')

data/{test → spec}/currency_spec.rb

@@ -1,10 +1,6 @@
 # encoding: utf-8
 
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
-
-require 'money/money'
-require 'money/currency'
-require 'money/defaults'
+require "spec_helper"
 
 describe Money::Currency do
 
@@ -36,6 +32,21 @@ describe Money::Currency do
     Money::Currency.new(:eur).should     == Money::Currency.new(:eur)
     Money::Currency.new(:eur).should_not == Money::Currency.new(:usd)
   end
+  
+  specify "#eql? should return true if #== returns true" do
+    Money::Currency.new(:eur).eql?(Money::Currency.new(:eur)).should be true
+    Money::Currency.new(:eur).eql?(Money::Currency.new(:usd)).should be false
+  end
+  
+  specify "#hash should return the same value for equal objects" do
+    Money::Currency.new(:eur).hash.should == Money::Currency.new(:eur).hash
+    Money::Currency.new(:eur).hash.should_not == Money::Currency.new(:usd).hash
+  end
+  
+  specify "#hash can be used to return the intersection of Currency object arrays" do
+    intersection = [Money::Currency.new(:eur), Money::Currency.new(:usd)] & [Money::Currency.new(:eur)]
+    intersection.should == [Money::Currency.new(:eur)]
+  end
 
   specify "#<=> should compare objects by priority" do
     Money::Currency.new(:cad).should > Money::Currency.new(:usd)

data/spec/deprecations_spec.rb

@@ -0,0 +1,16 @@
+require "spec_helper"
+
+describe "Money deprecations" do
+
+  describe Money::VariableExchangeBank do
+    it "should be deprecated" do
+      Money.should_receive(:deprecate)
+      Money::VariableExchangeBank.new.should_not be_nil
+    end
+
+    it "should extend Money::Bank::VariableExchange" do
+      Money::VariableExchangeBank.new.should be_kind_of Money::Bank::VariableExchange
+    end
+  end
+
+end

data/{test → spec}/money_spec.rb

@@ -1,11 +1,10 @@
 # encoding: utf-8
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
-require 'money/money'
-require 'money/defaults'
+
+require "spec_helper"
 
 describe Money do
-  it "is associated to the singleton instance of VariableExchangeBank by default" do
-    Money.new(0).bank.object_id.should == Money::VariableExchangeBank.instance.object_id
+  it "is associated to the singleton instance of Bank::VariableExchange by default" do
+    Money.new(0).bank.should be_equal Money::Bank::VariableExchange.instance
   end
 
   specify "#cents returns the amount of cents passed to the constructor" do
@@ -64,13 +63,13 @@ describe Money do
 
   specify "#exchange_to exchanges the amount via its exchange bank" do
     money = Money.new(100_00, "USD")
-    money.bank.should_receive(:exchange).with(100_00, Money::Currency.new("USD"), Money::Currency.new("EUR")).and_return(200_00)
+    money.bank.should_receive(:exchange_with).with(Money.new(100_00, Money::Currency.new("USD")), Money::Currency.new("EUR")).and_return(Money.new(200_00, Money::Currency.new('EUR')))
     money.exchange_to("EUR")
   end
 
   specify "#exchange_to exchanges the amount properly" do
     money = Money.new(100_00, "USD")
-    money.bank.should_receive(:exchange).with(100_00, Money::Currency.new("USD"), Money::Currency.new("EUR")).and_return(200_00)
+    money.bank.should_receive(:exchange_with).with(Money.new(100_00, Money::Currency.new("USD")), Money::Currency.new("EUR")).and_return(Money.new(200_00, Money::Currency.new('EUR')))
     money.exchange_to("EUR").should == Money.new(200_00, "EUR")
   end
 
@@ -163,6 +162,19 @@ describe Money do
     Money.new(1_00, "USD").eql?(/foo/).should be false
     Money.new(1_00, "USD").eql?(nil).should be false
   end
+  
+  specify "#hash should return the same value for equal objects" do
+    Money.new(1_00, :eur).hash.should == Money.new(1_00, :eur).hash
+    Money.new(2_00, :usd).hash.should == Money.new(2_00, :usd).hash
+    Money.new(1_00, :eur).hash.should_not == Money.new(2_00, :eur).hash
+    Money.new(1_00, :eur).hash.should_not == Money.new(1_00, :usd).hash
+    Money.new(1_00, :eur).hash.should_not == Money.new(2_00, :usd).hash
+  end
+  
+  specify "#hash can be used to return the intersection of Money object arrays" do
+    intersection = [Money.new(1_00, :eur), Money.new(1_00, :usd)] & [Money.new(1_00, :eur)]
+    intersection.should == [Money.new(1_00, :eur)]
+  end
 
   specify "#<=> can be used to compare with a String money value" do
     (Money.new(1_00) <=> "1.00").should == 0

data/spec/spec_helper.rb

@@ -0,0 +1,8 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+
+require "spec"
+require "money"
+
+Spec::Runner.configure do |config|
+end

metadata

@@ -1,24 +1,26 @@
 --- !ruby/object:Gem::Specification 
 name: money
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
+  hash: 33582789
+  prerelease: true
   segments: 
   - 3
+  - 1
   - 0
-  - 5
-  version: 3.0.5
+  - pre1
+  version: 3.1.0.pre1
 platform: ruby
 authors: 
 - Tobias Luetke
 - Hongli Lai
 - Jeremy McNevin
 - Shane Emmons
+- Simone Carletti
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-07-16 00:00:00 -04:00
+date: 2010-08-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,17 +74,21 @@ files:
 - Rakefile
 - VERSION
 - lib/money.rb
+- lib/money/bank/base.rb
+- lib/money/bank/variable_exchange.rb
 - lib/money/core_extensions.rb
 - lib/money/currency.rb
 - lib/money/defaults.rb
-- lib/money/errors.rb
+- lib/money/deprecations.rb
 - lib/money/money.rb
-- lib/money/variable_exchange_bank.rb
 - money.gemspec
-- test/core_extensions_spec.rb
-- test/currency_spec.rb
-- test/exchange_bank_spec.rb
-- test/money_spec.rb
+- spec/bank/base_spec.rb
+- spec/bank/variable_exchange_spec.rb
+- spec/core_extensions_spec.rb
+- spec/currency_spec.rb
+- spec/deprecations_spec.rb
+- spec/money_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://money.rubyforge.org/
 licenses: []
@@ -104,12 +110,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: money
@@ -118,7 +126,10 @@ signing_key:
 specification_version: 3
 summary: Money and currency exchange support library
 test_files: 
-- test/core_extensions_spec.rb
-- test/currency_spec.rb
-- test/exchange_bank_spec.rb
-- test/money_spec.rb
+- spec/bank/base_spec.rb
+- spec/bank/variable_exchange_spec.rb
+- spec/core_extensions_spec.rb
+- spec/currency_spec.rb
+- spec/deprecations_spec.rb
+- spec/money_spec.rb
+- spec/spec_helper.rb

data/lib/money/errors.rb

@@ -1,4 +0,0 @@
-class Money
-  class UnknownRate < StandardError
-  end
-end

data/lib/money/variable_exchange_bank.rb

@@ -1,82 +0,0 @@
-require 'thread'
-require 'money/errors'
-
-# Class for aiding in exchanging money between different currencies.
-# By default, the Money class uses an object of this class (accessible through
-# Money#bank) for performing currency exchanges.
-#
-# By default, VariableExchangeBank has no knowledge about conversion rates.
-# One must manually specify them with +add_rate+, after which one can perform
-# exchanges with +exchange+. For example:
-#
-#   bank = Money::VariableExchangeBank.new
-#   bank.add_rate("USD", "CAD", 1.24515)
-#   bank.add_rate("CAD", "USD", 0.803115)
-#
-#   # Exchange 100 CAD to USD:
-#   bank.exchange(100_00, "CAD", "USD")  # => 124
-#   # Exchange 100 USD to CAD:
-#   bank.exchange(100_00, "USD", "CAD")  # => 80
-#
-class Money
-  class VariableExchangeBank
-    # Returns the singleton instance of VariableExchangeBank.
-    #
-    # By default, <tt>Money.default_bank</tt> returns the same object.
-    def self.instance
-      @@singleton
-    end
-
-    def initialize(&block)
-      @rates = {}
-      @mutex = Mutex.new
-      @rounding_method = block
-    end
-
-    # Registers a conversion rate. +from+ and +to+ are both currency names.
-    def add_rate(from, to, rate)
-      @mutex.synchronize do
-        @rates["#{from}_TO_#{to}".upcase] = rate
-      end
-    end
-
-    # Gets the rate for exchanging the currency named +from+ to the currency
-    # named +to+. Returns nil if the rate is unknown.
-    def get_rate(from, to)
-      @mutex.synchronize do
-        @rates["#{from}_TO_#{to}".upcase]
-      end
-    end
-
-    # Given two currency names, checks whether they're both the same currency.
-    #
-    #   bank = VariableExchangeBank.new
-    #   bank.same_currency?("usd", "USD")   # => true
-    #   bank.same_currency?("usd", "EUR")   # => false
-    def same_currency?(currency1, currency2)
-      Currency.wrap(currency1) == Currency.wrap(currency2)
-    end
-
-    # Exchange the given amount of cents in +from_currency+ to +to_currency+.
-    # 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, &block)
-      rate = get_rate(from_currency, to_currency)
-      if !rate
-        raise Money::UnknownRate, "No conversion rate known for '#{from_currency}' -> '#{to_currency}'"
-      end
-      _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
-  end
-end

data/test/exchange_bank_spec.rb

@@ -1,101 +0,0 @@
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
-require 'money/variable_exchange_bank'
-
-describe Money::VariableExchangeBank do
-  before :each do
-    @bank = Money::VariableExchangeBank.new
-  end
-
-  it "returns the previously specified conversion rate" do
-    @bank.add_rate("USD", "EUR", 0.788332676)
-    @bank.add_rate("EUR", "YEN", 122.631477)
-    @bank.get_rate("USD", "EUR").should == 0.788332676
-    @bank.get_rate("EUR", "YEN").should == 122.631477
-  end
-
-  it "treats currency names case-insensitively" do
-    @bank.add_rate("usd", "eur", 1)
-    @bank.get_rate("USD", "EUR").should == 1
-    @bank.same_currency?("USD", "usd").should be_true
-    @bank.same_currency?("EUR", "usd").should be_false
-  end
-  
-  it "returns nil if the conversion rate is unknown" do
-    @bank.get_rate("American Pesos", "EUR").should be_nil
-  end
-
-  it "exchanges money from one currency to another according to the specified conversion rates" do
-    @bank.add_rate("USD", "EUR", 0.5)
-    @bank.add_rate("EUR", "YEN", 10)
-    @bank.exchange(10_00, "USD", "EUR").should == 5_00
-    @bank.exchange(500_00, "EUR", "YEN").should == 5000_00
-  end
-
-  it "rounds the exchanged result down" do
-    @bank.add_rate("USD", "EUR", 0.788332676)
-    @bank.add_rate("EUR", "YEN", 122.631477)
-    @bank.exchange(10_00, "USD", "EUR").should == 788
-    @bank.exchange(500_00, "EUR", "YEN").should == 6131573
-  end
-
-  it "raises Money::UnknownRate upon conversion if the conversion rate is unknown" do
-    block = lambda { @bank.exchange(10, "USD", "EUR") }
-    block.should raise_error(Money::UnknownRate)
-  end
-  
-  describe '.exchange' do
-    context 'sterling to euros using a rate of 1.39' do
-      it 'returns the correct amount' do
-        @bank.add_rate('GBP', 'EUR', 1.38)
-        @bank.exchange(10000, 'GBP', 'EUR').should == 13800
-      end
-    end
-    
-    context 'dollars to euros using a rate of 0.86' do
-      it 'returns the correct amount' do
-        @bank.add_rate('USD', 'EUR', 0.86)
-        @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