shopify-money 2.2.2 → 3.0.1

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("database_cleaner", "~> 2.0")
+  s.add_development_dependency("rails", "~> 7.2")
   s.add_development_dependency("rspec", "~> 3.2")
-  s.add_development_dependency("database_cleaner", "~> 1.6")
+  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/core_extensions_spec.rb

@@ -48,13 +48,17 @@ RSpec.describe String do
     configure(legacy_deprecations: true) do
       expect(Money).to receive(:deprecate).once
       expect(" ".to_money("CAD")).to eq(Money.new(0, "CAD"))
+
+      # empty should not show a deprecation
+      expect("".to_money("USD")).to eq(Money.new(0, "USD"))
     end
   end
 
   it "#to_money to handle thousands delimiters" do
     configure(legacy_deprecations: true) do
-      expect(Money).to receive(:deprecate).exactly(4).times
-      expect("29.000".to_money("USD")).to eq(Money.new("29000", "USD"))
+      expect("29.000".to_money("USD")).to eq(Money.new("29.00", "USD"))
+
+      expect(Money).to receive(:deprecate).exactly(3).times
       expect("29.000,00".to_money("USD")).to eq(Money.new("29000", "USD"))
       expect("29,000".to_money("USD")).to eq(Money.new("29000", "USD"))
       expect("29,000.00".to_money("USD")).to eq(Money.new("29000", "USD"))

data/spec/deprecations_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 
 RSpec.describe "deprecations" do
   it "has the deprecation_horizon as the next major release" do
-    allow(Money).to receive(:const_get).with('VERSION').and_return("2.1.0")
-    expect(Money.active_support_deprecator.deprecation_horizon).to eq("3.0.0")
+    expect(Money.active_support_deprecator.deprecation_horizon).to eq("4.0.0")
   end
 end

data/spec/helpers_spec.rb

@@ -45,11 +45,8 @@ RSpec.describe Money::Helpers do
       expect(subject.value_to_decimal(' -1.23 ')).to eq(-amount)
     end
 
-    it 'invalid string returns zero' do
-      configure(legacy_deprecations: true) do
-        expect(Money).to receive(:deprecate).once
-        expect(subject.value_to_decimal('invalid')).to eq(0)
-      end
+    it 'invalid string raises error' do
+      expect { subject.value_to_decimal('invalid') }.to raise_error(ArgumentError)
     end
 
     it 'raises on invalid object' do

data/spec/money_spec.rb

@@ -28,6 +28,10 @@ RSpec.describe "Money" do
     expect(Money.new(0, Money::NULL_CURRENCY)).to eq(Money.new(0))
   end
 
+  it "converts to a new currency" do
+    expect(Money.new(10, "USD").convert_currency(150, "JPY")).to eq(Money.new(1500, "JPY"))
+  end
+
   it "returns itself with to_money" do
     expect(money.to_money).to eq(money)
     expect(amount_money.to_money).to eq(amount_money)
@@ -58,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
@@ -104,13 +116,6 @@ RSpec.describe "Money" do
     end
   end
 
-  it "legacy_deprecations defaults to 0 when constructed with an invalid string" do
-    configure(legacy_deprecations: true) do
-      expect(Money).to receive(:deprecate).once
-      expect(Money.new('invalid', 'USD')).to eq(Money.new(0.00, 'USD'))
-    end
-  end
-
   it "raises when constructed with an invalid string" do
     expect{ Money.new('invalid') }.to raise_error(ArgumentError)
   end
@@ -388,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
@@ -612,13 +647,13 @@ RSpec.describe "Money" do
             configure(legacy_deprecations: true) { test.run }
           end
 
-          it { expect(Money).to(receive(:deprecate).once); expect(cad_10 <=> coercible_object).to(eq(0)) }
-          it { expect(Money).to(receive(:deprecate).once); expect(cad_10 >   coercible_object).to(eq(false)) }
-          it { expect(Money).to(receive(:deprecate).once); expect(cad_10 >=  coercible_object).to(eq(true)) }
-          it { expect(Money).to(receive(:deprecate).once); expect(cad_10 <=  coercible_object).to(eq(true)) }
-          it { expect(Money).to(receive(:deprecate).once); expect(cad_10 <   coercible_object).to(eq(false)) }
-          it { expect(Money).to(receive(:deprecate).once); expect(cad_10 +   coercible_object).to(eq(Money.new(20, 'CAD'))) }
-          it { expect(Money).to(receive(:deprecate).once); expect(cad_10 -   coercible_object).to(eq(Money.new(0, 'CAD'))) }
+          it { expect { cad_10 <=> coercible_object }.to(raise_error(TypeError)) }
+          it { expect { cad_10 >   coercible_object }.to(raise_error(TypeError)) }
+          it { expect { cad_10 >=  coercible_object }.to(raise_error(TypeError)) }
+          it { expect { cad_10 <=  coercible_object }.to(raise_error(TypeError)) }
+          it { expect { cad_10 <   coercible_object }.to(raise_error(TypeError)) }
+          it { expect { cad_10 +   coercible_object }.to(raise_error(TypeError)) }
+          it { expect { cad_10 -   coercible_object }.to(raise_error(TypeError)) }
         end
       end
     end

data/spec/parser/accounting_spec.rb

@@ -20,10 +20,7 @@ RSpec.describe Money::Parser::Accounting do
     end
 
     it "parses an invalid string to $0" do
-      configure(legacy_deprecations: true) do
-        expect(Money).to receive(:deprecate).once
-        expect(@parser.parse("no money", 'USD')).to eq(Money.new(0, 'USD'))
-      end
+      expect(@parser.parse("no money", 'USD')).to eq(Money.new(0, 'USD'))
     end
 
     it "parses a single digit integer string" do
@@ -122,7 +119,7 @@ RSpec.describe Money::Parser::Accounting do
 
     it "parses thousands amount" do
       Money.with_currency(Money::NULL_CURRENCY) do
-        expect(@parser.parse("1.000")).to eq(Money.new(1000.00))
+        expect(@parser.parse("1.000")).to eq(Money.new(1.00))
       end
     end
 

data/spec/parser/fuzzy_spec.rb

@@ -12,11 +12,8 @@ RSpec.describe Money::Parser::Fuzzy do
     end
 
     it "parses an invalid string when not strict" do
-      configure(legacy_deprecations: true) do
-        expect(Money).to receive(:deprecate).twice
-        expect(@parser.parse("no money", 'USD')).to eq(Money.new(0, 'USD'))
-        expect(@parser.parse("1..", 'USD')).to eq(Money.new(1, 'USD'))
-      end
+      expect(@parser.parse("no money", 'USD')).to eq(Money.new(0, 'USD'))
+      expect(@parser.parse("1..", 'USD')).to eq(Money.new(1, 'USD'))
     end
 
     it "parses raise with an invalid string and strict option" do
@@ -140,7 +137,7 @@ RSpec.describe Money::Parser::Fuzzy do
     end
 
     it "parses no currency amount" do
-      expect(@parser.parse("1.000", Money::NULL_CURRENCY)).to eq(Money.new(1000, Money::NULL_CURRENCY))
+      expect(@parser.parse("1.000", Money::NULL_CURRENCY)).to eq(Money.new(1, Money::NULL_CURRENCY))
     end
 
     it "parses amount with more than 3 decimals correctly" do
@@ -152,10 +149,7 @@ RSpec.describe Money::Parser::Fuzzy do
     end
 
     it "parses amount with multiple inconsistent thousands delimiters" do
-      configure(legacy_deprecations: true) do
-        expect(Money).to receive(:deprecate).once
-        expect(@parser.parse("1.1.11.111", 'USD')).to eq(Money.new(1_111_111, 'USD'))
-      end
+      expect(@parser.parse("1.1.11.111", 'USD')).to eq(Money.new(1_111_111, 'USD'))
     end
 
     it "parses raises with multiple inconsistent thousands delimiters and strict option" do
@@ -226,10 +220,7 @@ RSpec.describe Money::Parser::Fuzzy do
     end
 
     it "parses amount with multiple inconsistent thousands delimiters" do
-      configure(legacy_deprecations: true) do
-        expect(Money).to receive(:deprecate).once
-        expect(@parser.parse("1,1,11,111", 'USD')).to eq(Money.new(1_111_111, 'USD'))
-      end
+      expect(@parser.parse("1,1,11,111", 'USD')).to eq(Money.new(1_111_111, 'USD'))
     end
 
     it "parses raises with multiple inconsistent thousands delimiters and strict option" do
@@ -255,7 +246,7 @@ RSpec.describe Money::Parser::Fuzzy do
   describe "no decimal currency" do
     it "parses thousands correctly" do
       expect(@parser.parse("1,111", "JPY")).to eq(Money.new(1_111, 'JPY'))
-      expect(@parser.parse("1.111", "JPY")).to eq(Money.new(1_111, 'JPY'))
+      expect(@parser.parse("1.111", "JPY")).to eq(Money.new(1, 'JPY'))
       expect(@parser.parse("1 111", "JPY")).to eq(Money.new(1_111, 'JPY'))
       expect(@parser.parse("1111,111", "JPY")).to eq(Money.new(1_111_111, 'JPY'))
     end
@@ -270,7 +261,7 @@ RSpec.describe Money::Parser::Fuzzy do
   describe "two decimal currency" do
     it "parses thousands correctly" do
       expect(@parser.parse("1,111", "USD")).to eq(Money.new(1_111, 'USD'))
-      expect(@parser.parse("1.111", "USD")).to eq(Money.new(1_111, 'USD'))
+      expect(@parser.parse("1.111", "USD")).to eq(Money.new(1.11, 'USD'))
       expect(@parser.parse("1 111", "USD")).to eq(Money.new(1_111, 'USD'))
       expect(@parser.parse("1111,111", "USD")).to eq(Money.new(1_111_111, 'USD'))
     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)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: shopify-money
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 3.0.1
 platform: ruby
 authors:
 - Shopify Inc
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-03 00:00:00.000000000 Z
+date: 2025-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,33 +24,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -67,19 +66,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -102,10 +101,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".document"
+- ".github/dependabot.yml"
 - ".github/workflows/cla.yml"
 - ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - Gemfile
 - Gemfile.lock
@@ -173,7 +174,6 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -181,37 +181,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key: 
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Shopify's money gem
-test_files:
-- spec/allocator_spec.rb
-- spec/config_spec.rb
-- spec/core_extensions_spec.rb
-- spec/currency/loader_spec.rb
-- spec/currency_spec.rb
-- spec/deprecations_spec.rb
-- spec/helpers_spec.rb
-- spec/money_column_spec.rb
-- spec/money_spec.rb
-- spec/null_currency_spec.rb
-- spec/parser/accounting_spec.rb
-- spec/parser/fuzzy_spec.rb
-- spec/parser/locale_aware_spec.rb
-- spec/parser/simple_spec.rb
-- spec/rails/job_argument_serializer_spec.rb
-- spec/rails_spec_helper.rb
-- spec/rubocop/cop/money/missing_currency_spec.rb
-- spec/rubocop/cop/money/zero_money_spec.rb
-- spec/rubocop_helper.rb
-- spec/schema.rb
-- spec/spec_helper.rb
-- spec/splitter_spec.rb
+test_files: []