amountable 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f15a987389dd56fc45dcddf6145adddbfe47bfc8b3b7666180c1bd51d7638a1
-  data.tar.gz: 1a23700ce3d891c26c35e53fe2d2e3c2d07dea910b0e6057a71aa17740933b6b
+  metadata.gz: 65db41fdb8408b564c411d3ccd1af1e472283c5c3d3f315eafc32b5a9f027315
+  data.tar.gz: 5741d0ea7a24844389f7f522fca71f180b4271d0572647d0ccbb110ad1506d03
 SHA512:
-  metadata.gz: 3642a8c7ad8a7eb8ff0e039cb77abadb6ee11b4d53521e53028d2b4c74ad71e8a3ed1ab3762e36e55067d8e31813dfde1c0a2fdf1ae15fdf7583bac6f4ba65b4
-  data.tar.gz: 68285488fe760b730d09fd54640e2529bd579dbb3227cd313842ae8c7f5d4aa6db6d46d0e7bc7dc7a03541c0cf8de78a6aadb731fb654252df217f2ffa4a7a38
+  metadata.gz: ee011dcc7d65f146f331243798ce8c2198994215f9b6a565b1e859270eb38a852bd137bcb45dcdb0cd60eae7b43ba90d57d70dffc2669213b42e21123f954d65
+  data.tar.gz: 0a509e297d204a95326072236cc036b493b95e90204bc5170410b07163b9760135797e3928fedd97668c242565addd26eb76845523cacd2a72b9e3089a0cdfcf

data/.github/workflows/CI.yml

@@ -12,12 +12,19 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - '2.6'
+          - '3.1'
+          - '3.0'
           - '2.7'
         activerecord:
+          - '7.0'
           - '6.1'
           - '6.0'
           - '5.2'
+        exclude:
+          - activerecord: '5.2'
+            ruby: '3.0'
+          - activerecord: '5.2'
+            ruby: '3.1'
     services:
       postgres:
         image: postgres:12

data/amountable.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split($/)
   gem.test_files    = gem.files.grep(%r{^spec/})
   gem.require_paths = ['lib']
-  gem.required_ruby_version     = '>= 2.6'
+  gem.required_ruby_version     = '>= 2.7'
 
-  gem.add_dependency 'activerecord', '>= 5.2', '< 7'
+  gem.add_dependency 'activerecord', '>= 5.2', '< 8'
   gem.add_dependency 'activerecord-import', '>= 0.19.1'
   gem.add_dependency 'money-rails', '>=1.7.0'
   gem.add_dependency 'monetize'

data/gemfiles/activerecord_7.0.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec path: "../"
+
+gem "activerecord", "~> 7.0.0"

data/lib/amountable/table_methods.rb

@@ -19,15 +19,15 @@ module Amountable
       amount.value
     end
 
-    def save(args = {})
+    def save(**args)
       ActiveRecord::Base.transaction do
-        save_amounts if super(args)
+        save_amounts if super
       end
     end
 
-    def save!(args = {})
+    def save!(**args)
       ActiveRecord::Base.transaction do
-        save_amounts! if super(args)
+        save_amounts! if super
       end
     end
 

data/lib/amountable/version.rb

@@ -1,5 +1,5 @@
 # Copyright 2015-2021, Instacart
 
 module Amountable
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/lib/amountable.rb

@@ -119,6 +119,7 @@ module Amountable
         super
       end
     end
+    ruby2_keywords :where if Module.private_method_defined?(:ruby2_keywords)
 
     def where_json(opts, *rest)
       values = []
@@ -136,6 +137,7 @@ module Amountable
       query = [query.join(' AND ')] + values
       where(query, *rest).where(opts, *rest)
     end
+    ruby2_keywords :where_json if Module.private_method_defined?(:ruby2_keywords)
 
     def pg_json_field_access(name, field = :cents)
       name = name.to_sym

data/spec/support/database.rb

@@ -1,17 +1,24 @@
 # Copyright 2015-2021, Instacart
 
+require "activerecord-import/base"
+
 db_name = ENV['DB'] || 'postgresql'
 spec_dir = Pathname.new(File.dirname(__FILE__)) / '..'
 database_yml = spec_dir.join('internal/config/database.yml')
 
 fail "Please create #{database_yml} first to configure your database. Take a look at: #{database_yml}.sample" unless File.exist?(database_yml)
 
+module ActiveRecord::Import::Connection
+  ruby2_keywords :establish_connection if Module.private_method_defined?(:ruby2_keywords)
+end
+
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Base.default_timezone = :utc
 ActiveRecord::Base.configurations = YAML.load_file(database_yml)
 ActiveRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), '../debug.log'))
 ActiveRecord::Base.logger.level = ENV['CI'] ? ::Logger::ERROR : ::Logger::DEBUG
-config = ActiveRecord::Base.configurations[db_name]
+configs = ActiveRecord::Base.configurations
+config = configs.try(:find_db_config, db_name) || configs[db_name]
 
 begin
   ActiveRecord::Base.establish_connection(db_name.to_sym)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amountable
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Emmanuel Turlay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-01 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +192,7 @@ files:
 - gemfiles/activerecord_5.2.gemfile
 - gemfiles/activerecord_6.0.gemfile
 - gemfiles/activerecord_6.1.gemfile
+- gemfiles/activerecord_7.0.gemfile
 - lib/amountable.rb
 - lib/amountable/amount.rb
 - lib/amountable/jsonb_methods.rb
@@ -222,14 +223,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Easy Money fields for your Rails models.