money 6.13.6 → 6.16.0

data/lib/money/money/formatter.rb

@@ -211,6 +211,12 @@ class Money
     #   Money.new(89000, :btc).format(drop_trailing_zeros: true) #=> B⃦0.00089
     #   Money.new(110, :usd).format(drop_trailing_zeros: true)   #=> $1.1
     #
+    # @option rules [Boolean] :delimiter_pattern (/(\d)(?=(?:\d{3})+(?:[^\d]{1}|$))/) Regular expression to set the placement
+    #   for the thousands delimiter
+    #
+    # @example
+    #   Money.new(89000, :btc).format(delimiter_pattern: /(\d)(?=\d)/) #=> B⃦8,9,0.00
+    #
     # @option rules [String] :format (nil) Provide a template for formatting. `%u` will be replaced
     # with the symbol (if present) and `%n` will be replaced with the number.
     #
@@ -330,7 +336,9 @@ class Money
 
     def format_whole_part(value)
       # Apply thousands_separator
-      value.gsub regexp_format, "\\1#{thousands_separator}"
+      value.gsub(rules[:delimiter_pattern]) do |digit_to_delimit|
+        "#{digit_to_delimit}#{thousands_separator}"
+      end
     end
 
     def extract_whole_and_decimal_parts
@@ -347,7 +355,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
 
@@ -366,15 +374,6 @@ class Money
       (Money.locale_backend && Money.locale_backend.lookup(key, currency)) || DEFAULTS[key]
     end
 
-    def regexp_format
-      if rules[:south_asian_number_formatting]
-        # from http://blog.revathskumar.com/2014/11/regex-comma-seperated-indian-currency-format.html
-        /(\d+?)(?=(\d\d)+(\d)(?!\d))(\.\d+)?/
-      else
-        /(\d)(?=(?:\d{3})+(?:[^\d]{1}|$))/
-      end
-    end
-
     def symbol_value_from(rules)
       if rules.has_key?(:symbol)
         if rules[:symbol] === true

data/lib/money/money/formatting_rules.rb

@@ -12,6 +12,7 @@ class Money
       @rules = localize_formatting_rules(@rules)
       @rules = translate_formatting_rules(@rules) if @rules[:translate]
       @rules[:format] ||= determine_format_from_formatting_rules(@rules)
+      @rules[:delimiter_pattern] ||= delimiter_pattern_rule(@rules)
 
       warn_about_deprecated_rules(@rules)
     end
@@ -79,6 +80,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
@@ -88,6 +91,15 @@ class Money
       end
     end
 
+    def delimiter_pattern_rule(rules)
+      if rules[:south_asian_number_formatting]
+        # from http://blog.revathskumar.com/2014/11/regex-comma-seperated-indian-currency-format.html
+        /(\d+?)(?=(\d\d)+(\d)(?!\d))(\.\d+)?/
+      else
+        /(\d)(?=(?:\d{3})+(?:[^\d]{1}|$))/
+      end
+    end
+
     def symbol_position_from(rules)
       if rules.has_key?(:symbol_position)
         if [:before, :after].include?(rules[:symbol_position])

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

data/lib/money/version.rb

@@ -1,3 +1,3 @@
 class Money
-  VERSION = '6.13.6'
+  VERSION = '6.16.0'
 end

data/money.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 3.4"
   s.add_development_dependency "yard", "~> 0.9.11"
-  s.add_development_dependency "kramdown", "~> 1.1"
+  s.add_development_dependency "kramdown", "~> 2.3"
 
   s.files         = `git ls-files -z -- config/* lib/* CHANGELOG.md LICENSE money.gemspec README.md`.split("\x0")
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 6.13.6
+  version: 6.16.0
 platform: ruby
 authors:
 - Shane Emmons
 - Anthony Dmitriyev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-04 00:00:00.000000000 Z
+date: 2021-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -93,14 +93,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.3'
 description: A Ruby Library for dealing with money and currency conversion.
 email:
 - shane@emmons.io
@@ -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,8 +159,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A Ruby Library for dealing with money and currency conversion.
 test_files: []