minting 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b05d1cbbf6c714102f38f165effba77384e4fc5cebf691d4b9ab75082c22b992
-  data.tar.gz: 2d5bb5aeb6e527a2d4419bcca35d79c426709797975e9ec38217558d875ea9b8
+  metadata.gz: a7530401c0a722596508aab5aa587bc53a548698308f9d09ae34fac2ec671784
+  data.tar.gz: abe0501b11d4f9c77e2054443c12e1d4a5e2707fabbfac71f5bd4b8a7f5a3fb5
 SHA512:
-  metadata.gz: ce7311d97cbe60c2f71ba5f65d1313704084eebae842e012c2cd857230055ef56007575e8f89887f8ae157c004d205e43370ada8d2fc2b5f3ea00b7c21c8017a
-  data.tar.gz: e4903099bb997667472ddc0c26ff07b3894bb9fa5122221c94045d84f2699e28d203646429e341a8119177a07212991f04d36c5806a12c8388766a3a8aebb6eb
+  metadata.gz: 31db7b1c31b0f1329342162cb8f868e46d14e703df5dd36898dfeb74281d674bc0f7ba0b9b367d8568f0751c09f3a219dec172ed87cc8cc4d906606550492034
+  data.tar.gz: 7090942000722ce81b302237a6b71850ef8a8ec477ded927bb5914f1e198552512ae11b0b1f46d38dd44ae0d6b4a2b1e7d34dab3ec35ea107b800c38e60c7a94

data/lib/minting/mint/currency.rb

@@ -12,6 +12,10 @@ module Mint
       "<Currency:(#{code} #{symbol} #{subunit})>"
     end
 
+    def normalize_amount(amount)
+      amount.to_r.round(subunit)
+    end
+
     private
 
     def initialize(code:, symbol:, subunit: 0, priority: 0, country: nil, name: nil)

data/lib/minting/mint/registry.rb

@@ -9,9 +9,9 @@ module Mint
   # @raise [ArgumentError] if the currency code is not registered
   def self.money(amount, currency_code)
     currency = currency(currency_code)
-    return Money.new(amount, currency) if currency
+    return Money.create(amount, currency) if currency
 
-    raise ArgumentError, "Currency [#{currency_code}] not registered. Check Mint.currencies"
+    raise ArgumentError, "[#{currency.inspect}] is not a registered currency. Check Mint.currencies"
   end
 
   # Returns default zero, no currency money
@@ -66,9 +66,9 @@ module Mint
             "Currency: #{code} already registered"
     end
 
-    currencies[code] = Currency.new(code:, subunit:, symbol:, priority:)
+    currency = currencies[code] = Currency.new(code:, subunit:, symbol:, priority:)
     @currency_symbols = nil
-    currencies[code]
+    currency
   end
 
   # Returns the hash of all registered currencies.

data/lib/minting/money/allocation.rb

@@ -45,11 +45,12 @@ module Mint
 
     def allocate_left_over!(amounts:, left_over:)
       if left_over.nonzero?
-        minimum = left_over.positive? ? currency.minimum_amount : -currency.minimum_amount
+        minimum = currency.minimum_amount
+        minimum = -minimum if left_over.negative?
         last_slot = (left_over / minimum).to_i - 1
         (0..last_slot).each { |slot| amounts[slot] += minimum }
       end
-      amounts.map { mint it }
+      amounts.map { Money.new(it, currency) }
     end
   end
 end

data/lib/minting/money/arithmetics.rb

@@ -60,7 +60,7 @@ module Mint
     # @return [Money] the multiplied Money instance
     # @raise [TypeError] if multiplier is not Numeric or is a Money object
     def *(multiplicand)
-      return mint(amount * multiplicand.to_r) if multiplicand.is_a?(Numeric)
+      return mint(amount * multiplicand) if multiplicand.is_a?(Numeric)
 
       raise TypeError, "#{self} can't be multiplied by #{multiplicand}"
     end

data/lib/minting/money/coercion.rb

@@ -13,8 +13,6 @@ module Mint
     # Coerced Number contains the arithmetic logic for numeric compatible ops.
     # @private
     class CoercedNumber
-      include Comparable
-
       # @private
       def initialize(value)
         @value = value
@@ -44,19 +42,21 @@ module Mint
         raise_coercion_error(:/, other)
       end
 
-      # @private
+      # Only zero is dimensionless and comparable to Money.
+      # e.g. 0 < price is meaningful; 0.5 < price is not (what currency is 0.5?).
       def <=>(other)
-        return nil if @value.nil? || other.nil?
         return @value <=> other.amount if @value.zero? || other.zero?
 
         raise_coercion_error(:<=>, other)
       end
 
-      # @private
+      private
+
       def raise_coercion_error(operation, operand)
         raise TypeError,
-              "#{self} #{operation} #{operand} : incompatible operands"
+              "#{@value} #{operation} #{operand} : incompatible operands"
       end
     end
+    private_constant :CoercedNumber
   end
 end

data/lib/minting/money/money.rb

@@ -10,13 +10,16 @@ module Mint
     # @param amount [Numeric] The monetary amount
     # @param currency [Currency] The currency object
     # @raise [ArgumentError] If amount is not numeric or currency is invalid
-    def initialize(amount, currency)
+    def self.create(amount, currency)
       raise ArgumentError, 'amount must be Numeric' unless amount.is_a?(Numeric)
-      raise ArgumentError, 'currency must be a Currency object' unless currency.is_a?(Currency)
 
-      @amount = amount.to_r.round(currency.subunit)
-      @currency = currency
-      freeze
+      checked_currency = Mint.currency(currency)
+      unless checked_currency
+        raise ArgumentError,
+              "Currency not found (#{currency}). Check Mint.currencies"
+      end
+
+      new(checked_currency.normalize_amount(amount), checked_currency)
     end
 
     # Returns the ISO 3-letter currency code string.
@@ -35,6 +38,7 @@ module Mint
     # @param new_amount [Numeric] The new amount
     # @return [Money] A new Money object or self
     def mint(new_amount)
+      new_amount = new_amount.to_r.round(currency.subunit)
       new_amount == amount ? self : Money.new(new_amount, currency)
     end
 
@@ -50,5 +54,16 @@ module Mint
     # @param other [Object] the target object to compare
     # @return [Boolean] true if currencies match, false otherwise
     def same_currency?(other) = other.respond_to?(:currency) && other.currency == currency
+
+    private
+
+    # Initializes a new Money object with the given amount and currency.
+    # @param amount [Numeric] The monetary amount
+    # @param currency [Currency] The currency object
+    def initialize(amount, currency)
+      @amount = amount
+      @currency = currency
+      freeze
+    end
   end
 end

data/lib/minting/money/parse.rb

@@ -25,7 +25,7 @@ module Mint
       currency = currency ? Mint.currency(currency) : parse_currency(input)
       raise ArgumentError, "Currency [#{currency}] not registered" unless currency
 
-      amount = parse_amount(input)
+      amount = currency.normalize_amount(parse_amount(input))
       new(amount, currency)
     end
 

data/lib/minting/version.rb

@@ -1,5 +1,5 @@
 # Root namespace for the Minting library.
 module Minting
   # Current version of the Minting gem.
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.3.0'.freeze
 end

metadata

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