money 6.13.5 → 6.14.1

data/lib/money/money/formatter.rb

@@ -347,7 +347,7 @@ class Money
     end
 
     def format_decimal_part(value)
-      return nil if currency.decimal_places == 0 && !Money.infinite_precision
+      return nil if currency.decimal_places == 0 && !Money.default_infinite_precision
       return nil if rules[:no_cents]
       return nil if rules[:no_cents_if_whole] && value.to_i == 0
 

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

@@ -19,7 +19,7 @@ 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.
+      # @param [Hash] rates Optional initial exchange rate data.
       def initialize(opts = {}, rates = {})
         @rates = rates
         @options = opts
@@ -39,8 +39,8 @@ 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)
-        @guard.synchronize do
-          @rates[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
 
@@ -58,20 +58,20 @@ class Money
       #
       #   store.get_rate("USD", "CAD") #=> 1.24515
       def get_rate(currency_iso_from, currency_iso_to)
-        @guard.synchronize do
-          @rates[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
-        @guard.synchronize do
-          return [self.class, @options, @rates.dup]
+        guard.synchronize do
+          return [self.class, options, rates.dup]
         end
       end
 
       # Wraps block execution in a thread-safe transaction
       def transaction(&block)
-        @guard.synchronize do
+        guard.synchronize do
           yield
         end
       end
@@ -91,8 +91,8 @@ class Money
       def each_rate(&block)
         return to_enum(:each_rate) unless block_given?
 
-        @guard.synchronize do
-          @rates.each do |key, rate|
+        guard.synchronize do
+          rates.each do |key, rate|
             iso_from, iso_to = key.split(INDEX_KEY_SEPARATOR)
             yield iso_from, iso_to, rate
           end
@@ -101,6 +101,8 @@ class Money
 
       private
 
+      attr_reader :rates, :options, :guard
+
       # Return the rate hashkey for the given currencies.
       #
       # @param [String] currency_iso_from The currency to exchange from.

data/lib/money/version.rb

@@ -1,3 +1,3 @@
 class Money
-  VERSION = '6.13.5'
+  VERSION = '6.14.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 6.13.5
+  version: 6.14.1
 platform: ruby
 authors:
 - Shane Emmons
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-01 00:00:00.000000000 Z
+date: 2021-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A Ruby Library for dealing with money and currency conversion.