Merge branch 'main' into main

Author: edithemmings

.github/workflows/ruby.yml

@@ -5,7 +5,7 @@
 # This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
 # For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
 
-name: Ruby
+name: CI
 
 on:
   push:
@@ -19,10 +19,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['3.0', '3.1', '3.2', '3.3']
+        ruby-version: ['3.1', '3.2', '3.3', '3.4']
         mongodb-version: ['4.4']
         sqlite-version: ['3.0']
 
+    name: Test (Ruby ${{ matrix.ruby-version }}, MongoDB ${{ matrix.mongodb-version }}, SQLite ${{ matrix.sqlite-version }})
+
     steps:
     - uses: actions/checkout@v4
     - name: Set up Ruby

.gitignore

@@ -2,13 +2,15 @@
 gemfiles/*.lock
 Gemfile.lock
 
+spec/dummy/db/schema.rb
+
 # RVM / rbenv version files
 .rvmrc
 .rbenv-version
 .ruby-version
 
 # dummy dbs
-*.sqlite3
+*.sqlite3*
 
 # rcov generated
 coverage

CHANGELOG.md

@@ -2,8 +2,12 @@
 
 ## Unreleased
 
+- **Breaking change**: Drop support for Ruby < 3 and Rails < 6.1
+- **Breaking change**: Requires `money` gem version ~> 7.0
 - Allow monetizing methods with kwargs
-- Fix money_only_cents for negative money
+- Fix `money_only_cents` for negative money
+- Allow `nil` to be set as the default currency
+- Portuguese translation for errors
 
 ## 1.15.0
 

CONTRIBUTORS

@@ -31,6 +31,7 @@ James Chen
 Jamie Dyer
 Joe Frambach
 John Wood
+Julia López
 Kevin Sołtysiak
 Kirill Shamardin
 Michael J.

Gemfile

@@ -2,29 +2,22 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem "bigdecimal"
+gem "mutex_m"
+gem "benchmark"
+gem "drb"
+
 platforms :jruby do
   gem "activerecord-jdbc-adapter"
   gem "activerecord-jdbcsqlite3-adapter"
   gem "jruby-openssl"
 end
 
 platforms :ruby do
-  gem "sqlite3"
-end
-
-platform :mri do
-  # gem "ruby-prof", "~> 0.11.2"
-
-  case RUBY_VERSION
-  when /^1.9/
-    gem 'debugger'
-  end
+  gem "sqlite3", "~> 1.4"
 end
 
 group :development do
   gem "pry"
-  gem 'rb-inotify', '~> 0.9'
-  gem 'guard'
-  gem 'guard-rspec'
-  gem 'guard-rails'
+  gem "money", git: "https://github.com/RubyMoney/money.git"
 end

Guardfile

@@ -248,7 +248,7 @@ class Transaction < ActiveRecord::Base
   monetize :price_cents
   monetize :tax_cents
   monetize :total_cents
-  
+
   def total_cents
     price_cents + tax_cents
   end
@@ -576,12 +576,12 @@ For examples on using the test_helpers look at
 
 ## Supported ORMs/ODMs
 
-* ActiveRecord (>= 3.x)
+* ActiveRecord (>= 6.1)
 * Mongoid (>= 2.x)
 
 ## Supported Ruby interpreters
 
-* MRI Ruby >= 2.6
+* MRI Ruby >= 3.0
 
 You can see a full list of the currently supported interpreters in
 [ruby.yml](https://github.com/RubyMoney/money-rails/blob/main/.github/workflows/ruby.yml)

README.md

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'rubygems'
 require 'bundler'
 require 'bundler/gem_tasks'
@@ -15,8 +13,6 @@ end
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 GEMFILES_PATH = 'gemfiles/*.gemfile'.freeze
 
-load 'rails/tasks/engine.rake' if File.exist?(APP_RAKEFILE)
-
 require 'rake'
 require 'rspec/core/rake_task'
 
@@ -28,22 +24,19 @@ task spec: :prepare_test_env
 
 desc "Prepare money-rails engine test environment"
 task :prepare_test_env do
-  Rake.application['app:db:drop:all'].invoke
-  Rake.application['app:db:create'].invoke if Rails::VERSION::MAJOR >= 5
-  Rake.application['app:db:migrate'].invoke
-  Rake.application['app:db:test:prepare'].invoke
+  load APP_RAKEFILE if File.exist?(APP_RAKEFILE)
+  Rake.application["db:drop"].invoke
+  Rake.application["db:create"].invoke
+  Rake.application["db:migrate"].invoke
+  Rake.application["db:test:prepare"].invoke
 end
 
 def run_with_gemfile(gemfile)
   Bundler.with_original_env do
-    begin
-      sh "BUNDLE_GEMFILE='#{gemfile}' bundle install --quiet"
-      Rake.application['app:db:create'].invoke
-      Rake.application['app:db:test:prepare'].invoke
-      sh "BUNDLE_GEMFILE='#{gemfile}' bundle exec rake spec"
-    ensure
-      Rake.application['app:db:drop:all'].execute
-    end
+    lockfile = "#{gemfile}.lock"
+    File.delete(lockfile) if File.exist?(lockfile)
+    sh "BUNDLE_GEMFILE=#{gemfile} bundle install --quiet"
+    sh "BUNDLE_GEMFILE=#{gemfile} bundle exec rake spec"
   end
 end
 
@@ -57,17 +50,10 @@ namespace :spec do
 
     # Ruby 3 exclusions
     if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0')
-      # Rails 5 does not support ruby-3.0.0 https://github.com/rails/rails/issues/40938#issuecomment-751569171
       # Mongoid gem does not yet support ruby-3.0.0 https://github.com/mongodb/mongoid#compatibility
-      next if framework == 'mongoid' || (framework == 'rails' && version == "5")
+      next if framework == 'mongoid'
     end
 
-    # Skip Rails 7 unless the Ruby version is at least 2.7
-    if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7')
-      next if framework == 'rails' && version == "7"
-    end
-
-
     frameworks_versions[framework] ||= []
     frameworks_versions[framework] << file_name
 

Rakefile

@@ -0,0 +1,4 @@
+pt:
+  errors:
+    messages:
+      invalid_currency: tem um formato inválido (deve ser '100', '5%{decimal}24', ou '123%{thousands}456%{decimal}78'). Recebido %{currency}