amountable 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f15a987389dd56fc45dcddf6145adddbfe47bfc8b3b7666180c1bd51d7638a1
-  data.tar.gz: 1a23700ce3d891c26c35e53fe2d2e3c2d07dea910b0e6057a71aa17740933b6b
+  metadata.gz: 117dc0615f7234531a1bc2c82e198a92240350de974861bcd8c894475cd560bb
+  data.tar.gz: b7bc49c40bbc3b76bc0cf43b6acae5396f28d94fe71f24d7a3153b57481ef67d
 SHA512:
-  metadata.gz: 3642a8c7ad8a7eb8ff0e039cb77abadb6ee11b4d53521e53028d2b4c74ad71e8a3ed1ab3762e36e55067d8e31813dfde1c0a2fdf1ae15fdf7583bac6f4ba65b4
-  data.tar.gz: 68285488fe760b730d09fd54640e2529bd579dbb3227cd313842ae8c7f5d4aa6db6d46d0e7bc7dc7a03541c0cf8de78a6aadb731fb654252df217f2ffa4a7a38
+  metadata.gz: 5dc6d1475f0d577507167d0ce2f2781c15ca96312eba2c0de63867c8e9aecb9eb3a0b7970e1b24804fc44d8ccc6efef05ebe50c3aa8aeae6fc2a8f654a3ef57c
+  data.tar.gz: 9f52cda5ac6ad90460a7c4669f39c6e6caae271aa86d3dfda67da24a79a068a84ab3a91574e53328d771e35d2b00583f97ad3fc0d0c9549d25ca649ea8f14087

data/.github/dependabot.yml

@@ -8,4 +8,8 @@ updates:
   - package-ecosystem: "bundler" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
-      interval: "daily"
+      interval: "weekly"
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/CI.yml

@@ -12,15 +12,17 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - '2.6'
-          - '2.7'
+          - '3.3'
+          - '3.4'
         activerecord:
-          - '6.1'
-          - '6.0'
-          - '5.2'
+          - '7.0'
+          - '7.1'
+          - '7.2'
+          - '8.0'
+          - '8.1'
     services:
       postgres:
-        image: postgres:12
+        image: postgres:16
         ports:
           - 5432:5432
         env:
@@ -34,9 +36,9 @@ jobs:
 
     name: Ruby ${{ matrix.ruby }} / ActiveRecord ${{ matrix.activerecord }}
     env:
-      BUNDLE_GEMFILE: gemfiles/activerecord_${{ matrix.activerecord }}.gemfile
+      RAILS_VERSION: ${{ matrix.activerecord }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
       - run: |
           sudo apt-get -yqq install libpq-dev
       - uses: ruby/setup-ruby@v1
@@ -49,3 +51,10 @@ jobs:
           PGHOST: 127.0.0.1
           PGUSER: postgres
           RAILS_ENV: test
+  main:
+    runs-on: ubuntu-latest
+    needs:
+      - build
+    steps:
+      - run: |
+         echo "Confirmed all jobs passed"

data/.github/workflows/gem-publish-public.yml

@@ -12,7 +12,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-ruby@v1
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ruby
     - name: Build
       run: |
         gem build *.gemspec

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
+gem "activerecord", "~> #{ENV.fetch('RAILS_VERSION', '7.2')}.0"
+
 gemspec

data/amountable.gemspec

@@ -15,11 +15,11 @@ 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     = '>= 3.3'
 
-  gem.add_dependency 'activerecord', '>= 5.2', '< 7'
-  gem.add_dependency 'activerecord-import', '>= 0.19.1'
-  gem.add_dependency 'money-rails', '>=1.7.0'
+  gem.add_dependency 'activerecord', '>= 7.0', '< 9'
+  gem.add_dependency 'activerecord-import', '>= 2.0.0'
+  gem.add_dependency 'money-rails', '>= 1.7.0'
   gem.add_dependency 'monetize'
 
   gem.add_development_dependency 'sqlite3'
@@ -27,7 +27,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'pg'
 
   gem.add_development_dependency 'rspec-rails'
-  gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'database_cleaner'
   gem.add_development_dependency 'db-query-matchers'
 end

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.6.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/spec_helper.rb

@@ -12,6 +12,9 @@ require 'amountable/amount'
 require 'database_cleaner'
 require 'db-query-matchers'
 
+Money.locale_backend = :i18n
+Money.default_currency = "USD"
+
 RSpec.configure do |config|
 
   config.before(:suite) do

data/spec/support/database.rb

@@ -1,5 +1,7 @@
 # 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')
@@ -7,11 +9,12 @@ 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)
 
 ActiveRecord::Migration.verbose = false
-ActiveRecord::Base.default_timezone = :utc
+ActiveRecord.try(:default_timezone=, :utc) || 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 = Logger.new(File.join(__dir__, '../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,13 @@
 --- !ruby/object:Gem::Specification
 name: amountable
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Emmanuel Turlay
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-01 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,34 +15,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: money-rails
   requirement: !ruby/object:Gem::Requirement
@@ -128,20 +127,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  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'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -189,9 +174,6 @@ files:
 - Rakefile
 - amountable.gemspec
 - db/migrate/0_create_amounts.rb
-- gemfiles/activerecord_5.2.gemfile
-- gemfiles/activerecord_6.0.gemfile
-- gemfiles/activerecord_6.1.gemfile
 - lib/amountable.rb
 - lib/amountable/amount.rb
 - lib/amountable/jsonb_methods.rb
@@ -214,7 +196,6 @@ homepage: https://github.com/instacart/amountable
 licenses:
 - ISC
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -222,15 +203,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key: 
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Easy Money fields for your Rails models.
 test_files:

data/gemfiles/activerecord_5.2.gemfile

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

data/gemfiles/activerecord_6.0.gemfile

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

data/gemfiles/activerecord_6.1.gemfile

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