minting 1.9.5 → 1.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 429ae46c67aa4b6bb032a9e9be85cbf02b2ee0576cce83c0ad4f36aa0c46e08c
-  data.tar.gz: a5a1c37ad5f6b8ced5e62323803431cd7385577c7a15963b0a29c92f7f7907b8
+  metadata.gz: 51f0a76084db98e53f29af4f82f1284f749c9691727a7a84a7f8cc758d1a9f67
+  data.tar.gz: f24a130df454ee80f923aa42fd995e4b3eaf2f4f16d1a6f3a9e84548c08a4988
 SHA512:
-  metadata.gz: ad956434a0dd03f554a638466d44ce049cd7b16e1592f07507954d331d32b5ede3a3f9cb635b6fe9ad6204fe44f840240cbd6d8d49d5c18afcf7b4401328ecab
-  data.tar.gz: 5c81f05414ea2c8f4e6b68daaf5a48a76ab7109c68581246333d99e488d9eec3faf5f5e6dc7e8293f2dfb2d6fb51f01b43ddc49770fde62cb49c05288496a7be
+  metadata.gz: 42ed5e90ba4a936426344cfd1f8aad69755038704c53b67d8f714ced040661e2f37829aa44d2d67f12575596656b7d9bd5b80058995b57875aaa46b2cf6dd291
+  data.tar.gz: a6490a3356b949df6889e72ee3fc885a4e10af8d14e09591d7bd615ea468371c30b1695b73e996cb91526ab824a610e2667797eb24e94144ec46ddd22dc42395

data/README.md

@@ -80,43 +80,43 @@ price = Mint.money(9.99, 'USD')
 loss  = Mint.money(-1234.56, 'USD')
 
 # Built-in named presets
-loss.to_formatted_s(:accounting)                      #=> "($1,234.56)"
-Mint.money(1234.56, 'EUR').to_formatted_s(:european)  #=> "1.234,56 €"
-price.to_formatted_s(:amount)                         #=> "9.99"
-price.to_formatted_s(:currency)                       #=> "USD 9.99"
+loss.format(:accounting)                      #=> "($1,234.56)"
+Mint.money(1234.56, 'EUR').format(:european)  #=> "1.234,56 €"
+price.format(:amount)                         #=> "9.99"
+price.format(:currency)                       #=> "USD 9.99"
 
 # Presets can be overridden with explicit kwargs
-Mint.money(1234.56, 'EUR').to_formatted_s(:european, format: '%<amount>f %<currency>s')
+Mint.money(1234.56, 'EUR').format(:european, format: '%<amount>f %<currency>s')
 #=> "1.234,56 EUR"
 
 # Or use direct format strings
-price.to_formatted_s                                  #=> "$9.99",
-price.to_formatted_s(format: '%<amount>d')            #=> "9",
-price.to_formatted_s(format: '%<symbol>s%<amount>f')  #=> "$9.99",
-price.to_formatted_s(format: '%<symbol>s%<amount>+f') #=> "$+9.99",
-(-price).to_formatted_s(format: '%<amount>f')         #=> "-9.99",
+price.format                                  #=> "$9.99",
+price.format(format: '%<amount>d')            #=> "9",
+price.format(format: '%<symbol>s%<amount>f')  #=> "$9.99",
+price.format(format: '%<symbol>s%<amount>+f') #=> "$+9.99",
+(-price).format(format: '%<amount>f')         #=> "-9.99",
 
 # Format with padding
 price_in_euros = Mint.money(12.34, 'EUR')
 
-price.to_formatted_s(format: '--%<amount>7d')               #=> "--      9"
-price.to_formatted_s(format: '  %<amount>10f %<currency>s') #=> "        9.99 USD"
-(-price).to_formatted_s(format: '  %<amount>10f')           #=> "       -9.99"
+price.format(format: '--%<amount>7d')               #=> "--      9"
+price.format(format: '  %<amount>10f %<currency>s') #=> "        9.99 USD"
+(-price).format(format: '  %<amount>10f')           #=> "       -9.99"
 
-price_in_euros.to_formatted_s(format: '%<symbol>2s%<amount>+10f')    #=> " €    +12.34"
+price_in_euros.format(format: '%<symbol>2s%<amount>+10f')    #=> " €    +12.34"
 
 # Integral & fractional parts
-price.to_formatted_s(format: '%<integral>d %<fractional>d/100')        #=> "9 99/100"
-Mint.money(0.99, 'USD').to_fs(format: '%<integral>d dollars and %<fractional>02d cents')
+price.format(format: '%<integral>d %<fractional>d/100')        #=> "9 99/100"
+Mint.money(0.99, 'USD').format(format: '%<integral>d dollars and %<fractional>02d cents')
 #=> "0 dollars and 99 cents"
 
 # Per-sign Hash format (e.g. accounting parentheses for losses)
 loss = Mint.money(-1234.56, 'USD')
-loss.to_formatted_s(format: { negative: '(%<symbol>s%<amount>f)' })  #=> "($1,234.56)"
-Mint.money(0, 'BRL').to_formatted_s(format: { zero: '--' })          #=> "--"
+loss.format(format: { negative: '(%<symbol>s%<amount>f)' })  #=> "($1,234.56)"
+Mint.money(0, 'BRL').format(format: { zero: '--' })          #=> "--"
 # All three keys at once:
 fmt = { positive: '%<symbol>s%<amount>f', negative: '(%<symbol>s%<amount>f)', zero: '--' }
-Mint.money(1234.56, 'USD').to_formatted_s(format: fmt)               #=> "$1,234.56"
+Mint.money(1234.56, 'USD').format(format: fmt)               #=> "$1,234.56"
 
 # Json serialization
 

data/lib/minting/mint/mint.rb

@@ -12,7 +12,10 @@ module Mint
   # Creates a new {Money} instance with the given amount and currency code.
   #
   # @param amount [Numeric] the financial value
-  # @param currency_code [Currency, String] Currency code
+  # @param currency_code [String, Currency, Money, nil] Currency code, object,
+  #   Money whose currency to reuse, or +nil+. Passed through
+  #   {Mint::Currency.resolve!} so all accepted types resolve to a registered
+  #   currency.
   # @return [Money] the instantiated Money object
   # @raise [ArgumentError] if the amount is not a Numeric
   # @raise [Mint::UnknownCurrency] if the currency code is not registered.

data/lib/minting/money/conversion.rb

@@ -26,7 +26,7 @@ module Mint
     # @return [String] HTML5 `<data>` representation
     def to_html(format = DEFAULT_FORMAT)
       title = Kernel.format("#{currency_code} %0.#{currency.subunit}f", amount)
-      body = to_formatted_s(format: format)
+      body = format(format: format)
       %(<data class='money' title='#{title}'>#{ERB::Util.html_escape(body)}</data>)
     end
 

data/lib/minting/money/format/formatting.rb

@@ -33,10 +33,10 @@ module Mint
     # @private
     def validate_separators!(decimal:, thousand:)
       case decimal
-      when '' then raise ArgumentError, 'decimal must be a non-empty'
-      when nil # :noop
-      when String
-        raise ArgumentError, "decimal and thousand cannot be identical: #{decimal.inspect}" if decimal == thousand
+      when nil      # :noop
+      when ''       then raise ArgumentError, 'decimal must be a non-empty'
+      when thousand then raise ArgumentError, "decimal and thousand cannot be identical: #{decimal.inspect}"
+      when String   # :noop
       else raise ArgumentError, "decimal must be a String, false, or nil, got #{decimal.inspect}"
       end
 
@@ -62,13 +62,7 @@ module Mint
       subunit = currency.subunit
       resolved_format, adjusted_amount = resolve_format(format)
 
-      # Inject the currency's subunit precision into %<amount>f specifiers
-      # e.g. '%<amount>f' becomes '%<amount>.2f' for USD
-      resolved_format = resolved_format.gsub(/%<amount>(\s*\+?\d*)f/, "%<amount>\\1.#{subunit}f")
-
-      # Zero-subunit currencies (e.g. JPY) have no fractional part —
-      # strip %<fractional>d specifiers entirely since there's no valid integer for "nothing"
-      resolved_format.gsub!(/%<fractional>[^%]*?d/, '') if subunit.zero?
+      resolved_format = inject_subunit_precision(resolved_format, subunit)
 
       result = Kernel.format(resolved_format, {
                                amount: adjusted_amount,
@@ -86,5 +80,18 @@ module Mint
       # Apply thousands only to the integral portion, using the decimal as boundary
       apply_thousand_separator(result, decimal:, thousand:)
     end
+
+    # Injects the currency's subunit precision into %<amount>f specifiers
+    # (e.g. '%<amount>f' → '%<amount>.2f' for USD). For zero-subunit
+    # currencies (e.g. JPY), strips %<fractional>d specifiers.
+    # @private
+    def inject_subunit_precision(template, subunit)
+      cache ||= {}
+      cache[[template, subunit]] ||= begin
+        result = template.gsub(/%<amount>(\s*\+?\d*)f/, "%<amount>\\1.#{subunit}f")
+        result.gsub!(/%<fractional>[^%]*?d/, '') if subunit.zero?
+        result.freeze
+      end
+    end
   end
 end

data/lib/minting/money/format/to_s.rb

@@ -22,7 +22,7 @@ module Mint
     #   holding a format string. A Hash is convenient for sign-aware formats
     #   such as accounting parentheses:
     #
-    #     money.to_formatted_s(format: { negative: '(%<symbol>s%<amount>f)' })
+    #     money.format(format: { negative: '(%<symbol>s%<amount>f)' })
     #
     #   Missing keys fall back to the module default, so a Hash with only
     #   :negative will still format positives sensibly. The valid keys are
@@ -41,42 +41,42 @@ module Mint
     #
     # @example Basic formatting
     #   money = Mint.money(1234.56, 'USD')
-    #   money.to_formatted_s                               #=> "$1,234.56"
-    #   money.to_formatted_s(thousand: '.', decimal: ',')  #=> "$1.234,56"
-    #   money.to_formatted_s(decimal: ',', thousand: '')   #=> "$1234,56"
+    #   money.format                               #=> "$1,234.56"
+    #   money.format(thousand: '.', decimal: ',')  #=> "$1.234,56"
+    #   money.format(decimal: ',', thousand: '')   #=> "$1234,56"
     #
     # @example Preset formats
     #   loss = Mint.money(-1234.56, 'USD')
-    #   loss.to_formatted_s(:accounting)                   #=> "($1,234.56)"
-    #   money.to_formatted_s(:european)                    #=> "1.234,56 €"
-    #   money.to_formatted_s(:amount)                      #=> "1234.56"
-    #   money.to_formatted_s(:currency)                    #=> "USD 1234.56"
+    #   loss.format(:accounting)                   #=> "($1,234.56)"
+    #   money.format(:european)                    #=> "1.234,56 €"
+    #   money.format(:amount)                      #=> "1234.56"
+    #   money.format(:currency)                    #=> "USD 1234.56"
     #
     # @example Custom formats
-    #   money.to_formatted_s(format: '%<amount>f')                    #=> "1234.56"
-    #   money.to_formatted_s(format: '%<currency>s %<amount>f')       #=> "USD 1234.56"
-    #   money.to_formatted_s(format: '%<amount>f %<symbol>s')         #=> "1234.56 $"
-    #   money.to_formatted_s(format: '%<symbol>s%<amount>+f')         #=> "$+1234.56"
+    #   money.format(format: '%<amount>f')                    #=> "1234.56"
+    #   money.format(format: '%<currency>s %<amount>f')       #=> "USD 1234.56"
+    #   money.format(format: '%<amount>f %<symbol>s')         #=> "1234.56 $"
+    #   money.format(format: '%<symbol>s%<amount>+f')         #=> "$+1234.56"
     #
     # @example Integral & fractional parts
-    #   money.to_formatted_s(format: '%<integral>d.%<fractional>02d')  #=> "1234.56"
+    #   money.format(format: '%<integral>d.%<fractional>02d')  #=> "1234.56"
     #   price = Mint.money(0.99, 'USD')
-    #   price.to_formatted_s(format: '%<integral>d dollars and %<fractional>02d cents')
+    #   price.format(format: '%<integral>d dollars and %<fractional>02d cents')
     #   #=> "0 dollars and 99 cents"
     #
     # @example Per-sign Hash format (accounting parentheses)
     #   loss = Mint.money(-1234.56, 'USD')
-    #   loss.to_formatted_s(format: { negative: '(%<symbol>s%<amount>f)' }) #=> "($1,234.56)"
-    #   Mint.money(0, 'BRL').to_formatted_s(format: { zero: '--' })        #=> "--"
+    #   loss.format(format: { negative: '(%<symbol>s%<amount>f)' }) #=> "($1,234.56)"
+    #   Mint.money(0, 'BRL').format(format: { zero: '--' })        #=> "--"
     #
     # @example Padding and alignment
-    #   money.to_formatted_s(format: '%<amount>10.2f')                #=> "   1234.56"
-    #   money.to_formatted_s(format: '%<symbol>s%<amount>010.2f')     #=> "$0001234.56"
+    #   money.format(format: '%<amount>10.2f')                #=> "   1234.56"
+    #   money.format(format: '%<symbol>s%<amount>010.2f')     #=> "$0001234.56"
     #
     # @example Locale-aware formatting (with Mint.locale_backend set)
-    #   money.to_formatted_s  # decimal and thousand come from locale_backend
+    #   money.format  # decimal and thousand come from locale_backend
     #
-    def to_formatted_s(preset = nil, format: nil, decimal: nil, thousand: nil, width: nil)
+    def format(preset = nil, format: nil, decimal: nil, thousand: nil, width: nil)
       if preset
         config = PRESETS.fetch(preset) { raise ArgumentError, "Unknown format preset: #{preset.inspect}" }
         format ||= config[:format]
@@ -101,8 +101,8 @@ module Mint
       width ? formatted.rjust(width) : formatted
     end
 
-    def to_s = to_formatted_s
+    def to_s = format
 
-    alias to_fs to_formatted_s
+    alias to_fs :format
   end
 end

data/lib/minting/version.rb

@@ -3,5 +3,5 @@
 # Root namespace for the Minting library.
 module Minting
   # Current version of the Minting gem.
-  VERSION = '1.9.5'
+  VERSION = '1.9.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minting
 version: !ruby/object:Gem::Version
-  version: 1.9.5
+  version: 1.9.6
 platform: ruby
 authors:
 - Gilson Ferraz