shopify-money 3.2.7 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e07bfd5c8705cab2343063d668fdb4659127ab09519903cc616428e997f49a8
-  data.tar.gz: 5882ced49ceb284b2f84a77b1c9991c7fc76a5e645af18fbe09d58a6ed13a456
+  metadata.gz: cadc7891cca0acc6f6128c570b259a5c1bead3a6a87175ebe3def93d9a618afb
+  data.tar.gz: 3fcc02abc7af2a86aba449ed135361a1024a18975430c8075f4b36d36d70c72a
 SHA512:
-  metadata.gz: 3f5854c8d9a0f6d43850dfdbda770e5ea8af4ac64852715a934f2bd3043701bb5a6da52390abb8d033b105f7141f1b42c820f31e8e987a9bdf5b421e41fc4a0a
-  data.tar.gz: 0e64426c69688957315be52bee4b23369a6492e8e2fcf403594387026a7b8a4dea7f77c21f01e137060ad2fb1211d828d092783b61b02f26a2f6c147374901fb
+  metadata.gz: 982ccb02e8ad20c3ad3ba9d217e0a53531d370cf32e7664947d859997ee2bc493614908f722fd1dc1ee0f234e114cb4c7e3552c85401d978afac4d462e35344c
+  data.tar.gz: 4a5e188fb292ad0ca2afdc2ba3dbcde89507a352d34ac7b7964870fc1584c0f9fd10d1036bd5b78a1971649d107b89f549f3b38a4f9bad823e829ac0c60d29ea

data/.github/workflows/tests.yml

@@ -9,26 +9,26 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['3.1', '3.2', '3.3', '3.4']
+        ruby: ['3.2', '3.3', '3.4', '4.0']
 
     name: Ruby ${{ matrix.ruby }}
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up Ruby ${{ matrix.ruby }}
-      uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
+      uses: ruby/setup-ruby@4fc31e1c823882afd7ef55985266a526c589de90 # v1.238.0
       with:
         ruby-version: ${{ matrix.ruby }}
-    - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+        bundler-cache: true
+    - name: Cache RBS collection
+      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
       with:
-        path: vendor/bundle
-        key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+        path: .gem_rbs_collection
+        key: ${{ runner.os }}-rbs-${{ hashFiles('rbs_collection.lock.yaml') }}
         restore-keys: |
-          ${{ runner.os }}-gems-
-    - name: Install dependencies
-      run: |
-        gem install bundler
-        bundle config path vendor/bundle
-        bundle install --jobs 4 --retry 3
+          ${{ runner.os }}-rbs-
     - name: Run tests
       run: |
-        bundle exec rake
+        bundle exec rake spec
+    - name: Run typecheck
+      run: |
+        bundle exec rake typecheck

data/.gitignore

@@ -49,3 +49,6 @@ pkg
 
 .rspec_status
 .DS_Store
+
+# RBS collection (installed via rbs collection install)
+.gem_rbs_collection

data/.rubocop.yml

@@ -1,4 +1,4 @@
-require:
+plugins:
   - rubocop-performance
 
 inherit_gem:

data/.ruby-version

@@ -1 +1 @@
-3.4.2
+4.0.1

data/Gemfile

@@ -3,8 +3,11 @@
 source "https://rubygems.org"
 
 gem "pry-byebug", require: false
+gem "readline", require: false
 gem "rubocop", require: false
-gem "rubocop-shopify", ">=2.8.0", require: false
+gem "rubocop-shopify", require: false
 gem "rubocop-performance", require: false
 
 gemspec
+
+gem "steep", "~> 1.10"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-money (3.2.7)
+    shopify-money (4.1.0)
       bigdecimal (>= 3.0)
 
 GEM
@@ -81,13 +81,14 @@ GEM
     ast (2.4.3)
     base64 (0.2.0)
     benchmark (0.4.0)
-    bigdecimal (3.2.2)
+    bigdecimal (3.3.1)
     builder (3.3.0)
     byebug (12.0.0)
     coderay (1.1.3)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.0)
     crass (1.0.6)
+    csv (3.3.5)
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
     database_cleaner-active_record (2.2.0)
@@ -99,6 +100,13 @@ GEM
     docile (1.4.1)
     drb (2.2.1)
     erubi (1.13.1)
+    ffi (1.17.3-aarch64-linux-gnu)
+    ffi (1.17.3-arm-linux-gnu)
+    ffi (1.17.3-arm64-darwin)
+    ffi (1.17.3-x86-linux-gnu)
+    ffi (1.17.3-x86_64-darwin)
+    ffi (1.17.3-x86_64-linux-gnu)
+    fileutils (1.7.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
     i18n (1.14.7)
@@ -111,6 +119,9 @@ GEM
     json (2.13.2)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
+    listen (3.9.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
     loofah (2.24.0)
       crass (~> 1.0.2)
@@ -123,8 +134,10 @@ GEM
     marcel (1.0.4)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.8)
-    minitest (5.25.5)
+    mini_portile2 (2.8.9)
+    minitest (6.0.1)
+      prism (~> 1.5)
+    mutex_m (0.3.0)
     net-imap (0.5.7)
       date
       net-protocol
@@ -135,18 +148,18 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.18.8)
+    nokogiri (1.19.0)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.8-aarch64-linux-gnu)
+    nokogiri (1.19.0-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.8-arm-linux-gnu)
+    nokogiri (1.19.0-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.8-arm64-darwin)
+    nokogiri (1.19.0-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-darwin)
+    nokogiri (1.19.0-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-gnu)
+    nokogiri (1.19.0-x86_64-linux-gnu)
       racc (~> 1.4)
     ostruct (0.6.1)
     parallel (1.27.0)
@@ -156,7 +169,7 @@ GEM
     pp (0.6.2)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.4.0)
+    prism (1.9.0)
     pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -206,8 +219,15 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.2.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
+      ffi (~> 1.0)
+    rbs (3.9.5)
+      logger
     rdoc (6.13.1)
       psych (>= 4.0.0)
+    readline (0.0.4)
+      reline
     regexp_parser (2.11.0)
     reline (0.6.1)
       io-console (~> 0.5)
@@ -224,7 +244,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.79.1)
+    rubocop (1.84.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -232,17 +252,17 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.46.0, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.46.0)
+    rubocop-ast (1.49.0)
       parser (>= 3.3.7.2)
-      prism (~> 1.4)
-    rubocop-performance (1.25.0)
+      prism (~> 1.7)
+    rubocop-performance (1.26.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
-    rubocop-shopify (2.17.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
+    rubocop-shopify (2.18.0)
       rubocop (~> 1.62)
     ruby-progressbar (1.13.0)
     securerandom (0.4.1)
@@ -252,20 +272,41 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    sqlite3 (2.6.0-aarch64-linux-gnu)
-    sqlite3 (2.6.0-arm-linux-gnu)
-    sqlite3 (2.6.0-arm64-darwin)
-    sqlite3 (2.6.0-x86-linux-gnu)
-    sqlite3 (2.6.0-x86_64-darwin)
-    sqlite3 (2.6.0-x86_64-linux-gnu)
-    stringio (3.1.6)
+    sqlite3 (2.9.0-aarch64-linux-gnu)
+    sqlite3 (2.9.0-arm-linux-gnu)
+    sqlite3 (2.9.0-arm64-darwin)
+    sqlite3 (2.9.0-x86-linux-gnu)
+    sqlite3 (2.9.0-x86_64-darwin)
+    sqlite3 (2.9.0-x86_64-linux-gnu)
+    steep (1.10.0)
+      activesupport (>= 5.1)
+      concurrent-ruby (>= 1.1.10)
+      csv (>= 3.0.9)
+      fileutils (>= 1.1.0)
+      json (>= 2.1.0)
+      language_server-protocol (>= 3.17.0.4, < 4.0)
+      listen (~> 3.0)
+      logger (>= 1.3.0)
+      mutex_m (>= 0.3.0)
+      parser (>= 3.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rbs (~> 3.9)
+      securerandom (>= 0.1)
+      strscan (>= 1.0.0)
+      terminal-table (>= 2, < 5)
+      uri (>= 0.12.0)
+    stringio (3.2.0)
+    strscan (3.1.5)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
     thor (1.3.2)
     timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
+    unicode-emoji (4.2.0)
+    uri (1.0.4)
     useragent (0.16.11)
     websocket-driver (0.7.7)
       base64
@@ -287,13 +328,16 @@ DEPENDENCIES
   ostruct
   pry-byebug
   rails (~> 7.2)
+  rbs (~> 3.0)
+  readline
   rspec (~> 3.2)
   rubocop
   rubocop-performance
-  rubocop-shopify (>= 2.8.0)
+  rubocop-shopify
   shopify-money!
   simplecov
   sqlite3
+  steep (~> 1.10)
 
 BUNDLED WITH
-   2.6.7
+  4.0.6

data/README.md

@@ -157,6 +157,23 @@ Money.new(money.value * exchange_rate, "JPY")
 money.convert_currency(exchange_rate, "JPY")
 ```
 
+### Allocation Strategy
+
+By default `allocate` distributes leftover subunits using the `:roundrobin` strategy.
+You can change the default:
+
+``` ruby
+Money.configure do |config|
+  config.default_allocation_strategy = :nearest
+end
+```
+
+Or pass a strategy per call:
+
+``` ruby
+Money.new(10.55, "USD").allocate([0.25, 0.5, 0.25], :nearest)
+```
+
 ### Crypto Currencies
 To enable support for currencies listed in `crypto.yml` use
 ``` ruby
@@ -165,6 +182,28 @@ Money.configure do |config|
 end
 ```
 
+### Custom Currencies
+To load custom currencies from a YAML file:
+``` ruby
+Money.configure do |config|
+  config.experimental_custom_currency_path = Rails.root.join("config/custom_currencies.yml")
+end
+```
+
+``` yaml
+# config/custom_currencies.yml
+credits:
+  iso_code: "CREDITS"
+  name: "Loyalty Points"
+  symbol: "CR"
+  disambiguate_symbol: "CR"
+  subunit_to_unit: 1
+  smallest_denomination: 1
+  decimal_mark: "."
+```
+
+Custom currencies are looked up after ISO and crypto currencies, so they cannot shadow built-in currencies.
+
 ### Converters
 The Money gem provides a flexible converter system for handling different subunit formats. This is particularly useful when working with payment providers or APIs that have their own conventions for handling currency subunits.
 

data/Rakefile

@@ -30,7 +30,34 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
-task default: :spec
+namespace :rbs do
+  desc "Install RBS collection"
+  task :install do
+    sh "rbs collection install > /dev/null"
+  end
+
+  desc "Validate RBS type signatures"
+  task validate: :install do
+    sh "rbs -I sig validate"
+  end
+
+  desc "List RBS files"
+  task :list do
+    sh "find sig -name '*.rbs'"
+  end
+end
+
+namespace :steep do
+  desc "Type check Ruby code against RBS signatures"
+  task check: "rbs:install" do
+    sh "steep check --jobs 2"
+  end
+end
+
+desc "Run all type checks (RBS validation + Steep type checking)"
+task typecheck: ["rbs:validate", "steep:check"]
+
+task default: [:spec, :typecheck]
 
 require 'rake/task'
 RDoc::Task.new do |rdoc|

data/Steepfile

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+target :lib do
+  signature "sig"
+
+  check "lib"
+  ignore "lib/rubocop/**/*.rb" # RuboCop cops use metaprogramming DSL
+  ignore "lib/money/railtie.rb" # Rails types
+  ignore "lib/money/deprecations.rb" # Uses class_eval
+  ignore "lib/money/rails/**/*.rb" # Rails-specific code
+  ignore "lib/money_column/railtie.rb" # Rails types
+  ignore "lib/money_column/active_record_hooks.rb" # Heavy metaprogramming with define_method
+
+  library "bigdecimal"
+  library "json"
+  library "forwardable"
+  library "yaml"
+
+  configure_code_diagnostics(Steep::Diagnostic::Ruby.lenient)
+end

data/config/currency_iso.yml

@@ -420,7 +420,6 @@ cad:
   alternate_symbols:
   - C$
   - CAD$
-  subunit_symbol: "¢"
   subunit: Cent
   subunit_to_unit: 100
   symbol_first: true
@@ -758,7 +757,6 @@ gbp:
   name: British Pound
   symbol: "£"
   alternate_symbols: []
-  subunit_symbol: p
   subunit: Penny
   subunit_to_unit: 100
   symbol_first: true
@@ -1339,7 +1337,7 @@ mga:
   symbol: Ar
   alternate_symbols: []
   subunit: Iraimbilanja
-  subunit_to_unit: 5
+  subunit_to_unit: 1
   symbol_first: true
   html_entity: ''
   decimal_mark: "."
@@ -2235,7 +2233,6 @@ usd:
   alternate_symbols:
   - US$
   subunit: Cent
-  subunit_symbol: "¢"
   subunit_to_unit: 100
   symbol_first: true
   html_entity: "$"

data/dev.yml

@@ -2,8 +2,14 @@
 # describe the required dependencies
 ---
 name: money
+
+dev.edition: 2024
+nix: true
+
 up:
+- packages:
+  - libyaml
 - ruby
 - bundler
 commands:
-  test: bundle exec rspec
+  test: bundle exec rake

data/lib/money/allocator.rb

@@ -33,6 +33,8 @@ class Money
     # - `:roundrobin_reverse`: leftover subunits will be accumulated starting from the last allocation right to left
     # - `:nearest`: leftover subunits will by given first to the party closest to the next whole subunit
     #
+    # The default strategy can be changed via `Money::Config.current.default_allocation_strategy`.
+    #
     # @example
     #   Money.new(5, "USD").allocate([0.50, 0.25, 0.25])
     #     #=> [#<Money value:2.50 currency:USD>, #<Money value:1.25 currency:USD>, #<Money value:1.25 currency:USD>]
@@ -57,12 +59,16 @@ class Money
     #   Money.new(10.55, "USD").allocate([0.25, 0.5, 0.25], :nearest)
     #     #=> [#<Money value:2.64 currency:USD>, #<Money value:5.27 currency:USD>, #<Money value:2.64 currency:USD>]
 
-    def allocate(splits, strategy = :roundrobin)
+    def allocate(splits, strategy = nil)
       if splits.empty?
         raise ArgumentError, 'at least one split must be provided'
       end
 
-      splits.map!(&:to_r)
+      strategy ||= Money::Config.current.default_allocation_strategy
+
+      # Float#to_r preserves float imprecision (0.98.to_r != 98/100).
+      # Rationalize gives the clean fraction (0.98.rationalize == 49/50).
+      splits.map!(&:rationalize)
       allocations = splits.inject(0, :+)
 
       if (allocations - ONE) > Float::EPSILON

data/lib/money/config.rb

@@ -41,7 +41,7 @@ class Money
       end
     end
 
-    attr_accessor :legacy_json_format, :legacy_deprecations, :experimental_crypto_currencies, :default_subunit_format
+    attr_accessor :legacy_json_format, :experimental_crypto_currencies, :default_subunit_format, :experimental_custom_currency_path, :default_allocation_strategy
 
     attr_reader :default_currency
     alias_method :currency, :default_currency
@@ -59,14 +59,6 @@ class Money
     end
     alias_method :currency=, :default_currency=
 
-    def legacy_default_currency!
-      @default_currency ||= Money::NULL_CURRENCY
-    end
-
-    def legacy_deprecations!
-      @legacy_deprecations = true
-    end
-
     def legacy_json_format!
       @legacy_json_format = true
     end
@@ -78,9 +70,10 @@ class Money
     def initialize
       @default_currency = nil
       @legacy_json_format = false
-      @legacy_deprecations = false
       @experimental_crypto_currencies = false
       @default_subunit_format = :iso4217
+      @experimental_custom_currency_path = nil
+      @default_allocation_strategy = :roundrobin
     end
   end
 end

data/lib/money/core_extensions.rb

@@ -16,27 +16,6 @@ end
 class String
   def to_money(currency = nil)
     currency = Money::Helpers.value_to_currency(currency)
-
-    unless Money::Config.current.legacy_deprecations
-      return Money.new(self, currency)
-    end
-
-    new_value = BigDecimal(self, exception: false)&.round(currency.minor_units)
-    unless new_value.nil?
-      return Money.new(self, currency)
-    end
-
-    return Money.new(0, currency) if empty?
-
-    Money::Parser::Fuzzy.parse(self, currency).tap do |money|
-      old_value = money.value
-
-      if new_value != old_value
-        message = "`\"#{self}\".to_money` will soon behave like `Money.new(\"#{self}\")` and " \
-          "raise an ArgumentError exception. Use the browser's locale to parse money strings."
-
-        Money.deprecate(message)
-      end
-    end
+    Money.new(self, currency)
   end
 end

data/lib/money/currency/loader.rb

@@ -5,7 +5,7 @@ require 'yaml'
 class Money
   class Currency
     module Loader
-      CURRENCY_DATA_PATH = File.expand_path("../../../config", __dir__)
+      CURRENCY_DATA_PATH = File.expand_path("../../../config", __dir__ || raise("__dir__ is nil"))
 
       class << self
         def load_currencies
@@ -22,6 +22,13 @@ class Money
           deep_deduplicate!(currencies)
         end
 
+        def load_custom_currencies(path)
+          raise ArgumentError, "Custom currency file not found: #{path}" unless File.exist?(path)
+          data = YAML.safe_load_file(path, permitted_classes: [])
+          raise ArgumentError, "Custom currency file must contain a YAML hash" unless data.is_a?(Hash)
+          deep_deduplicate!(data)
+        end
+
         private
 
         def deep_deduplicate!(data)

data/lib/money/currency.rb

@@ -31,6 +31,15 @@ class Money
         @@crypto_currencies ||= Loader.load_crypto_currencies
       end
 
+      def custom_currencies(path)
+        @@custom_currencies_cache ||= {}
+        @@custom_currencies_cache[path] ||= Loader.load_custom_currencies(path)
+      end
+
+      def reset_custom_currencies
+        @@custom_currencies_cache = nil
+      end
+
       def reset_loaded_currencies
         @@loaded_currencies = {}
       end
@@ -52,6 +61,10 @@ class Money
       if data.nil? && Money::Config.current.experimental_crypto_currencies
         data = self.class.crypto_currencies[currency_iso]
       end
+      if data.nil?
+        custom_path = Money::Config.current.experimental_custom_currency_path
+        data = self.class.custom_currencies(custom_path)[currency_iso] if custom_path
+      end
 
       raise UnknownCurrency, "Invalid iso4217 currency '#{currency_iso}'" unless data
       @symbol                = data['symbol']

data/lib/money/helpers.rb

@@ -44,16 +44,7 @@ class Money
       when 'xxx', 'XXX'
         Money::NULL_CURRENCY
       when String
-        begin
-          Currency.find!(currency)
-        rescue Money::Currency::UnknownCurrency => error
-          if Money::Config.current.legacy_deprecations
-            Money.deprecate(error.message)
-            Money::NULL_CURRENCY
-          else
-            raise error
-          end
-        end
+        Currency.find!(currency)
       else
         raise ArgumentError, "could not parse as currency #{currency.inspect}"
       end

data/lib/money/money.rb

@@ -41,10 +41,6 @@ class Money
     extend Forwardable
     def_delegators :'Money::Config.global', :default_currency, :default_currency=
 
-    def without_legacy_deprecations(&block)
-      with_config(legacy_deprecations: false, &block)
-    end
-
     def with_config(**configs, &block)
       Money::Config.configure_current(**configs, &block)
     end
@@ -124,28 +120,24 @@ class Money
       msg = "Money.new(Money.new(amount, #{amount.currency}), #{currency}) " \
         "is changing the currency of an existing money object"
 
-      if Money::Config.current.legacy_deprecations
-        Money.deprecate("#{msg}. A Money::IncompatibleCurrencyError will raise in the next major release")
-        Money.new(amount.value, currency)
-      else
-        raise Money::IncompatibleCurrencyError, msg
-      end
+      raise Money::IncompatibleCurrencyError, msg
     end
   end
 
   def initialize(value, currency)
     raise ArgumentError if value.nan?
-    if value.infinite?
-      Money.deprecate("Initializing Money with infinity is deprecated and will raise an ArgumentError in v4")
-    end
+    raise ArgumentError if value.infinite?
 
-    @currency = Helpers.value_to_currency(currency)
+    @currency = currency
     @value = BigDecimal(value.round(@currency.minor_units))
     freeze
   end
 
   def init_with(coder)
-    initialize(Helpers.value_to_decimal(coder['value']), coder['currency'])
+    initialize(
+      Helpers.value_to_decimal(coder['value']),
+      Helpers.value_to_currency(coder['currency']),
+    )
   end
 
   def encode_with(coder)
@@ -394,11 +386,7 @@ class Money
   def ensure_compatible_currency(other_currency, msg)
     return if currency.compatible?(other_currency)
 
-    if Money::Config.current.legacy_deprecations
-      Money.deprecate("#{msg}. A Money::IncompatibleCurrencyError will raise in the next major release")
-    else
-      raise Money::IncompatibleCurrencyError, msg
-    end
+    raise Money::IncompatibleCurrencyError, msg
   end
 
   def calculated_currency(other)