money 7.0.2 → 7.1.0

data/lib/money/money/arithmetic.rb

@@ -37,17 +37,17 @@ class Money
     #   Money.new(1_00).eql?("1.00")                        #=> false
     #
     # @see Money.strict_eql_compare
-    def eql?(other_money)
-      if other_money.is_a?(Money)
-        if !Money.strict_eql_compare && fractional == 0 && other_money.fractional == 0
+    def eql?(other)
+      if other.is_a?(Money)
+        if !Money.strict_eql_compare && fractional == 0 && other.fractional == 0
           warn "[DEPRECATION] Comparing 0 #{currency} with 0 " \
-                "#{other_money.currency} using `#eql?` will return false in " \
-                "future versions of Money. Opt-in to the new behavior by " \
-                "setting `Money.strict_eql_compare = true`."
+               "#{other.currency} using `#eql?` will return false in " \
+               "future versions of Money. Opt-in to the new behavior by " \
+               "setting `Money.strict_eql_compare = true`."
           return true
         end
 
-        fractional == other_money.fractional && currency == other_money.currency
+        fractional == other.fractional && currency == other.currency
       else
         false
       end
@@ -65,6 +65,7 @@ class Money
     def <=>(other)
       unless other.is_a?(Money)
         return unless other.respond_to?(:zero?) && other.zero?
+
         return other.is_a?(CoercedNumeric) ? 0 <=> fractional : fractional <=> 0
       end
 
@@ -76,14 +77,16 @@ class Money
       other = other.exchange_to(currency)
       fractional <=> other.fractional
     rescue Money::Bank::UnknownRate
+      nil
     end
 
     # Uses Comparable's implementation but raises ArgumentError if non-zero
     # numeric value is given.
     def ==(other)
       if other.is_a?(Numeric) && !other.zero?
-        raise ArgumentError, 'Money#== supports only zero numerics'
+        raise ArgumentError, "Money#== supports only zero numerics"
       end
+
       super
     end
 
@@ -148,9 +151,11 @@ class Money
           dup_with(fractional: new_fractional)
         when CoercedNumeric
           raise TypeError, non_zero_message.call(other.value) unless other.zero?
+
           dup_with(fractional: other.value.public_send(op, fractional))
         when Numeric
           raise TypeError, non_zero_message.call(other) unless other.zero?
+
           self
         else
           raise TypeError, "Unsupported argument type: #{other.class.name}"
@@ -172,12 +177,12 @@ class Money
     # @example
     #   Money.new(100) * 2 #=> #<Money @fractional=200>
     #
-    def *(value)
-      value = value.value if value.is_a?(CoercedNumeric)
-      if value.is_a? Numeric
-        dup_with(fractional: fractional * value)
+    def *(other)
+      other = other.value if other.is_a?(CoercedNumeric)
+      if other.is_a? Numeric
+        dup_with(fractional: fractional * other)
       else
-        raise TypeError, "Can't multiply a #{self.class.name} by a #{value.class.name}'s value"
+        raise TypeError, "Can't multiply a #{self.class.name} by a #{other.class.name}'s value"
       end
     end
 
@@ -196,17 +201,19 @@ class Money
     #   Money.new(100) / 10            #=> #<Money @fractional=10>
     #   Money.new(100) / Money.new(10) #=> 10.0
     #
-    def /(value)
-      if value.is_a?(self.class)
-        exchanged = value.exchange_to(currency)
+    def /(other)
+      if other.is_a?(self.class)
+        exchanged = other.exchange_to(currency)
         raise ZeroDivisionError, "divided by Money(0)" if exchanged.zero?
+
         fractional / as_d(exchanged.fractional).to_f
       else
-        raise TypeError, 'Can not divide by Money' if value.is_a?(CoercedNumeric)
+        raise TypeError, "Can not divide by Money" if other.is_a?(CoercedNumeric)
+
+        other = as_d(other)
+        raise ZeroDivisionError, "divided by zero" if other.zero?
 
-        value = as_d(value)
-        raise ZeroDivisionError, "divided by zero" if value.zero?
-        dup_with(fractional: fractional / value)
+        dup_with(fractional: fractional / other)
       end
     end
 
@@ -244,6 +251,7 @@ class Money
     def divmod_money(val)
       cents = val.exchange_to(currency).cents
       raise ZeroDivisionError, "divided by Money(0)" if cents == 0
+
       quotient, remainder = fractional.divmod(cents)
       [quotient, dup_with(fractional: remainder)]
     end
@@ -252,6 +260,7 @@ class Money
     def divmod_other(val)
       val = as_d(val)
       raise ZeroDivisionError, "divided by zero" if val.zero?
+
       quotient, remainder = fractional.divmod(val)
       [dup_with(fractional: quotient), dup_with(fractional: remainder)]
     end
@@ -277,8 +286,8 @@ class Money
     # @return [Money]
     #
     # @see #modulo
-    def %(val)
-      modulo(val)
+    def %(other)
+      modulo(other)
     end
 
     # If different signs +self.modulo(val) - val+ otherwise +self.modulo(val)+
@@ -295,9 +304,9 @@ class Money
       end
 
       if (fractional < 0 && val < 0) || (fractional > 0 && val > 0)
-        self.modulo(val)
+        modulo(val)
       else
-        self.modulo(val) - (val.is_a?(Money) ? val : dup_with(fractional: val))
+        modulo(val) - (val.is_a?(Money) ? val : dup_with(fractional: val))
       end
     end
 
@@ -331,7 +340,7 @@ class Money
     #   Money.new(100).nonzero? #=> #<Money @fractional=100>
     #   Money.new(0).nonzero?   #=> nil
     def nonzero?
-      fractional != 0 ? self : nil
+      fractional == 0 ? nil : self
     end
 
     # Used to make Money instance handle the operations when arguments order is reversed

data/lib/money/money/constructors.rb

@@ -2,7 +2,6 @@
 
 class Money
   module Constructors
-
     # Create a new money object with value 0.
     #
     # @param [Currency, String, Symbol] currency The currency to use.
@@ -14,8 +13,8 @@ class Money
     def empty(currency = default_currency)
       new(0, currency)
     end
-    alias_method :zero, :empty
 
+    alias zero empty
 
     # Creates a new Money object of the given value, using the Canadian
     # dollar currency.
@@ -31,8 +30,8 @@ class Money
     def ca_dollar(cents)
       new(cents, "CAD")
     end
-    alias_method :cad, :ca_dollar
 
+    alias cad ca_dollar
 
     # Creates a new Money object of the given value, using the American dollar
     # currency.
@@ -48,8 +47,8 @@ class Money
     def us_dollar(cents)
       new(cents, "USD")
     end
-    alias_method :usd, :us_dollar
 
+    alias usd us_dollar
 
     # Creates a new Money object of the given value, using the Euro currency.
     #
@@ -64,8 +63,8 @@ class Money
     def euro(cents)
       new(cents, "EUR")
     end
-    alias_method :eur, :euro
 
+    alias eur euro
 
     # Creates a new Money object of the given value, in British pounds.
     #
@@ -80,7 +79,7 @@ class Money
     def pound_sterling(pence)
       new(pence, "GBP")
     end
-    alias_method :gbp, :pound_sterling
 
+    alias gbp pound_sterling
   end
 end

data/lib/money/money/formatter.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'money/money/formatting_rules'
+require "money/money/formatting_rules"
 
 class Money
   class Formatter
     DEFAULTS = {
-      thousands_separator: '',
-      decimal_mark: '.'
+      thousands_separator: "",
+      decimal_mark: ".",
     }.freeze
 
     # Creates a formatted price string according to several rules.
@@ -117,7 +117,11 @@ class Money
     #
     # @example
     #   Money.ca_dollar(570).format(html_wrap: true, with_currency: true)
-    #   #=> "<span class=\"money-currency-symbol\">$</span><span class=\"money-whole\">5</span><span class=\"money-decimal-mark\">.</span><span class=\"money-decimal\">70</span> <span class=\"money-currency\">CAD</span>"
+    #   #=> "<span class=\"money-currency-symbol\">$</span>" \
+    #       "<span class=\"money-whole\">5</span>" \
+    #       "<span class=\"money-decimal-mark\">.</span>" \
+    #       "<span class=\"money-decimal\">70</span> " \
+    #       "<span class=\"money-currency\">CAD</span>"
     #
     # @option rules [Boolean] :sign_before_symbol (false) Whether the sign should be
     #  before the currency symbol.
@@ -145,7 +149,7 @@ class Money
     # @example
     #   Money.new(10000, "USD").format(disambiguate: false)   #=> "$100.00"
     #   Money.new(10000, "CAD").format(disambiguate: false)   #=> "$100.00"
-    #   Money.new(10000, "USD").format(disambiguate: true)    #=> "$100.00"
+    #   Money.new(10000, "USD").format(disambiguate: true)    #=> "US$100.00"
     #   Money.new(10000, "CAD").format(disambiguate: true)    #=> "C$100.00"
     #
     # @option rules [Boolean] :translate (true) `true` Checks for custom
@@ -191,6 +195,7 @@ class Money
 
     def to_s
       return free_text if show_free_text?
+
       result = format_number
       formatted = append_sign(result)
       append_currency_symbol(formatted)
@@ -208,8 +213,8 @@ class Money
       lookup :decimal_mark
     end
 
-    alias_method :delimiter, :thousands_separator
-    alias_method :separator, :decimal_mark
+    alias delimiter thousands_separator
+    alias separator decimal_mark
 
     private
 
@@ -230,7 +235,7 @@ class Money
           [
             html_wrap(whole_part, "whole"),
             html_wrap(decimal_mark, "decimal-mark"),
-            html_wrap(decimal_part, "decimal")
+            html_wrap(decimal_part, "decimal"),
           ].join
         end
       else
@@ -239,15 +244,15 @@ class Money
     end
 
     def append_sign(formatted_number)
-      sign = money.negative? ? '-' : ''
+      sign = money.negative? ? "-" : ""
 
       if rules[:sign_positive] == true && money.positive?
-        sign = '+'
+        sign = "+"
       end
 
       if rules[:sign_before_symbol] == true
         sign_before = sign
-        sign = ''
+        sign = ""
       end
 
       symbol_value = symbol_value_from(rules)
@@ -258,10 +263,10 @@ class Money
         end
 
         rules[:format]
-          .gsub('%u', [sign_before, symbol_value].join)
-          .gsub('%n', [sign, formatted_number].join)
+          .gsub("%u", [sign_before, symbol_value].join)
+          .gsub("%n", [sign, formatted_number].join)
       else
-        formatted_number = "#{sign_before}#{sign}#{formatted_number}"
+        "#{sign_before}#{sign}#{formatted_number}"
       end
     end
 
@@ -289,7 +294,7 @@ class Money
     end
 
     def free_text
-      rules[:display_free].respond_to?(:to_str) ? rules[:display_free] : 'free'
+      rules[:display_free].respond_to?(:to_str) ? rules[:display_free] : "free"
     end
 
     def format_whole_part(value)
@@ -309,7 +314,7 @@ class Money
       fractional_units = BigDecimal(fractional) / currency.subunit_to_unit
 
       # Split the result and return whole and decimal parts separately
-      fractional_units.to_s('F').split('.')
+      fractional_units.to_s("F").split(".")
     end
 
     def format_decimal_part(value)
@@ -318,10 +323,10 @@ class Money
       return nil if rules[:no_cents_if_whole] && value.to_i == 0
 
       # Pad value, making up for missing zeroes at the end
-      value = value.ljust(currency.decimal_places, '0')
+      value = value.ljust(currency.decimal_places, "0")
 
       # Drop trailing zeros if needed
-      value.gsub!(/0*$/, '') if rules[:drop_trailing_zeros]
+      value.gsub!(/0*$/, "") if rules[:drop_trailing_zeros]
 
       value.empty? ? nil : value
     end
@@ -338,7 +343,7 @@ class Money
 
     def symbol_value_from(rules)
       if rules.has_key?(:symbol)
-        if rules[:symbol] === true
+        if rules[:symbol] == true
           if rules[:disambiguate] && currency.disambiguate_symbol
             currency.disambiguate_symbol
           else
@@ -350,7 +355,7 @@ class Money
           ""
         end
       elsif rules[:html_wrap]
-        currency.html_entity == '' ? currency.symbol : currency.html_entity
+        currency.html_entity == "" ? currency.symbol : currency.html_entity
       elsif rules[:disambiguate] && currency.disambiguate_symbol
         currency.disambiguate_symbol
       else

data/lib/money/money/formatting_rules.rb

@@ -18,9 +18,11 @@ class Money
       @rules[key]
     end
 
+    # rubocop:disable Naming/PredicatePrefix
     def has_key?(key)
       @rules.has_key? key
     end
+    # rubocop:enable Naming/PredicatePrefix
 
     private
 
@@ -32,14 +34,14 @@ class Money
     #
     # @return [Hash]
     def normalize_formatting_rules(rules)
-      if rules.size == 0
+      if rules.empty?
         rules = {}
       elsif rules.size == 1
         rules = rules.pop
         rules = rules.dup if rules.is_a?(Hash)
 
         if rules.is_a?(Symbol)
-          warn '[DEPRECATION] Use Hash when passing rules to Money#format.'
+          warn "[DEPRECATION] Use Hash when passing rules to Money#format."
           rules = { rules => true }
         end
       end

data/lib/money/money/locale_backend.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'money/locale_backend/errors'
-require 'money/locale_backend/i18n'
-require 'money/locale_backend/currency'
+require "money/locale_backend/errors"
+require "money/locale_backend/i18n"
+require "money/locale_backend/currency"
 
 class Money
   module LocaleBackend
     BACKENDS = {
       i18n: Money::LocaleBackend::I18n,
-      currency: Money::LocaleBackend::Currency
+      currency: Money::LocaleBackend::Currency,
     }.freeze
 
     def self.find(name)

data/lib/money/money.rb

@@ -82,16 +82,16 @@ class Money
   #
   # @return [Money]
   def to_nearest_cash_value
-    unless self.currency.smallest_denomination
+    unless currency.smallest_denomination
       raise UndefinedSmallestDenomination,
             "Smallest denomination of this currency is not defined"
     end
 
     fractional = as_d(@fractional)
-    smallest_denomination = as_d(self.currency.smallest_denomination)
+    smallest_denomination = as_d(currency.smallest_denomination)
     rounded_value =
       (fractional / smallest_denomination)
-        .round(0, self.class.rounding_mode) * smallest_denomination
+      .round(0, self.class.rounding_mode) * smallest_denomination
 
     dup_with(fractional: return_value(rounded_value))
   end
@@ -106,7 +106,6 @@ class Money
 
   # Class Methods
   class << self
-
     # @!attribute [rw] default_bank
     #   Used to set a default bank for currency exchange.
     #
@@ -163,7 +162,13 @@ class Money
                   :conversion_precision,
                   :strict_eql_compare
     attr_reader :locale_backend
-    attr_writer :default_bank
+    attr_writer :default_bank,
+                :default_currency
+
+    # @attr_writer rounding_mode Use this to specify the rounding mode
+    attr_writer :rounding_mode
+
+    alias from_cents new
   end
 
   # @!attribute default_currency
@@ -179,10 +184,6 @@ class Money
     end
   end
 
-  def self.default_currency=(currency)
-    @default_currency = currency
-  end
-
   # Modified to support thread-local bank override
   def self.default_bank
     # Check for thread-local bank first, then fall back to global default
@@ -218,11 +219,6 @@ class Money
     @locale_backend = value ? LocaleBackend.find(value) : nil
   end
 
-  # @attr_writer rounding_mode Use this to specify the rounding mode
-  def self.rounding_mode=(new_rounding_mode)
-    @rounding_mode = new_rounding_mode
-  end
-
   def self.setup_defaults
     # Set the default bank for creating new +Money+ objects.
     self.default_bank = Bank::VariableExchange.instance
@@ -246,6 +242,8 @@ class Money
 
   def self.inherited(base)
     base.setup_defaults
+
+    super
   end
 
   setup_defaults
@@ -316,10 +314,10 @@ class Money
   #
   # @see #initialize
   def self.from_amount(amount, currency = default_currency, options = {})
-    raise ArgumentError, "'amount' must be numeric" unless Numeric === amount
+    raise ArgumentError, "'amount' must be numeric" unless amount.is_a?(Numeric)
 
     currency = Currency.wrap(currency) || Money.default_currency
-    raise Currency::NoCurrency, 'must provide a currency' if currency.nil?
+    raise Currency::NoCurrency, "must provide a currency" if currency.nil?
 
     value = amount.to_d * currency.subunit_to_unit
     new(value, currency, options)
@@ -335,10 +333,6 @@ class Money
     from_amount(amount, currency, options)
   end
 
-  class << self
-    alias_method :from_cents, :new
-  end
-
   # Creates a new Money object of value given in the
   # +fractional unit+ of the given +currency+.
   #
@@ -373,8 +367,8 @@ class Money
     @bank     ||= Money.default_bank
 
     # BigDecimal can be Infinity and NaN, money of that amount does not make sense
-    raise ArgumentError, 'must be initialized with a finite value' unless @fractional.finite?
-    raise Currency::NoCurrency, 'must provide a currency' if @currency.nil?
+    raise ArgumentError, "must be initialized with a finite value" unless @fractional.finite?
+    raise Currency::NoCurrency, "must provide a currency" if @currency.nil?
   end
 
   # DEPRECATED.
@@ -408,7 +402,7 @@ class Money
   # @example
   #   Money.new(100).hash #=> 908351
   def hash
-    [fractional.hash, currency.hash].hash
+    [fractional, currency].hash
   end
 
   # Uses +Currency#symbol+. If +nil+ is returned, defaults to "¤".
@@ -435,7 +429,7 @@ class Money
   # @example
   #   Money.ca_dollar(100).to_s #=> "1.00"
   def to_s
-    format thousands_separator: '',
+    format thousands_separator: "",
            no_cents_if_whole: currency.decimal_places == 0,
            symbol: false,
            ignore_defaults: true
@@ -494,7 +488,7 @@ class Money
   # @return [self]
   def to_money(given_currency = nil)
     given_currency = Currency.wrap(given_currency)
-    if given_currency.nil? || self.currency == given_currency
+    if given_currency.nil? || currency == given_currency
       self
     else
       exchange_to(given_currency)
@@ -517,12 +511,12 @@ class Money
   #   Money.new(2000, "USD").exchange_to("EUR")
   #   Money.new(2000, "USD").exchange_to("EUR") {|x| x.round}
   #   Money.new(2000, "USD").exchange_to(Currency.new("EUR"))
-  def exchange_to(other_currency, &rounding_method)
+  def exchange_to(other_currency, &)
     other_currency = Currency.wrap(other_currency)
-    if self.currency == other_currency
+    if currency == other_currency
       self
     else
-      @bank.exchange_with(self, other_currency, &rounding_method)
+      @bank.exchange_with(self, other_currency, &)
     end
   end
 
@@ -584,7 +578,8 @@ class Money
     amounts = Money::Allocation.generate(fractional, parts, !Money.default_infinite_precision)
     amounts.map { |amount| dup_with(fractional: amount) }
   end
-  alias_method :split, :allocate
+
+  alias split allocate
 
   # Round the monetary amount to smallest unit of coinage.
   #
@@ -636,7 +631,7 @@ class Money
     self.class.new(
       options[:fractional] || fractional,
       options[:currency] || currency,
-      bank: options[:bank] || bank
+      bank: options[:bank] || bank,
     )
   end
 

data/lib/money/rates_store/memory.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require 'monitor'
+require "monitor"
 
 class Money
   module RatesStore
-
     # Class for thread-safe storage of exchange rate pairs.
     # Used by instances of +Money::Bank::VariableExchange+.
     #
@@ -15,7 +14,7 @@ class Money
     #   # iterates rates
     #   store.each_rate {|iso_from, iso_to, rate| puts "#{from} -> #{to}: #{rate}" }
     class Memory
-      INDEX_KEY_SEPARATOR = '_TO_'.freeze
+      INDEX_KEY_SEPARATOR = "_TO_"
 
       # Initializes a new +Money::RatesStore::Memory+ object.
       #
@@ -72,10 +71,8 @@ class Money
       end
 
       # Wraps block execution in a thread-safe transaction
-      def transaction(&block)
-        guard.synchronize do
-          yield
-        end
+      def transaction(&)
+        guard.synchronize(&)
       end
 
       # Iterate over rate tuples (iso_from, iso_to, rate)
@@ -90,7 +87,7 @@ class Money
       #   store.each_rate do |iso_from, iso_to, rate|
       #     puts [iso_from, iso_to, rate].join
       #   end
-      def each_rate(&block)
+      def each_rate(&)
         return to_enum(:each_rate) unless block_given?
 
         guard.synchronize do

data/lib/money/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Money
-  VERSION = "7.0.2"
+  VERSION = "7.1.0"
 end

data/money.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.name        = "money"
   s.version     = Money::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ['Shane Emmons', 'Anthony Dmitriyev']
-  s.email       = ['shane@emmons.io', 'anthony.dmitriyev@gmail.com']
+  s.authors     = ["Shane Emmons", "Anthony Dmitriyev"]
+  s.email       = ["shane@emmons.io", "anthony.dmitriyev@gmail.com"]
   s.homepage    = "https://rubymoney.github.io/money"
   s.summary     = "A Ruby Library for dealing with money and currency conversion."
   s.description = "A Ruby Library for dealing with money and currency conversion."
@@ -20,13 +20,13 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 3.1"
 
-  s.files         = `git ls-files -z -- config/* lib/* CHANGELOG.md LICENSE money.gemspec README.md`.split("\x0")
+  s.files         = `git ls-files -z -- config/* lib/* sig/* CHANGELOG.md LICENSE money.gemspec README.md`.split("\x0")
   s.require_paths = ["lib"]
 
   if s.respond_to?(:metadata)
-    s.metadata['changelog_uri'] = 'https://github.com/RubyMoney/money/blob/main/CHANGELOG.md'
-    s.metadata['source_code_uri'] = 'https://github.com/RubyMoney/money/'
-    s.metadata['bug_tracker_uri'] = 'https://github.com/RubyMoney/money/issues'
-    s.metadata['rubygems_mfa_required'] = 'true'
+    s.metadata["changelog_uri"] = "https://github.com/RubyMoney/money/blob/main/CHANGELOG.md"
+    s.metadata["source_code_uri"] = "https://github.com/RubyMoney/money/"
+    s.metadata["bug_tracker_uri"] = "https://github.com/RubyMoney/money/issues"
+    s.metadata["rubygems_mfa_required"] = "true"
   end
 end