affirm 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 689c049744aaff6ed260bd43c0bcdf0219e6689a
-  data.tar.gz: 90142f082b195d4b12b593ba8dbe8f0a9d0a01b1
+  metadata.gz: 39c1e3c767578030a0b0d4040f1369a0984537dc
+  data.tar.gz: 41fe7e6a858817d7bb521c68dcc3238457e347e3
 SHA512:
-  metadata.gz: 6b0c3a679864712c47a0053eff6135b0fc2ba4c6a24cb49f9d66b019c95b1ca3b724f2eff90d0a4a8e07f46a5654c8667b44a9e87edbb3d817995b25eca1369b
-  data.tar.gz: 0836887d3303dbb09d741b13e8894b5f6ec7c987c8218cc1a744e053b4b99a86fb440a14ecb93ba9aabb80051fab200833c211ff7d0e3071d54c35e6c84110a4
+  metadata.gz: d00eda5029a694f08f75cbd2512dbf6acd9ae10cd2a4de39e41b10c004d454623142aa791bb74ce4481ce39689a3d4790cbf4d5213739794c041a69e77060f23
+  data.tar.gz: 12f0057579aba7917cb39f3f5e5d12d38662b6c8639090652e2215c40be8c8278ed1dba5157adf93b118a9f5dd232f428f802eacdb8e466681eedd8c14469e38

data/README.md

@@ -7,15 +7,16 @@ Requires Ruby 2.1 or greater.
 
 ## Install
 Add to your gemfile:
+
 ```ruby
-gem 'affirm-ruby'
+gem 'affirm'
 ```
-and `bundle install`.
 
-*Note*: This gem is not yet registered with Rubygems. In the meantime, you can use the 'git' option in your Gemfile.
+and `bundle install`.
 
 ## Initialize
 Initialize the client with your credentials (if you're using rails, this goes in `config/initializers`).
+
 ```ruby
 Affirm::API.public_key = "xxx"
 Affirm::API.secret_key = "xxx"
@@ -23,86 +24,87 @@ Affirm::API.api_url    = "https://sandbox.affirm.com/api/v2/"
 ```
 
 ## Charges
-The charges resource can be accessed through the api class:
-```ruby
-Affirm::API.charges
-```
 
-### Authorizing a charge
+All API requests raise an `Affirm::Error` or subclass thereof on failure.
+
+### Creating/authorizing a charge
+
 ```ruby
-Affirm::API.charges.authorize(checkout_token: "token")
-Affirm::API.charges.authorize!(checkout_token: "token") # raises Affirm::Error on failure
+charge = Affirm::Charge.create("checkout_token")
 ```
 
-### Reading a charge
+### Retrieving a charge
+
 ```ruby
-Affirm::API.charges.get(charge_id: "abcd")
+charge = Affirm::Charge.retrieve("ABCD-ABCD")
+
+charge.id
+charge.amount
+charge.created
+charge.currency
+charge.auth_hold
+charge.payable
+charge.void?
+charge.order_id
+charge.events    # array of Affirm::ChargeEvent
+charge.details   # hash of order details
 ```
 
+Raises an `Affirm::ResourceNotFoundError` if the charge doesn't exist.
+
+See https://docs.affirm.com/v2/api/charges/#charge-object for more info on the charge object
+
 ### Capturing a charge
 Optionally takes an `order_id`, `shipping_carrier`, and `shipping_confirmation`.
+
 ```ruby
-Affirm::API.charges.capture(charge_id: "abcd")
-Affirm::API.charges.capture(charge_id: "abcd", order_id: "1234", shipping_carrier: "USPS", shipping_confirmation: "ABCD1234")
-Affirm::API.charges.capture!(charge_id: "abcd") # raises Affirm::Error on failure
+charge.capture
+charge.capture(order_id: "1234", shipping_carrier: "USPS", shipping_confirmation: "ABCD1234")
 ```
 
+Returns an `Affirm::ChargeEvent` object of type `capture`.
+
 ### Voiding a charge
+
 ```ruby
-Affirm::API.charges.void(charge_id: "abcd")
-Affirm::API.charges.void!(charge_id: "abcd") # raises Affirm::Error on failure
+charge.void
 ```
 
+Returns an `Affirm::ChargeEvent` object of type `void`.
+
 ### Refunding a charge
 Optionally takes an `amount` to refund (in cents).
+
 ```ruby
-Affirm::API.charges.refund(charge_id: "abcd")
-Affirm::API.charges.refund(charge_id: "abcd", amount: 5000)
-Affirm::API.charges.refund!(charge_id: "abcd") # raises Affirm::Error on failure
+charge.refund
+charge.refund(amount: 1000)
 ```
 
+Returns an `Affirm::ChargeEvent` object of type `refund`.
+
 ### Updating tracking fields
 Optionally takes an `order_id`, `shipping_carrier`, and `shipping_confirmation`.
-```ruby
-Affirm::API.charges.update(charge_id: "abcd", order_id: "1234", shipping_carrier: "USPS", shipping_confirmation: "ABCD1234")
-Affirm::API.charges.update!(charge_id: "abcd", order_id: "1234") # raises Affirm::Error on failure
-```
 
-## Responses
-On successful api calls, the response json is 
 ```ruby
-response = Affirm::API.charges.get(charge_id: "abcd")
-
-response.success? # => true
-response.error? # => false
-
-response.status_code # => 200
-
-response.body # => hash of values
-response.body["id"] # eg "abcd"
-response.body["details"]["shipping_amount"] # eg 400
+charge.update(order_id: "1234", shipping_carrier: "USPS", shipping_confirmation: "ABCD1234")
 ```
 
-### Error responses
-Unsuccessful responses have a few methods built in:
-```ruby
-response.code # eg "auth-declined"
-response.type # eg "invalid_request"
-response.message # eg "Invalid phone number format"
-response.field # eg "shipping_address.phone"
-```
-See https://docs.affirm.com/v2/api/errors/#error-object.
+Returns an `Affirm::ChargeEvent` object of type `update`.
 
-### Exceptions
-Exceptions are raised for 5xx, 404 and 401 responses, yielding an `Affirm::ServerError`,
+## Exceptions
+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::Error`.
+
+All exceptions have the following methods on them:
+
 ```ruby
 begin
-  Affirm::API.charges.authorize(checkout_token: "token")
-rescue Affirm::ServerError => e
-  Logger.info e.code
-  Logger.info e.message
+  Affirm::Charge.create("checkout_token")
+rescue Affirm::Error => e
+  Logger.info e.http_code # eg 422
+  Logger.info e.code      # eg "auth-declined"
+  Logger.info e.message   # eg "Invalid phone number format"
 end
 ```
 

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 = "0.0.1"
+  s.version = "1.0.0"
   s.license = "Apache License Version 2.0"
   s.author = "Reverb.com"
   s.email = "dev@reverb.com"

data/lib/affirm/api.rb

@@ -4,10 +4,6 @@ module Affirm
       attr_accessor :public_key, :secret_key, :api_url
       @@client = nil
 
-      def charges
-        @@charges ||= Affirm::Charges.new(client)
-      end
-
       def client
         @@client ||= Affirm::Client.new(
           public_key: public_key,

data/lib/affirm/charge.rb

@@ -0,0 +1,115 @@
+module Affirm
+  class Charge
+    attr_reader :id, :amount, :created, :currency, :auth_hold, :payable, :order_id, :events, :details
+
+    ##
+    # RETRIEVE
+    #
+    # id - (required) string. The charge id, in format 'XXXX-XXXX'
+    def self.retrieve(id, client: Affirm::API.client)
+      new(attrs: {"id" => id}, client: client).refresh
+    end
+
+    ##
+    # CREATE / AUTHORIZE
+    #
+    # 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)
+
+      new(attrs: response.body, client: client)
+    end
+
+    ##
+    # CAPTURE
+    #
+    # order_id - (optional) string. Your internal order id. This is stored for your own future reference.
+    # shipping_carrier - (optional) string. The shipping carrier used to ship the items in the charge.
+    # shipping_confirmation - (optional) string. The shipping confirmation for the shipment.
+    def capture(order_id: nil, shipping_carrier: nil, shipping_confirmation: nil)
+      api_request("/charges/#{id}/capture", :post, {
+        order_id: order_id,
+        shipping_carrier: shipping_carrier,
+        shipping_confirmation: shipping_confirmation
+      })
+    end
+
+    ##
+    # VOID
+    #
+    def void
+      api_request("/charges/#{id}/void", :post)
+    end
+
+    ##
+    # REFUND
+    #
+    # amount - (optional) integer or null. The amount to refund in cents. The default amount is the remaining balance on the charge.
+    def refund(amount: nil)
+      api_request("/charges/#{id}/refund", :post, {
+        amount: amount
+      })
+    end
+
+    ##
+    # UPDATE
+    #
+    # order_id - (optional) string. Your internal order id. This is stored for your own future reference.
+    # shipping_carrier - (optional) string. The shipping carrier used to ship the items in the charge.
+    # shipping_confirmation - (optional) string. The shipping confirmation for the shipment.
+    def update(order_id: nil, shipping_carrier: nil, shipping_confirmation: nil)
+      api_request("/charges/#{id}/update", :post, {
+        order_id: order_id,
+        shipping_carrier: shipping_carrier,
+        shipping_confirmation: shipping_confirmation
+      })
+    end
+
+    def initialize(attrs: {}, client: Affirm::API.client)
+      @client = client
+      set_attrs(attrs)
+    end
+
+    def refresh
+      response = @client.make_request("/charges/#{id}", :get)
+
+      set_attrs(response.body)
+
+      self
+    end
+
+    def void?
+      @void
+    end
+
+    private
+
+    def set_attrs(attrs)
+      @id        = attrs["id"]
+      @amount    = attrs["amount"]
+      @created   = attrs["created"]
+      @currency  = attrs["currency"]
+      @auth_hold = attrs["auth_hold"]
+      @payable   = attrs["payable"]
+      @void      = attrs["void"]
+      @order_id  = attrs["order_id"]
+      @details   = attrs["details"]
+      @events    = parse_events(attrs["events"])
+    end
+
+    def parse_events(events_attrs)
+      if events_attrs
+        events_attrs.map { |event| ChargeEvent.new(event) }
+      else
+        []
+      end
+    end
+
+    def api_request(url, method, params={})
+      response = @client.make_request!(url, method, params)
+      event = ChargeEvent.new(response.body)
+      @events << event
+      event
+    end
+  end
+end

data/lib/affirm/charge_event.rb

@@ -0,0 +1,20 @@
+module Affirm
+  class ChargeEvent
+    attr_reader :id, :transaction_id, :type, :created,
+      :amount, :fee, :order_id, :shipping_carrier, :shipping_confirmation,
+      :fee_refunded
+
+    def initialize(attrs)
+      @id                    = attrs["id"]
+      @transaction_id        = attrs["transaction_id"]
+      @type                  = attrs["type"]
+      @created               = attrs["created"]
+      @amount                = attrs["amount"]
+      @fee                   = attrs["fee"]
+      @order_id              = attrs["order_id"]
+      @shipping_carrier      = attrs["shipping_carrier"]
+      @shipping_confirmation = attrs["shipping_confirmation"]
+      @fee_refunded          = attrs["fee_refunded"]
+    end
+  end
+end

data/lib/affirm/client.rb

@@ -28,6 +28,15 @@ 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/error.rb

@@ -6,7 +6,7 @@ module Affirm
       new(
         status_code: response.status_code,
         code:        response.code,
-        message:     response.message
+        message:     response.message || response.raw_body
       )
     end
 
@@ -17,7 +17,11 @@ module Affirm
     end
 
     def to_s
-      "#{status_code} #{code}: #{message}"
+      if code || message
+        "#{status_code} - (#{code}) #{message}"
+      else
+        status_code.to_s
+      end
     end
   end
 end

data/lib/affirm/response.rb

@@ -1,11 +1,11 @@
 module Affirm
   class Response
-    attr_reader :status_code
+    attr_reader :status_code, :raw_body
 
     def initialize(success:, status_code:, body:)
       @success = success
       @status_code = status_code.to_i
-      @body = body
+      @raw_body = body
     end
 
     def success?
@@ -17,7 +17,9 @@ module Affirm
     end
 
     def body
-      JSON.parse(@body)
+      JSON.parse(@raw_body)
+    rescue JSON::ParserError
+      {}
     end
 
     def type

data/lib/affirm.rb

@@ -3,7 +3,8 @@ require 'json'
 require 'affirm/api'
 require 'affirm/client'
 require 'affirm/response'
-require 'affirm/charges'
+require 'affirm/charge_event'
+require 'affirm/charge'
 
 require 'affirm/errors/error'
 require 'affirm/errors/authentication_error'

data/spec/charge_spec.rb

@@ -0,0 +1,242 @@
+require 'spec_helper'
+
+describe Affirm::Charge do
+  let(:id) { "ABCD" }
+  let!(:request) do
+    stub_request(request_method, request_url).to_return(status: response_code, body: response_body)
+  end
+
+  let(:response_code) { 200 }
+
+  let(:charge) { Affirm::Charge.new(attrs: {"id" => id}) }
+
+  describe "self.retrieve" do
+    let(:request_method) { :get }
+    let(:request_url) { "#{TEST_URL}/charges/#{id}" }
+    let(:response_body) { load_fixture("charges/retrieve.json") }
+
+    it "returns a charge" do
+      charge = Affirm::Charge.retrieve(id)
+
+      charge.should be_a Affirm::Charge
+    end
+
+    it "sets attributes" do
+      charge = Affirm::Charge.retrieve(id)
+
+      charge.id.should == id
+      charge.created.should == "2014-03-18T19:19:04Z"
+      charge.currency.should == "USD"
+      charge.amount.should == 6100
+      charge.auth_hold.should == 6100
+      charge.payable.should == 0
+      charge.void?.should == false
+    end
+
+    it "parses events" do
+      charge = Affirm::Charge.retrieve(id)
+      events = charge.events
+
+      events.length.should == 1
+      events.first.type.should == "auth"
+    end
+
+    context "not found" do
+      let(:response_code) { 404 }
+
+      it "raises an error" do
+        expect { Affirm::Charge.retrieve(id) }.to raise_error(Affirm::ResourceNotFoundError)
+      end
+    end
+  end
+
+  describe "self.create" do
+    let(:request_method) { :post }
+    let(:request_url) { "#{TEST_URL}/charges" }
+    let(:response_body) { load_fixture("charges/create.json") }
+
+    it "returns a charge" do
+      charge = Affirm::Charge.create("token")
+
+      charge.should be_a Affirm::Charge
+      charge.id.should == id
+    end
+
+    it "sends the correct body" do
+      charge = Affirm::Charge.create("token")
+
+      expect(WebMock).to have_requested(request_method, request_url).with(body: {
+        checkout_token: "token"
+      }.to_json)
+    end
+
+    context "failed response" 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)
+      end
+    end
+  end
+
+  describe "capture" do
+    let(:request_method) { :post }
+    let(:request_url) { "#{TEST_URL}/charges/#{id}/capture" }
+    let(:response_body) { load_fixture("charges/capture.json") }
+
+    it "POSTs to the capture url" do
+      charge.capture
+
+      expect(WebMock).to have_requested(request_method, request_url)
+    end
+
+    it "optionally allows tracking params" do
+      params = { order_id: "order_id", shipping_carrier: "carrier", shipping_confirmation: "confirmation" }
+      charge.capture(params)
+
+      expect(WebMock).to have_requested(request_method, request_url).with(body: params.to_json)
+    end
+
+    it "adds the event to the charge" do
+      expect { charge.capture }.to change { charge.events.length }.by(1)
+
+      charge.events.last.type.should == "capture"
+    end
+
+    it "returns an event" do
+      charge.capture.should be_a Affirm::ChargeEvent
+    end
+
+    context "failed response" 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)
+      end
+    end
+  end
+
+  describe "void" do
+    let(:request_method) { :post }
+    let(:request_url) { "#{TEST_URL}/charges/#{id}/void" }
+    let(:response_body) { load_fixture("charges/void.json") }
+
+    it "POSTs to the void url" do
+      charge.void
+
+      expect(WebMock).to have_requested(request_method, request_url)
+    end
+
+    it "adds the event to the charge" do
+      expect { charge.void }.to change { charge.events.length }.by(1)
+
+      charge.events.last.type.should == "void"
+    end
+
+    it "returns an event" do
+      charge.void.should be_a Affirm::ChargeEvent
+    end
+
+    context "failed response" 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)
+      end
+    end
+  end
+
+  describe "refund" do
+    let(:request_method) { :post }
+    let(:request_url) { "#{TEST_URL}/charges/#{id}/refund" }
+    let(:response_body) { load_fixture("charges/refund.json") }
+
+    it "POSTs to the refund url" do
+      charge.refund
+
+      expect(WebMock).to have_requested(request_method, request_url)
+    end
+
+    it "adds the event to the charge" do
+      expect { charge.refund }.to change { charge.events.length }.by(1)
+
+      charge.events.last.type.should == "refund"
+    end
+
+    it "returns an event" do
+      charge.refund.should be_a Affirm::ChargeEvent
+    end
+
+    context "with amount" do
+      it "sends the amount" do
+        charge.refund(amount: 100)
+
+        expect(WebMock).to have_requested(request_method, request_url).with(body: {
+          amount: 100
+        }.to_json)
+      end
+    end
+
+    context "failed response" 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)
+      end
+    end
+  end
+
+  describe "update" do
+    let(:request_method) { :post }
+    let(:request_url) { "#{TEST_URL}/charges/#{id}/update" }
+    let(:response_body) { load_fixture("charges/update.json") }
+
+    it "POSTs to the update url" do
+      charge.update
+
+      expect(WebMock).to have_requested(request_method, request_url)
+    end
+
+    it "optionally allows params" do
+      params = { order_id: "order_id", shipping_carrier: "carrier", shipping_confirmation: "confirmation" }
+      charge.update(params)
+
+      expect(WebMock).to have_requested(request_method, request_url).with(body: params.to_json)
+    end
+
+    it "adds the event to the charge" do
+      expect { charge.update }.to change { charge.events.length }.by(1)
+
+      charge.events.last.type.should == "update"
+    end
+
+    it "returns an event" do
+      charge.update.should be_a Affirm::ChargeEvent
+    end
+
+    context "failed response" do
+      let(:response_code) { 422 }
+      let(:response_body) { load_fixture("charges/invalid_request.json") }
+
+      it "raises an error" do
+        expect { charge.update }.to raise_error(Affirm::Error)
+      end
+    end
+  end
+
+  context "with specified client" do
+    let(:client) { Affirm::Client.new(public_key: "other_public", secret_key: "other_secret") }
+
+    let(:request_method) { :get }
+    let(:response_body) { load_fixture("charges/retrieve.json") }
+    let(:request_url) { /.*other_public:other_secret.*/ }
+
+    it "uses the client's creds" do
+      Affirm::Charge.retrieve(id, client: client)
+    end
+  end
+end

data/spec/client_spec.rb

@@ -54,10 +54,6 @@ describe Affirm::Client do
         end
       end
     end
-
-    context "authentication error" do
-
-    end
   end
 
   describe "get" do
@@ -137,5 +133,16 @@ describe Affirm::Client do
         expect { client.get("testpath") }.to raise_error(Affirm::ResourceNotFoundError)
       end
     end
+
+    context "non-json response" do
+      before do
+        stub_request(:get, affirm_url).
+          to_return(status: 500, body: "the server is down")
+      end
+
+      it "doesn't blow up" do
+        expect { client.get("testpath") }.to raise_error(Affirm::ServerError)
+      end
+    end
   end
 end

data/spec/fixtures/charges/{authorize.json → create.json}

@@ -1,5 +1,5 @@
 {
-   "id":"TEST-ALO4-UVGR",
+   "id":"ABCD",
    "created":"2014-03-18T19:19:04Z",
    "currency":"USD",
    "amount":6100,

data/spec/fixtures/charges/{get.json → retrieve.json}

@@ -1,5 +1,5 @@
 {
-   "id":"TEST-ALO4-UVGR",
+   "id":"ABCD",
    "created":"2014-03-18T19:19:04Z",
    "currency":"USD",
    "amount":6100,

data/spec/fixtures/charges/update.json

@@ -1,6 +1,7 @@
 {
   "created": "2014-10-08T23:48:04Z",
   "id": "DCPO5PP6QA9V7T60",
+  "type": "update",
   "order_id": "CUSTOM_ORDER_ID",
   "shipping_carrier": "USPS",
   "shipping_confirmation": "1Z23223"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: affirm
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Reverb.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -90,20 +90,21 @@ files:
 - affirm.gemspec
 - lib/affirm.rb
 - lib/affirm/api.rb
-- lib/affirm/charges.rb
+- lib/affirm/charge.rb
+- lib/affirm/charge_event.rb
 - lib/affirm/client.rb
 - lib/affirm/errors/authentication_error.rb
 - lib/affirm/errors/error.rb
 - lib/affirm/errors/resource_not_found_error.rb
 - lib/affirm/errors/server_error.rb
 - lib/affirm/response.rb
-- spec/charges_spec.rb
+- spec/charge_spec.rb
 - spec/client_spec.rb
-- spec/fixtures/charges/authorize.json
 - spec/fixtures/charges/capture.json
-- spec/fixtures/charges/get.json
+- spec/fixtures/charges/create.json
 - spec/fixtures/charges/invalid_request.json
 - spec/fixtures/charges/refund.json
+- spec/fixtures/charges/retrieve.json
 - spec/fixtures/charges/update.json
 - spec/fixtures/charges/void.json
 - spec/spec_helper.rb

data/lib/affirm/charges.rb

@@ -1,103 +0,0 @@
-module Affirm
-  class Charges
-    def initialize(client)
-      @client = client
-      @namespace = "charges"
-    end
-
-    ######
-    # GET
-    #
-    def get(charge_id:)
-      make_request(charge_id, :get)
-    end
-
-    ######
-    # AUTHORIZE
-    #
-    # checkout_token - (required) string. The charge token passed through the confirmation response.
-    def authorize(checkout_token:)
-      make_request("/", :post, checkout_token: checkout_token)
-    end
-
-    def authorize!(checkout_token:)
-      response = authorize(checkout_token: checkout_token)
-      assert_success(response)
-    end
-
-    ######
-    # CAPTURE
-    #
-    # order_id - (optional) string. Your internal order id. This is stored for your own future reference.
-    # shipping_carrier - (optional) string. The shipping carrier used to ship the items in the charge.
-    # shipping_confirmation - (optional) string. The shipping confirmation for the shipment.
-    def capture(charge_id:, order_id: nil, shipping_carrier: nil, shipping_confirmation: nil)
-      make_request("#{charge_id}/capture", :post, {
-        order_id: order_id,
-        shipping_carrier: shipping_carrier,
-        shipping_confirmation: shipping_confirmation
-      })
-    end
-
-    def capture!(charge_id:, order_id: nil, shipping_carrier: nil, shipping_confirmation: nil)
-      response = capture(charge_id: charge_id, order_id: order_id, shipping_carrier: shipping_carrier, shipping_confirmation: shipping_confirmation)
-      assert_success(response)
-    end
-
-    ######
-    # VOID
-    #
-    def void(charge_id:)
-      make_request("#{charge_id}/void", :post)
-    end
-
-    def void!(charge_id:)
-      response = void(charge_id: charge_id)
-      assert_success(response)
-    end
-
-    ######
-    # REFUND
-    #
-    # amount - (optional) integer or null. The amount to refund in cents. The default amount is the remaining balance on the charge.
-    def refund(charge_id:, amount: nil)
-      make_request("#{charge_id}/refund", :post, amount: amount)
-    end
-
-    def refund!(charge_id:, amount: nil)
-      response = refund(charge_id: charge_id, amount: amount)
-      assert_success(response)
-    end
-
-    ######
-    # UPDATE
-    #
-    # order_id - (optional) string. Your internal order id. This is stored for your own future reference.
-    # shipping_carrier - (optional) string. The shipping carrier used to ship the items in the charge.
-    # shipping_confirmation - (optional) string. The shipping confirmation for the shipment.
-    def update(charge_id:, order_id: nil, shipping_carrier: nil, shipping_confirmation: nil)
-      make_request("#{charge_id}/update", :post, {
-        order_id: order_id,
-        shipping_carrier: shipping_carrier,
-        shipping_confirmation: shipping_confirmation
-      })
-    end
-
-    def update!(charge_id:, order_id: nil, shipping_carrier: nil, shipping_confirmation: nil)
-      response = update(charge_id: charge_id, order_id: order_id, shipping_carrier: shipping_carrier, shipping_confirmation: shipping_confirmation)
-      assert_success(response)
-    end
-
-    private
-
-    def make_request(path, method, data={})
-      @client.make_request(File.join(@namespace, path), method, data)
-    end
-
-    def assert_success(response)
-      raise Affirm::Error.from_response(response) if response.error?
-
-      response
-    end
-  end
-end

data/spec/charges_spec.rb

@@ -1,170 +0,0 @@
-require 'spec_helper'
-
-describe Affirm::Charges do
-  let!(:request) do
-    stub_request(request_method, request_url).to_return(status: response_code, body: response_body)
-  end
-
-  let(:response_code) { 200 }
-
-  describe "self.get" do
-    let(:request_method) { :get }
-    let(:request_url) { "#{TEST_URL}/charges/ABCD" }
-    let(:response_body) { load_fixture("charges/get.json") }
-
-    it "is successful" do
-      response = Affirm::API.charges.get(charge_id: "ABCD")
-      response.should be_success
-      response.body["amount"].should == 6100
-    end
-  end
-
-  describe "self.authorize" do
-    let(:request_method) { :post }
-    let(:request_url) { "#{TEST_URL}/charges/" }
-    let(:response_body) { load_fixture("charges/authorize.json") }
-
-    it "is successful" do
-      response = Affirm::API.charges.authorize(checkout_token: "token")
-      response.should be_success
-    end
-
-    it "sends the correct body" do
-      Affirm::API.charges.authorize(checkout_token: "token")
-
-      expect(WebMock).to have_requested(request_method, request_url).with(body: {
-        checkout_token: "token"
-      }.to_json)
-    end
-
-    context "bang method" do
-      let(:response_code) { 422 }
-      let(:response_body) { load_fixture("charges/invalid_request.json") }
-
-      it "raises an error on failure" do
-        expect { Affirm::API.charges.authorize!(checkout_token: "token") }.to raise_error(Affirm::Error)
-      end
-    end
-  end
-
-  describe "self.capture" do
-    let(:request_method) { :post }
-    let(:request_url) { "#{TEST_URL}/charges/ABCD/capture" }
-    let(:response_body) { load_fixture("charges/capture.json") }
-
-    it "is successful" do
-      response = Affirm::API.charges.capture(charge_id: "ABCD")
-      response.should be_success
-    end
-
-    it "optionally allows tracking params" do
-      params = { order_id: "order_id", shipping_carrier: "carrier", shipping_confirmation: "confirmation" }
-      Affirm::API.charges.capture({charge_id: "ABCD"}.merge(params))
-
-      expect(WebMock).to have_requested(request_method, request_url).with(body: params.to_json)
-    end
-
-    context "bang method" do
-      let(:response_code) { 422 }
-      let(:response_body) { load_fixture("charges/invalid_request.json") }
-
-      it "raises an error on failure" do
-        expect { Affirm::API.charges.capture!(charge_id: "ABCD") }.to raise_error(Affirm::Error)
-      end
-    end
-  end
-
-  describe "self.void" do
-    let(:request_method) { :post }
-    let(:request_url) { "#{TEST_URL}/charges/ABCD/void" }
-    let(:response_body) { load_fixture("charges/void.json") }
-
-    it "is successful" do
-      response = Affirm::API.charges.void(charge_id: "ABCD")
-      response.should be_success
-    end
-
-    context "bang method" do
-      let(:response_code) { 422 }
-      let(:response_body) { load_fixture("charges/invalid_request.json") }
-
-      it "raises an error on failure" do
-        expect { Affirm::API.charges.void!(charge_id: "ABCD") }.to raise_error(Affirm::Error)
-      end
-    end
-  end
-
-  describe "self.refund" do
-    let(:request_method) { :post }
-    let(:request_url) { "#{TEST_URL}/charges/ABCD/refund" }
-    let(:response_body) { load_fixture("charges/refund.json") }
-
-    it "is successful" do
-      response = Affirm::API.charges.refund(charge_id: "ABCD")
-      response.should be_success
-    end
-
-    context "with amount" do
-      it "sends the correct body" do
-        Affirm::API.charges.refund(charge_id: "ABCD", amount: 100)
-
-        expect(WebMock).to have_requested(request_method, request_url).with(body: {
-          amount: 100
-        }.to_json)
-      end
-    end
-
-    context "bang method" do
-      let(:response_code) { 422 }
-      let(:response_body) { load_fixture("charges/invalid_request.json") }
-
-      it "raises an error on failure" do
-        expect { Affirm::API.charges.refund!(charge_id: "ABCD") }.to raise_error(Affirm::Error)
-      end
-    end
-  end
-
-  describe "self.update" do
-    let(:request_method) { :post }
-    let(:request_url) { "#{TEST_URL}/charges/ABCD/update" }
-    let(:response_body) { load_fixture("charges/update.json") }
-
-    it "is successful" do
-      response = Affirm::API.charges.update(charge_id: "ABCD", order_id: "order_id", shipping_carrier: "carrier", shipping_confirmation: "confirmation")
-      response.should be_success
-    end
-
-    it "sends the correct body" do
-      params = { order_id: "order_id", shipping_carrier: "carrier", shipping_confirmation: "confirmation" }
-      Affirm::API.charges.update({charge_id: "ABCD"}.merge(params))
-
-      expect(WebMock).to have_requested(request_method, request_url).with(body: params.to_json)
-    end
-
-    it "doesn't require the params" do
-      response = Affirm::API.charges.update(charge_id: "ABCD")
-      response.should be_success
-    end
-
-    context "bang method" do
-      let(:response_code) { 422 }
-      let(:response_body) { load_fixture("charges/invalid_request.json") }
-
-      it "raises an error on failure" do
-        expect { Affirm::API.charges.update!(charge_id: "ABCD") }.to raise_error(Affirm::Error)
-      end
-    end
-  end
-
-  context "with specified client" do
-    let(:client) { Affirm::Client.new(public_key: "other_public", secret_key: "other_secret") }
-
-    let(:request_method) { :get }
-    let(:response_body) { load_fixture("charges/get.json") }
-    let(:request_url) { /.*other_public:other_secret.*/ }
-
-    it "uses the client's creds" do
-      described_class.new(client).get(charge_id: "ABCD")
-    end
-  end
-end