Merge branch 'main' into main

Author: semmons99

CHANGELOG.md

@@ -46,7 +46,7 @@
 
 - Bump money version to ~> 6.12.0
 - Bump monetize version to ~> 1.9.0
-- BREAKING CHANGE: Fix to rounding logic in this version from 1.11.0 can cause breaking changes for those relying on the incorrect behavior. Eee [the issue](https://github.com/RubyMoney/money-rails/issues/608) for details.
+- BREAKING CHANGE: Fix to rounding logic in this version from 1.11.0 can cause breaking changes for those relying on the incorrect behavior. See [the issue](https://github.com/RubyMoney/money-rails/issues/608) for details.
 
 ## 1.11.0
 
@@ -84,7 +84,7 @@
 - Fix attribute order possibly affecting the value of monetized attribute
 - Add support for RailsAdmin (use :money type)
 - Raise error when gem was unable to infer monetized attribute name
-- Revert decimal mark and thousands separator addtion, since formatting should depend on country and locale, instead of currency
+- Revert decimal mark and thousands separator addition, since formatting should depend on country and locale, instead of currency
 
 ## 1.6.1
 
@@ -148,8 +148,8 @@
 ## 1.1.0
 
 - Update dependencies to money 6.4.x and monetize 1.0.x.
-- Make subunit setter (e.g. `#price_cents=`) set the `before_type_cast...` va
-  riable. (Fixes validation errors.)
+- Make subunit setter (e.g. `#price_cents=`) set the `before_type_cast...`
+  variable. (Fixes validation errors.)
 - use HashWithIndifferentAccess instead of Hash for
   ActiveRecord::Base::monetized_attributes
 - Let the 'monetize' test helper work when testing against the model's class,
@@ -159,7 +159,7 @@
 - Upgrade specs to RSpec 3
 - Use #respond_to? instead of #try? when monetizing an aliased attribute.
 - Allow aliased attributes to be monetized
-- Fix compatability issue with Rails 4.2
+- Fix compatibility issue with Rails 4.2
 - Allow empty string as thousands separator.
 - Allow using a lambda to set default_currency
 

README.md

@@ -138,7 +138,8 @@ monetize :optional_price_cents, allow_nil: true
 
 # in Migration
 def change
-  add_money :products, :optional_price, amount: { null: true, default: nil }
+  add_money :products, :optional_price, amount: { null: true, default: nil }, currency: { null: true, default: nil } # Rails 3
+  add_monetize :products, :optional_price, amount: { null: true, default: nil }, currency: { null: true, default: nil } # Rails 4x and above
 end
 
 # now blank assignments are permitted

lib/money-rails/version.rb

@@ -1,3 +1,3 @@
 module MoneyRails
-  VERSION = '1.14.0'
+  VERSION = '1.15.0'
 end

money-rails.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_dependency "railties",      ">= 3.0"
   s.add_dependency "mime-types",    "< 3" if RUBY_VERSION < '2.0' # mime-types > 3 depends on mime-types-data, which doesn't support ruby 1.9
 
-  s.add_development_dependency "rails",       ">= 3.0"
+  s.add_development_dependency "rails",       ">= 3.0", "< 7.0"
   s.add_development_dependency "rspec-rails", "~> 3.0"
   s.add_development_dependency 'database_cleaner', '~> 1.6.1'
   s.add_development_dependency 'test-unit', '~> 3.0' if RUBY_VERSION >= '2.2'