shopify-money 3.2.7 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e07bfd5c8705cab2343063d668fdb4659127ab09519903cc616428e997f49a8
-  data.tar.gz: 5882ced49ceb284b2f84a77b1c9991c7fc76a5e645af18fbe09d58a6ed13a456
+  metadata.gz: 3376d45362e482215d25c4c1e256842d5a5011708ab3775125255e48637f5962
+  data.tar.gz: 2909f3605931b62b9efcb1799d928aea723fcde9a5f3182f3705a14887c1c2d1
 SHA512:
-  metadata.gz: 3f5854c8d9a0f6d43850dfdbda770e5ea8af4ac64852715a934f2bd3043701bb5a6da52390abb8d033b105f7141f1b42c820f31e8e987a9bdf5b421e41fc4a0a
-  data.tar.gz: 0e64426c69688957315be52bee4b23369a6492e8e2fcf403594387026a7b8a4dea7f77c21f01e137060ad2fb1211d828d092783b61b02f26a2f6c147374901fb
+  metadata.gz: 7bf580f71b0341993e260c1ee10036f46d585ffcb286fa567d0bc72b18e38a531600622f828a7d3895d0df48c0edc7aa3b9b539477f2ac5aacf7cd902ca8ac76
+  data.tar.gz: e5b249cb19e32a2ceb897cb047382a8fcb27b7408e4675f59a9b951dc8e916777e54038e43b7157d22484a6b443a9ad19273fb2030305f714ab184291742fc56

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.0.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/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/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
 
     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,7 +70,6 @@ class Money
     def initialize
       @default_currency = nil
       @legacy_json_format = false
-      @legacy_deprecations = false
       @experimental_crypto_currencies = false
       @default_subunit_format = :iso4217
     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

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,20 +120,13 @@ 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)
     @value = BigDecimal(value.round(@currency.minor_units))
@@ -394,11 +383,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)

data/lib/money/null_currency.rb

@@ -47,7 +47,6 @@ class Money
     def initialize
       @symbol                = '$'
       @disambiguate_symbol   = nil
-      @subunit_symbol        = nil
       @iso_code              = 'XXX'
       @iso_numeric           = '999'
       @name                  = 'No Currency'

data/lib/money/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Money
-  VERSION = "3.2.7"
+  VERSION = "4.0.0"
 end

data/lib/money_column/active_record_hooks.rb

@@ -91,26 +91,18 @@ module MoneyColumn
     def validate_hardcoded_currency_compatibility!(column, money, expected_currency)
       return if money.currency.compatible?(Money::Helpers.value_to_currency(expected_currency))
 
-      msg = "Invalid #{column}: attempting to write a money object with currency '#{money.currency}' to a record with hard-coded currency '#{expected_currency}'."
-      if Money::Config.current.legacy_deprecations
-        Money.deprecate(msg)
-      else
-        raise MoneyColumn::CurrencyMismatchError, msg
-      end
+      raise MoneyColumn::CurrencyMismatchError,
+        "Invalid #{column}: attempting to write a money object with currency '#{money.currency}' to a record with hard-coded currency '#{expected_currency}'."
     end
 
     def validate_currency_compatibility!(column, money, currency_column)
       current_currency = read_currency_column(currency_column)
       return if current_currency.nil? || money.currency.compatible?(Money::Helpers.value_to_currency(current_currency))
 
-      msg = "Invalid #{column}: attempting to write a money object with currency '#{money.currency}' to a record with currency '#{current_currency}'. " \
-        "If you do want to change the record's currency, either remove `currency_read_only` or update the record's currency manually"
+      msg = "Invalid #{column}: Money '#{money.currency}' != record '#{current_currency}'. " \
+        "Remove column's `currency_read_only` option or update value+currency together (e.g., record.update(value: money, currency: money.currency))."
 
-      if Money::Config.current.legacy_deprecations
-        Money.deprecate(msg)
-      else
-        raise MoneyColumn::CurrencyReadOnlyError, msg
-      end
+      raise MoneyColumn::CurrencyReadOnlyError, msg
     end
 
     def _assign_attributes(new_attributes)

data/money.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.summary = "Shopify's money gem"
 
   s.metadata['allowed_push_host'] = "https://rubygems.org"
+  s.metadata['rbs_types'] = "sig"
 
   s.add_dependency("bigdecimal", ">= 3.0")
 
@@ -22,13 +23,13 @@ Gem::Specification.new do |s|
   s.add_development_dependency("database_cleaner", "~> 2.0")
   s.add_development_dependency("ostruct")
   s.add_development_dependency("rails", "~> 7.2")
+  s.add_development_dependency("rbs", "~> 3.0")
   s.add_development_dependency("rspec", "~> 3.2")
   s.add_development_dependency("simplecov", ">= 0")
   s.add_development_dependency("sqlite3")
 
-  s.required_ruby_version = '>= 3.1'
+  s.required_ruby_version = '>= 3.2'
 
   s.files = %x(git ls-files).split($/)
-  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.require_paths = ["lib"]
 end