money 6.0.1.beta2 → 6.0.1.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dbef5f1733e04f6823d0e504dbbe73112545214
-  data.tar.gz: 62e28891ffa15550bf323af2671a20cfa663279f
+  metadata.gz: cf2817efb2d831c4dc20a21ad35e2668ef18f877
+  data.tar.gz: ab6fb4c372bae304d46f672517844816e2d9788e
 SHA512:
-  metadata.gz: f1b30704d8098a4b7a5301775d4de24b9d8a2c0a02da1e175130319b7d177adca746203277ac7c7ee78e012ad6dd8df535333ae280fc7b235b469abe0330371f
-  data.tar.gz: 3de4d2fe5d9b244d7358f168b9f3fe6c5b6fb9f48b87a2be65436f95b7789bb12268dc83bb8dba0295656c28dd13cef522ef3f45c69f2f274e098f0afb1a41c4
+  metadata.gz: f6a4ce82b5f4d9624d9b1568a39357b0d35d190f2c6b94f30bce534f2b2daffa103e40c9da450788c36c2d994e33eeb1554eb1931655c29fa0cd474ceb971402
+  data.tar.gz: f08fda3dc489e7031a6937c28a32678bdef279b8e0e8725c832019576f380da9ee4b217aa6a5d7055985dcdff49cec1d6e48117a0e49843ad5792683290356aa

data/lib/money/bank/variable_exchange.rb

@@ -30,7 +30,7 @@ class Money
     #   bank.exchange_with(c2, "USD") #=> #<Money @fractional=803115>
     class VariableExchange < Base
 
-      attr_reader :rates
+      attr_reader :rates, :mutex
 
       # Available formats for importing/exporting rates.
       RATE_FORMATS = [:json, :ruby, :yaml]
@@ -84,27 +84,38 @@ class Money
       #
       #   # Exchange 100 CAD to USD:
       #   bank.exchange_with(c2, "USD") #=> #<Money @fractional=803115>
-      def exchange_with(from, to_currency)
-        return from if same_currency?(from.currency, to_currency)
+      def exchange_with(from, to_currency, &block)
+        to_currency = Currency.wrap(to_currency)
+        if from.currency == to_currency
+          from
+        else
+          if rate = get_rate(from.currency, to_currency)
+            fractional = calculate_fractional(from, to_currency)
+            Money.new(
+              exchange(fractional, rate, &block), to_currency
+            )
+          else
+            raise UnknownRate, "No conversion rate known for '#{from.currency.iso_code}' -> '#{to_currency}'"
+          end
+        end
+      end
+
+      def calculate_fractional(from, to_currency)
+        BigDecimal.new(from.fractional.to_s) / (
+          BigDecimal.new(from.currency.subunit_to_unit.to_s) /
+          BigDecimal.new(to_currency.subunit_to_unit.to_s)
+        )
+      end
 
-        rate = get_rate(from.currency, to_currency)
-        unless rate
-          raise UnknownRate, "No conversion rate known for '#{from.currency.iso_code}' -> '#{to_currency}'"
+      def exchange(fractional, rate, &block)
+        ex = (fractional * BigDecimal.new(rate.to_s)).to_f
+        if block_given?
+          yield ex
+        elsif @rounding_method
+          @rounding_method.call(ex)
+        else
+          ex.to_s.to_i
         end
-        _to_currency_  = Currency.wrap(to_currency)
-
-        fractional = BigDecimal.new(from.fractional.to_s) / (BigDecimal.new(from.currency.subunit_to_unit.to_s) / BigDecimal.new(_to_currency_.subunit_to_unit.to_s))
-
-        ex = fractional * BigDecimal.new(rate.to_s)
-        ex = ex.to_f
-        ex = if block_given?
-               yield 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 and returns it (uses +#set_rate+).
@@ -129,6 +140,8 @@ class Money
       # @param [Currency, String, Symbol] from Currency to exchange from.
       # @param [Currency, String, Symbol] to Currency to exchange to.
       # @param [Numeric] rate Rate to use when exchanging currencies.
+      # @param [Hash] opts Options hash to set special parameters
+      # @option opts [Boolean] :without_mutex disables the usage of a mutex
       #
       # @return [Numeric]
       #
@@ -136,8 +149,13 @@ class Money
       #   bank = Money::Bank::VariableExchange.new
       #   bank.set_rate("USD", "CAD", 1.24515)
       #   bank.set_rate("CAD", "USD", 0.803115)
-      def set_rate(from, to, rate)
-        @mutex.synchronize { @rates[rate_key_for(from, to)] = rate }
+      def set_rate(from, to, rate, opts = {})
+        fn = -> { @rates[rate_key_for(from, to)] = rate }
+        if opts[:without_mutex]
+          fn.call
+        else
+          @mutex.synchronize { fn.call }
+        end
       end
 
       # Retrieve the rate for the given currencies. Uses +Mutex+ to synchronize
@@ -145,6 +163,8 @@ class Money
       #
       # @param [Currency, String, Symbol] from Currency to exchange from.
       # @param [Currency, String, Symbol] to Currency to exchange to.
+      # @param [Hash] opts Options hash to set special parameters
+      # @option opts [Boolean] :without_mutex disables the usage of a mutex
       #
       # @return [Numeric]
       #
@@ -155,8 +175,13 @@ class Money
       #
       #   bank.get_rate("USD", "CAD") #=> 1.24515
       #   bank.get_rate("CAD", "USD") #=> 0.803115
-      def get_rate(from, to)
-        @mutex.synchronize { @rates[rate_key_for(from, to)] }
+      def get_rate(from, to, opts = {})
+        fn = -> { @rates[rate_key_for(from, to)] }
+        if opts[:without_mutex]
+          fn.call
+        else
+          @mutex.synchronize { fn.call }
+        end
       end
 
       # Return the known rates as a string in the format specified. If +file+
@@ -165,6 +190,8 @@ class Money
       #
       # @param [Symbol] format Request format for the resulting string.
       # @param [String] file Optional file location to write the rates to.
+      # @param [Hash] opts Options hash to set special parameters
+      # @option opts [Boolean] :without_mutex disables the usage of a mutex
       #
       # @return [String]
       #
@@ -177,12 +204,12 @@ class Money
       #
       #   s = bank.export_rates(:json)
       #   s #=> "{\"USD_TO_CAD\":1.24515,\"CAD_TO_USD\":0.803115}"
-      def export_rates(format, file=nil)
+      def export_rates(format, file = nil, opts = {})
         raise Money::Bank::UnknownRateFormat unless
           RATE_FORMATS.include? format
 
         s = ""
-        @mutex.synchronize {
+        fn = -> {
           s = case format
               when :json
                 JSON.dump(@rates)
@@ -196,6 +223,11 @@ class Money
             File.open(file, "w") {|f| f.write(s) }
           end
         }
+        if opts[:without_mutex]
+          fn.call
+        else
+          @mutex.synchronize { fn.call }
+        end
         s
       end
 
@@ -204,6 +236,8 @@ class Money
       #
       # @param [Symbol] format The format of +s+.
       # @param [String] s The rates string.
+      # @param [Hash] opts Options hash to set special parameters
+      # @option opts [Boolean] :without_mutex disables the usage of a mutex
       #
       # @return [self]
       #
@@ -216,11 +250,11 @@ class Money
       #
       #   bank.get_rate("USD", "CAD") #=> 1.24515
       #   bank.get_rate("CAD", "USD") #=> 0.803115
-      def import_rates(format, s)
+      def import_rates(format, s, opts = {})
         raise Money::Bank::UnknownRateFormat unless
           RATE_FORMATS.include? format
 
-        @mutex.synchronize {
+        fn = -> {
           @rates = case format
                    when :json
                      JSON.load(s)
@@ -230,6 +264,11 @@ class Money
                      YAML.load(s)
                    end
         }
+        if opts[:without_mutex]
+          fn.call
+        else
+          @mutex.synchronize { fn.call }
+        end
         self
       end
 

data/lib/money/currency.rb

@@ -1,20 +1,19 @@
 # encoding: utf-8
 
-require 'json'
+require "json"
+require "money/currency/loader"
+require "money/currency/heuristics"
 
 class Money
 
   # Represents a specific currency unit.
   #
   # @see http://en.wikipedia.org/wiki/Currency
+  # @see http://iso4217.net/
   class Currency
     include Comparable
-
-    require "money/currency/loader"
-    extend  Loader
-
-    require "money/currency/heuristics"
-    extend  Heuristics
+    extend Money::Currency::Loader
+    extend Money::Currency::Heuristics
 
     # Thrown when an unknown currency is requested.
     class UnknownCurrency < StandardError; end
@@ -34,7 +33,9 @@ class Money
       #   Money::Currency.find(:foo) #=> nil
       def find(id)
         id = id.to_s.downcase.to_sym
-        new(id) if self.table[id]
+        new(id)
+      rescue UnknownCurrency
+        nil
       end
 
       # Lookup a currency with given +num+ as an ISO 4217 numeric and returns an
@@ -51,7 +52,9 @@ class Money
       def find_by_iso_numeric(num)
         num = num.to_s
         id, _ = self.table.find{|key, currency| currency[:iso_numeric] == num}
-        new(id) if self.table[id]
+        new(id)
+      rescue UnknownCurrency
+        nil
       end
 
       # Wraps the object in a +Currency+ unless it's already a +Currency+
@@ -68,9 +71,7 @@ class Money
       #   Money::Currency.wrap(c1)    #=> #<Money::Currency id: usd ...>
       #   Money::Currency.wrap("usd") #=> #<Money::Currency id: usd ...>
       def wrap(object)
-        if object.nil?
-          nil
-        elsif object.is_a?(Currency)
+        if object.nil? || object.is_a?(Currency)
           object
         else
           Currency.new(object)
@@ -128,71 +129,33 @@ class Money
       end
     end
 
-    # The symbol used to identify the currency, usually the lowercase
-    # +iso_code+ attribute.
-    #
-    # @return [Symbol]
-    attr_reader :id
-
-    # A numerical value you can use to sort/group the currency list.
-    #
-    # @return [Integer]
-    attr_reader :priority
-
-    # The international 3-letter code as defined by the ISO 4217 standard.
-    #
-    # @return [String]
-    # @see http://iso4217.net/
-    attr_reader :iso_code
-
-    #
-    # The international 3-numeric code as defined by the ISO 4217 standard.
-    #
-    # @return [String]
-    # @see http://iso4217.net/
-    attr_reader :iso_numeric
-
-    # The currency name.
-    #
-    # @return [String]
-    attr_reader :name
-
-    # The currency symbol (UTF-8 encoded).
-    #
-    # @return [String]
-    attr_reader :symbol
-
-    # The html entity for the currency symbol
-    #
-    # @return [String]
-    attr_reader :html_entity
-
-    # The name of the fractional monetary unit.
-    #
-    # @return [String]
-    attr_reader :subunit
-
-    # The proportion between the unit and the subunit
-    #
-    # @return [Integer]
-    attr_reader :subunit_to_unit
-
-    # The decimal mark, or character used to separate the whole unit from the subunit.
-    #
-    # @return [String]
-    attr_reader :decimal_mark
-    alias :separator :decimal_mark
-
-    # The character used to separate thousands grouping of the whole unit.
-    #
-    # @return [String]
-    attr_reader :thousands_separator
-    alias :delimiter :thousands_separator
-
-    # Should the currency symbol precede the amount, or should it come after?
-    #
-    # @return [Boolean]
-    attr_reader :symbol_first
+    # @attr_reader [Symbol] id The symbol used to identify the currency,
+    # usually the lowercase +iso_code+ attribute.
+    # @attr_reader [Integer] priority A numerical value you can use to
+    # sort/group the currency list.
+    # @attr_reader [String] iso_code The international 3-letter code as defined
+    # by the ISO 4217 standard.
+    # @attr_reader [String] iso_numeric The international 3-numeric code as
+    # defined by the ISO 4217 standard.
+    # @attr_reader [String] name The currency name.
+    # @attr_reader [String] symbol The currency symbol (UTF-8 encoded).
+    # @attr_reader [String] html_entity The html entity for the currency symbol
+    # @attr_reader [String] subunit The name of the fractional monetary unit.
+    # @attr_reader [Integer] subunit_to_unit The proportion between the unit
+    # and the subunit
+    # @attr_reader [String] decimal_mark The decimal mark, or character used to
+    # separate the whole unit from the subunit.
+    # @attr_reader [String] The character used to separate thousands grouping
+    # of the whole unit.
+    # @attr_reader [Boolean] symbol_first Should the currency symbol precede
+    # the amount, or should it come after?
+
+    attr_reader :id, :priority, :iso_code, :iso_numeric, :name, :symbol,
+      :html_entity, :subunit, :subunit_to_unit, :decimal_mark,
+      :thousands_separator, :symbol_first
+
+    alias_method :separator, :decimal_mark
+    alias_method :delimiter, :thousands_separator
 
     # Create a new +Currency+ object.
     #
@@ -205,12 +168,15 @@ class Money
     #   Money::Currency.new(:usd) #=> #<Money::Currency id: usd ...>
     def initialize(id)
       id = id.to_s.downcase
-      raise(UnknownCurrency, "Unknown currency `#{id}'") unless self.class.stringified_keys.include?(id)
 
-      @id  = id.to_sym
-      data = self.class.table[@id]
-      data.each_pair do |key, value|
-        instance_variable_set(:"@#{key}", value)
+      if self.class.stringified_keys.include?(id)
+        @id = id.to_sym
+        data = self.class.table[@id]
+        data.each_pair do |key, value|
+          instance_variable_set(:"@#{key}", value)
+        end
+      else
+        raise UnknownCurrency, "Unknown currency '#{id}'"
       end
     end
 
@@ -244,9 +210,18 @@ class Money
     #   c1 == c1 #=> true
     #   c1 == c2 #=> false
     def ==(other_currency)
-      self.equal?(other_currency) ||
-      self.id.to_s.downcase == (other_currency.is_a?(Currency) ? other_currency.id.to_s.downcase : other_currency.to_s.downcase)
+      self.equal?(other_currency) || compare_ids(other_currency)
+    end
+
+    def compare_ids(other_currency)
+      other_currency_id = if other_currency.is_a?(Currency)
+                            other_currency.id.to_s.downcase
+                          else
+                            other_currency.to_s.downcase
+                          end
+      self.id.to_s.downcase == other_currency_id
     end
+    private :compare_ids
 
     # Compares +self+ with +other_currency+ and returns +true+ if the are the
     # same or if their +id+ attributes match.
@@ -288,7 +263,7 @@ class Money
     # Returns a string representation corresponding to the upcase +id+
     # attribute.
     #
-    # -–
+    # --
     # DEV: id.to_s.upcase corresponds to iso_code but don't use ISO_CODE for consistency.
     #
     # @return [String]
@@ -311,7 +286,7 @@ class Money
     def to_str
       id.to_s.upcase
     end
-    
+
     # Returns a symbol representation corresponding to the upcase +id+
     # attribute.
     #
@@ -321,12 +296,7 @@ class Money
     #   Money::Currency.new(:usd).to_sym #=> :USD
     #   Money::Currency.new(:eur).to_sym #=> :EUR
     def to_sym
-      if id.respond_to?(:upcase)
-        id.upcase
-      else
-        # Ruby <= 1.8.7 doesn't support Symbol#upcase
-        id.to_s.upcase.to_sym
-      end
+      id.to_s.upcase.to_sym
     end
 
     # Conversation to +self+.
@@ -336,7 +306,6 @@ class Money
       self
     end
 
-
     # Returns currency symbol or iso code for currencies with no symbol.
     #
     # @return [String]
@@ -357,31 +326,24 @@ class Money
 
     # Cache decimal places for subunit_to_unit values.  Common ones pre-cached.
     def self.decimal_places_cache
-      @decimal_places_cache ||= {
-        1 => 0,
-        10 => 1,
-        100 => 2,
-        1000 => 3
-      }
+      @decimal_places_cache ||= {1 => 0, 10 => 1, 100 => 2, 1000 => 3}
     end
 
     # The number of decimal places needed.
     #
     # @return [Integer]
     def decimal_places
-      cache = self.class.decimal_places_cache
-      places  = cache[subunit_to_unit]
-      unless places
-        places = calculate_decimal_places(subunit_to_unit)
-        cache[subunit_to_unit] = places
-      end
-      places
+      cache[subunit_to_unit] ||= calculate_decimal_places(subunit_to_unit)
     end
 
+    def cache
+      self.class.decimal_places_cache
+    end
+    private :cache
+
     # If we need to figure out how many decimal places we need we
     # use repeated integer division.
     def calculate_decimal_places(num)
-      return 0 if num == 1
       i = 1
       while num >= 10
         num /= 10
@@ -390,6 +352,5 @@ class Money
       i
     end
     private :calculate_decimal_places
-
   end
 end