shopify-money 0.14.5 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 683fbe81ccbaba82b0ff6aeae0cd13086453cf72eef33c8be0fb8afa453f7b6a
-  data.tar.gz: e4fdaff4a2761fd6d37a9ff50eeda4667572b563f9bd50e6c491808ab17fe3b5
+  metadata.gz: f9919cf2d14833f204c05a9642efb7a48bb23822c70c48cf523ccbc68c3e7491
+  data.tar.gz: d73bd65e6cb49ee8f5be7add57683274bb006fbfd0ec61aec566385fd92d50f6
 SHA512:
-  metadata.gz: 1190c9f7033aca4e0c44a60489dc2fac9b86d597afb6f3976da33b05e816719b8702af4b9c32ac0ffbf6230847c7858b18ce497c5d929336bbff8cfb89ee11fb
-  data.tar.gz: 97bcf3f52c7985422490074cb8c920d6ccc85cfc64e401ad5fa4c7bb5f5ee9ad449a3d89b19bbf9f5afa0f79cf23a7cd61804497dfcfca02f6ce76863a7e5c16
+  metadata.gz: b3dc0c02cee6598d2369ce472a5df01dfb3528cfb45f517394ab7c29b059338b8d65d10c03ae397a4ecdff98a7987a61e0312b894947b728e1ed32078b726086
+  data.tar.gz: 1e7cec90da29c1327fdf64984f34e7b6fa01282eb7a0c2e3eda6482d688b06d148b7b7bff760555e3a7d7302ec8b20079ad468cd7c02dabb83c7e9a0aeb0a1f2

data/.github/workflows/tests.yml

@@ -0,0 +1,34 @@
+name: tests
+
+on: [push, pull_request]
+  
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby: ['2.6', '2.7', '3.0']
+
+    name: Ruby ${{ matrix.ruby }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby ${{ matrix.ruby }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - uses: actions/cache@v1
+      with:
+        path: vendor/bundle
+        key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-gems-
+    - name: Install dependencies
+      run: |
+        gem install bundler
+        bundle config path vendor/bundle
+        bundle install --jobs 4 --retry 3
+    - name: Run tests
+      run: |
+        bundle exec rake

data/README.md

@@ -1,6 +1,6 @@
 # money
 
-[![Build Status](https://travis-ci.org/Shopify/money.svg?branch=master)](https://travis-ci.org/Shopify/money)
+[![tests](https://github.com/Shopify/money/workflows/tests/badge.svg)](https://github.com/Shopify/money/actions?query=workflow%3Atests+branch%3Amaster)
 
 
 money_column expects a DECIMAL(21,3) database field.

data/config/currency_historic.yml

@@ -29,7 +29,7 @@ eek:
   smallest_denomination: 5
 ghc:
   priority: 100
-  iso_code: GHS
+  iso_code: GHC
   name: Ghanaian Cedi
   symbol: "₵"
   disambiguate_symbol: GH₵

data/lib/money.rb

@@ -9,7 +9,6 @@ require_relative 'money/errors'
 require_relative 'money/deprecations'
 require_relative 'money/accounting_money_parser'
 require_relative 'money/core_extensions'
-require_relative 'money_accessor'
 require_relative 'money_column' if defined?(ActiveRecord)
 
 require_relative 'rubocop/cop/money' if defined?(RuboCop)

data/lib/money/currency.rb

@@ -50,6 +50,10 @@ class Money
       self.class == other.class && iso_code == other.iso_code
     end
 
+    def hash
+      [ self.class, iso_code ].hash
+    end
+
     def compatible?(other)
       other.is_a?(NullCurrency) || eql?(other)
     end

data/lib/money/helpers.rb

@@ -8,6 +8,10 @@ class Money
     DECIMAL_ZERO = BigDecimal(0).freeze
     MAX_DECIMAL = 21
 
+    STRIPE_SUBUNIT_OVERRIDE = {
+      'ISK' => 100,
+    }.freeze
+
     def value_to_decimal(num)
       value =
         case num

data/lib/money/money.rb

@@ -26,22 +26,22 @@ class Money
     end
     alias_method :from_amount, :new
 
-    def zero(currency = NULL_CURRENCY)
-      new(0, currency)
-    end
-    alias_method :empty, :zero
-
     def parse(*args, **kwargs)
       parser.parse(*args, **kwargs)
     end
 
-    def from_cents(cents, currency = nil)
-      new(cents.round.to_f / 100, currency)
-    end
-
-    def from_subunits(subunits, currency_iso)
+    def from_subunits(subunits, currency_iso, format: :iso4217)
       currency = Helpers.value_to_currency(currency_iso)
-      value = Helpers.value_to_decimal(subunits) / currency.subunit_to_unit
+
+      subunit_to_unit_value = if format == :iso4217
+        currency.subunit_to_unit
+      elsif format == :stripe
+        Helpers::STRIPE_SUBUNIT_OVERRIDE.fetch(currency.iso_code, currency.subunit_to_unit)
+      else
+        raise ArgumentError, "unknown format #{format}"
+      end
+
+      value = Helpers.value_to_decimal(subunits) / subunit_to_unit_value
       new(value, currency)
     end
 
@@ -84,7 +84,7 @@ class Money
   def initialize(value, currency)
     raise ArgumentError if value.nan?
     @currency = Helpers.value_to_currency(currency)
-    @value = value.round(@currency.minor_units)
+    @value = BigDecimal(value.round(@currency.minor_units))
     freeze
   end
 
@@ -97,13 +97,16 @@ class Money
     coder['currency'] = @currency.iso_code
   end
 
-  def cents
-    # Money.deprecate('`money.cents` is deprecated and will be removed in the next major release. Please use `money.subunits` instead. Keep in mind, subunits are currency aware.')
-    (value * 100).to_i
-  end
+  def subunits(format: :iso4217)
+    subunit_to_unit_value = if format == :iso4217
+      @currency.subunit_to_unit
+    elsif format == :stripe
+      Helpers::STRIPE_SUBUNIT_OVERRIDE.fetch(@currency.iso_code, @currency.subunit_to_unit)
+    else
+      raise ArgumentError, "unknown format #{format}"
+    end
 
-  def subunits
-    (@value * @currency.subunit_to_unit).to_i
+    (@value * subunit_to_unit_value).to_i
   end
 
   def no_currency?
@@ -207,16 +210,23 @@ class Money
   end
 
   def to_s(style = nil)
-    case style
+    units = case style
     when :legacy_dollars
-      sprintf("%.2f", value)
+      2
     when :amount, nil
-      sprintf("%.#{currency.minor_units}f", value)
+      currency.minor_units
+    else
+      raise ArgumentError, "Unexpected style: #{style}"
     end
-  end
 
-  def to_liquid
-    cents
+    rounded_value = value.round(units)
+    if units == 0
+      sprintf("%d", rounded_value)
+    else
+      sign = rounded_value < 0 ? '-' : ''
+      rounded_value = rounded_value.abs
+      sprintf("%s%d.%0#{units}d", sign, rounded_value.truncate, rounded_value.frac * (10 ** units))
+    end
   end
 
   def to_json(options = {})

data/lib/money/null_currency.rb

@@ -1,5 +1,36 @@
 # 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
+  # directly. It's here mostly for backwards compatibility and for that reason
+  # behaves like a dollar, which is how this gem worked before the introduction
+  # of currency.
+  #
+  # Here follows a list of preferred alternatives over using Money with
+  # NullCurrency:
+  #
+  # For comparisons where you don't know the currency beforehand, you can use
+  # Numeric predicate methods like #positive?/#negative?/#zero?/#nonzero?.
+  # Comparison operators with Numeric (==, !=, <=, =>, <, >) work as well.
+  #
+  # @example
+  #   Money.new(1, 'CAD').positive? #=> true
+  #   Money.new(2, 'CAD') >= 0      #=> true
+  #
+  # Money with NullCurrency has behaviour that may surprise you, such as
+  # database validations or GraphQL enum not allowing the string representation
+  # of NullCurrency. Prefer using Money.new(0, currency) where possible, as
+  # this sidesteps these issues and provides additional currency check
+  # safeties.
+  #
+  # Unlike other currencies, it is allowed to calculate a Money object with
+  # NullCurrency with another currency. The resulting Money object will have
+  # the other currency.
+  #
+  # @example
+  #   Money.new(0, Money::NULL_CURRENCY) + Money.new(5, 'CAD')
+  #   #=> #<Money value:5.00 currency:CAD>
+  #
   class NullCurrency
 
     attr_reader :iso_code, :iso_numeric, :name, :smallest_denomination, :subunit_symbol,
@@ -9,7 +40,7 @@ class Money
       @symbol                = '$'
       @disambiguate_symbol   = nil
       @subunit_symbol        = nil
-      @iso_code              = 'XXX' # Valid ISO4217
+      @iso_code              = 'XXX'
       @iso_numeric           = '999'
       @name                  = 'No Currency'
       @smallest_denomination = 1

data/lib/money/version.rb

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

data/lib/rubocop/cop/money.rb

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

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

@@ -20,11 +20,11 @@ module RuboCop
         #
 
         def_node_matcher :money_new, <<~PATTERN
-          (send (const nil? :Money) {:new :from_amount :from_cents} $...)
+          (send (const {nil? cbase} :Money) {:new :from_amount :from_cents} $...)
         PATTERN
 
         def_node_matcher :to_money_without_currency?, <<~PATTERN
-          (send _ :to_money)
+          ({send csend} _ :to_money)
         PATTERN
 
         def_node_matcher :to_money_block?, <<~PATTERN
@@ -42,11 +42,9 @@ module RuboCop
             add_offense(node, message: 'to_money is missing currency argument')
           end
         end
+        alias on_csend on_send
 
         def autocorrect(node)
-          currency = cop_config['ReplacementCurrency']
-          return unless currency
-
           receiver, method, _ = *node
 
           lambda do |corrector|
@@ -55,20 +53,30 @@ module RuboCop
 
               corrector.replace(
                 node.loc.expression,
-                "#{receiver.source}.#{method}(#{amount&.source || 0}, '#{currency}')"
+                "#{receiver.source}.#{method}(#{amount&.source || 0}, #{replacement_currency})"
               )
             end
 
             if to_money_without_currency?(node)
-              corrector.insert_after(node.loc.expression, "('#{currency}')")
+              corrector.insert_after(node.loc.expression, "(#{replacement_currency})")
             elsif to_money_block?(node)
               corrector.replace(
                 node.loc.expression,
-                "#{receiver.source}.#{method} { |x| x.to_money('#{currency}') }"
+                "#{receiver.source}.#{method} { |x| x.to_money(#{replacement_currency}) }"
               )
             end
           end
         end
+
+        private
+
+        def replacement_currency
+          if cop_config['ReplacementCurrency']
+            "'#{cop_config['ReplacementCurrency']}'"
+          else
+            'Money::NULL_CURRENCY'
+          end
+        end
       end
     end
   end

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

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Money
+      class ZeroMoney < Cop
+        # `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
+        # additional currency safety checks.
+        #
+        # If no currency was supplied, it defaults to
+        # Money::NULL_CURRENCY which was the default setting of
+        # Money.default_currency and should effectively be the same. The cop
+        # can be configured with a ReplacementCurrency in case that is more
+        # appropriate for your application.
+        #
+        # @example
+        #
+        #   # bad
+        #   Money.zero
+        #
+        #   # good when configured with `ReplacementCurrency: CAD`
+        #   Money.new(0, 'CAD')
+        #
+
+        MSG = 'Money.zero is removed, use `Money.new(0, %<currency>s)`.'
+
+        def_node_matcher :money_zero, <<~PATTERN
+          (send (const {nil? cbase} :Money) {:zero :empty} $...)
+        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)
+
+              corrector.replace(
+                node.loc.expression,
+                "#{receiver.source}.new(0, #{replacement_currency})"
+              )
+            end
+          end
+        end
+
+        private
+
+        def replacement_currency(currency_arg)
+          return currency_arg.first.source unless currency_arg.empty?
+          return "'#{cop_config['ReplacementCurrency']}'" if cop_config['ReplacementCurrency']
+
+          'Money::NULL_CURRENCY'
+        end
+      end
+    end
+  end
+end

data/money.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.metadata['allowed_push_host'] = "https://rubygems.org"
 
-  s.add_development_dependency("bundler", ">= 1.5")
+  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")

data/spec/allocator_spec.rb

@@ -43,7 +43,7 @@ RSpec.describe "Allocator" do
 
     specify "#allocate will convert rationals with high precision" do
       ratios = [Rational(1, 1), Rational(0)]
-      expect(new_allocator("858993456.12").allocate(ratios)).to eq([Money.new("858993456.12"), Money.empty])
+      expect(new_allocator("858993456.12").allocate(ratios)).to eq([Money.new("858993456.12"), Money.new(0, Money::NULL_CURRENCY)])
       ratios = [Rational(1, 6), Rational(5, 6)]
       expect(new_allocator("3.00").allocate(ratios)).to eq([Money.new("0.50"), Money.new("2.50")])
     end
@@ -131,8 +131,8 @@ RSpec.describe "Allocator" do
 
     specify "#allocate_max_amounts supports all-zero maxima" do
       expect(
-        new_allocator(3).allocate_max_amounts([Money.empty, Money.empty, Money.empty]),
-      ).to eq([Money.empty, Money.empty, Money.empty])
+        new_allocator(3).allocate_max_amounts([Money.new(0, Money::NULL_CURRENCY), Money.new(0, Money::NULL_CURRENCY), Money.new(0, Money::NULL_CURRENCY)]),
+      ).to eq([Money.new(0, Money::NULL_CURRENCY), Money.new(0, Money::NULL_CURRENCY), Money.new(0, Money::NULL_CURRENCY)])
     end
 
     specify "#allocate_max_amounts allocates the right amount without rounding error" do

data/spec/core_extensions_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe Integer do
   it_should_behave_like "an object supporting to_money"
 
   it "parses 0 to Money.zero" do
-    expect(0.to_money).to eq(Money.zero)
+    expect(0.to_money).to eq(Money.new(0, Money::NULL_CURRENCY))
   end
 end
 
@@ -30,7 +30,7 @@ RSpec.describe Float do
   it_should_behave_like "an object supporting to_money"
 
   it "parses 0.0 to Money.zero" do
-    expect(0.0.to_money).to eq(Money.zero)
+    expect(0.0.to_money).to eq(Money.new(0, Money::NULL_CURRENCY))
   end
 end
 
@@ -43,8 +43,8 @@ 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.zero)
-    expect(' '.to_money).to eq(Money.zero)
+    expect(''.to_money).to eq(Money.new(0, Money::NULL_CURRENCY))
+    expect(' '.to_money).to eq(Money.new(0, Money::NULL_CURRENCY))
   end
 end
 
@@ -57,6 +57,6 @@ RSpec.describe BigDecimal do
   it_should_behave_like "an object supporting to_money"
 
   it "parses a zero BigDecimal to Money.zero" do
-    expect(BigDecimal("-0.000").to_money).to eq(Money.zero)
+    expect(BigDecimal("-0.000").to_money).to eq(Money.new(0, Money::NULL_CURRENCY))
   end
 end

data/spec/currency_spec.rb

@@ -77,6 +77,16 @@ RSpec.describe "Currency" do
     end
   end
 
+  describe "#hash" do
+    specify "equal currencies from different loaders have the same hash" do
+      currency_1 = Money::Currency.find('USD')
+      currency_2 = YAML.load(Money::Currency.find('USD').to_yaml)
+
+      expect(currency_1.eql?(currency_2)).to eq(true)
+      expect(currency_1.hash).to eq(currency_2.hash)
+    end
+  end
+
   describe "==" do
     it "returns true when both objects have the same currency" do
       expect(currency == Money.new(1, 'USD').currency).to eq(true)

data/spec/money_column_spec.rb

@@ -136,7 +136,7 @@ RSpec.describe 'MoneyColumn' do
 
   it 'does not overwrite a currency column with a default currency when saving zero' do
     expect(record.currency.to_s).to eq('EUR')
-    record.update(price: Money.zero)
+    record.update(price: Money.new(0, Money::NULL_CURRENCY))
     expect(record.currency.to_s).to eq('EUR')
   end
 

data/spec/money_parser_spec.rb

@@ -8,12 +8,12 @@ RSpec.describe MoneyParser do
 
   describe "parsing of amounts with period decimal separator" do
     it "parses an empty string to $0" do
-      expect(@parser.parse("")).to eq(Money.zero)
+      expect(@parser.parse("")).to eq(Money.new(0, Money::NULL_CURRENCY))
     end
 
     it "parses an invalid string when not strict" do
       expect(Money).to receive(:deprecate).twice
-      expect(@parser.parse("no money")).to eq(Money.zero)
+      expect(@parser.parse("no money")).to eq(Money.new(0, Money::NULL_CURRENCY))
       expect(@parser.parse("1..")).to eq(Money.new(1))
     end
 

data/spec/money_spec.rb

@@ -9,10 +9,6 @@ RSpec.describe "Money" do
   let (:non_fractional_money) { Money.new(1, 'JPY') }
   let (:zero_money) { Money.new(0) }
 
-  it "is contructable with empty class method" do
-    expect(Money.empty).to eq(Money.new)
-  end
-
   context "default currency not set" do
     before(:each) do
       @default_currency = Money.default_currency
@@ -28,15 +24,11 @@ RSpec.describe "Money" do
   end
 
   it ".zero has no currency" do
-    expect(Money.zero.currency).to be_a(Money::NullCurrency)
+    expect(Money.new(0, Money::NULL_CURRENCY).currency).to be_a(Money::NullCurrency)
   end
 
   it ".zero is a 0$ value" do
-    expect(Money.zero).to eq(Money.new(0))
-  end
-
-  it ".zero accepts an optional currency" do
-    expect(Money.zero('USD')).to eq(Money.new(0, 'USD'))
+    expect(Money.new(0, Money::NULL_CURRENCY)).to eq(Money.new(0))
   end
 
   it "returns itself with to_money" do
@@ -80,6 +72,33 @@ RSpec.describe "Money" do
     expect(non_fractional_money.to_s(:amount)).to eq("1")
   end
 
+  it "to_s correctly displays negative numbers" do
+    expect((-money).to_s).to eq("-1.00")
+    expect((-amount_money).to_s).to eq("-1.23")
+    expect((-non_fractional_money).to_s).to eq("-1")
+    expect((-Money.new("0.05")).to_s).to eq("-0.05")
+  end
+
+  it "to_s rounds when  more fractions than currency allows" do
+    expect(Money.new("9.999", "USD").to_s).to eq("10.00")
+    expect(Money.new("9.889", "USD").to_s).to eq("9.89")
+  end
+
+  it "to_s does not round when fractions same as currency allows" do
+    expect(Money.new("1.25", "USD").to_s).to eq("1.25")
+    expect(Money.new("9.99", "USD").to_s).to eq("9.99")
+    expect(Money.new("9.999", "BHD").to_s).to eq("9.999")
+  end
+
+  it "to_s does not round if amount is larger than float allows" do
+    expect(Money.new("99999999999999.99", "USD").to_s).to eq("99999999999999.99")
+    expect(Money.new("999999999999999999.99", "USD").to_s).to eq("999999999999999999.99")
+  end
+
+  it "to_s raises ArgumentError on unsupported style" do
+    expect{ money.to_s(:some_weird_style) }.to raise_error(ArgumentError)
+  end
+
   it "as_json as a float with 2 decimal places" do
     expect(money.as_json).to eq("1.00")
   end
@@ -220,11 +239,6 @@ RSpec.describe "Money" do
     expect((1.50 * Money.new(1.00))).to eq(Money.new(1.50))
   end
 
-  it "is multipliable by a cents amount" do
-    expect((Money.new(1.00) * 0.50)).to eq(Money.new(0.50))
-    expect((0.50 * Money.new(1.00))).to eq(Money.new(0.50))
-  end
-
   it "is multipliable by a rational" do
     expect((Money.new(3.3) * Rational(1, 12))).to eq(Money.new(0.28))
     expect((Rational(1, 12) * Money.new(3.3))).to eq(Money.new(0.28))
@@ -279,10 +293,6 @@ RSpec.describe "Money" do
     expect { Money.new(55.00) / 55 }.to raise_error(RuntimeError)
   end
 
-  it "returns cents in to_liquid" do
-    expect(Money.new(1.00).to_liquid).to eq(100)
-  end
-
   it "returns cents in to_json" do
     expect(Money.new(1.00).to_json).to eq("1.00")
   end
@@ -303,24 +313,28 @@ RSpec.describe "Money" do
     expect(Money.new(1.50).to_f.to_s).to eq("1.5")
   end
 
-  it "is creatable from an integer value in cents" do
-    expect(Money.from_cents(1950)).to eq(Money.new(19.50))
-  end
+  describe '#from_subunits' do
+    it "creates Money object from an integer value in cents and currency" do
+      expect(Money.from_subunits(1950, 'CAD')).to eq(Money.new(19.50))
+    end
 
-  it "is creatable from an integer value of 0 in cents" do
-    expect(Money.from_cents(0)).to eq(Money.new)
-  end
+    it "creates Money object from an integer value in dollars and currency with no cents" do
+      expect(Money.from_subunits(1950, 'JPY')).to eq(Money.new(1950, 'JPY'))
+    end
 
-  it "is creatable from a float cents amount" do
-    expect(Money.from_cents(1950.5)).to eq(Money.new(19.51))
-  end
+    describe 'with format specified' do
+      it 'overrides the subunit_to_unit amount' do
+        expect(Money.from_subunits(100, 'ISK', format: :stripe)).to eq(Money.new(1, 'ISK'))
+      end
 
-  it "is creatable from an integer value in cents and currency" do
-    expect(Money.from_subunits(1950, 'CAD')).to eq(Money.new(19.50))
-  end
+      it 'fallbacks to the default subunit_to_unit amount if no override is specified' do
+        expect(Money.from_subunits(100, 'USD', format: :stripe)).to eq(Money.new(1, 'USD'))
+      end
 
-  it "is creatable from an integer value in dollars and currency with no cents" do
-    expect(Money.from_subunits(1950, 'JPY')).to eq(Money.new(1950, 'JPY'))
+      it 'raises if the format is not found' do
+        expect { Money.from_subunits(100, 'ISK', format: :unknown) }.to(raise_error(ArgumentError))
+      end
+    end
   end
 
   it "raises when constructed with a NaN value" do
@@ -517,6 +531,20 @@ RSpec.describe "Money" do
       expect(Money.new(1, 'IQD').subunits).to eq(1000)
       expect(Money.new(1).subunits).to eq(100)
     end
+
+    describe 'with format specified' do
+      it 'overrides the subunit_to_unit amount' do
+        expect(Money.new(1, 'ISK').subunits(format: :stripe)).to eq(100)
+      end
+
+      it 'fallbacks to the default subunit_to_unit amount if no override is specified' do
+        expect(Money.new(1, 'USD').subunits(format: :stripe)).to eq(100)
+      end
+
+      it 'raises if the format is not found' do
+        expect { Money.new(1, 'ISK').subunits(format: :unknown) }.to(raise_error(ArgumentError))
+      end
+    end
   end
 
   describe "value" do
@@ -562,10 +590,6 @@ RSpec.describe "Money" do
       expect(money.value).to eq(BigDecimal("1.00"))
     end
 
-    it "returns cents as 100 cents" do
-      expect(money.cents).to eq(100)
-    end
-
     it "returns cents as 100 cents" do
       expect(money.subunits).to eq(100)
     end
@@ -726,20 +750,6 @@ RSpec.describe "Money" do
   end
 
   describe "from_amount quacks like RubyMoney" do
-    it "accepts numeric values" do
-      expect(Money.from_amount(1)).to eq Money.from_cents(1_00)
-      expect(Money.from_amount(1.0)).to eq Money.from_cents(1_00)
-      expect(Money.from_amount(BigDecimal("1"))).to eq Money.from_cents(1_00)
-    end
-
-    it "accepts string values" do
-      expect(Money.from_amount("1")).to eq Money.from_cents(1_00)
-    end
-
-    it "accepts nil values" do
-      expect(Money.from_amount(nil)).to eq Money.from_cents(0)
-    end
-
     it "accepts an optional currency parameter" do
       expect { Money.from_amount(1, "CAD") }.to_not raise_error
     end
@@ -759,10 +769,14 @@ RSpec.describe "Money" do
       money = YAML.dump(Money.new(750, 'usd'))
       expect(money).to eq("--- !ruby/object:Money\nvalue: '750.0'\ncurrency: USD\n")
     end
+
+    it "does not change BigDecimal value to Integer while rounding for currencies without subunits" do
+      money = Money.new(100, 'JPY').to_yaml
+      expect(money).to eq("--- !ruby/object:Money\nvalue: '100.0'\ncurrency: JPY\n")
+    end
   end
 
   describe "YAML deserialization" do
-
     it "accepts values with currencies" do
       money = YAML.load("--- !ruby/object:Money\nvalue: '750.0'\ncurrency: USD\n")
       expect(money).to eq(Money.new(750, 'usd'))

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

@@ -8,12 +8,16 @@ RSpec.describe RuboCop::Cop::Money::MissingCurrency do
 
   let(:config) { RuboCop::Config.new }
 
-  describe '#on_send' do
-    it 'registers an offense for Money.new without a currency argument' do
+  context 'with default configuration' 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
       RUBY
+
+      expect_correction(<<~RUBY)
+        Money.new(1, Money::NULL_CURRENCY)
+      RUBY
     end
 
     it 'does not register an offense for Money.new with currency argument' do
@@ -22,18 +26,26 @@ RSpec.describe RuboCop::Cop::Money::MissingCurrency do
       RUBY
     end
 
-    it 'registers an offense for Money.new without a currency argument' 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
       RUBY
+
+      expect_correction(<<~RUBY)
+        Money.new(0, Money::NULL_CURRENCY)
+      RUBY
     end
 
-    it 'registers an offense for Money.from_amount without a currency argument' 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
       RUBY
+
+      expect_correction(<<~RUBY)
+        Money.from_amount(1, Money::NULL_CURRENCY)
+      RUBY
     end
 
     it 'does not register an offense for Money.from_amount with currency argument' do
@@ -42,11 +54,15 @@ RSpec.describe RuboCop::Cop::Money::MissingCurrency do
       RUBY
     end
 
-    it 'registers an offense for Money.from_cents without a currency argument' 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
       RUBY
+
+      expect_correction(<<~RUBY)
+        Money.from_cents(1, Money::NULL_CURRENCY)
+      RUBY
     end
 
     it 'does not register an offense for Money.from_cents with currency argument' do
@@ -55,11 +71,26 @@ RSpec.describe RuboCop::Cop::Money::MissingCurrency do
       RUBY
     end
 
-    it 'registers an offense for to_money without a currency argument' 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
       RUBY
+
+      expect_correction(<<~RUBY)
+        '1'.to_money(Money::NULL_CURRENCY)
+      RUBY
+    end
+
+    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
+      RUBY
+
+      expect_correction(<<~RUBY)
+        item&.to_money(Money::NULL_CURRENCY)
+      RUBY
     end
 
     it 'does not register an offense for to_money with currency argument' do
@@ -68,15 +99,19 @@ RSpec.describe RuboCop::Cop::Money::MissingCurrency do
       RUBY
     end
 
-    it 'registers an offense for to_money block pass form' 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
       RUBY
+
+      expect_correction(<<~RUBY)
+        ['1'].map { |x| x.to_money(Money::NULL_CURRENCY) }
+      RUBY
     end
   end
 
-  describe '#autocorrect' do
+  context 'with ReplacementCurrency configuration' do
     let(:config) do
       RuboCop::Config.new(
         'Money/MissingCurrency' => {

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

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require_relative '../../../rubocop_helper'
+require 'rubocop/cop/money/zero_money'
+
+RSpec.describe RuboCop::Cop::Money::ZeroMoney do
+  subject(:cop) { described_class.new(config) }
+
+  let(:config) { RuboCop::Config.new }
+
+  context 'with default configuration' 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)`.
+      RUBY
+
+      expect_correction(<<~RUBY)
+        Money.new(0, Money::NULL_CURRENCY)
+      RUBY
+    end
+
+    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')`.
+      RUBY
+
+      expect_correction(<<~RUBY)
+        Money.new(0, 'CAD')
+      RUBY
+    end
+
+    it 'does not register an offense when using Money.new with a currency' do
+      expect_no_offenses(<<~RUBY)
+        Money.new(0, 'CAD')
+      RUBY
+    end
+  end
+
+  context 'with ReplacementCurrency configuration' do
+    let(:config) do
+      RuboCop::Config.new(
+        'Money/ZeroMoney' => {
+          'ReplacementCurrency' => 'CAD'
+        }
+      )
+    end
+
+    it 'registers an offense and corrects Money.zero without currency' do
+      expect_offense(<<~RUBY)
+        Money.zero
+        ^^^^^^^^^^ Money.zero is removed, use `Money.new(0, 'CAD')`.
+      RUBY
+
+      expect_correction(<<~RUBY)
+        Money.new(0, 'CAD')
+      RUBY
+    end
+
+    it 'registers an offense and corrects Money.zero with currency' do
+      expect_offense(<<~RUBY)
+        Money.zero('EUR')
+        ^^^^^^^^^^^^^^^^^ Money.zero is removed, use `Money.new(0, 'EUR')`.
+      RUBY
+
+      expect_correction(<<~RUBY)
+        Money.new(0, 'EUR')
+      RUBY
+    end
+
+    it 'does not register an offense when using Money.new with a currency' do
+      expect_no_offenses(<<~RUBY)
+        Money.new(0, 'EUR')
+      RUBY
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-money
 version: !ruby/object:Gem::Version
-  version: 0.14.5
+  version: 0.16.0
 platform: ruby
 authors:
 - Shopify Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -103,9 +103,9 @@ extra_rdoc_files: []
 files:
 - ".document"
 - ".github/probots.yml"
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -128,13 +128,13 @@ files:
 - lib/money/money_parser.rb
 - lib/money/null_currency.rb
 - lib/money/version.rb
-- lib/money_accessor.rb
 - lib/money_column.rb
 - lib/money_column/active_record_hooks.rb
 - lib/money_column/active_record_type.rb
 - lib/money_column/railtie.rb
 - lib/rubocop/cop/money.rb
 - lib/rubocop/cop/money/missing_currency.rb
+- lib/rubocop/cop/money/zero_money.rb
 - lib/shopify-money.rb
 - money.gemspec
 - spec/accounting_money_parser_spec.rb
@@ -143,12 +143,12 @@ files:
 - spec/currency/loader_spec.rb
 - spec/currency_spec.rb
 - spec/helpers_spec.rb
-- spec/money_accessor_spec.rb
 - spec/money_column_spec.rb
 - spec/money_parser_spec.rb
 - spec/money_spec.rb
 - spec/null_currency_spec.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
@@ -183,12 +183,12 @@ test_files:
 - spec/currency/loader_spec.rb
 - spec/currency_spec.rb
 - spec/helpers_spec.rb
-- spec/money_accessor_spec.rb
 - spec/money_column_spec.rb
 - spec/money_parser_spec.rb
 - spec/money_spec.rb
 - spec/null_currency_spec.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

data/.travis.yml

@@ -1,13 +0,0 @@
-sudo: false
-language: ruby
-cache: bundler
-branches:
-  only:
-  - master
-rvm:
-  - 2.7
-  - 2.6
-before_install:
-  # https://github.com/travis-ci/travis-ci/issues/8978#issuecomment-354036443
-  - gem update --system
-  - gem install bundler

data/lib/money_accessor.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-module MoneyAccessor
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
-
-  module ClassMethods
-    def money_accessor(*columns)
-      variable_get = self <= Struct ? :[]  : :instance_variable_get
-      variable_set = self <= Struct ? :[]= : :instance_variable_set
-
-      Array(columns).flatten.each do |name|
-        variable_name = self <= Struct ? name : "@#{name}"
-
-        define_method(name) do
-          value = public_send(variable_get, variable_name)
-          value.blank? ? nil : Money.new(value)
-        end
-
-        define_method("#{name}=") do |value|
-          if value.blank? || !value.respond_to?(:to_money)
-            public_send(variable_set, variable_name, nil)
-            nil
-          else
-            money = value.to_money
-            public_send(variable_set, variable_name, money.value)
-            money
-          end
-        end
-      end
-    end
-  end
-end

data/spec/money_accessor_spec.rb

@@ -1,87 +0,0 @@
-# frozen_string_literal: true
-require 'spec_helper'
-
-class NormalObject
-  include MoneyAccessor
-
-  money_accessor :price
-
-  def initialize(price)
-    @price = price
-  end
-end
-
-class StructObject < Struct.new(:price)
-  include MoneyAccessor
-
-  money_accessor :price
-end
-
-RSpec.shared_examples_for "an object with a money accessor" do
-  it "generates an attribute reader that returns a money object" do
-    object = described_class.new(100)
-
-    expect(object.price).to eq(Money.new(100))
-  end
-
-  it "generates an attribute reader that returns a nil object if the value was nil" do
-    object = described_class.new(nil)
-
-    expect(object.price).to eq(nil)
-  end
-
-  it "generates an attribute reader that returns a nil object if the value was blank" do
-    object = described_class.new('')
-
-    expect(object.price).to eq(nil)
-  end
-
-  it "generates an attribute writer that allow setting a money object" do
-    object = described_class.new(0)
-    object.price = Money.new(10)
-
-    expect(object.price).to eq(Money.new(10))
-  end
-
-  it "generates an attribute writer that allow setting a integer value" do
-    object = described_class.new(0)
-    object.price = 10
-
-    expect(object.price).to eq(Money.new(10))
-  end
-
-  it "generates an attribute writer that allow setting a float value" do
-    object = described_class.new(0)
-    object.price = 10.12
-
-    expect(object.price).to eq(Money.new(10.12))
-  end
-
-  it "generates an attribute writer that allow setting a nil value" do
-    object = described_class.new(0)
-    object.price = nil
-
-    expect(object.price).to eq(nil)
-  end
-
-  it "generates an attribute writer that allow setting a blank value" do
-    object = described_class.new(0)
-    object.price = ''
-
-    expect(object.price).to eq(nil)
-  end
-end
-
-RSpec.describe NormalObject do
-  it_behaves_like "an object with a money accessor"
-end
-
-RSpec.describe StructObject do
-  it_behaves_like "an object with a money accessor"
-
-  it 'does not generate an ivar to store the price value' do
-    object = described_class.new(10.00)
-
-    expect(object.instance_variable_get(:@price)).to eq(nil)
-  end
-end