shopify-money 2.2.2 → 3.0.1

data/lib/money/money.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
+
 require 'forwardable'
+require 'json'
 
 class Money
   include Comparable
@@ -8,6 +10,7 @@ class Money
   NULL_CURRENCY = NullCurrency.new.freeze
 
   attr_reader :value, :currency
+
   def_delegators :@value, :zero?, :nonzero?, :positive?, :negative?, :to_i, :to_f, :hash
 
   class ReverseOperationProxy
@@ -36,11 +39,17 @@ class Money
 
   class << self
     extend Forwardable
-    attr_accessor :config
-    def_delegators :@config, :default_currency, :default_currency=
+    def_delegators :config, :default_currency, :default_currency=, :without_legacy_deprecations
+
+    def config
+      Thread.current[:shopify_money__config] ||= Config.new
+    end
+
+    def config=(config)
+      Thread.current[:shopify_money__config] = config
+    end
 
     def configure
-      self.config ||= Config.new
       yield(config) if block_given?
     end
 
@@ -74,6 +83,16 @@ class Money
       new(value, currency)
     end
 
+    def from_json(string)
+      hash = JSON.parse(string, symbolize_names: true)
+      Money.new(hash.fetch(:value), hash.fetch(:currency))
+    end
+
+    def from_hash(hash)
+      hash = hash.transform_keys(&:to_sym)
+      Money.new(hash.fetch(:value), hash.fetch(:currency))
+    end
+
     def rational(money1, money2)
       money1.send(:arithmetic, money2) do
         factor = money1.currency.subunit_to_unit * money2.currency.subunit_to_unit
@@ -94,13 +113,11 @@ class Money
     # I18n.with_locale and ActiveSupport's Time.use_zone. This won't affect
     # instances being created with explicitly set currency.
     def with_currency(new_currency)
-      begin
-        old_currency = Money.current_currency
-        Money.current_currency = new_currency
-        yield
-      ensure
-        Money.current_currency = old_currency
-      end
+      old_currency = Money.current_currency
+      Money.current_currency = new_currency
+      yield
+    ensure
+      Money.current_currency = old_currency
     end
 
     private
@@ -116,10 +133,12 @@ class Money
         return amount
       end
 
-      msg = "Money.new(Money.new(amount, #{amount.currency}), #{currency}) is changing the currency of an existing money object"
+      msg = "Money.new(Money.new(amount, #{amount.currency}), #{currency}) " \
+        "is changing the currency of an existing money object"
+
       if Money.config.legacy_deprecations
         Money.deprecate("#{msg}. A Money::IncompatibleCurrencyError will raise in the next major release")
-        return Money.new(amount.value, currency)
+        Money.new(amount.value, currency)
       else
         raise Money::IncompatibleCurrencyError, msg
       end
@@ -184,19 +203,19 @@ class Money
     end
   end
 
-  def *(numeric)
-    raise ArgumentError, "Money objects can only be multiplied by a Numeric" unless numeric.is_a?(Numeric)
+  def *(other)
+    raise ArgumentError, "Money objects can only be multiplied by a Numeric" unless other.is_a?(Numeric)
 
-    return self if numeric == 1
-    Money.new(value.to_r * numeric, currency)
+    return self if other == 1
+    Money.new(value.to_r * other, currency)
   end
 
-  def /(numeric)
+  def /(other)
     raise "[Money] Dividing money objects can lose pennies. Use #split instead"
   end
 
   def inspect
-    "#<#{self.class} value:#{self} currency:#{self.currency}>"
+    "#<#{self.class} value:#{self} currency:#{currency}>"
   end
 
   def ==(other)
@@ -215,6 +234,10 @@ class Money
     [ReverseOperationProxy.new(other), self]
   end
 
+  def convert_currency(exchange_rate, new_currency)
+    Money.new(value * exchange_rate, new_currency)
+  end
+
   def to_money(new_currency = nil)
     if new_currency.nil?
       return self
@@ -224,8 +247,10 @@ class Money
       return Money.new(value, new_currency)
     end
 
-    ensure_compatible_currency(Helpers.value_to_currency(new_currency),
-      "to_money is attempting to change currency of an existing money object from #{currency} to #{new_currency}")
+    ensure_compatible_currency(
+      Helpers.value_to_currency(new_currency),
+      "to_money is attempting to change currency of an existing money object from #{currency} to #{new_currency}",
+    )
 
     self
   end
@@ -246,7 +271,7 @@ class Money
 
     rounded_value = value.round(units)
     if units == 0
-      sprintf("%d", rounded_value)
+      format("%d", rounded_value)
     else
       formatted = rounded_value.to_s("F")
       decimal_digits = formatted.size - formatted.index(".") - 1
@@ -260,7 +285,7 @@ class Money
   alias_method :to_formatted_s, :to_fs
 
   def to_json(options = nil)
-    if (options.is_a?(Hash) && options.delete(:legacy_format)) || Money.config.legacy_json_format
+    if (options.is_a?(Hash) && options[:legacy_format]) || Money.config.legacy_json_format
       to_s
     else
       as_json(options).to_json
@@ -268,12 +293,13 @@ class Money
   end
 
   def as_json(options = nil)
-    if (options.is_a?(Hash) && options.delete(:legacy_format)) || Money.config.legacy_json_format
+    if (options.is_a?(Hash) && options[:legacy_format]) || Money.config.legacy_json_format
       to_s
     else
       { value: to_s(:amount), currency: currency.to_s }
     end
   end
+  alias_method :to_h, :as_json
 
   def abs
     abs = value.abs
@@ -287,7 +313,7 @@ class Money
     Money.new(floor, currency)
   end
 
-  def round(ndigits=0)
+  def round(ndigits = 0)
     round = value.round(ndigits)
     return self if round == value
     Money.new(round, currency)
@@ -348,13 +374,13 @@ class Money
   def clamp(min, max)
     raise ArgumentError, 'min cannot be greater than max' if min > max
 
-    clamped_value = min if self.value < min
-    clamped_value = max if self.value > max
+    clamped_value = min if value < min
+    clamped_value = max if value > max
 
     if clamped_value.nil?
       self
     else
-      Money.new(clamped_value, self.currency)
+      Money.new(clamped_value, currency)
     end
   end
 
@@ -363,20 +389,17 @@ class Money
   def arithmetic(other)
     case other
     when Money
-      ensure_compatible_currency(other.currency,
-        "mathematical operation not permitted for Money objects with different currencies #{other.currency} and #{currency}.")
+      desc = "mathematical operation not permitted for Money objects with different currencies " \
+        "#{other.currency} and #{currency}."
+
+      ensure_compatible_currency(other.currency, desc)
       yield(other)
 
     when Numeric, String
       yield(Money.new(other, currency))
 
     else
-      if Money.config.legacy_deprecations && other.respond_to?(:to_money)
-        Money.deprecate("#{other.inspect} is being implicitly coerced into a Money object. Call `to_money` on this object to transform it into a money explicitly. An TypeError will raise in the next major release")
-        yield(other.to_money(currency))
-      else
-        raise TypeError, "#{other.class.name} can't be coerced into Money"
-      end
+      raise TypeError, "#{other.class.name} can't be coerced into a Money object"
     end
   end
 

data/lib/money/null_currency.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Money
   # A placeholder currency for instances where no actual currency is available,
   # as defined by ISO4217. You should rarely, if ever, need to use this
@@ -32,9 +33,16 @@ class Money
   #   #=> #<Money value:5.00 currency:CAD>
   #
   class NullCurrency
-
-    attr_reader :iso_code, :iso_numeric, :name, :smallest_denomination, :subunit_symbol,
-                :subunit_to_unit, :minor_units, :symbol, :disambiguate_symbol, :decimal_mark
+    attr_reader :iso_code,
+      :iso_numeric,
+      :name,
+      :smallest_denomination,
+      :subunit_symbol,
+      :subunit_to_unit,
+      :minor_units,
+      :symbol,
+      :disambiguate_symbol,
+      :decimal_mark
 
     def initialize
       @symbol                = '$'

data/lib/money/parser/accounting.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Money
   module Parser
     class Accounting < Fuzzy

data/lib/money/parser/fuzzy.rb

@@ -1,43 +1,44 @@
 # frozen_string_literal: true
+
 class Money
   module Parser
     class Fuzzy
       class MoneyFormatError < ArgumentError; end
 
-      MARKS = %w[. , · ’ ˙ '] + [' ']
+      MARKS = ['.', ',', '·', '’', '˙', "'", ' '].freeze
 
       ESCAPED_MARKS = Regexp.escape(MARKS.join)
       ESCAPED_NON_SPACE_MARKS = Regexp.escape((MARKS - [' ']).join)
       ESCAPED_NON_DOT_MARKS = Regexp.escape((MARKS - ['.']).join)
       ESCAPED_NON_COMMA_MARKS = Regexp.escape((MARKS - [',']).join)
 
-      NUMERIC_REGEX = /(
+      NUMERIC_REGEX = %r{(
         [\+\-]?
         [\d#{ESCAPED_NON_SPACE_MARKS}][\d#{ESCAPED_MARKS}]*
-      )/ix
+      )}ix
 
       # 1,234,567.89
-      DOT_DECIMAL_REGEX = /\A
+      DOT_DECIMAL_REGEX = %r{\A
         [\+\-]?
         (?:
           (?:\d+)
           (?:[#{ESCAPED_NON_DOT_MARKS}]\d{3})+
           (?:\.\d{2,})?
         )
-      \z/ix
+      \z}ix
 
       # 1.234.567,89
-      COMMA_DECIMAL_REGEX = /\A
+      COMMA_DECIMAL_REGEX = %r{\A
         [\+\-]?
         (?:
           (?:\d+)
           (?:[#{ESCAPED_NON_COMMA_MARKS}]\d{3})+
           (?:\,\d{2,})?
         )
-      \z/ix
+      \z}ix
 
       # 12,34,567.89
-      INDIAN_NUMERIC_REGEX = /\A
+      INDIAN_NUMERIC_REGEX = %r{\A
         [\+\-]?
         (?:
           (?:\d+)
@@ -45,17 +46,17 @@ class Money
           (?:\,\d{3})
           (?:\.\d{2})?
         )
-      \z/ix
+      \z}ix
 
       # 1,1123,4567.89
-      CHINESE_NUMERIC_REGEX = /\A
+      CHINESE_NUMERIC_REGEX = %r{\A
         [\+\-]?
         (?:
           (?:\d+)
           (?:\,\d{4})+
           (?:\.\d{2})?
         )
-      \z/ix
+      \z}ix
 
       def self.parse(input, currency = nil, **options)
         new.parse(input, currency, **options)
@@ -92,8 +93,7 @@ class Money
         number = number.to_s.strip
 
         if number.empty?
-          if Money.config.legacy_deprecations && !strict
-            Money.deprecate("invalid money strings will raise in the next major release \"#{input}\"")
+          if !strict
             return '0'
           else
             raise MoneyFormatError, "invalid money string: #{input}"
@@ -112,17 +112,15 @@ class Money
         # remove end of string mark
         number.sub!(/[#{ESCAPED_MARKS}]\z/, '')
 
-        if amount = number[DOT_DECIMAL_REGEX] || number[INDIAN_NUMERIC_REGEX] || number[CHINESE_NUMERIC_REGEX]
+        if (amount = number[DOT_DECIMAL_REGEX] || number[INDIAN_NUMERIC_REGEX] || number[CHINESE_NUMERIC_REGEX])
           return amount.tr(ESCAPED_NON_DOT_MARKS, '')
         end
 
-        if amount = number[COMMA_DECIMAL_REGEX]
+        if (amount = number[COMMA_DECIMAL_REGEX])
           return amount.tr(ESCAPED_NON_COMMA_MARKS, '').sub(',', '.')
         end
 
-        if Money.config.legacy_deprecations && !strict
-          Money.deprecate("invalid money strings will raise in the next major release \"#{input}\"")
-        else
+        if strict
           raise MoneyFormatError, "invalid money string: #{input}"
         end
 
@@ -161,11 +159,6 @@ class Money
           return true
         end
 
-        # legacy support for 1.000 USD
-        if digits.last.size == 3 && digits.first.size <= 3 && currency.minor_units < 3
-          return false
-        end
-
         # The last mark matches the one used by the provided currency to delimiter decimals
         currency.decimal_mark == last_mark
       end

data/lib/money/parser/locale_aware.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Money
   module Parser
     class LocaleAware
@@ -7,18 +8,14 @@ class Money
       class << self
         # The +Proc+ called to get the current locale decimal separator. In Rails apps this defaults to the same lookup
         # ActionView's +number_to_currency+ helper will use to format the monetary amount for display.
-        def decimal_separator_resolver
-          @decimal_separator_resolver
-        end
+        attr_reader :decimal_separator_resolver
 
         # Set the default +Proc+ to determine the current locale decimal separator.
         #
         # @example
         #   Money::Parser::LocaleAware.decimal_separator_resolver =
         #     ->() { MyFormattingLibrary.current_locale.decimal.separator }
-        def decimal_separator_resolver=(proc)
-          @decimal_separator_resolver = proc
-        end
+        attr_writer :decimal_separator_resolver
 
         # Parses an input string, normalizing some non-ASCII characters to their equivalent ASCII, then discarding any
         # character that is not a digit, hyphen-minus or the decimal separator. To prevent user confusion, make sure

data/lib/money/parser/simple.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 class Money
   module Parser
     class Simple
-      SIGNED_DECIMAL_MATCHER = /\A-?\d*(?:\.\d*)?\z/.freeze
+      SIGNED_DECIMAL_MATCHER = /\A-?\d*(?:\.\d*)?\z/
 
       class << self
         # Parses an input string using BigDecimal, it always expects a dot character as a decimal separator and

data/lib/money/rails/job_argument_serializer.rb

@@ -19,4 +19,3 @@ class Money
     end
   end
 end
-

data/lib/money/railtie.rb

@@ -3,9 +3,11 @@
 class Money
   class Railtie < Rails::Railtie
     initializer "shopify-money.setup_active_job_serializer" do
-      ActiveSupport.on_load :active_job do
-        require_relative "rails/job_argument_serializer"
-        ActiveJob::Serializers.add_serializers ::Money::Rails::JobArgumentSerializer
+      ActiveSupport.on_load(:active_job) do
+        if defined?(ActiveJob::Serializers)
+          require_relative "rails/job_argument_serializer"
+          ActiveJob::Serializers.add_serializers(::Money::Rails::JobArgumentSerializer)
+        end
       end
     end
 

data/lib/money/splitter.rb

@@ -11,7 +11,7 @@ class Money
       @split = nil
     end
 
-    protected attr_writer :split
+    protected attr_writer(:split)
 
     def split
       @split ||= begin
@@ -35,19 +35,17 @@ class Money
         each do |money|
           return money
         end
+      elsif count >= size
+        to_a
       else
-        if count >= size
-          to_a
-        else
-          result = Array.new(count)
-          index = 0
-          each do |money|
-            result[index] = money
-            index += 1
-            break if index == count
-          end
-          result
+        result = Array.new(count)
+        index = 0
+        each do |money|
+          result[index] = money
+          index += 1
+          break if index == count
         end
+        result
       end
     end
 
@@ -56,20 +54,18 @@ class Money
         reverse_each do |money|
           return money
         end
+      elsif count >= size
+        to_a
       else
-        if count >= size
-          to_a
-        else
-          result = Array.new(count)
-          index = 0
-          reverse_each do |money|
-            result[index] = money
-            index += 1
-            break if index == count
-          end
-          result.reverse!
-          result
+        result = Array.new(count)
+        index = 0
+        reverse_each do |money|
+          result[index] = money
+          index += 1
+          break if index == count
         end
+        result.reverse!
+        result
       end
     end
 

data/lib/money/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Money
-  VERSION = "2.2.2"
+  VERSION = "3.0.1"
 end

data/lib/money.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'money/version'
 require_relative 'money/parser/fuzzy'
 require_relative 'money/helpers'

data/lib/money_column/active_record_hooks.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module MoneyColumn
   class CurrencyReadOnlyError < StandardError; end
 
@@ -82,7 +83,7 @@ module MoneyColumn
           currency_column: currency_column,
           currency: currency,
           currency_read_only: currency_read_only,
-          coerce_null: coerce_null
+          coerce_null: coerce_null,
         )
 
         if options[:currency_column]
@@ -96,11 +97,11 @@ module MoneyColumn
 
           attribute(column_string, MoneyColumn::ActiveRecordType.new)
 
-          define_method column do
+          define_method(column) do
             read_money_attribute(column_string)
           end
 
-          define_method "#{column}=" do |money|
+          define_method("#{column}=") do |money|
             write_money_attribute(column_string, money)
           end
         end
@@ -109,8 +110,10 @@ module MoneyColumn
       private
 
       def normalize_money_column_options(options)
-        raise ArgumentError, 'cannot set both :currency_column and :currency options' if options[:currency] && options[:currency_column]
-        raise ArgumentError, 'must set one of :currency_column or :currency options' unless options[:currency] || options[:currency_column]
+        raise ArgumentError,
+          'cannot set both :currency_column and :currency options' if options[:currency] && options[:currency_column]
+        raise ArgumentError,
+          'must set one of :currency_column or :currency options' unless options[:currency] || options[:currency_column]
 
         if options[:currency]
           options[:currency] = Money::Currency.find!(options[:currency]).to_s.freeze
@@ -126,7 +129,7 @@ module MoneyColumn
       def clear_cache_on_currency_change(currency_column)
         return if money_column_options.any? { |_, opt| opt[:currency_column] == currency_column }
 
-        define_method "#{currency_column}=" do |value|
+        define_method("#{currency_column}=") do |value|
           clear_money_column_cache
           super(value)
         end

data/lib/money_column/active_record_type.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
-class MoneyColumn::ActiveRecordType < ActiveRecord::Type::Decimal
-  def serialize(money)
-    return nil unless money
-    super(money.to_d)
+
+module MoneyColumn
+  class ActiveRecordType < ActiveRecord::Type::Decimal
+    def serialize(money)
+      return unless money
+      super(money.to_d)
+    end
   end
 end

data/lib/money_column/railtie.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 module MoneyColumn
   class Railtie < Rails::Railtie
-    ActiveSupport.on_load :active_record do
+    ActiveSupport.on_load(:active_record) do
       ActiveRecord::Base.send(:include, MoneyColumn::ActiveRecordHooks)
     end
   end

data/lib/money_column.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'money_column/active_record_hooks'
 require_relative 'money_column/active_record_type'
 require_relative 'money_column/railtie'

data/lib/rubocop/cop/money/missing_currency.rb

@@ -3,7 +3,8 @@
 module RuboCop
   module Cop
     module Money
-      class MissingCurrency < Cop
+      class MissingCurrency < Base
+        extend RuboCop::Cop::AutoCorrector
         # `Money.new()` without a currency argument cannot guarantee correctness:
         # - no error raised for cross-currency computation (e.g. 5 CAD + 5 USD)
         # - #subunits returns wrong values for 0 and 3 decimals currencies
@@ -32,48 +33,40 @@ module RuboCop
         PATTERN
 
         def on_send(node)
+          receiver, method, _ = *node
+
           money_new(node) do |amount, currency_arg|
             return if amount&.splat_type?
             return if currency_arg
 
-            add_offense(node, message: 'Money is missing currency argument')
-          end
-
-          if to_money_block?(node) || to_money_without_currency?(node)
-            add_offense(node, message: 'to_money is missing currency argument')
-          end
-        end
-        alias on_csend on_send
-
-        def autocorrect(node)
-          receiver, method, _ = *node
-
-          lambda do |corrector|
-            money_new(node) do |amount, currency_arg|
-              return if currency_arg
-
+            add_offense(node, message: 'Money is missing currency argument') do |corrector|
               corrector.replace(
                 node.loc.expression,
-                "#{receiver.source}.#{method}(#{amount&.source || 0}, #{replacement_currency})"
+                "#{receiver.source}.#{method}(#{amount&.source || 0}, #{replacement_currency})",
               )
             end
+          end
 
-            if to_money_without_currency?(node)
-              corrector.insert_after(node.loc.expression, "(#{replacement_currency})")
-            elsif to_money_block?(node)
+          if to_money_block?(node)
+            add_offense(node, message: 'to_money is missing currency argument') do |corrector|
               corrector.replace(
                 node.loc.expression,
-                "#{receiver.source}.#{method} { |x| x.to_money(#{replacement_currency}) }"
+                "#{receiver.source}.#{method} { |x| x.to_money(#{replacement_currency}) }",
               )
             end
+          elsif to_money_without_currency?(node)
+            add_offense(node, message: 'to_money is missing currency argument') do |corrector|
+              corrector.insert_after(node.loc.expression, "(#{replacement_currency})")
+            end
           end
         end
+        alias_method :on_csend, :on_send
 
         private
 
         def replacement_currency
           if cop_config['ReplacementCurrency']
-            "'#{cop_config['ReplacementCurrency']}'"
+            "'#{cop_config["ReplacementCurrency"]}'"
           else
             'Money::NULL_CURRENCY'
           end