minting 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dfd2f98840b009208b9cccab86e9ca5d093300351e9e2031e70e03b93315638
-  data.tar.gz: 47a92df548558e20fd7bea3caa10a8966db91341d998e9712405af3d97fe12ae
+  metadata.gz: e2e9f992fc49846276b49db3b06639ed38a2037dceb3762ffac27d1bc03b4d37
+  data.tar.gz: 12fdb933a6cd61b2fa2dc61455ac3932f71fdd7822dd04261d5b0b8ec0fa4ba8
 SHA512:
-  metadata.gz: 175607c53124f16cac60c699a6ed6f042b3c3e960055bca1ccb7ba822a05b6cf8401fb66902e148a9ed50b43524ce6e708feaa72cac15f6ddd8b9cf3e9189cc6
-  data.tar.gz: 4fc09433abd38014d0d99c16aed5f88eb36ad039e422b0ffa305d3335da1753a23bae2bfcf775ce6142edf844463ed3942710d87f034375f99e04ff1b7e92812
+  metadata.gz: 3013fca2971566d9503f2375aa1330f191e3467cdd2c442d92a83cd5b493e2778a7ef97dfc6248166af9be4002990a31eb2cbd3df38dcd1508407e12829d2515
+  data.tar.gz: ff7261f4c1fd93586833feb391fd8c95c90a1c1de7f6d5410a4ba406d40f4fcb536684e01ecbd725c87a1c9ef53caa29371a17bf05a6fc7d65320f5c255bb39b

data/README.md

@@ -33,7 +33,7 @@ total.currency_code                    #=> "USD"
 
 - Arithmetic: `+ - * /`, unary minus, `abs`
 - Comparisons: `==`, `<=>`, `zero?`, `nonzero?`, `positive?`, `negative?`
-- Formatting: `to_s` with custom formats, delimiters, separators
+- Formatting: `to_s` with custom formats, thousand delimiters and decimal separators
 - Serialization: `to_json`, `to_i`, `to_f`, `to_r`, `to_d`
 - Allocation utilities: `split(quantity)`, `allocate([ratios])`
 - Numeric Refinements for ergonomics: `10.dollars`, `3.euros`, `4.to_money('USD')`

data/lib/minting/mint/registry.rb

@@ -2,7 +2,7 @@
 module Mint
   def self.money(amount, currency_code)
     currency = currency(currency_code)
-    return Money.new(amount, currency) if currency
+    return Money.new(amount, currency).freeze if currency
 
     available = currencies.keys.join(', ')
     raise ArgumentError, "Currency [#{currency_code}] not registered. Available: #{available}"

data/lib/minting/money/conversion.rb

@@ -29,18 +29,5 @@ module Mint
     def to_r
       amount
     end
-
-    def to_s(format: '%<symbol>s%<amount>f', delimiter: false, separator: '.')
-      format = format.gsub(/%<amount>(\+?\d*)f/,
-                           "%<amount>\\1.#{currency.subunit}f")
-      formatted = Kernel.format(format, amount: amount, currency: currency_code,
-                                        symbol: currency.symbol)
-      if delimiter
-        # Thanks Money gem for the regular expression
-        formatted.gsub!(/(\d)(?=(?:\d{3})+(?:[^\d]{1}|$))/, "\\1#{delimiter}")
-      end
-      formatted.tr!('.', separator) if separator != '.'
-      formatted
-    end
   end
 end

data/lib/minting/money/formatting.rb

@@ -0,0 +1,69 @@
+module Mint
+  # Formatting functionality for Money objects
+  class Money
+    # Formats money as a string with customizable format, thousand delimiter, and decimal
+    #
+    # @param format [String] Format string with placeholders: %<symbol>s, %<amount>f, %<currency>s
+    # @param thousand [String, false] Thousands delimiter (e.g., ',' for 1,000)
+    # @param decimal [String] Decimal separator (e.g., '.' or ',')
+    # @return [String] Formatted money string
+    #
+    # @example Basic formatting
+    #   money = Mint.money(1234.56, 'USD')
+    #   money.to_s                           #=> "$1234.56"
+    #   money.to_s(thousand: ',')           #=> "$1,234.56"
+    #   money.to_s(decimal: ',')           #=> "$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"
+    #
+    # @example Padding and alignment
+    #   money.to_s(format: '%<amount>10.2f')                #=> "   1234.56"
+    #   money.to_s(format: '%<symbol>s%<amount>010.2f')     #=> "$0001234.56"
+    #
+    def to_s(format: '%<symbol>s%<amount>f', decimal: '.', thousand: ',', width: nil)
+      raise ArgumentError, 'Invalid format' unless format.is_a?(String) || format.is_a?(Hash)
+
+      formatted = format_amount(format)
+
+      formatted.tr!('.', decimal) if decimal != '.'
+
+      unless thousand.empty?
+        # Regular expression courtesy of Money gem
+        # Matches digits followed by groups of 3 digits until non-digit or end
+        formatted.gsub!(/(\d)(?=(?:\d{3})+(?:[^\d]{1}|$))/, "\\1#{thousand}")
+      end
+
+      formatted = formatted.rjust(width) if width
+      formatted
+    end
+
+    def format_amount(format)
+      # binding.irb if format.is_a? Hash
+      format = { positive: format } if format.is_a?(String)
+      value = amount
+
+      if amount.negative? && format[:negative]
+        format = format[:negative]
+        value = -amount
+      elsif amount.zero? && format[:zero]
+        format = format[:zero]
+      else
+        format = format[:positive]
+      end
+      format ||= '%<symbol>s%<amount>f'
+
+      # Automatically adjust decimal places based on currency subunit
+      adjusted_format = format.gsub(/%<amount>(\+?\d*)f/,
+                                    "%<amount>\\1.#{currency.subunit}f")
+
+      Kernel.format(adjusted_format,
+                    amount: value,
+                    currency: currency_code,
+                    symbol: currency.symbol)
+    end
+  end
+end

data/lib/minting/money/money.rb

@@ -25,14 +25,14 @@ module Mint
     end
 
     def hash
-      @hash ||= zero? ? 0.hash : [amount, currency.code].hash
+      zero? ? 0.hash : [amount, currency.code].hash
     end
 
     # Returns a new Money object with the specified amount, or self if unchanged
     # @param new_amount [Numeric] The new amount
     # @return [Money] A new Money object or self
     def mint(new_amount)
-      new_amount.to_r == amount ? self : Money.new(new_amount, currency)
+      new_amount.to_r == amount ? self : Money.new(new_amount, currency).freeze
     end
 
     def inspect

data/lib/minting/money.rb

@@ -3,4 +3,5 @@ require 'minting/money/arithmetics'
 require 'minting/money/coercion'
 require 'minting/money/comparable'
 require 'minting/money/conversion'
+require 'minting/money/formatting'
 require 'minting/money/money'

data/lib/minting/version.rb

@@ -1,3 +1,3 @@
 module Minting
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minting
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Gilson Ferraz
@@ -30,6 +30,7 @@ files:
 - lib/minting/money/coercion.rb
 - lib/minting/money/comparable.rb
 - lib/minting/money/conversion.rb
+- lib/minting/money/formatting.rb
 - lib/minting/money/money.rb
 - lib/minting/version.rb
 - minting.gemspec