shopify-money 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c67c2dd8b088c4dd304e61c162f100be69c492de2a3a45f8954bca27a5a524dc
-  data.tar.gz: d162ab0971609899ac9b152e62eb96bce8c54908761310e99a361280b20fd005
+  metadata.gz: 968f61cd2788112e0310dad876e0100eef9bdc375b39d10b7a34e98cb23650fc
+  data.tar.gz: 279e00665cf1561add517a797afc0d732410813233da3dfe6c09225de9108445
 SHA512:
-  metadata.gz: b272a70b2e03787371782b781e62b291d292c5486070899253ba286d8a91461581fda8904e1f38025dceabda6d3690373b72333f8d103d8b6cd698bf1213787c
-  data.tar.gz: b3f3165474b9d0fc614dca9c3f1a771de70aa8e02423e68deb3ecc2c90201454d52dac62a813ab132605526f122e43822abfd3049d55ced561b0eecb2532fc9a
+  metadata.gz: 5abf64ebc32b62bbb31906b977a05e66362dc68453c454efedfe0c83ae5743454c526882fbec437f4874d36ae5d384947c64175a8d50fba0fb339c58d77500c5
+  data.tar.gz: 76a439a0dca761dc12b3fd44e90737aee88fe26f11ed20af1ab9eba45ce20d6fa55265c9130ee034548d5b799621eef4d328808ca12fcfdcca6b02e258a496b4

data/README.md

@@ -1,20 +1,17 @@
 # money
 
-[![tests](https://github.com/Shopify/money/workflows/tests/badge.svg)](https://github.com/Shopify/money/actions?query=workflow%3Atests+branch%3Amaster)
+[![tests](https://github.com/Shopify/money/workflows/tests/badge.svg)](https://github.com/Shopify/money/actions?query=workflow%3Atests+branch%3Amain)
 
 
 money_column expects a DECIMAL(21,3) database field.
 
 ### Features
 
-- Keeps value in decimal
-- Provides a `Money` class which encapsulates all information about an certain
-  amount of money, such as its value and its currency.
-- Provides a `Money::Currency` class which encapsulates all information about
-  a monetary unit.
-- Does NOT provides APIs for exchanging money from one currency to another.
-- wont lose pennies during division!
-- Money::NullCurrency for no currency support
+- Provides a `Money` class which encapsulates all information about a certain amount of money, such as its value and its currency.
+- Provides a `Money::Currency` class which encapsulates all information about a monetary unit.
+- Represents monetary values as decimals. No need to convert your amounts every time you use them. Easily understand the data in your DB.
+- Does NOT provide APIs for exchanging money from one currency to another.
+- Will not lose pennies during divisions
 
 ## Installation
 
@@ -22,7 +19,7 @@ money_column expects a DECIMAL(21,3) database field.
 
 ## Upgrading to v1.0
 
-see instructions and breaking changes: https://github.com/Shopify/money/blob/master/UPGRADING.md
+see instructions and breaking changes: https://github.com/Shopify/money/blob/main/UPGRADING.md
 
 ## Usage
 
@@ -171,7 +168,7 @@ Money/UnsafeToMoney:
 
 ## Contributing to money
 
-- Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
+- Check out the latest main to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 - Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
 - Fork the project
 - Start a feature/bugfix branch

data/lib/money/core_extensions.rb

@@ -14,6 +14,14 @@ end
 #   '100.37'.to_money => #<Money @cents=10037>
 class String
   def to_money(currency = nil)
-    Money::Parser::Fuzzy.parse(self, currency)
+    if Money.config.legacy_deprecations
+      Money::Parser::Fuzzy.parse(self, currency).tap do |money|
+        message = "`#{self}.to_money` will behave like `Money.new` and raise on the next release. " \
+          "To parse user input, do so on the browser and use the user's locale."
+        Money.deprecate(message) if money.value != BigDecimal(self, exception: false)
+      end
+    else
+      Money.new(self, currency)
+    end
   end
 end

data/lib/money/deprecations.rb

@@ -3,7 +3,10 @@ Money.class_eval do
   ACTIVE_SUPPORT_DEFINED = defined?(ActiveSupport)
 
   def self.active_support_deprecator
-    @active_support_deprecator ||= ActiveSupport::Deprecation.new('1.0.0', 'Shopify/Money')
+    @active_support_deprecator ||= begin
+      next_major_version = Money::VERSION.split(".").first.to_i + 1
+      ActiveSupport::Deprecation.new("#{next_major_version}.0.0", "Shopify/Money")
+    end
   end
 
   def self.deprecate(message)

data/lib/money/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 class Money
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

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

@@ -32,7 +32,8 @@ module RuboCop
         PATTERN
 
         def on_send(node)
-          money_new(node) do |_amount, currency_arg|
+          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')

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

@@ -16,7 +16,7 @@ module RuboCop
 
         def on_send(node)
           return unless node.method?(:to_money)
-          return if node.receiver.is_a?(AST::NumericNode)
+          return if node.receiver.nil? || node.receiver.is_a?(AST::NumericNode)
 
           add_offense(node, location: :selector)
         end

data/lib/rubocop/cop/money.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
 require 'rubocop/cop/money/missing_currency'
+require 'rubocop/cop/money/unsafe_to_money'
 require 'rubocop/cop/money/zero_money'

data/spec/core_extensions_spec.rb

@@ -43,8 +43,26 @@ RSpec.describe String do
   it_should_behave_like "an object supporting to_money"
 
   it "parses an empty string to Money.zero" do
-    expect(''.to_money).to eq(Money.new(0, Money::NULL_CURRENCY))
-    expect(' '.to_money).to eq(Money.new(0, Money::NULL_CURRENCY))
+    expect("".to_money("USD")).to eq(Money.new(0, "USD"))
+
+    configure(legacy_deprecations: true) do
+      expect(Money).to receive(:deprecate).once
+      expect(" ".to_money("CAD")).to eq(Money.new(0, "CAD"))
+    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,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"))
+    end
+  end
+
+  it "#to_money should behave like Money.new with three decimal places amounts" do
+    expect("29.000".to_money("USD")).to eq(Money.new("29.00", "USD"))
   end
 end
 

data/spec/deprecations_spec.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+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("1.2.3")
+    expect(Money.active_support_deprecator.deprecation_horizon).to eq("2.0.0")
+  end
+end

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

@@ -26,6 +26,13 @@ RSpec.describe RuboCop::Cop::Money::MissingCurrency do
       RUBY
     end
 
+    it 'does not register an offense for Money.new with splat argument' do
+      expect_no_offenses(<<~RUBY)
+        value_and_currency = [1, 'CAD']
+        Money.new(*value_and_currency)
+      RUBY
+    end
+
     it 'registers an offense and corrects for Money.new without a currency argument' do
       expect_offense(<<~RUBY)
         Money.new

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

@@ -53,5 +53,11 @@ RSpec.describe RuboCop::Cop::Money::UnsafeToMoney do
         Money.new(obj.money, 'USD')
       RUBY
     end
+
+    it 'does not register an offense for receiver-less calls' do
+      expect_no_offenses(<<~RUBY)
+        a = to_money
+      RUBY
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-money
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Shopify Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-20 00:00:00.000000000 Z
+date: 2023-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -149,6 +149,7 @@ files:
 - 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
@@ -185,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.14
+rubygems_version: 3.4.17
 signing_key: 
 specification_version: 4
 summary: Shopify's money gem
@@ -195,6 +196,7 @@ test_files:
 - 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