gecko-ruby 0.11.0 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57ccb059212f755e0b5199cb01f8b32bc190e3b614ce0fcc8c0f1313363a91bb
-  data.tar.gz: 59271e89c7f7ac7217d53f6a44cbb1b6b453ce7d03602b2540490edc67f0abf5
+  metadata.gz: 4c83ec642703ff89b134c3f724eaf7552cba11b4c836417842403462a126c431
+  data.tar.gz: 4848a524d27dc714d78d182f9344ef8e97f8acd9fb9d7067ef520bd1c2a6f36e
 SHA512:
-  metadata.gz: 0ecc3d0449defcebc48edc48780eeeb9419ca8cc02b7f0b28223725f3722940d1c68fe7280d8c70b4b5ef4ac14f6d0d387ef56c465824f2cc6e03ffc8c7a75f8
-  data.tar.gz: 7e8a8f9e96f966c23bc66f7577ae735f0144553bf3011e40784cafd7ce9b4def6b64bb61cfb87b64f8a6cadd1789344268ff66d224c559ee5c9bb55950f0da7f
+  metadata.gz: 0d56c4816c3972f9b38a0f36a6466b62ca545454b2df3dd1fc9011a772ca1b07046feaf1f76c24d81793b6201ae9cbfb31d74ba2241373a326cf8dff10596666
+  data.tar.gz: b5f13eee91dd43cc7d415753cce8a01a1ee63f134cb78af03ce12b85e42f2aa2eb717edd437b3298802a71192c1b7e193f17a9257716ec5071551ffdc3cf5809

data/.github/workflows/testing.yml

@@ -12,7 +12,7 @@ jobs:
     name: Ruby ${{ matrix.ruby }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
       - name: Run Tests

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.12.2 (2020-08-12)
+- Change authorize url to commerce.intuit.com
+- Add `payment_due_at` to `Gecko::Record::PurchaseOrder`
+
+## 0.12.1 (2020-07-20)
+- Add `Gecko::Record::PaymentMethod` model.
+
+## 0.12.0 (2020-07-09)
+- Silence warnings in Ruby 2.7
+- Ensure response is passed to `ActiveSupport::Notifications` on error
+- Ensure `adapter.last_response` is set on error response
+
+## 0.11.1 (2020-04-30)
+- Fix addresses on Invoice
+
 ## 0.11.0 (2020-04-29)
 - Store create/update responses under `adapter.last_response` as well.
 
@@ -11,7 +26,7 @@
 ## 0.9.0 (2019-07-24)
 - Added an optional `ActiveSupport::LogSubscriber` class for easy logging,
   can be enabled via `Gecko.enable_logging`.
-- Added an optional compatibility shim for the Liquid templating language, 
+- Added an optional compatibility shim for the Liquid templating language,
   can be enabled via `Gecko.install_liquid_shim`.
 
 ## 0.8.0 (2019-07-01)

data/lib/gecko.rb

@@ -32,6 +32,7 @@ require 'gecko/record/user'
 require 'gecko/record/purchase_order'
 require 'gecko/record/purchase_order_line_item'
 require 'gecko/record/tax_type'
+require 'gecko/record/payment_method'
 require 'gecko/record/payment_term'
 require 'gecko/record/webhook'
 

data/lib/gecko/client.rb

@@ -33,6 +33,7 @@ module Gecko
     record :PurchaseOrder
     record :PurchaseOrderLineItem
     record :TaxType
+    record :PaymentMethod
     record :PaymentTerm
     record :Webhook
 
@@ -126,7 +127,7 @@ module Gecko
     def setup_oauth_client(client_id, client_secret, options)
       defaults = {
         site:            'https://api.tradegecko.com',
-        authorize_url:   'https://go.tradegecko.com/oauth/authorize',
+        authorize_url:   'https://commerce.intuit.com/oauth/authorize',
         connection_opts: {
           headers: self.class.default_headers
         }

data/lib/gecko/helpers/association_helper.rb

@@ -72,7 +72,7 @@ module Gecko
                              []
                            end
 
-              build_collection_proxy(collection, {
+              build_collection_proxy(collection, **{
                 embedded:         options[:embedded],
                 class_name:       class_name,
                 association_name: association_name
@@ -100,7 +100,7 @@ module Gecko
       #
       # @api private
       def build_collection_proxy(target, association_name:, class_name:, embedded:)
-        CollectionProxy.new({
+        CollectionProxy.new(**{
           parent:           self,
           target:           target,
           embedded:         embedded,

data/lib/gecko/record/account.rb

@@ -11,6 +11,7 @@ module Gecko
       belongs_to :primary_location,                class_name: "Location"
       belongs_to :primary_billing_location,        class_name: "Location"
       belongs_to :default_currency,                class_name: "Currency"
+      belongs_to :default_payment_method,          class_name: "PaymentMethod"
       belongs_to :default_payment_term,            class_name: "PaymentTerm"
       belongs_to :billing_contact,                 class_name: "User"
       belongs_to :default_sales_order_tax_type,    class_name: "TaxType"

data/lib/gecko/record/base_adapter.rb

@@ -111,7 +111,7 @@ module Gecko
       #
       # @api public
       def where(params = {})
-        response = @last_response = request(:get, plural_path, params: params)
+        response = request(:get, plural_path, params: params)
         parsed_response = response.parsed
         set_pagination(response.headers)
         parse_records(parsed_response)
@@ -203,7 +203,7 @@ module Gecko
       # @api private
       def fetch(id) # rubocop:disable Metrics/MethodLength
         verify_id_presence!(id)
-        response = @last_response = request(:get, plural_path + '/' + id.to_s)
+        response = request(:get, plural_path + '/' + id.to_s)
         record_json = extract_record(response.parsed)
         instantiate_and_register_record(record_json)
       rescue OAuth2::Error => e
@@ -343,7 +343,7 @@ module Gecko
       #
       # @api private
       def create_record(record, opts = {})
-        response = @last_response = request(:post, plural_path, {
+        response = request(:post, plural_path, {
           body:         record.as_json,
           raise_errors: false
         }.merge(headers: headers_from_opts(opts)))
@@ -356,7 +356,7 @@ module Gecko
       #
       # @api private
       def update_record(record, opts = {})
-        response = @last_response = request(:put, plural_path + "/" + record.id.to_s, {
+        response = request(:put, plural_path + "/" + record.id.to_s, {
           body:         record.as_json,
           raise_errors: false
         }.merge(headers: headers_from_opts(opts)))
@@ -431,18 +431,24 @@ module Gecko
       # @return [OAuth2::Response]
       #
       # @api private
-      def request(verb, path, options = {}) # rubocop:disable Metrics/MethodLength
+      def request(verb, path, options = {}) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         ActiveSupport::Notifications.instrument('request.gecko') do |payload|
           payload[:verb]         = verb
           payload[:params]       = options[:params]
           payload[:body]         = options[:body]
           payload[:model_class]  = model_class
           payload[:request_path] = path
+
           options[:headers]      = options.fetch(:headers, {}).tap do |headers|
             headers['Content-Type'] = 'application/json'
           end
-          options[:body]         = options[:body].to_json if options[:body]
-          payload[:response]     = @client.access_token.request(verb, path, options)
+
+          options[:body] = options[:body].to_json if options[:body]
+
+          @client.access_token.request(verb, path, options.merge(raise_errors: false)).tap do |response|
+            payload[:response] = @last_response = response
+            raise response.error if response.error && options[:raise_errors] != false
+          end
         end
       end
 

data/lib/gecko/record/company.rb

@@ -7,6 +7,7 @@ module Gecko
     class Company < Base
       belongs_to :assignee,               class_name: "User"
       belongs_to :default_tax_type,       class_name: "TaxType"
+      belongs_to :default_payment_method, class_name: "PaymentMethod"
       belongs_to :default_payment_term,   class_name: "PaymentTerm"
       belongs_to :default_stock_location, class_name: "Location"
       # belongs_to :default_price_list,   class_name: "PriceList"

data/lib/gecko/record/invoice.rb

@@ -6,8 +6,8 @@ module Gecko
   module Record
     class Invoice < Base
       belongs_to :order, writeable_on: :create
-      belongs_to :shipping_address
-      belongs_to :billing_address
+      belongs_to :shipping_address,           class_name: 'Address'
+      belongs_to :billing_address,            class_name: 'Address'
       belongs_to :payment_term
       belongs_to :company,                    readonly: true
       belongs_to :currency,                   readonly: true

data/lib/gecko/record/payment_method.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'gecko/record/base'
+
+module Gecko
+  module Record
+    class PaymentMethod < Base
+      attribute :name,        String
+      attribute :is_default,  Boolean,   readonly: true
+    end
+
+    class PaymentMethodAdapter < BaseAdapter
+    end
+  end
+end

data/lib/gecko/record/purchase_order.rb

@@ -20,7 +20,9 @@ module Gecko
       attribute :order_number,          String
       attribute :reference_number,      String
       attribute :email,                 String
+
       attribute :due_at,                Date
+      attribute :payment_due_at,        Date
       attribute :received_at,           Date
 
       attribute :status,                String
@@ -34,9 +36,6 @@ module Gecko
       attribute :cached_quantity,       BigDecimal, readonly: true
 
       attribute :tags,                  Array[String]
-
-      # DEPRECATED
-      # attribute :cached_total,          BigDecimal, readonly: true
     end
 
     class PurchaseOrderAdapter < BaseAdapter

data/lib/gecko/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gecko
-  VERSION = '0.11.0'
+  VERSION = '0.12.2'
 end

data/test/fixtures/vcr_cassettes/payment_methods.yml

@@ -0,0 +1,69 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://api.lvh.me:3000/payment_methods?limit=5
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Gecko/0.12.0 OAuth2/1.4.1 Faraday/0.15.4 Ruby/2.5.7
+      Content-Type:
+      - application/json
+      Authorization:
+      - Bearer <__ACCESS_TOKEN__>
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Content-Type-Options:
+      - nosniff
+      X-Download-Options:
+      - noopen
+      X-Permitted-Cross-Domain-Policies:
+      - none
+      Referrer-Policy:
+      - strict-origin-when-cross-origin
+      X-Rate-Limit-Limit:
+      - '300'
+      X-Rate-Limit-Remaining:
+      - '299'
+      X-Rate-Limit-Reset:
+      - '1594871400'
+      Cache-Control:
+      - no-cache, no-store
+      X-Pagination:
+      - '{"total_records":11,"total_pages":3,"first_page":true,"last_page":false,"out_of_bounds":false,"offset":0}'
+      Link:
+      - <http://api.lvh.me:3000/ajax/payment_methods?limit=5&page=2>; rel="next",
+        <http://api.lvh.me:3000/ajax/payment_methods?limit=5&page=3>; rel="last"
+      Content-Type:
+      - application/json; charset=utf-8
+      Etag:
+      - W/"7462907dae56049f84e55abca4a15c5e"
+      X-Request-Id:
+      - ac553ee8-d518-404c-bd7b-215a168d164c
+      X-Runtime:
+      - '0.108324'
+      Connection:
+      - close
+      Server:
+      - thin
+    body:
+      encoding: UTF-8
+      string: '{"payment_methods":[{"id":32,"created_at":"2020-07-16T03:46:03.946Z","updated_at":"2020-07-16T03:46:03.946Z","name":"PayNow","is_default":false},{"id":31,"created_at":"2020-07-16T03:45:50.096Z","updated_at":"2020-07-16T03:45:50.096Z","name":"Singtel
+        Dash","is_default":false},{"id":30,"created_at":"2020-07-16T03:45:36.276Z","updated_at":"2020-07-16T03:45:36.276Z","name":"eNets","is_default":false},{"id":29,"created_at":"2020-07-16T03:45:21.473Z","updated_at":"2020-07-16T03:45:21.473Z","name":"Voucher","is_default":false},{"id":28,"created_at":"2020-07-16T03:45:15.160Z","updated_at":"2020-07-16T03:45:15.160Z","name":"Credit
+        Note","is_default":false}]}'
+    http_version: null
+  recorded_at: Thu, 16 Jul 2020 03:48:15 GMT
+recorded_with: VCR 5.1.0

data/test/fixtures/vcr_cassettes/payment_methods_count.yml

@@ -0,0 +1,66 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://api.lvh.me:3000/payment_methods?limit=0
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Gecko/0.12.0 OAuth2/1.4.1 Faraday/0.15.4 Ruby/2.5.7
+      Content-Type:
+      - application/json
+      Authorization:
+      - Bearer <__ACCESS_TOKEN__>
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Content-Type-Options:
+      - nosniff
+      X-Download-Options:
+      - noopen
+      X-Permitted-Cross-Domain-Policies:
+      - none
+      Referrer-Policy:
+      - strict-origin-when-cross-origin
+      X-Rate-Limit-Limit:
+      - '300'
+      X-Rate-Limit-Remaining:
+      - '299'
+      X-Rate-Limit-Reset:
+      - '1594871400'
+      Cache-Control:
+      - no-cache, no-store
+      X-Pagination:
+      - '{"total_records":11,"total_pages":1,"first_page":true,"last_page":true,"out_of_bounds":false,"offset":0}'
+      Link:
+      - <http://api.lvh.me:3000/ajax/payment_methods?limit=0&page=1>; rel="last"
+      Content-Type:
+      - application/json; charset=utf-8
+      Etag:
+      - W/"98c458ef2a733afd7d9fbf88e776e5c2"
+      X-Request-Id:
+      - 89f1b27c-35d7-4b3c-a356-d87c0a1d4cc1
+      X-Runtime:
+      - '0.160860'
+      Connection:
+      - close
+      Server:
+      - thin
+    body:
+      encoding: UTF-8
+      string: '{"payment_methods":[]}'
+    http_version: null
+  recorded_at: Thu, 16 Jul 2020 03:48:14 GMT
+recorded_with: VCR 5.1.0

data/test/record/payment_method_adapter_test.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class Gecko::Record::PaymentMethodAdapterTest < Minitest::Test
+  include TestingAdapter
+  include SharedAdapterExamples
+
+  let(:adapter)       { @client.PaymentMethod }
+  let(:plural_name)   { "payment_methods" }
+  let(:record_class)  { Gecko::Record::PaymentMethod }
+
+  def test_initializes_adapter
+    assert_instance_of(Gecko::Record::PaymentMethodAdapter, @client.PaymentMethod)
+  end
+end

data/test/record/payment_method_test.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class Gecko::PaymentMethodTest < Minitest::Test
+  include VCRHelper
+  include SharedRecordExamples
+
+  let(:plural_name)   { "payment_methods" }
+  let(:record_class)  { Gecko::Record::PaymentMethod }
+
+  def setup
+    @json   = load_vcr_hash("payment_methods", "payment_methods").first
+    @record = record_class.new(client, @json)
+  end
+
+  def test_initializes_record
+    assert_instance_of(Gecko::Record::PaymentMethod, @record)
+  end
+end

data/test/support/shared_adapter_examples.rb

@@ -147,7 +147,7 @@ module SharedAdapterExamples # rubocop:disable Metrics/ModuleLength
   def test_saving_record_with_idempotency_key # rubocop:disable Metrics/MethodLength
     record = adapter.build
     mock_token = mock
-    mock_response = mock(status: 200, parsed: { plural_name.singularize => { id: 123 } })
+    mock_response = mock(status: 200, parsed: { plural_name.singularize => { id: 123 } }, error: nil)
     mock_token.expects(:request)
               .with(:post, plural_name, {
                 body:         record.as_json.to_json,
@@ -165,7 +165,7 @@ private
 
   def mock_api_request(record, request, response)
     mock_token = mock
-    mock_response = mock(status: response[0], parsed: response[1])
+    mock_response = mock(status: response[0], parsed: response[1], error: nil)
     mock_token.expects(:request)
               .with(request[0], request[1], {
                 body:         record.as_json.to_json,

data/test/test_helper.rb

@@ -15,9 +15,19 @@ require 'support/shared_sideloaded_data_parsing_examples'
 require 'support/testing_adapter'
 require 'support/vcr_support'
 
+ENV_SECRETS = %w[
+  OAUTH_ID
+  OAUTH_SECRET
+  ACCESS_TOKEN
+  REFRESH_TOKEN
+].freeze
+
 VCR.configure do |c|
   c.cassette_library_dir = 'test/fixtures/vcr_cassettes'
   c.hook_into :webmock
+  ENV_SECRETS.each do |variable|
+    c.filter_sensitive_data("<__#{variable}__>") { ENV[variable] }
+  end
 end
 
 class Minitest::Test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gecko-ruby
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.2
 platform: ruby
 authors:
 - Bradley Priest
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2021-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -239,6 +239,7 @@ files:
 - lib/gecko/record/note.rb
 - lib/gecko/record/order.rb
 - lib/gecko/record/order_line_item.rb
+- lib/gecko/record/payment_method.rb
 - lib/gecko/record/payment_term.rb
 - lib/gecko/record/product.rb
 - lib/gecko/record/purchase_order.rb
@@ -275,6 +276,8 @@ files:
 - test/fixtures/vcr_cassettes/order_line_items_specific_count.yml
 - test/fixtures/vcr_cassettes/orders.yml
 - test/fixtures/vcr_cassettes/orders_count.yml
+- test/fixtures/vcr_cassettes/payment_methods.yml
+- test/fixtures/vcr_cassettes/payment_methods_count.yml
 - test/fixtures/vcr_cassettes/payment_terms.yml
 - test/fixtures/vcr_cassettes/payment_terms_count.yml
 - test/fixtures/vcr_cassettes/products.yml
@@ -325,6 +328,8 @@ files:
 - test/record/order_line_item_adapter_test.rb
 - test/record/order_line_item_test.rb
 - test/record/order_test.rb
+- test/record/payment_method_adapter_test.rb
+- test/record/payment_method_test.rb
 - test/record/payment_term_adapter_test.rb
 - test/record/payment_term_test.rb
 - test/record/product_adapter_test.rb
@@ -366,7 +371,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.25
 signing_key: 
 specification_version: 4
 summary: A Ruby interface to the TradeGecko API.
@@ -398,6 +403,8 @@ test_files:
 - test/fixtures/vcr_cassettes/order_line_items_specific_count.yml
 - test/fixtures/vcr_cassettes/orders.yml
 - test/fixtures/vcr_cassettes/orders_count.yml
+- test/fixtures/vcr_cassettes/payment_methods.yml
+- test/fixtures/vcr_cassettes/payment_methods_count.yml
 - test/fixtures/vcr_cassettes/payment_terms.yml
 - test/fixtures/vcr_cassettes/payment_terms_count.yml
 - test/fixtures/vcr_cassettes/products.yml
@@ -448,6 +455,8 @@ test_files:
 - test/record/order_line_item_adapter_test.rb
 - test/record/order_line_item_test.rb
 - test/record/order_test.rb
+- test/record/payment_method_adapter_test.rb
+- test/record/payment_method_test.rb
 - test/record/payment_term_adapter_test.rb
 - test/record/payment_term_test.rb
 - test/record/product_adapter_test.rb