amountable 0.2.6 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6e145cd82c4b5847530ddd449de2ec1818ae60d5
-  data.tar.gz: 84b68e8cf0f8cfa202179c75b7d7e75ac7d658b9
+SHA256:
+  metadata.gz: aee387d2d2d88c2fc8086dd0cc4b09293e775bd3c9a4f5e6bc507d18ca06976b
+  data.tar.gz: 93b2fef942db13a396dae78c9fe533d74290f7ffd47b0df6d581fe8e5fdcbf72
 SHA512:
-  metadata.gz: 1bc432398eaa8a091f1a80654efed493fef2fdf84ee9557ccb463194538ede8b64373eb22701f61f22b408100807c796f341232120925f772540d8f60d8bf941
-  data.tar.gz: 218f5b307d72a04ef4022ed51193160f816abe0db742deebe086d267465b2296fcca29a3cb15837e6011a96ab08ba8508e659f1dd0a6d91d5f70ce947ba8c60d
+  metadata.gz: 2c090c0efc1c00740a594f805fa49c967adce57369b19d5d509be9c1d708e454a9ce778d7d262aee3ae387d050e6f5b70692fc9a4b4f06ad520732388e78bf5e
+  data.tar.gz: 4119055f5f5e0631abf38758e638e2fa5619b5136c09a740a799bbe1b9743d36a662b37f7a091a0129090b397cf800b91c15e5fd7d3429d1b56d91a9ec451666

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,43 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby:
+          - 2.6
+          - 2.7
+    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 }}
+    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-push.yml

@@ -0,0 +1,34 @@
+name: Ruby 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/amountable.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.required_ruby_version     = '>= 2.1.1'
 
-  gem.add_dependency 'activerecord', '>= 4.1', '< 5.1'
-  gem.add_dependency 'activesupport', '>= 4.1', '< 5.1'
-  gem.add_dependency 'activerecord-import', '~> 0.19.1'
-  gem.add_dependency 'money-rails'
+  gem.add_dependency 'activerecord', '>= 4.1', '< 6.1'
+  gem.add_dependency 'activesupport', '>= 4.1'
+  gem.add_dependency 'activerecord-import', '>= 0.19.1'
+  gem.add_dependency 'money-rails', '>=1.7.0'
   gem.add_dependency 'monetize'
 
   gem.add_development_dependency 'sqlite3'

data/lib/amountable.rb

@@ -4,6 +4,7 @@ module Amountable
   extend ActiveSupport::Autoload
   autoload :Operations
   autoload :Amount
+  autoload :VirtualAmount
   autoload :NilAmount
   autoload :VERSION
   autoload :TableMethods
@@ -71,7 +72,6 @@ module Amountable
         include Amountable::TableMethods
       when :jsonb
         self.amounts_column_name = options[:column].to_s if options[:column]
-        raise MissingColumn.new("You need an amounts jsonb field on the #{self.table_name} table.") unless column_names.include?(self.amounts_column_name)
         include Amountable::JsonbMethods
       else
         raise ArgumentError.new("Please specify a storage: #{ALLOWED_STORAGE}")

data/lib/amountable/jsonb_methods.rb

@@ -6,7 +6,7 @@ module Amountable
 
     def amounts
       @_amounts ||= attribute(amounts_column_name).to_h['amounts'].to_h.map do |name, amount|
-        Amount.new(name: name, value_cents: amount['cents'], value_currency: amount['value_currency'], persistable: false, amountable: self)
+        Amountable::VirtualAmount.new(name: name, value_cents: amount['cents'], value_currency: amount['currency'], persistable: false, amountable: self)
       end.to_set
     end
 

data/lib/amountable/version.rb

@@ -1,5 +1,5 @@
 # Copyright 2015-2017, Instacart
 
 module Amountable
-  VERSION = '0.2.6'
+  VERSION = '0.3.2'
 end

data/lib/amountable/virtual_amount.rb

@@ -0,0 +1,35 @@
+# Copyright 2015-2017, Instacart
+
+module Amountable
+  class VirtualAmount
+    include ActiveModel::Model
+
+    attr_accessor :amountable, :value_cents, :value_currency, :name, :persistable
+
+    include Amountable::Operations
+
+    validates :name, presence: true
+
+    def value
+      Money.new(value_cents, value_currency)
+    end
+
+    def value=(val)
+      self.value_cents = value.fractional
+      self.value_currency = value.currency.iso_code
+    end
+
+    def new_record?
+      true
+    end
+
+    def persisted?
+      false
+    end
+
+    def save
+      raise StandardError.new("Can't persist amount to database") if persistable == false
+      super
+    end
+  end
+end

data/spec/support/database.rb

@@ -30,13 +30,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.2.6
+  version: 0.3.2
 platform: ruby
 authors:
 - Emmanuel Turlay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -37,9 +37,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,21 +44,18 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
 - !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
@@ -70,14 +64,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: monetize
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +192,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/CI.yml"
+- ".github/workflows/gem-push.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -214,6 +211,7 @@ files:
 - lib/amountable/operations.rb
 - lib/amountable/table_methods.rb
 - lib/amountable/version.rb
+- lib/amountable/virtual_amount.rb
 - spec/amountable/amount_spec.rb
 - spec/amountable/amountable_spec.rb
 - spec/amountable/nil_amount_spec.rb
@@ -243,8 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Easy Money fields for your Rails models.