money 6.0.1.beta2 → 6.0.1.beta3

data/lib/money/money/arithmetic.rb

@@ -45,19 +45,21 @@ class Money
       self == other_money
     end
 
-    def <=>(other_money)
-      if other_money.respond_to?(:to_money)
-        unless other_money.is_a?(Money)
-          Money.deprecate "as of Money 6.1.0 you must `require 'monetize/core_extensions'` to compare Money to core classes." unless Money.silence_core_extensions_deprecations
-        end
-        other_money = other_money.to_money
-        if fractional == 0 || other_money.fractional == 0 || currency == other_money.currency
-          fractional <=> other_money.fractional
-        else
-          fractional <=> other_money.exchange_to(currency).fractional
-        end
-      else
-        raise ArgumentError, "Comparison of #{self.class} with #{other_money.inspect} failed"
+    def <=>(val)
+      check_compare_deprecate(val)
+
+      val = val.to_money
+      unless fractional == 0 || val.fractional == 0 || currency == val.currency
+        val = val.exchange_to(currency)
+      end
+      fractional <=> val.fractional
+    rescue NoMethodError
+      raise ArgumentError, "Comparison of #{self.class} with #{val.inspect} failed"
+    end
+
+    def check_compare_deprecate(val)
+      unless val.is_a?(Money) || Money.silence_core_extensions_deprecations
+        Money.deprecate "as of Money 6.1.0 you must `require 'monetize/core_extensions'` to compare Money to core classes."
       end
     end
 
@@ -188,20 +190,29 @@ class Money
     #   Money.new(100).divmod(Money.new(9)) #=> [11, #<Money @fractional=1>]
     def divmod(val)
       if val.is_a?(Money)
-        a = fractional
-        b = val.exchange_to(currency).cents
-        q, m = a.divmod(b)
-        return [q, Money.new(m, currency)]
+        divmod_money(val)
       else
-        if self.class.infinite_precision
-          q, m = fractional.divmod(as_d(val))
-          return [Money.new(q, currency), Money.new(m, currency)]
-        else
-          return [div(val), Money.new(fractional.modulo(val), currency)]
-        end
+        divmod_other(val)
       end
     end
 
+    def divmod_money(val)
+      cents = val.exchange_to(currency).cents
+      quotient, remainder = fractional.divmod(cents)
+      [quotient, Money.new(remainder, currency)]
+    end
+    private :divmod_money
+
+    def divmod_other(val)
+      if self.class.infinite_precision
+        quotient, remainder = fractional.divmod(as_d(val))
+        [Money.new(quotient, currency), Money.new(remainder, currency)]
+      else
+        [div(val), Money.new(fractional.modulo(val), currency)]
+      end
+    end
+    private :divmod_other
+
     # Equivalent to +self.divmod(val)[1]+
     #
     # @param [Money, Fixnum] val Number take modulo with.
@@ -235,15 +246,15 @@ class Money
     # @example
     #   Money.new(100).remainder(9) #=> #<Money @fractional=1>
     def remainder(val)
-      a, b = self, val
-      b = b.exchange_to(a.currency) if b.is_a?(Money) and a.currency != b.currency
-
-      a_sign, b_sign = :pos, :pos
-      a_sign = :neg if a.fractional < 0
-      b_sign = :neg if (b.is_a?(Money) and b.fractional < 0) or (b < 0)
+      if val.is_a?(Money) && currency != val.currency
+        val = val.exchange_to(currency)
+      end
 
-      return a.modulo(b) if a_sign == b_sign
-      a.modulo(b) - (b.is_a?(Money) ? b : Money.new(b, a.currency))
+      if (fractional < 0 && val < 0) || (fractional > 0 && val > 0)
+        self.modulo(val)
+      else
+        self.modulo(val) - (val.is_a?(Money) ? val : Money.new(val, currency))
+      end
     end
 
     # Return absolute value of self as a new Money object.

data/lib/money/money/formatting.rb

@@ -3,47 +3,35 @@ class Money
   module Formatting
 
     if Object.const_defined?("I18n")
-      def thousands_separator
-        if self.class.use_i18n
-          I18n.t(
-            :"number.currency.format.delimiter",
-            :default => I18n.t(
-              :"number.format.delimiter",
-              :default => (currency.thousands_separator || ",")
+      [
+        [:thousands_separator, :delimiter, "."],
+        [:decimal_mark, :separator, ","]
+      ].each do |method, name, character|
+        define_method(method) do
+          if self.class.use_i18n
+            I18n.t(
+              :"number.currency.format.#{name}",
+              :default => I18n.t(
+                :"number.format.#{name}",
+                :default => (currency.send(method) || character)
+              )
             )
-          )
-        else
-          currency.thousands_separator || ","
+          else
+            currency.send(method) || character
+          end
         end
       end
     else
       def thousands_separator
         currency.thousands_separator || ","
       end
-    end
-    alias :delimiter :thousands_separator
-
 
-    if Object.const_defined?("I18n")
-      def decimal_mark
-        if self.class.use_i18n
-          I18n.t(
-            :"number.currency.format.separator",
-            :default => I18n.t(
-              :"number.format.separator",
-              :default => (currency.decimal_mark || ".")
-            )
-          )
-        else
-          currency.decimal_mark || "."
-        end
-      end
-    else
       def decimal_mark
         currency.decimal_mark || "."
       end
     end
-    alias :separator :decimal_mark
+    alias_method :delimiter, :thousands_separator
+    alias_method :separator, :decimal_mark
 
     # Creates a formatted price string according to several rules.
     #
@@ -213,20 +201,7 @@ class Money
         end
       end
 
-      symbol_value =
-        if rules.has_key?(:symbol)
-          if rules[:symbol] === true
-            symbol
-          elsif rules[:symbol]
-            rules[:symbol]
-          else
-            ""
-          end
-        elsif rules[:html]
-          currency.html_entity == '' ? currency.symbol : currency.html_entity
-        else
-          symbol
-        end
+      symbol_value = symbol_value_from(rules)
 
       formatted = self.abs.to_s
 
@@ -254,14 +229,7 @@ class Money
       formatted.gsub!(regexp_format(formatted, rules, decimal_mark, symbol_value),
                       "\\1#{thousands_separator_value}")
 
-      symbol_position =
-        if rules.has_key?(:symbol_position)
-          rules[:symbol_position]
-        elsif currency.symbol_first?
-          :before
-        else
-          :after
-        end
+      symbol_position = symbol_position_from(rules)
 
       if rules[:sign_positive] == true && self.positive?
         sign = '+'
@@ -298,7 +266,6 @@ class Money
       formatted
     end
 
-
     private
 
     # Cleans up formatting rules.
@@ -345,4 +312,30 @@ class Money
     end
     rules
   end
+
+  def symbol_value_from(rules)
+    if rules.has_key?(:symbol)
+      if rules[:symbol] === true
+        symbol
+      elsif rules[:symbol]
+        rules[:symbol]
+      else
+        ""
+      end
+    elsif rules[:html]
+      currency.html_entity == '' ? currency.symbol : currency.html_entity
+    else
+      symbol
+    end
+  end
+
+  def symbol_position_from(rules)
+    if rules.has_key?(:symbol_position)
+      rules[:symbol_position]
+    elsif currency.symbol_first?
+      :before
+    else
+      :after
+    end
+  end
 end

data/lib/money/version.rb

@@ -1,3 +1,3 @@
 class Money
-  VERSION = "6.0.1.beta2"
+  VERSION = "6.0.1.beta3"
 end

data/spec/bank/variable_exchange_spec.rb

@@ -96,6 +96,16 @@ describe Money::Bank::VariableExchange do
     it "raises an UnknownCurrency exception when an unknown currency is passed" do
       expect { subject.set_rate('AAA', 'BBB', 1.25) }.to raise_exception(Money::Currency::UnknownCurrency)
     end
+
+    it "uses a mutex by default" do
+      subject.instance_variable_get(:@mutex).should_receive(:synchronize)
+      subject.set_rate('USD', 'EUR', 1.25)
+    end
+
+    it "doesn't use mutex if requested not to" do
+      subject.instance_variable_get(:@mutex).should_not_receive(:synchronize)
+      subject.set_rate('USD', 'EUR', 1.25, :without_mutex => true)
+    end
   end
 
   describe "#get_rate" do
@@ -107,6 +117,16 @@ describe Money::Bank::VariableExchange do
     it "raises an UnknownCurrency exception when an unknown currency is passed" do
       expect { subject.get_rate('AAA', 'BBB') }.to raise_exception(Money::Currency::UnknownCurrency)
     end
+
+    it "uses a mutex by default" do
+      subject.instance_variable_get(:@mutex).should_receive(:synchronize)
+      subject.get_rate('USD', 'EUR')
+    end
+
+    it "doesn't use mutex if requested not to" do
+      subject.instance_variable_get(:@mutex).should_not_receive(:synchronize)
+      subject.get_rate('USD', 'EUR', :without_mutex => true)
+    end
   end
 
   describe "#export_rates" do
@@ -152,6 +172,16 @@ describe Money::Bank::VariableExchange do
         subject.export_rates(:json, 'null')
       end
     end
+
+    it "uses a mutex by default" do
+      subject.instance_variable_get(:@mutex).should_receive(:synchronize)
+      subject.export_rates(:yaml)
+    end
+
+    it "doesn't use mutex if requested not to" do
+      subject.instance_variable_get(:@mutex).should_not_receive(:synchronize)
+      subject.export_rates(:yaml, nil, :without_mutex => true)
+    end
   end
 
   describe "#import_rates" do
@@ -187,6 +217,18 @@ describe Money::Bank::VariableExchange do
         expect { subject.import_rates(:foo, "")}.to raise_error Money::Bank::UnknownRateFormat
       end
     end
+
+    it "uses a mutex by default" do
+      subject.instance_variable_get(:@mutex).should_receive(:synchronize)
+      s = "--- \nUSD_TO_EUR: 1.25\nUSD_TO_JPY: 2.55\n"
+      subject.import_rates(:yaml, s)
+    end
+
+    it "doesn't use mutex if requested not to" do
+      subject.instance_variable_get(:@mutex).should_not_receive(:synchronize)
+      s = "--- \nUSD_TO_EUR: 1.25\nUSD_TO_JPY: 2.55\n"
+      subject.import_rates(:yaml, s, :without_mutex => true)
+    end
   end
 
   describe "#rate_key_for" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 6.0.1.beta2
+  version: 6.0.1.beta3
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n