money-rails 1.13.4 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 618663a78af12610ff9901dd5ed3b3e5e5bf74d6d24b65141a52b2811179a0d8
-  data.tar.gz: 0724c64933122f73af34f1ad606c309e40c224a8b8636053ca437145527a8490
+  metadata.gz: 8226863e954671b603c22fac3eae1667b81ba88eb3425b8c9cd798e2cfa2f303
+  data.tar.gz: cc9c7c8fbc27bcc9343ad457f596b15594a576d0da93448d3bfbabe1caedcfbb
 SHA512:
-  metadata.gz: d0b87a85f4fe133e3fc75d75722c42dbb445c05cc98ebe7d242d8b63a27d8b879d324d37a8ca9b1ee24fddc8c0381152cd04e449dc8f8c041ec1598371760551
-  data.tar.gz: c984f12a0162f918b6d5c67b009da28d37a96a63ee0db664a8778e03503d60064ad9e8227d2e1d4fd37f61098f235445f0b959b7612aa503a1b90416f70b69c0
+  metadata.gz: 0ed641980d3b776a3b2ec80d9ff1e7247415248eeff0bdc3fbc7077ad7700171fdcbda6c4c13bf39c2cda063a9fdf2575b660f9625fb506e8d39a815b96ab02f
+  data.tar.gz: 301fbd73c779ac54d60e1be7137df6e0a89974b0372d1667fe9eb69c2a8e40c309768bcda6d885f1d6e7168512d2e62a61562ea2189dcd1bba14c53d58b1b891

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.14.0
+
+- Tweaks to support Ruby 3.0
+
 ## 1.13.4
 
 - Fix validator race condition

data/LICENSE

@@ -1,22 +1,22 @@
-Copyright (c) 2012 Andreas Loupasakis
-
 MIT License
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Copyright (c) 2012 Andreas Loupasakis
+Copyright (c) 2021 Shane Emmons
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -587,4 +587,4 @@ If you are testing against mongoid, make sure to have the mongod process running
 
 ## License
 
-MIT License. Copyright 2012-2014 RubyMoney.
+MIT License. Copyright 2021 RubyMoney.

data/Rakefile

@@ -55,6 +55,13 @@ namespace :spec do
     framework, version = file_name.split(/(\d+)/)
     major, minor = version.split(//)
 
+    # 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")
+    end
+
     frameworks_versions[framework] ||= []
     frameworks_versions[framework] << file_name
 

data/lib/money-rails/active_model/validator.rb

@@ -79,12 +79,12 @@ module MoneyRails
         attr_name = attr.to_s.tr('.', '_').humanize
         attr_name = record.class.human_attribute_name(attr, default: attr_name)
 
-        record.errors.add(attr, :invalid_currency, {
+        record.errors.add(attr, :invalid_currency,
           thousands: details.thousands_separator,
           decimal: details.decimal_mark,
           currency: details.abs_raw_value,
           attribute: attr_name
-        })
+        )
       end
 
       def value_has_too_many_decimal_points(details)

data/lib/money-rails/active_record/migration_extensions/schema_statements_pg_rails4.rb

@@ -5,7 +5,8 @@ module MoneyRails
         def add_monetize(table_name, accessor, options={})
           [:amount, :currency].each do |attribute|
             column_present, *opts = OptionsExtractor.extract attribute, table_name, accessor, options
-            add_column(*opts) if column_present
+            constraints = opts.pop
+            add_column(*opts, **constraints) if column_present
           end
         end
 

data/lib/money-rails/active_record/migration_extensions/table_pg_rails4.rb

@@ -5,7 +5,8 @@ module MoneyRails
         def monetize(accessor, options={})
           [:amount, :currency].each do |attribute|
             column_present, _, *opts = OptionsExtractor.extract attribute, :no_table, accessor, options
-            column(*opts) if column_present
+            constraints = opts.pop
+            column(*opts, **constraints) if column_present
           end
         end
 

data/lib/money-rails/version.rb

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

data/money-rails.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
   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'
+  s.add_development_dependency 'bundler'
 
   if s.respond_to?(:metadata)
     s.metadata['changelog_uri'] = 'https://github.com/RubyMoney/money-rails/blob/master/CHANGELOG.md'

data/spec/dummy/db/schema.rb

@@ -1,60 +1,59 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151026220420) do
+ActiveRecord::Schema.define(version: 2015_10_26_220420) do
 
   create_table "dummy_products", force: :cascade do |t|
-    t.string   "currency"
-    t.integer  "price_cents"
+    t.string "currency"
+    t.integer "price_cents"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "products", force: :cascade do |t|
-    t.integer  "price_cents"
-    t.integer  "discount"
+    t.integer "price_cents"
+    t.integer "discount"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "bonus_cents"
-    t.integer  "optional_price_cents"
-    t.integer  "sale_price_amount",             default: 0, null: false
-    t.string   "sale_price_currency_code"
-    t.integer  "price_in_a_range_cents"
-    t.integer  "validates_method_amount_cents"
-    t.integer  "aliased_cents"
-    t.integer  "delivery_fee_cents"
-    t.integer  "restock_fee_cents"
-    t.integer  "reduced_price_cents"
-    t.string   "reduced_price_currency"
-    t.integer  "special_price_cents"
-    t.integer  "lambda_price_cents"
-    t.string   "skip_validation_price_cents"
+    t.integer "bonus_cents"
+    t.integer "optional_price_cents"
+    t.integer "sale_price_amount", default: 0, null: false
+    t.string "sale_price_currency_code"
+    t.integer "price_in_a_range_cents"
+    t.integer "validates_method_amount_cents"
+    t.integer "aliased_cents"
+    t.integer "delivery_fee_cents"
+    t.integer "restock_fee_cents"
+    t.integer "reduced_price_cents"
+    t.string "reduced_price_currency"
+    t.integer "special_price_cents"
+    t.integer "lambda_price_cents"
+    t.string "skip_validation_price_cents"
   end
 
   create_table "services", force: :cascade do |t|
-    t.integer  "charge_cents"
-    t.integer  "discount_cents"
+    t.integer "charge_cents"
+    t.integer "discount_cents"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "transactions", force: :cascade do |t|
-    t.integer  "amount_cents"
-    t.integer  "tax_cents"
-    t.string   "currency"
+    t.integer "amount_cents"
+    t.integer "tax_cents"
+    t.string "currency"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "optional_amount_cents"
+    t.integer "optional_amount_cents"
   end
 
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: money-rails
 version: !ruby/object:Gem::Version
-  version: 1.13.4
+  version: 1.14.0
 platform: ruby
 authors:
 - Andreas Loupasakis
 - Shane Emmons
 - Simone Carletti
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -124,6 +124,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This library provides integration of RubyMoney - Money gem with Rails
 email:
 - alup.rubymoney@gmail.com
@@ -236,7 +250,7 @@ metadata:
   changelog_uri: https://github.com/RubyMoney/money-rails/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/RubyMoney/money-rails/
   bug_tracker_uri: https://github.com/RubyMoney/money-rails/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -251,8 +265,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Money gem integration with Rails
 test_files: