money 6.13.4 → 6.14.0

data/lib/money/money/arithmetic.rb

@@ -16,7 +16,7 @@ class Money
     # @example
     #    - Money.new(100) #=> #<Money @fractional=-100>
     def -@
-      self.class.new(-fractional, currency, bank)
+      dup_with(fractional: -fractional)
     end
 
     # Checks whether two Money objects have the same currency and the same
@@ -46,7 +46,7 @@ class Money
     # Compares two Money objects. If money objects have a different currency it
     # will attempt to convert the currency.
     #
-    # @param [Money] other_money Value to compare with.
+    # @param [Money] other Value to compare with.
     #
     # @return [Integer]
     #
@@ -57,7 +57,12 @@ class Money
         return unless other.respond_to?(:zero?) && other.zero?
         return other.is_a?(CoercedNumeric) ? 0 <=> fractional : fractional <=> 0
       end
-      return 0 if zero? && other.zero?
+
+      # Always allow comparison with zero
+      if zero? || other.zero?
+        return fractional <=> other.fractional
+      end
+
       other = other.exchange_to(currency)
       fractional <=> other.fractional
     rescue Money::Bank::UnknownRate
@@ -103,7 +108,7 @@ class Money
     # values. If +other_money+ has a different currency then its monetary value
     # is automatically exchanged to this object's currency using +exchange_to+.
     #
-    # @param [Money] other_money Other +Money+ object to add.
+    # @param [Money] other Other +Money+ object to add.
     #
     # @return [Money]
     #
@@ -116,7 +121,7 @@ class Money
     # its monetary value is automatically exchanged to this object's currency
     # using +exchange_to+.
     #
-    # @param [Money] other_money Other +Money+ object to subtract.
+    # @param [Money] other Other +Money+ object to subtract.
     #
     # @return [Money]
     #
@@ -132,10 +137,10 @@ class Money
         when Money
           other = other.exchange_to(currency)
           new_fractional = fractional.public_send(op, other.fractional)
-          self.class.new(new_fractional, currency, bank)
+          dup_with(fractional: new_fractional)
         when CoercedNumeric
           raise TypeError, non_zero_message.call(other.value) unless other.zero?
-          self.class.new(other.value.public_send(op, fractional), currency)
+          dup_with(fractional: other.value.public_send(op, fractional))
         when Numeric
           raise TypeError, non_zero_message.call(other) unless other.zero?
           self
@@ -162,7 +167,7 @@ class Money
     def *(value)
       value = value.value if value.is_a?(CoercedNumeric)
       if value.is_a? Numeric
-        self.class.new(fractional * value, currency, bank)
+        dup_with(fractional: fractional * value)
       else
         raise TypeError, "Can't multiply a #{self.class.name} by a #{value.class.name}'s value"
       end
@@ -188,7 +193,7 @@ class Money
         fractional / as_d(value.exchange_to(currency).fractional).to_f
       else
         raise TypeError, 'Can not divide by Money' if value.is_a?(CoercedNumeric)
-        self.class.new(fractional / as_d(value), currency, bank)
+        dup_with(fractional: fractional / as_d(value))
       end
     end
 
@@ -226,13 +231,13 @@ class Money
     def divmod_money(val)
       cents = val.exchange_to(currency).cents
       quotient, remainder = fractional.divmod(cents)
-      [quotient, self.class.new(remainder, currency, bank)]
+      [quotient, dup_with(fractional: remainder)]
     end
     private :divmod_money
 
     def divmod_other(val)
       quotient, remainder = fractional.divmod(as_d(val))
-      [self.class.new(quotient, currency, bank), self.class.new(remainder, currency, bank)]
+      [dup_with(fractional: quotient), dup_with(fractional: remainder)]
     end
     private :divmod_other
 
@@ -276,7 +281,7 @@ class Money
       if (fractional < 0 && val < 0) || (fractional > 0 && val > 0)
         self.modulo(val)
       else
-        self.modulo(val) - (val.is_a?(Money) ? val : self.class.new(val, currency, bank))
+        self.modulo(val) - (val.is_a?(Money) ? val : dup_with(fractional: val))
       end
     end
 
@@ -287,7 +292,7 @@ class Money
     # @example
     #   Money.new(-100).abs #=> #<Money @fractional=100>
     def abs
-      self.class.new(fractional.abs, currency, bank)
+      dup_with(fractional: fractional.abs)
     end
 
     # Test if the money amount is zero.

data/lib/money/money/formatting_rules.rb

@@ -79,6 +79,8 @@ class Money
     end
 
     def determine_format_from_formatting_rules(rules)
+      return currency.format if currency.format && !rules.has_key?(:symbol_position)
+
       symbol_position = symbol_position_from(rules)
 
       if symbol_position == :before

data/lib/money/rates_store/memory.rb

@@ -1,3 +1,5 @@
+require 'monitor'
+
 class Money
   module RatesStore
 
@@ -17,11 +19,11 @@ class Money
       #
       # @param [Hash] opts Optional store options.
       # @option opts [Boolean] :without_mutex disables the usage of a mutex
-      # @param [Hash] rt Optional initial exchange rate data.
-      def initialize(opts = {}, rt = {})
-        @options, @index = opts, rt
-        @mutex = Mutex.new
-        @in_transaction = false
+      # @param [Hash] rates Optional initial exchange rate data.
+      def initialize(opts = {}, rates = {})
+        @rates = rates
+        @options = opts
+        @guard = Monitor.new
       end
 
       # Registers a conversion rate and returns it. Uses +Mutex+ to synchronize data access.
@@ -37,7 +39,9 @@ class Money
       #   store.add_rate("USD", "CAD", 1.24515)
       #   store.add_rate("CAD", "USD", 0.803115)
       def add_rate(currency_iso_from, currency_iso_to, rate)
-        transaction { index[rate_key_for(currency_iso_from, currency_iso_to)] = rate }
+        guard.synchronize do
+          rates[rate_key_for(currency_iso_from, currency_iso_to)] = rate
+        end
       end
 
       # Retrieve the rate for the given currencies. Uses +Mutex+ to synchronize data access.
@@ -54,24 +58,21 @@ class Money
       #
       #   store.get_rate("USD", "CAD") #=> 1.24515
       def get_rate(currency_iso_from, currency_iso_to)
-        transaction { index[rate_key_for(currency_iso_from, currency_iso_to)] }
+        guard.synchronize do
+          rates[rate_key_for(currency_iso_from, currency_iso_to)]
+        end
       end
 
       def marshal_dump
-        [self.class, options, index]
+        guard.synchronize do
+          return [self.class, options, rates.dup]
+        end
       end
 
       # Wraps block execution in a thread-safe transaction
       def transaction(&block)
-        if @in_transaction || options[:without_mutex]
-          block.call self
-        else
-          @mutex.synchronize do
-            @in_transaction = true
-            result = block.call
-            @in_transaction = false
-            result
-          end
+        guard.synchronize do
+          yield
         end
       end
 
@@ -88,19 +89,19 @@ class Money
       #     puts [iso_from, iso_to, rate].join
       #   end
       def each_rate(&block)
-        enum = Enumerator.new do |yielder|
-          index.each do |key, rate|
+        return to_enum(:each_rate) unless block_given?
+
+        guard.synchronize do
+          rates.each do |key, rate|
             iso_from, iso_to = key.split(INDEX_KEY_SEPARATOR)
-            yielder.yield iso_from, iso_to, rate                  
+            yield iso_from, iso_to, rate
           end
         end
-
-        block_given? ? enum.each(&block) : enum
       end
 
       private
 
-      attr_reader :index, :options
+      attr_reader :rates, :options, :guard
 
       # Return the rate hashkey for the given currencies.
       #

data/lib/money/version.rb

@@ -1,3 +1,3 @@
 class Money
-  VERSION = '6.13.4'
+  VERSION = '6.14.0'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 6.13.4
+  version: 6.14.0
 platform: ruby
 authors:
 - Shane Emmons
 - Anthony Dmitriyev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2021-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -144,7 +144,7 @@ metadata:
   changelog_uri: https://github.com/RubyMoney/money/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/RubyMoney/money/
   bug_tracker_uri: https://github.com/RubyMoney/money/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -159,9 +159,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: A Ruby Library for dealing with money and currency conversion.
 test_files: []