gocardless_pro 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecf319e84ed4dfe44efbdbccfa3b78fd3a2d21fa
-  data.tar.gz: 62778f5f199f97beda830c8135d76c9b3b9db140
+  metadata.gz: 25c17c94e9c95d89c64ef541cba1ad27a4161034
+  data.tar.gz: f3e4363abacd1fd9762b6e93dc1f1a9be5108a11
 SHA512:
-  metadata.gz: c44529e6d3b9d177f5c4cceded3dfb02dae73ee6c7ef5427e28574e6bb5466b804d01d4b519e60c91a948dc9b4409320701746214a4ae3f8d4e88239757a85a6
-  data.tar.gz: d0539445ad58e6dbb99e1394466261ed8e8d7b415148bf5f55ff48e0cbbe8f440d68aead63008f30bc7f0ba921b8507e447004711476c614f32eec157db7aebc
+  metadata.gz: 25a5a1693d92817de49cd708ae348c0c86833fae5838c4691c877fbb298ca5c5e023671cdd5dbb4d0f374329837fc5d4273205ef2c380ce77192737771059265
+  data.tar.gz: b4ad5c3055093b64930ca5612940f75ad0f8db82c153a3b8e8b58680f08e379c8880f381f11dab061e914ae0d2276bf8a9ee18a3806bf6fb0b1edd2c0e30aae1

data/lib/gocardless_pro/paginator.rb

@@ -4,12 +4,9 @@ module GoCardlessPro
     # initialize a paginator
     # @param options [Hash]
     # @option options :service the service class to use to make requests to
-    # @option options :path the path to make the request to
     # @option options :options additional options to send with the requests
     def initialize(options = {})
       @service = options.fetch(:service)
-      @resource_class = options.fetch(:resource_class)
-      @path = options.fetch(:path)
       @options = options.fetch(:options)
     end
 
@@ -18,18 +15,14 @@ module GoCardlessPro
       response = get_initial_response
       Enumerator.new do |yielder|
         loop do
-          items = @service.unenvelope_body(response.body).map do |item|
-            @resource_class.new(item)
-          end
+          response.records.each { |item| yielder << item }
 
-          items.each { |item| yielder << item }
-
-          after_cursor = response.meta['cursors']['after']
+          after_cursor = response.after
           break if after_cursor.nil?
 
           @options[:params] ||= {}
           @options[:params] = @options[:params].merge(after: after_cursor)
-          response = @service.make_request(:get, @path, @options.merge(after: after_cursor))
+          response = @service.list(@options.merge(after: after_cursor))
         end
       end.lazy
     end
@@ -37,7 +30,7 @@ module GoCardlessPro
     private
 
     def get_initial_response
-      @initial_response ||= @service.make_request(:get, @path, @options)
+      @initial_response ||= @service.list(@options)
     end
   end
 end

data/lib/gocardless_pro/resources/payout.rb

@@ -26,6 +26,8 @@ module GoCardlessPro
 
       attr_reader :currency
 
+      attr_reader :deducted_fees
+
       attr_reader :id
 
       attr_reader :reference
@@ -40,6 +42,7 @@ module GoCardlessPro
         @arrival_date = object['arrival_date']
         @created_at = object['created_at']
         @currency = object['currency']
+        @deducted_fees = object['deducted_fees']
         @id = object['id']
         @links = object['links']
         @reference = object['reference']

data/lib/gocardless_pro/services/bank_details_lookups_service.rb

@@ -38,6 +38,8 @@ module GoCardlessPro
         Resources::BankDetailsLookup.new(unenvelope_body(response.body), response)
       end
 
+      private
+
       # Unenvelope the response of the body using the service's `envelope_key`
       #
       # @param body [Hash]
@@ -45,8 +47,6 @@ module GoCardlessPro
         body[envelope_key] || body['data']
       end
 
-      private
-
       # return the key which API responses will envelope data under
       def envelope_key
         'bank_details_lookups'

data/lib/gocardless_pro/services/creditor_bank_accounts_service.rb

@@ -48,9 +48,7 @@ module GoCardlessPro
       def all(options = {})
         Paginator.new(
           service: self,
-          path: '/creditor_bank_accounts',
-          options: options,
-          resource_class: Resources::CreditorBankAccount
+          options: options
         ).enumerator
       end
 
@@ -94,6 +92,8 @@ module GoCardlessPro
         Resources::CreditorBankAccount.new(unenvelope_body(response.body), response)
       end
 
+      private
+
       # Unenvelope the response of the body using the service's `envelope_key`
       #
       # @param body [Hash]
@@ -101,8 +101,6 @@ module GoCardlessPro
         body[envelope_key] || body['data']
       end
 
-      private
-
       # return the key which API responses will envelope data under
       def envelope_key
         'creditor_bank_accounts'

data/lib/gocardless_pro/services/creditors_service.rb

@@ -48,9 +48,7 @@ module GoCardlessPro
       def all(options = {})
         Paginator.new(
           service: self,
-          path: '/creditors',
-          options: options,
-          resource_class: Resources::Creditor
+          options: options
         ).enumerator
       end
 
@@ -88,6 +86,8 @@ module GoCardlessPro
         Resources::Creditor.new(unenvelope_body(response.body), response)
       end
 
+      private
+
       # Unenvelope the response of the body using the service's `envelope_key`
       #
       # @param body [Hash]
@@ -95,8 +95,6 @@ module GoCardlessPro
         body[envelope_key] || body['data']
       end
 
-      private
-
       # return the key which API responses will envelope data under
       def envelope_key
         'creditors'

data/lib/gocardless_pro/services/customer_bank_accounts_service.rb

@@ -63,9 +63,7 @@ module GoCardlessPro
       def all(options = {})
         Paginator.new(
           service: self,
-          path: '/customer_bank_accounts',
-          options: options,
-          resource_class: Resources::CustomerBankAccount
+          options: options
         ).enumerator
       end
 
@@ -128,6 +126,8 @@ module GoCardlessPro
         Resources::CustomerBankAccount.new(unenvelope_body(response.body), response)
       end
 
+      private
+
       # Unenvelope the response of the body using the service's `envelope_key`
       #
       # @param body [Hash]
@@ -135,8 +135,6 @@ module GoCardlessPro
         body[envelope_key] || body['data']
       end
 
-      private
-
       # return the key which API responses will envelope data under
       def envelope_key
         'customer_bank_accounts'

data/lib/gocardless_pro/services/customers_service.rb

@@ -48,9 +48,7 @@ module GoCardlessPro
       def all(options = {})
         Paginator.new(
           service: self,
-          path: '/customers',
-          options: options,
-          resource_class: Resources::Customer
+          options: options
         ).enumerator
       end
 
@@ -88,6 +86,8 @@ module GoCardlessPro
         Resources::Customer.new(unenvelope_body(response.body), response)
       end
 
+      private
+
       # Unenvelope the response of the body using the service's `envelope_key`
       #
       # @param body [Hash]
@@ -95,8 +95,6 @@ module GoCardlessPro
         body[envelope_key] || body['data']
       end
 
-      private
-
       # return the key which API responses will envelope data under
       def envelope_key
         'customers'

data/lib/gocardless_pro/services/events_service.rb

@@ -31,9 +31,7 @@ module GoCardlessPro
       def all(options = {})
         Paginator.new(
           service: self,
-          path: '/events',
-          options: options,
-          resource_class: Resources::Event
+          options: options
         ).enumerator
       end
 
@@ -52,6 +50,8 @@ module GoCardlessPro
         Resources::Event.new(unenvelope_body(response.body), response)
       end
 
+      private
+
       # Unenvelope the response of the body using the service's `envelope_key`
       #
       # @param body [Hash]
@@ -59,8 +59,6 @@ module GoCardlessPro
         body[envelope_key] || body['data']
       end
 
-      private
-
       # return the key which API responses will envelope data under
       def envelope_key
         'events'

data/lib/gocardless_pro/services/mandate_pdfs_service.rb

@@ -37,6 +37,8 @@ module GoCardlessPro
         Resources::MandatePdf.new(unenvelope_body(response.body), response)
       end
 
+      private
+
       # Unenvelope the response of the body using the service's `envelope_key`
       #
       # @param body [Hash]
@@ -44,8 +46,6 @@ module GoCardlessPro
         body[envelope_key] || body['data']
       end
 
-      private
-
       # return the key which API responses will envelope data under
       def envelope_key
         'mandate_pdfs'

data/lib/gocardless_pro/services/mandates_service.rb

@@ -48,9 +48,7 @@ module GoCardlessPro
       def all(options = {})
         Paginator.new(
           service: self,
-          path: '/mandates',
-          options: options,
-          resource_class: Resources::Mandate
+          options: options
         ).enumerator
       end
 
@@ -139,6 +137,8 @@ module GoCardlessPro
         Resources::Mandate.new(unenvelope_body(response.body), response)
       end
 
+      private
+
       # Unenvelope the response of the body using the service's `envelope_key`
       #
       # @param body [Hash]
@@ -146,8 +146,6 @@ module GoCardlessPro
         body[envelope_key] || body['data']
       end
 
-      private
-
       # return the key which API responses will envelope data under
       def envelope_key
         'mandates'

data/lib/gocardless_pro/services/payments_service.rb

@@ -54,9 +54,7 @@ module GoCardlessPro
       def all(options = {})
         Paginator.new(
           service: self,
-          path: '/payments',
-          options: options,
-          resource_class: Resources::Payment
+          options: options
         ).enumerator
       end
 
@@ -145,6 +143,8 @@ module GoCardlessPro
         Resources::Payment.new(unenvelope_body(response.body), response)
       end
 
+      private
+
       # Unenvelope the response of the body using the service's `envelope_key`
       #
       # @param body [Hash]
@@ -152,8 +152,6 @@ module GoCardlessPro
         body[envelope_key] || body['data']
       end
 
-      private
-
       # return the key which API responses will envelope data under
       def envelope_key
         'payments'

data/lib/gocardless_pro/services/payouts_service.rb

@@ -32,9 +32,7 @@ module GoCardlessPro
       def all(options = {})
         Paginator.new(
           service: self,
-          path: '/payouts',
-          options: options,
-          resource_class: Resources::Payout
+          options: options
         ).enumerator
       end
 
@@ -55,6 +53,8 @@ module GoCardlessPro
         Resources::Payout.new(unenvelope_body(response.body), response)
       end
 
+      private
+
       # Unenvelope the response of the body using the service's `envelope_key`
       #
       # @param body [Hash]
@@ -62,8 +62,6 @@ module GoCardlessPro
         body[envelope_key] || body['data']
       end
 
-      private
-
       # return the key which API responses will envelope data under
       def envelope_key
         'payouts'

data/lib/gocardless_pro/services/redirect_flows_service.rb

@@ -70,6 +70,8 @@ module GoCardlessPro
         Resources::RedirectFlow.new(unenvelope_body(response.body), response)
       end
 
+      private
+
       # Unenvelope the response of the body using the service's `envelope_key`
       #
       # @param body [Hash]
@@ -77,8 +79,6 @@ module GoCardlessPro
         body[envelope_key] || body['data']
       end
 
-      private
-
       # return the key which API responses will envelope data under
       def envelope_key
         'redirect_flows'

data/lib/gocardless_pro/services/refunds_service.rb

@@ -66,9 +66,7 @@ module GoCardlessPro
       def all(options = {})
         Paginator.new(
           service: self,
-          path: '/refunds',
-          options: options,
-          resource_class: Resources::Refund
+          options: options
         ).enumerator
       end
 
@@ -105,6 +103,8 @@ module GoCardlessPro
         Resources::Refund.new(unenvelope_body(response.body), response)
       end
 
+      private
+
       # Unenvelope the response of the body using the service's `envelope_key`
       #
       # @param body [Hash]
@@ -112,8 +112,6 @@ module GoCardlessPro
         body[envelope_key] || body['data']
       end
 
-      private
-
       # return the key which API responses will envelope data under
       def envelope_key
         'refunds'

data/lib/gocardless_pro/services/subscriptions_service.rb

@@ -48,9 +48,7 @@ module GoCardlessPro
       def all(options = {})
         Paginator.new(
           service: self,
-          path: '/subscriptions',
-          options: options,
-          resource_class: Resources::Subscription
+          options: options
         ).enumerator
       end
 
@@ -110,6 +108,8 @@ module GoCardlessPro
         Resources::Subscription.new(unenvelope_body(response.body), response)
       end
 
+      private
+
       # Unenvelope the response of the body using the service's `envelope_key`
       #
       # @param body [Hash]
@@ -117,8 +117,6 @@ module GoCardlessPro
         body[envelope_key] || body['data']
       end
 
-      private
-
       # return the key which API responses will envelope data under
       def envelope_key
         'subscriptions'

data/lib/gocardless_pro/version.rb

@@ -4,5 +4,5 @@ end
 
 module GoCardlessPro
   # Current version of the GC gem
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/spec/resources/payout_spec.rb

@@ -13,6 +13,8 @@ describe GoCardlessPro::Resources::Payout do
 
         'currency' => 'currency-input',
 
+        'deducted_fees' => 'deducted_fees-input',
+
         'id' => 'id-input',
 
         'links' => {
@@ -41,6 +43,8 @@ describe GoCardlessPro::Resources::Payout do
 
       expect(resource.currency).to eq('currency-input')
 
+      expect(resource.deducted_fees).to eq('deducted_fees-input')
+
       expect(resource.id).to eq('id-input')
 
       expect(resource.links.creditor).to eq('creditor-input')

data/spec/services/payouts_service_spec.rb

@@ -20,6 +20,7 @@ describe GoCardlessPro::Services::PayoutsService do
               'arrival_date' => 'arrival_date-input',
               'created_at' => 'created_at-input',
               'currency' => 'currency-input',
+              'deducted_fees' => 'deducted_fees-input',
               'id' => 'id-input',
               'links' => 'links-input',
               'reference' => 'reference-input',
@@ -47,6 +48,8 @@ describe GoCardlessPro::Services::PayoutsService do
 
         expect(get_list_response.records.first.currency).to eq('currency-input')
 
+        expect(get_list_response.records.first.deducted_fees).to eq('deducted_fees-input')
+
         expect(get_list_response.records.first.id).to eq('id-input')
 
         expect(get_list_response.records.first.reference).to eq('reference-input')
@@ -73,6 +76,7 @@ describe GoCardlessPro::Services::PayoutsService do
             'arrival_date' => 'arrival_date-input',
             'created_at' => 'created_at-input',
             'currency' => 'currency-input',
+            'deducted_fees' => 'deducted_fees-input',
             'id' => 'id-input',
             'links' => 'links-input',
             'reference' => 'reference-input',
@@ -96,6 +100,7 @@ describe GoCardlessPro::Services::PayoutsService do
             'arrival_date' => 'arrival_date-input',
             'created_at' => 'created_at-input',
             'currency' => 'currency-input',
+            'deducted_fees' => 'deducted_fees-input',
             'id' => 'id-input',
             'links' => 'links-input',
             'reference' => 'reference-input',
@@ -135,6 +140,7 @@ describe GoCardlessPro::Services::PayoutsService do
                 'arrival_date' => 'arrival_date-input',
                 'created_at' => 'created_at-input',
                 'currency' => 'currency-input',
+                'deducted_fees' => 'deducted_fees-input',
                 'id' => 'id-input',
                 'links' => 'links-input',
                 'reference' => 'reference-input',
@@ -168,6 +174,7 @@ describe GoCardlessPro::Services::PayoutsService do
               'arrival_date' => 'arrival_date-input',
               'created_at' => 'created_at-input',
               'currency' => 'currency-input',
+              'deducted_fees' => 'deducted_fees-input',
               'id' => 'id-input',
               'links' => 'links-input',
               'reference' => 'reference-input',

metadata

@@ -1,89 +1,89 @@
 --- !ruby/object:Gem::Specification
 name: gocardless_pro
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - GoCardless
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.18'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.35.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.35.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.7.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.7.6
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.9
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.9
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '0.10'
 description: 
@@ -93,8 +93,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".rspec"
-- ".travis.yml"
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -185,17 +185,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A gem for calling the GoCardless Pro API
@@ -232,4 +232,3 @@ test_files:
 - spec/services/refunds_service_spec.rb
 - spec/services/subscriptions_service_spec.rb
 - spec/spec_helper.rb
-has_rdoc: