gocardless_pro 1.1.0 → 2.0.0

data/lib/gocardless_pro/resources/redirect_flow.rb

@@ -76,7 +76,7 @@ module GoCardlessPro
 
       # Return the links that the resource has
       def links
-        @links_links ||= Links.new(@links)
+        @redirect_flow_links ||= Links.new(@links)
       end
 
       # Provides the redirect_flow resource as a hash of all its readable attributes
@@ -86,7 +86,7 @@ module GoCardlessPro
 
       class Links
         def initialize(links)
-          @links = links
+          @links = links || {}
         end
 
         def creditor

data/lib/gocardless_pro/resources/refund.rb

@@ -47,7 +47,7 @@ module GoCardlessPro
 
       # Return the links that the resource has
       def links
-        @links_links ||= Links.new(@links)
+        @refund_links ||= Links.new(@links)
       end
 
       # Provides the refund resource as a hash of all its readable attributes
@@ -57,7 +57,7 @@ module GoCardlessPro
 
       class Links
         def initialize(links)
-          @links = links
+          @links = links || {}
         end
 
         def payment

data/lib/gocardless_pro/resources/subscription.rb

@@ -128,7 +128,7 @@ module GoCardlessPro
 
       # Return the links that the resource has
       def links
-        @links_links ||= Links.new(@links)
+        @subscription_links ||= Links.new(@links)
       end
 
       # Provides the subscription resource as a hash of all its readable attributes
@@ -138,7 +138,7 @@ module GoCardlessPro
 
       class Links
         def initialize(links)
-          @links = links
+          @links = links || {}
         end
 
         def mandate

data/lib/gocardless_pro/response.rb

@@ -12,27 +12,13 @@ module GoCardlessPro
       @response = response
     end
 
-    # Return the body of the API response
+    # Return the body of parsed JSON body of the API response
     def body
-      json? ? handle_json : handle_raw
-    end
-
-    # Returns true if the response is JSON
-    def json?
-      content_type = @response.headers['Content-Type'] ||
-                     @response.headers['content-type'] || ''
-      content_type.include?('application/json')
-    end
-
-    # Returns true if the response is an error
-    def error?
-      @response.status >= 400
+      JSON.parse(@response.body) unless @response.body.empty?
     end
 
     # Returns the meta hash of the response
     def meta
-      fail ResponseError, 'Cannot fetch meta for non JSON response' unless json?
-
       json_body.fetch('meta', {})
     end
 
@@ -40,43 +26,5 @@ module GoCardlessPro
     def limit
       meta.fetch('limit', nil)
     end
-
-    private
-
-    def json_body
-      @json_body ||= JSON.parse(@response.body) unless @response.body.empty?
-    end
-
-    def raw_body
-      @response.body
-    end
-
-    def handle_json
-      if error?
-        type = json_body['error']['type']
-        fail(error_class_for_type(type), json_body['error'])
-      else
-        json_body
-      end
-    end
-
-    def error_class_for_type(type)
-      {
-        validation_failed: GoCardlessPro::ValidationError,
-        gocardless: GoCardlessPro::GoCardlessError,
-        invalid_api_usage: GoCardlessPro::InvalidApiUsageError,
-        invalid_state: GoCardlessPro::InvalidStateError
-      }.fetch(type.to_sym)
-    end
-
-    def handle_raw
-      default_raw_message = {
-        'message' => "Something went wrong with this raw request\n" \
-        "status: #{@response.status}\n" \
-        "headers: #{@response.headers}\n" \
-        "body: #{@response.body}"
-      }
-      error? ? fail(ApiError, default_raw_message) : raw_body
-    end
   end
 end

data/lib/gocardless_pro/services/bank_details_lookups_service.rb

@@ -32,6 +32,9 @@ module GoCardlessPro
         params = options.delete(:params) || {}
         options[:params] = {}
         options[:params][envelope_key] = params
+
+        options[:retry_failures] = true
+
         response = make_request(:post, path, options)
 
         return if response.body.nil?

data/lib/gocardless_pro/services/creditor_bank_accounts_service.rb

@@ -20,7 +20,19 @@ module GoCardlessPro
         params = options.delete(:params) || {}
         options[:params] = {}
         options[:params][envelope_key] = params
-        response = make_request(:post, path, options)
+
+        options[:retry_failures] = true
+
+        begin
+          response = make_request(:post, path, options)
+
+          # Response doesn't raise any errors until #body is called
+          response.tap(&:body)
+        rescue InvalidStateError => e
+          return get(e.conflicting_resource_id) if e.idempotent_creation_conflict?
+
+          raise e
+        end
 
         return if response.body.nil?
 
@@ -34,7 +46,10 @@ module GoCardlessPro
       def list(options = {})
         path = '/creditor_bank_accounts'
 
+        options[:retry_failures] = true
+
         response = make_request(:get, path, options)
+
         ListResponse.new(
           response: response,
           unenveloped_body: unenvelope_body(response.body),
@@ -61,6 +76,8 @@ module GoCardlessPro
       def get(identity, options = {})
         path = sub_url('/creditor_bank_accounts/:identity', 'identity' => identity)
 
+        options[:retry_failures] = true
+
         response = make_request(:get, path, options)
 
         return if response.body.nil?
@@ -86,7 +103,19 @@ module GoCardlessPro
         params = options.delete(:params) || {}
         options[:params] = {}
         options[:params]['data'] = params
-        response = make_request(:post, path, options)
+
+        options[:retry_failures] = false
+
+        begin
+          response = make_request(:post, path, options)
+
+          # Response doesn't raise any errors until #body is called
+          response.tap(&:body)
+        rescue InvalidStateError => e
+          return get(e.conflicting_resource_id) if e.idempotent_creation_conflict?
+
+          raise e
+        end
 
         return if response.body.nil?
 

data/lib/gocardless_pro/services/creditors_service.rb

@@ -20,7 +20,19 @@ module GoCardlessPro
         params = options.delete(:params) || {}
         options[:params] = {}
         options[:params][envelope_key] = params
-        response = make_request(:post, path, options)
+
+        options[:retry_failures] = true
+
+        begin
+          response = make_request(:post, path, options)
+
+          # Response doesn't raise any errors until #body is called
+          response.tap(&:body)
+        rescue InvalidStateError => e
+          return get(e.conflicting_resource_id) if e.idempotent_creation_conflict?
+
+          raise e
+        end
 
         return if response.body.nil?
 
@@ -34,7 +46,10 @@ module GoCardlessPro
       def list(options = {})
         path = '/creditors'
 
+        options[:retry_failures] = true
+
         response = make_request(:get, path, options)
+
         ListResponse.new(
           response: response,
           unenveloped_body: unenvelope_body(response.body),
@@ -61,6 +76,8 @@ module GoCardlessPro
       def get(identity, options = {})
         path = sub_url('/creditors/:identity', 'identity' => identity)
 
+        options[:retry_failures] = true
+
         response = make_request(:get, path, options)
 
         return if response.body.nil?
@@ -80,6 +97,9 @@ module GoCardlessPro
         params = options.delete(:params) || {}
         options[:params] = {}
         options[:params][envelope_key] = params
+
+        options[:retry_failures] = true
+
         response = make_request(:put, path, options)
 
         return if response.body.nil?

data/lib/gocardless_pro/services/customer_bank_accounts_service.rb

@@ -35,7 +35,19 @@ module GoCardlessPro
         params = options.delete(:params) || {}
         options[:params] = {}
         options[:params][envelope_key] = params
-        response = make_request(:post, path, options)
+
+        options[:retry_failures] = true
+
+        begin
+          response = make_request(:post, path, options)
+
+          # Response doesn't raise any errors until #body is called
+          response.tap(&:body)
+        rescue InvalidStateError => e
+          return get(e.conflicting_resource_id) if e.idempotent_creation_conflict?
+
+          raise e
+        end
 
         return if response.body.nil?
 
@@ -49,7 +61,10 @@ module GoCardlessPro
       def list(options = {})
         path = '/customer_bank_accounts'
 
+        options[:retry_failures] = true
+
         response = make_request(:get, path, options)
+
         ListResponse.new(
           response: response,
           unenveloped_body: unenvelope_body(response.body),
@@ -76,6 +91,8 @@ module GoCardlessPro
       def get(identity, options = {})
         path = sub_url('/customer_bank_accounts/:identity', 'identity' => identity)
 
+        options[:retry_failures] = true
+
         response = make_request(:get, path, options)
 
         return if response.body.nil?
@@ -95,6 +112,9 @@ module GoCardlessPro
         params = options.delete(:params) || {}
         options[:params] = {}
         options[:params][envelope_key] = params
+
+        options[:retry_failures] = true
+
         response = make_request(:put, path, options)
 
         return if response.body.nil?
@@ -120,7 +140,19 @@ module GoCardlessPro
         params = options.delete(:params) || {}
         options[:params] = {}
         options[:params]['data'] = params
-        response = make_request(:post, path, options)
+
+        options[:retry_failures] = false
+
+        begin
+          response = make_request(:post, path, options)
+
+          # Response doesn't raise any errors until #body is called
+          response.tap(&:body)
+        rescue InvalidStateError => e
+          return get(e.conflicting_resource_id) if e.idempotent_creation_conflict?
+
+          raise e
+        end
 
         return if response.body.nil?
 

data/lib/gocardless_pro/services/customers_service.rb

@@ -20,7 +20,19 @@ module GoCardlessPro
         params = options.delete(:params) || {}
         options[:params] = {}
         options[:params][envelope_key] = params
-        response = make_request(:post, path, options)
+
+        options[:retry_failures] = true
+
+        begin
+          response = make_request(:post, path, options)
+
+          # Response doesn't raise any errors until #body is called
+          response.tap(&:body)
+        rescue InvalidStateError => e
+          return get(e.conflicting_resource_id) if e.idempotent_creation_conflict?
+
+          raise e
+        end
 
         return if response.body.nil?
 
@@ -34,7 +46,10 @@ module GoCardlessPro
       def list(options = {})
         path = '/customers'
 
+        options[:retry_failures] = true
+
         response = make_request(:get, path, options)
+
         ListResponse.new(
           response: response,
           unenveloped_body: unenvelope_body(response.body),
@@ -61,6 +76,8 @@ module GoCardlessPro
       def get(identity, options = {})
         path = sub_url('/customers/:identity', 'identity' => identity)
 
+        options[:retry_failures] = true
+
         response = make_request(:get, path, options)
 
         return if response.body.nil?
@@ -80,6 +97,9 @@ module GoCardlessPro
         params = options.delete(:params) || {}
         options[:params] = {}
         options[:params][envelope_key] = params
+
+        options[:retry_failures] = true
+
         response = make_request(:put, path, options)
 
         return if response.body.nil?

data/lib/gocardless_pro/services/events_service.rb

@@ -18,7 +18,10 @@ module GoCardlessPro
       def list(options = {})
         path = '/events'
 
+        options[:retry_failures] = true
+
         response = make_request(:get, path, options)
+
         ListResponse.new(
           response: response,
           unenveloped_body: unenvelope_body(response.body),
@@ -45,6 +48,8 @@ module GoCardlessPro
       def get(identity, options = {})
         path = sub_url('/events/:identity', 'identity' => identity)
 
+        options[:retry_failures] = true
+
         response = make_request(:get, path, options)
 
         return if response.body.nil?

data/lib/gocardless_pro/services/mandate_pdfs_service.rb

@@ -31,6 +31,9 @@ module GoCardlessPro
         params = options.delete(:params) || {}
         options[:params] = {}
         options[:params][envelope_key] = params
+
+        options[:retry_failures] = true
+
         response = make_request(:post, path, options)
 
         return if response.body.nil?

data/lib/gocardless_pro/services/mandates_service.rb

@@ -20,7 +20,19 @@ module GoCardlessPro
         params = options.delete(:params) || {}
         options[:params] = {}
         options[:params][envelope_key] = params
-        response = make_request(:post, path, options)
+
+        options[:retry_failures] = true
+
+        begin
+          response = make_request(:post, path, options)
+
+          # Response doesn't raise any errors until #body is called
+          response.tap(&:body)
+        rescue InvalidStateError => e
+          return get(e.conflicting_resource_id) if e.idempotent_creation_conflict?
+
+          raise e
+        end
 
         return if response.body.nil?
 
@@ -34,7 +46,10 @@ module GoCardlessPro
       def list(options = {})
         path = '/mandates'
 
+        options[:retry_failures] = true
+
         response = make_request(:get, path, options)
+
         ListResponse.new(
           response: response,
           unenveloped_body: unenvelope_body(response.body),
@@ -61,6 +76,8 @@ module GoCardlessPro
       def get(identity, options = {})
         path = sub_url('/mandates/:identity', 'identity' => identity)
 
+        options[:retry_failures] = true
+
         response = make_request(:get, path, options)
 
         return if response.body.nil?
@@ -79,6 +96,9 @@ module GoCardlessPro
         params = options.delete(:params) || {}
         options[:params] = {}
         options[:params][envelope_key] = params
+
+        options[:retry_failures] = true
+
         response = make_request(:put, path, options)
 
         return if response.body.nil?
@@ -102,7 +122,19 @@ module GoCardlessPro
         params = options.delete(:params) || {}
         options[:params] = {}
         options[:params]['data'] = params
-        response = make_request(:post, path, options)
+
+        options[:retry_failures] = false
+
+        begin
+          response = make_request(:post, path, options)
+
+          # Response doesn't raise any errors until #body is called
+          response.tap(&:body)
+        rescue InvalidStateError => e
+          return get(e.conflicting_resource_id) if e.idempotent_creation_conflict?
+
+          raise e
+        end
 
         return if response.body.nil?
 
@@ -131,7 +163,19 @@ module GoCardlessPro
         params = options.delete(:params) || {}
         options[:params] = {}
         options[:params]['data'] = params
-        response = make_request(:post, path, options)
+
+        options[:retry_failures] = false
+
+        begin
+          response = make_request(:post, path, options)
+
+          # Response doesn't raise any errors until #body is called
+          response.tap(&:body)
+        rescue InvalidStateError => e
+          return get(e.conflicting_resource_id) if e.idempotent_creation_conflict?
+
+          raise e
+        end
 
         return if response.body.nil?