amountable 0.3.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddad2c59d957b1f0b01390e301141baa98422f644ccc965f66946670f1d42112
-  data.tar.gz: 834d8c9530e849eb6d65e461251a59faa4495e2b787e71733b83f6cb9333c257
+  metadata.gz: 65db41fdb8408b564c411d3ccd1af1e472283c5c3d3f315eafc32b5a9f027315
+  data.tar.gz: 5741d0ea7a24844389f7f522fca71f180b4271d0572647d0ccbb110ad1506d03
 SHA512:
-  metadata.gz: cc16662084b3068fbc45586360e37b33edd0b6c4fd7fd531bea0ab0f0cbe0eb6b64751f8dbed95f5325e4c210978c0b4cbb2183853b27898234ccf3a397b0502
-  data.tar.gz: 6bb3891dbefa950390c037d066d5d16990475fdbd373b8d10500ec79355cdc03fb104aa2089b15247a0a4fe8a2f8ad3372f1d2cb32e2f5906d733ee2149b98e0
+  metadata.gz: ee011dcc7d65f146f331243798ce8c2198994215f9b6a565b1e859270eb38a852bd137bcb45dcdb0cd60eae7b43ba90d57d70dffc2669213b42e21123f954d65
+  data.tar.gz: 0a509e297d204a95326072236cc036b493b95e90204bc5170410b07163b9760135797e3928fedd97668c242565addd26eb76845523cacd2a72b9e3089a0cdfcf

data/.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "bundler" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

data/.github/workflows/CI.yml

@@ -0,0 +1,58 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby:
+          - '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
+        ports:
+          - 5432:5432
+        env:
+          POSTGRES_HOST_AUTH_METHOD: trust
+          POSTGRES_DB: amountable_test
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    name: Ruby ${{ matrix.ruby }} / ActiveRecord ${{ matrix.activerecord }}
+    env:
+      BUNDLE_GEMFILE: gemfiles/activerecord_${{ matrix.activerecord }}.gemfile
+    steps:
+      - uses: actions/checkout@v2
+      - run: |
+          sudo apt-get -yqq install libpq-dev
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: |
+          bundle exec rake
+        env:
+          PGHOST: 127.0.0.1
+          PGUSER: postgres
+          RAILS_ENV: test

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

@@ -0,0 +1,34 @@
+name: Publish Public Gem
+
+on:
+  release:
+    types:
+      - published
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-ruby@v1
+    - name: Build
+      run: |
+        gem build *.gemspec
+    - name: Publish to Github
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:github: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem push --verbose --key github --host https://rubygems.pkg.github.com/${OWNER} *.gem
+      env:
+        GEM_HOST_API_KEY: "Bearer ${{secrets.GITHUB_TOKEN}}"
+        OWNER: ${{ github.repository_owner }}
+      continue-on-error: true
+    - name: Publish to RubyGems
+      run: |
+        gem push --verbose *.gem
+      env:
+        GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_TOKEN}}

data/.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+gemfiles/*.lock
+*.log

data/.rspec

@@ -1 +1 @@
---colour
+--force-color

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright © 2015-2016, Instacart
+Copyright © 2015-2021, Instacart
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

data/amountable.gemspec

@@ -15,11 +15,10 @@ 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.1.1'
+  gem.required_ruby_version     = '>= 2.7'
 
-  gem.add_dependency 'activerecord', '>= 4.1', '< 5.3'
-  gem.add_dependency 'activesupport', '>= 4.1', '< 5.3'
-  gem.add_dependency 'activerecord-import', '~> 0.19.1'
+  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/db/migrate/0_create_amounts.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2017, Instacart
+# Copyright 2015-2021, Instacart
 
 class CreateAmounts < ActiveRecord::Migration
   def change

data/gemfiles/activerecord_5.2.gemfile

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

data/gemfiles/activerecord_6.0.gemfile

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

data/gemfiles/activerecord_6.1.gemfile

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

data/gemfiles/activerecord_7.0.gemfile

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

data/lib/amountable/amount.rb

@@ -1,21 +1,7 @@
-# Copyright 2015-2017, Instacart
+# Copyright 2015-2021, Instacart
 
 module Amountable
   class Amount < ActiveRecord::Base
-    class_attribute :columns
-    self.columns = []
-
-    def self.column(name, sql_type = nil, default = nil, null = true)
-      type = "ActiveRecord::Type::#{sql_type.to_s.camelize}".constantize.new
-      columns << ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, type, null)
-    end
-
-    column :amountable_type, :string, nil, false
-    column :amountable_id, :integer, nil, false
-    column :value_currency, :string, nil, true
-    column :value_cents, :integer, 0, false
-    column :name, :string, nil, false
-
     include Amountable::Operations
 
     belongs_to :amountable, polymorphic: true
@@ -31,6 +17,5 @@ module Amountable
       raise StandardError.new("Can't persist amount to database") if persistable == false
       super
     end
-
   end
-end
+end

data/lib/amountable/jsonb_methods.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2017, Instacart
+# Copyright 2015-2021, Instacart
 
 module Amountable
   module JsonbMethods

data/lib/amountable/nil_amount.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2017, Instacart
+# Copyright 2015-2021, Instacart
 
 module Amountable
   class NilAmount

data/lib/amountable/operations.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2017, Instacart
+# Copyright 2015-2021, Instacart
 
 module Amountable
   module Operations

data/lib/amountable/table_methods.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2017, Instacart
+# Copyright 2015-2021, Instacart
 
 module Amountable
   module TableMethods
@@ -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-2017, Instacart
+# Copyright 2015-2021, Instacart
 
 module Amountable
-  VERSION = '0.3.1'
+  VERSION = '0.5.0'
 end

data/lib/amountable/virtual_amount.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2017, Instacart
+# Copyright 2015-2021, Instacart
 
 module Amountable
   class VirtualAmount

data/lib/amountable.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2017, Instacart
+# Copyright 2015-2021, Instacart
 
 module Amountable
   extend ActiveSupport::Autoload
@@ -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/amountable/amount_spec.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2016, Instacart
+# Copyright 2015-2021, Instacart
 
 require 'spec_helper'
 

data/spec/amountable/amountable_spec.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2016, Instacart
+# Copyright 2015-2021, Instacart
 
 require 'spec_helper'
 
@@ -23,7 +23,7 @@ describe Amountable do
         expect(amount.persisted?).to be true
       end
       expect do
-        expect(order.update_attributes(sub_total: Money.new(200)))
+        expect(order.update(sub_total: Money.new(200)))
       end.not_to change { Amountable::Amount.count }
     end
 
@@ -80,7 +80,7 @@ describe Amountable do
           expect { subscription.save }.not_to change { Amountable::Amount.count }
           expect(amount.persisted?).to be false
         end
-        subscription.update_attributes(sub_total: Money.new(200))
+        subscription.update(sub_total: Money.new(200))
         expect(subscription.sub_total).to eq(Money.new(200))
         expect(subscription.total).to eq(Money.new(200))
         subscription.sub_total = Money.zero

data/spec/amountable/nil_amount_spec.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2016, Instacart
+# Copyright 2015-2021, Instacart
 
 require 'spec_helper'
 

data/spec/internal/app/models/order.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2016, Instacart
+# Copyright 2015-2021, Instacart
 
 class Order < ActiveRecord::Base
 

data/spec/internal/app/models/subscription.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2016, Instacart
+# Copyright 2015-2021, Instacart
 
 if jsonb_available?
   class Subscription < ActiveRecord::Base

data/spec/internal/db/schema.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2016, Instacart
+# Copyright 2015-2021, Instacart
 
 ActiveRecord::Schema.define do
 

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2016, Instacart
+# Copyright 2015-2021, Instacart
 
 ENV['RAILS_ENV'] = 'test'
 require 'rails'

data/spec/support/database.rb

@@ -1,4 +1,6 @@
-# Copyright 2015-2016, Instacart
+# Copyright 2015-2021, Instacart
+
+require "activerecord-import/base"
 
 db_name = ENV['DB'] || 'postgresql'
 spec_dir = Pathname.new(File.dirname(__FILE__)) / '..'
@@ -6,12 +8,17 @@ 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['TRAVIS'] ? ::Logger::ERROR : ::Logger::DEBUG
-config = ActiveRecord::Base.configurations[db_name]
+ActiveRecord::Base.logger.level = ENV['CI'] ? ::Logger::ERROR : ::Logger::DEBUG
+configs = ActiveRecord::Base.configurations
+config = configs.try(:find_db_config, db_name) || configs[db_name]
 
 begin
   ActiveRecord::Base.establish_connection(db_name.to_sym)
@@ -30,13 +37,7 @@ rescue
 end
 
 def jsonb_available?
-  return @@jsonb_available if defined?(@@jsonb_available)
-  @@jsonb_available = if ActiveRecord::Base.connection.class.ancestors.include?(ActiveRecord::Import::PostgreSQLAdapter)
-    version = /PostgreSQL\s(\d+.\d+.\d+)\s/.match(ActiveRecord::Base.connection.execute("select version();")[0]['version'])[1].split('.').map(&:to_i)
-    version[0] >= 9 && version[1] >= 3
-  else
-    false
-  end
+  true
 end
 
 require_relative '../internal/db/schema'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amountable
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Emmanuel Turlay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,52 +16,32 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.1
 - !ruby/object:Gem::Dependency
@@ -198,15 +178,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/CI.yml"
+- ".github/workflows/gem-publish-public.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - amountable.gemspec
 - db/migrate/0_create_amounts.rb
+- 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
@@ -237,15 +223,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.1
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Easy Money fields for your Rails models.

data/.travis.yml

@@ -1,5 +0,0 @@
-language: ruby
-rvm:
- - 2.2.2
-addons:
-  postgresql: "9.4"