minting 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab50e08056b726cc6c721cfc7443c6bddb0eed1ea488d869263a5c2964c3d408
-  data.tar.gz: c4e4fb240658b41d3d6ed4817c7ff0aa934797685553732aa7a9752423c54a04
+  metadata.gz: 23c80bac64759b49a2da0d18633a2c960d3417e3b4b997a9c018d9ec1dcd9b16
+  data.tar.gz: af77fde4b65155855694b0ab33ecec2b812d063780fe61ed8040c0a505599d96
 SHA512:
-  metadata.gz: d4b45c5a5ccfad6d9008218a685b8982bd27e388b32dfd4847393548973eab9d2071bd8bad1141a89f11d3030f78ab816ffc6215a33c83167c46afe9678a982a
-  data.tar.gz: 3fb0f12ef494765945f22b4c6c8ad8a9cc59ef85fae47131d65614c9f585b680314a2af11182b32e75daf0fd1c74f223ea866d8fea9064e9a838a7dbb6b4bfbb
+  metadata.gz: 805ca02f7017378de64228a61d1679b86d34368254812d32e0a791c74fce5a91f01ea8fbddc367b63cd816ab469c54a8a59e5a85d036f33a0a9795a0bf09d20f
+  data.tar.gz: d5d9c81600d03d8ff15e4cfc0d87b4c5b93d97ebc5b3e1e476a437fac58446e87ed203311bdf93f9354be84afae415cb91d21a60ad2da97e19654096dfbd06dd

data/README.md

@@ -83,43 +83,43 @@ price = Mint.money(9.99, 'USD')
 loss  = Mint.money(-1234.56, 'USD')
 
 # Built-in named presets
-loss.to_s(:accounting)                      #=> "($1,234.56)"
-Mint.money(1234.56, 'EUR').to_s(:european)  #=> "1.234,56 €"
-price.to_s(:amount)                         #=> "9.99"
-price.to_s(:currency)                       #=> "USD 9.99"
+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"
 
 # Presets can be overridden with explicit kwargs
-Mint.money(1234.56, 'EUR').to_s(:european, format: '%<amount>f %<currency>s')
+Mint.money(1234.56, 'EUR').to_formatted_s(:european, format: '%<amount>f %<currency>s')
 #=> "1.234,56 EUR"
 
 # Or use direct format strings
-price.to_s                                  #=> "$9.99",
-price.to_s(format: '%<amount>d')            #=> "9",
-price.to_s(format: '%<symbol>s%<amount>f')  #=> "$9.99",
-price.to_s(format: '%<symbol>s%<amount>+f') #=> "$+9.99",
-(-price).to_s(format: '%<amount>f')         #=> "-9.99",
+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",
 
 # Format with padding
 price_in_euros = Mint.money(12.34, 'EUR')
 
-price.to_s(format: '--%<amount>7d')               #=> "--      9"
-price.to_s(format: '  %<amount>10f %<currency>s') #=> "        9.99 USD"
-(-price).to_s(format: '  %<amount>10f')           #=> "       -9.99"
+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_in_euros.to_s(format: '%<symbol>2s%<amount>+10f')    #=> " €    +12.34"
+price_in_euros.to_formatted_s(format: '%<symbol>2s%<amount>+10f')    #=> " €    +12.34"
 
 # Integral & fractional parts
-price.to_s(format: '%<integral>d %<fractional>d/100')        #=> "9 99/100"
+price.to_formatted_s(format: '%<integral>d %<fractional>d/100')        #=> "9 99/100"
 Mint.money(0.99, 'USD').to_s(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_s(format: { negative: '(%<symbol>s%<amount>f)' })  #=> "($1,234.56)"
-Mint.money(0, 'BRL').to_s(format: { zero: '--' })          #=> "--"
+loss.to_formatted_s(format: { negative: '(%<symbol>s%<amount>f)' })  #=> "($1,234.56)"
+Mint.money(0, 'BRL').to_formatted_s(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_s(format: fmt)               #=> "$1,234.56"
+Mint.money(1234.56, 'USD').to_formatted_s(format: fmt)               #=> "$1,234.56"
 
 # Json serialization
 

data/lib/minting/mint/i18n.rb

@@ -10,7 +10,7 @@ module Mint
     #   [+:thousand+]  Thousands delimiter (e.g. +"."+)
     #   [+:format+]    Format template string (e.g. +"%<amount>f %<symbol>s"+)
     #
-    # When set, +#to_s+ and +#format+ use these values as fallbacks when the
+    # When set, +#to_formatted_s+ and +#format+ use these values as fallbacks when the
     # corresponding parameter is not explicitly provided.
     #
     # @example Rails I18n integration (in minting-rails railtie)

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_s(format: format)
+      body = to_formatted_s(format: format)
       %(<data class='money' title='#{title}'>#{ERB::Util.html_escape(body)}</data>)
     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_s(format: { negative: '(%<symbol>s%<amount>f)' })
+    #     money.to_formatted_s(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_s                               #=> "$1,234.56"
-    #   money.to_s(thousand: '.', decimal: ',')  #=> "$1.234,56"
-    #   money.to_s(decimal: ',', thousand: '')   #=> "$1234,56"
+    #   money.to_formatted_s                               #=> "$1,234.56"
+    #   money.to_formatted_s(thousand: '.', decimal: ',')  #=> "$1.234,56"
+    #   money.to_formatted_s(decimal: ',', thousand: '')   #=> "$1234,56"
     #
     # @example Preset formats
     #   loss = Mint.money(-1234.56, 'USD')
-    #   loss.to_s(:accounting)                   #=> "($1,234.56)"
-    #   money.to_s(:european)                    #=> "1.234,56 €"
-    #   money.to_s(:amount)                      #=> "1234.56"
-    #   money.to_s(:currency)                    #=> "USD 1234.56"
+    #   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"
     #
     # @example Custom formats
-    #   money.to_s(format: '%<amount>f')                    #=> "1234.56"
-    #   money.to_s(format: '%<currency>s %<amount>f')       #=> "USD 1234.56"
-    #   money.to_s(format: '%<amount>f %<symbol>s')         #=> "1234.56 $"
-    #   money.to_s(format: '%<symbol>s%<amount>+f')         #=> "$+1234.56"
+    #   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"
     #
     # @example Integral & fractional parts
-    #   money.to_s(format: '%<integral>d.%<fractional>02d')  #=> "1234.56"
+    #   money.to_formatted_s(format: '%<integral>d.%<fractional>02d')  #=> "1234.56"
     #   price = Mint.money(0.99, 'USD')
-    #   price.to_s(format: '%<integral>d dollars and %<fractional>02d cents')
+    #   price.to_formatted_s(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_s(format: { negative: '(%<symbol>s%<amount>f)' }) #=> "($1,234.56)"
-    #   Mint.money(0, 'BRL').to_s(format: { zero: '--' })        #=> "--"
+    #   loss.to_formatted_s(format: { negative: '(%<symbol>s%<amount>f)' }) #=> "($1,234.56)"
+    #   Mint.money(0, 'BRL').to_formatted_s(format: { zero: '--' })        #=> "--"
     #
     # @example Padding and alignment
-    #   money.to_s(format: '%<amount>10.2f')                #=> "   1234.56"
-    #   money.to_s(format: '%<symbol>s%<amount>010.2f')     #=> "$0001234.56"
+    #   money.to_formatted_s(format: '%<amount>10.2f')                #=> "   1234.56"
+    #   money.to_formatted_s(format: '%<symbol>s%<amount>010.2f')     #=> "$0001234.56"
     #
     # @example Locale-aware formatting (with Mint.locale_backend set)
-    #   money.to_s  # decimal and thousand come from locale_backend
+    #   money.to_formatted_s  # decimal and thousand come from locale_backend
     #
-    def to_s(preset = nil, format: nil, decimal: nil, thousand: nil, width: nil)
+    def to_formatted_s(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]
@@ -100,5 +100,7 @@ module Mint
 
       width ? formatted.rjust(width) : formatted
     end
+
+    def to_s = to_formatted_s
   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.1'
+  VERSION = '1.9.2'
 end

metadata

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