shopify-money 3.0.0 → 3.0.1

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)
@@ -111,11 +112,11 @@ 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
 

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 = "3.0.0"
+  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

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

@@ -3,7 +3,9 @@
 module RuboCop
   module Cop
     module Money
-      class ZeroMoney < Cop
+      class ZeroMoney < Base
+        extend RuboCop::Cop::AutoCorrector
+
         # `Money.zero` and it's alias `empty`, with or without currency
         # argument is removed in favour of the more explicit Money.new
         # syntax. Supplying it with a real currency is preferred for
@@ -31,21 +33,13 @@ module RuboCop
         PATTERN
 
         def on_send(node)
-          money_zero(node) do |currency_arg|
-            add_offense(node, message: format(MSG, currency: replacement_currency(currency_arg)))
-          end
-        end
-
-        def autocorrect(node)
           receiver, _ = *node
 
-          lambda do |corrector|
-            money_zero(node) do |currency_arg|
-              replacement_currency = replacement_currency(currency_arg)
-
+          money_zero(node) do |currency_arg|
+            add_offense(node, message: format(MSG, currency: replacement_currency(currency_arg))) do |corrector|
               corrector.replace(
                 node.loc.expression,
-                "#{receiver.source}.new(0, #{replacement_currency})"
+                "#{receiver.source}.new(0, #{replacement_currency(currency_arg)})",
               )
             end
           end
@@ -55,7 +49,7 @@ module RuboCop
 
         def replacement_currency(currency_arg)
           return currency_arg.first.source unless currency_arg.empty?
-          return "'#{cop_config['ReplacementCurrency']}'" if cop_config['ReplacementCurrency']
+          return "'#{cop_config["ReplacementCurrency"]}'" if cop_config['ReplacementCurrency']
 
           'Money::NULL_CURRENCY'
         end

data/lib/shopify-money.rb

@@ -1,2 +1,3 @@
 # frozen_string_literal: true
+
 require_relative 'money'

data/money.gemspec

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 # frozen_string_literal: true
+
 require_relative "lib/money/version"
 
 Gem::Specification.new do |s|
@@ -16,16 +17,15 @@ Gem::Specification.new do |s|
   s.metadata['allowed_push_host'] = "https://rubygems.org"
 
   s.add_development_dependency("bundler")
-  s.add_development_dependency("simplecov", ">= 0")
-  s.add_development_dependency("rails", "~> 6.0")
-  s.add_development_dependency("rspec", "~> 3.2")
   s.add_development_dependency("database_cleaner", "~> 2.0")
+  s.add_development_dependency("rails", "~> 7.2")
+  s.add_development_dependency("rspec", "~> 3.2")
+  s.add_development_dependency("simplecov", ">= 0")
   s.add_development_dependency("sqlite3")
 
-  s.required_ruby_version = '>= 3.0'
+  s.required_ruby_version = '>= 3.1'
 
-  s.files = `git ls-files`.split($/)
+  s.files = %x(git ls-files).split($/)
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 end

data/spec/config_spec.rb

@@ -2,6 +2,20 @@
 require 'spec_helper'
 
 RSpec.describe "Money::Config" do
+  describe 'thread safety' do
+    it 'does not share the same config across threads' do
+      configure(legacy_deprecations: true, default_currency: 'USD') do
+        expect(Money.config.legacy_deprecations).to eq(true)
+        expect(Money.default_currency).to eq('USD')
+        thread = Thread.new do
+          expect(Money.config.legacy_deprecations).to eq(false)
+          expect(Money.default_currency).to eq(nil)
+        end
+        thread.join
+      end
+    end
+  end
+
   describe 'legacy_deprecations' do
     it "respects the default currency" do
       configure(default_currency: 'USD', legacy_deprecations: true) do

data/spec/money_spec.rb

@@ -62,6 +62,14 @@ RSpec.describe "Money" do
     end
   end
 
+  it "#without_legacy_deprecations bypasses the legacy deprecations and gives the real behavior" do
+    configure(legacy_deprecations: true) do
+      Money.without_legacy_deprecations do
+        expect{ Money.new(1, 'USD').to_money('CAD') }.to raise_error(Money::IncompatibleCurrencyError)
+      end
+    end
+  end
+
   it "#to_money raises when changing currency" do
     expect{ Money.new(1, 'USD').to_money('CAD') }.to raise_error(Money::IncompatibleCurrencyError)
   end
@@ -385,6 +393,36 @@ RSpec.describe "Money" do
     expect(JSON.dump(Money.new(1.00, "CAD"))).to eq('{"value":"1.00","currency":"CAD"}')
   end
 
+  describe ".from_hash" do
+    it "is the inverse operation of #to_h" do
+      one_cad = Money.new(1, "CAD")
+      expect(Money.from_hash(one_cad.to_h)).to eq(one_cad)
+    end
+
+    it "creates Money object from hash with expected keys" do
+      expect(Money.from_hash({ value: 1.01, currency: "CAD" })).to eq(Money.new(1.01, "CAD"))
+    end
+
+    it "raises if Hash does not have the expected keys" do
+      expect { Money.from_hash({ "val": 1.0 }) }.to raise_error(KeyError)
+    end
+  end
+
+  describe ".from_json" do
+    it "is the inverse operation of #to_json" do
+      one_cad = Money.new(1, "CAD")
+      expect(Money.from_json(one_cad.to_json)).to eq(one_cad)
+    end
+
+    it "creates Money object from JSON-encoded string" do
+      expect(Money.from_json('{ "value": 1.01, "currency": "CAD" }')).to eq(Money.new(1.01, "CAD"))
+    end
+
+    it "raises if JSON string is malformed" do
+      expect { Money.from_json('{ "val": 1.0 }') }.to raise_error(KeyError)
+    end
+  end
+
   it "supports absolute value" do
     expect(Money.new(-1.00).abs).to eq(Money.new(1.00))
   end

data/spec/rubocop/cop/money/missing_currency_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe RuboCop::Cop::Money::MissingCurrency do
     it 'registers an offense and corrects for Money.new without a currency argument' do
       expect_offense(<<~RUBY)
         Money.new(1)
-        ^^^^^^^^^^^^ Money is missing currency argument
+        ^^^^^^^^^^^^ Money/MissingCurrency: Money is missing currency argument
       RUBY
 
       expect_correction(<<~RUBY)
@@ -36,7 +36,7 @@ RSpec.describe RuboCop::Cop::Money::MissingCurrency do
     it 'registers an offense and corrects for Money.new without a currency argument' do
       expect_offense(<<~RUBY)
         Money.new
-        ^^^^^^^^^ Money is missing currency argument
+        ^^^^^^^^^ Money/MissingCurrency: Money is missing currency argument
       RUBY
 
       expect_correction(<<~RUBY)
@@ -47,7 +47,7 @@ RSpec.describe RuboCop::Cop::Money::MissingCurrency do
     it 'registers an offense and corrects for Money.from_amount without a currency argument' do
       expect_offense(<<~RUBY)
         Money.from_amount(1)
-        ^^^^^^^^^^^^^^^^^^^^ Money is missing currency argument
+        ^^^^^^^^^^^^^^^^^^^^ Money/MissingCurrency: Money is missing currency argument
       RUBY
 
       expect_correction(<<~RUBY)
@@ -64,7 +64,7 @@ RSpec.describe RuboCop::Cop::Money::MissingCurrency do
     it 'registers an offense and corrects for Money.from_cents without a currency argument' do
       expect_offense(<<~RUBY)
         Money.from_cents(1)
-        ^^^^^^^^^^^^^^^^^^^ Money is missing currency argument
+        ^^^^^^^^^^^^^^^^^^^ Money/MissingCurrency: Money is missing currency argument
       RUBY
 
       expect_correction(<<~RUBY)
@@ -81,7 +81,7 @@ RSpec.describe RuboCop::Cop::Money::MissingCurrency do
     it 'registers an offense and corrects for to_money without a currency argument' do
       expect_offense(<<~RUBY)
         '1'.to_money
-        ^^^^^^^^^^^^ to_money is missing currency argument
+        ^^^^^^^^^^^^ Money/MissingCurrency: to_money is missing currency argument
       RUBY
 
       expect_correction(<<~RUBY)
@@ -92,7 +92,7 @@ RSpec.describe RuboCop::Cop::Money::MissingCurrency do
     it 'registers an offense and corrects for safe navigation to_money without a currency argument' do
       expect_offense(<<~RUBY)
         item&.to_money
-        ^^^^^^^^^^^^^^ to_money is missing currency argument
+        ^^^^^^^^^^^^^^ Money/MissingCurrency: to_money is missing currency argument
       RUBY
 
       expect_correction(<<~RUBY)
@@ -109,7 +109,7 @@ RSpec.describe RuboCop::Cop::Money::MissingCurrency do
     it 'registers an offense and corrects for to_money block pass form' do
       expect_offense(<<~RUBY)
         ['1'].map(&:to_money)
-        ^^^^^^^^^^^^^^^^^^^^^ to_money is missing currency argument
+        ^^^^^^^^^^^^^^^^^^^^^ Money/MissingCurrency: to_money is missing currency argument
       RUBY
 
       expect_correction(<<~RUBY)

data/spec/rubocop/cop/money/zero_money_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe RuboCop::Cop::Money::ZeroMoney do
     it 'registers an offense and corrects Money.zero without currency' do
       expect_offense(<<~RUBY)
         Money.zero
-        ^^^^^^^^^^ Money.zero is removed, use `Money.new(0, Money::NULL_CURRENCY)`.
+        ^^^^^^^^^^ Money/ZeroMoney: Money.zero is removed, use `Money.new(0, Money::NULL_CURRENCY)`.
       RUBY
 
       expect_correction(<<~RUBY)
@@ -23,7 +23,7 @@ RSpec.describe RuboCop::Cop::Money::ZeroMoney do
     it 'registers an offense and corrects Money.zero with currency' do
       expect_offense(<<~RUBY)
         Money.zero('CAD')
-        ^^^^^^^^^^^^^^^^^ Money.zero is removed, use `Money.new(0, 'CAD')`.
+        ^^^^^^^^^^^^^^^^^ Money/ZeroMoney: Money.zero is removed, use `Money.new(0, 'CAD')`.
       RUBY
 
       expect_correction(<<~RUBY)