affirm 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39c1e3c767578030a0b0d4040f1369a0984537dc
-  data.tar.gz: 41fe7e6a858817d7bb521c68dcc3238457e347e3
+  metadata.gz: f7e00e989ab313897e9c4276f4b75e33399cefdb
+  data.tar.gz: a918946c0a75ffcf870e79208e8f4d30244a4ddb
 SHA512:
-  metadata.gz: d00eda5029a694f08f75cbd2512dbf6acd9ae10cd2a4de39e41b10c004d454623142aa791bb74ce4481ce39689a3d4790cbf4d5213739794c041a69e77060f23
-  data.tar.gz: 12f0057579aba7917cb39f3f5e5d12d38662b6c8639090652e2215c40be8c8278ed1dba5157adf93b118a9f5dd232f428f802eacdb8e466681eedd8c14469e38
+  metadata.gz: cf933ec1f98c796aeb348c80dcfe4d104528138a5ac47d2cff0041665efeec1651ee23f78302c4bf94517b507d185825a3aa2ae2099bf739ecd6791425b6ff03
+  data.tar.gz: 7dc451129c89024fc10618b6932918ca7f0cf5cf0b641987fb542d9dccffafe829ef96a01cf4c97f1c031131286ceee0a89852b3033939ed25cafce0002f9adc

data/README.md

@@ -92,8 +92,10 @@ charge.update(order_id: "1234", shipping_carrier: "USPS", shipping_confirmation:
 Returns an `Affirm::ChargeEvent` object of type `update`.
 
 ## Exceptions
+Errors due to failed requests with the charges api (ie http code 400) will raise an `Affirm::ChargeError`.
+
 Special exceptions are raised for 5xx, 404 and 401 responses, yielding an `Affirm::ServerError`,
-`Affirm::ResourceNotFoundError` and `Affirm::AuthenticationError`, respectively. These are subclassed from
+`Affirm::ResourceNotFoundError` and `Affirm::AuthenticationError`, respectively. These are all subclassed from
 `Affirm::Error`.
 
 All exceptions have the following methods on them:

data/affirm.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
   s.name = "affirm"
   s.summary = "Affirm Ruby Client Library"
   s.description = "Ruby client library for integrating with Affirm financing payments"
-  s.version = "1.0.0"
+  s.version = "1.1.0"
   s.license = "Apache License Version 2.0"
   s.author = "Reverb.com"
   s.email = "dev@reverb.com"

data/lib/affirm.rb

@@ -7,6 +7,7 @@ require 'affirm/charge_event'
 require 'affirm/charge'
 
 require 'affirm/errors/error'
+require 'affirm/errors/charge_error'
 require 'affirm/errors/authentication_error'
 require 'affirm/errors/resource_not_found_error'
 require 'affirm/errors/server_error'

data/lib/affirm/api.rb

@@ -2,10 +2,10 @@ module Affirm
   class API
     class << self
       attr_accessor :public_key, :secret_key, :api_url
-      @@client = nil
+      @client = nil
 
       def client
-        @@client ||= Affirm::Client.new(
+        @client ||= Affirm::Client.new(
           public_key: public_key,
           secret_key: secret_key,
           api_url: api_url

data/lib/affirm/charge.rb

@@ -15,9 +15,13 @@ module Affirm
     #
     # checkout_token - (required) string. The charge token passed through the confirmation response.
     def self.create(checkout_token, client: Affirm::API.client)
-      response = client.make_request!("/charges", :post, checkout_token: checkout_token)
+      response = client.make_request("/charges", :post, checkout_token: checkout_token)
 
-      new(attrs: response.body, client: client)
+      if response.success?
+        new(attrs: response.body, client: client)
+      else
+        raise ChargeError.from_response(response)
+      end
     end
 
     ##
@@ -106,10 +110,14 @@ module Affirm
     end
 
     def api_request(url, method, params={})
-      response = @client.make_request!(url, method, params)
-      event = ChargeEvent.new(response.body)
-      @events << event
-      event
+      response = @client.make_request(url, method, params)
+      if response.success?
+        event = ChargeEvent.new(response.body)
+        @events << event
+        event
+      else
+        raise ChargeError.from_response(response)
+      end
     end
   end
 end

data/lib/affirm/client.rb

@@ -28,15 +28,6 @@ module Affirm
       handle_errors(affirm_response)
     end
 
-    # like make_request, but raise error on failure
-    def make_request!(path, method, data={})
-      response = make_request(path, method, data)
-
-      raise Affirm::Error.from_response(response) if response.error?
-
-      response
-    end
-
     private
 
     def parse_response(response)

data/lib/affirm/errors/charge_error.rb

@@ -0,0 +1,3 @@
+module Affirm
+  class ChargeError < Error; end
+end

data/spec/charge_spec.rb

@@ -74,8 +74,17 @@ describe Affirm::Charge do
       let(:response_code) { 422 }
       let(:response_body) { load_fixture("charges/invalid_request.json") }
 
-      it "raises an error" do
-        expect { Affirm::Charge.create("token") }.to raise_error(Affirm::Error)
+      it "raises a charge error" do
+        expect { Affirm::Charge.create("token") }.to raise_error(Affirm::ChargeError)
+      end
+    end
+
+    context "other api error" do
+      let(:response_code) { 500 }
+      let(:response_body) { "" }
+
+      it "raises relevant error" do
+        expect { Affirm::Charge.create("token") }.to raise_error(Affirm::ServerError)
       end
     end
   end
@@ -112,8 +121,8 @@ describe Affirm::Charge do
       let(:response_code) { 422 }
       let(:response_body) { load_fixture("charges/invalid_request.json") }
 
-      it "raises an error" do
-        expect { charge.capture }.to raise_error(Affirm::Error)
+      it "raises a charge error" do
+        expect { charge.capture }.to raise_error(Affirm::ChargeError)
       end
     end
   end
@@ -143,8 +152,8 @@ describe Affirm::Charge do
       let(:response_code) { 422 }
       let(:response_body) { load_fixture("charges/invalid_request.json") }
 
-      it "raises an error" do
-        expect { charge.void }.to raise_error(Affirm::Error)
+      it "raises a charge error" do
+        expect { charge.void }.to raise_error(Affirm::ChargeError)
       end
     end
   end
@@ -184,8 +193,8 @@ describe Affirm::Charge do
       let(:response_code) { 422 }
       let(:response_body) { load_fixture("charges/invalid_request.json") }
 
-      it "raises an error" do
-        expect { charge.refund }.to raise_error(Affirm::Error)
+      it "raises a charge error" do
+        expect { charge.refund }.to raise_error(Affirm::ChargeError)
       end
     end
   end
@@ -223,7 +232,7 @@ describe Affirm::Charge do
       let(:response_body) { load_fixture("charges/invalid_request.json") }
 
       it "raises an error" do
-        expect { charge.update }.to raise_error(Affirm::Error)
+        expect { charge.update }.to raise_error(Affirm::ChargeError)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: affirm
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Reverb.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -94,6 +94,7 @@ files:
 - lib/affirm/charge_event.rb
 - lib/affirm/client.rb
 - lib/affirm/errors/authentication_error.rb
+- lib/affirm/errors/charge_error.rb
 - lib/affirm/errors/error.rb
 - lib/affirm/errors/resource_not_found_error.rb
 - lib/affirm/errors/server_error.rb