apruve 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f77ae16802dececd30e06bdbbd304c22bc9ff54
-  data.tar.gz: d85fef623412045ca74e915fea7ed579976e9f01
+  metadata.gz: 24401a925e3305111fbbe854bba852da2abb854f
+  data.tar.gz: bfed11774b2cec8edf220cc1cdb4f29eb8993a5e
 SHA512:
-  metadata.gz: 678517ef6ac88dc6c7baab6a2d1db526bac09f0a2b8e57179b17230bee7f99684bf56bd4f9b99523ec8c735cb4d8f6e52996d717b2f900cbb16ac2f962436885
-  data.tar.gz: 220c84012bb49de0d07853d3a4ba704530a61421da39e79d8806d7a10c74ad6dfe0ebf550b231c999507a09de0032f8bf130237bdbde65cf7741233a280d904a
+  metadata.gz: c15cbe632feebad3ee53777e79e646b5c5b4bba422a0afbfa912b54fbd1e50e360261060200d33ea01a2593e30ad5f9a6d48da6a46c0deef5808ba2d3117cd09
+  data.tar.gz: 4277d7145125765dfb4a9d5d4b02860bd65d1b51ac3ed3ea2210c951d29542bdc8d583a83a5f3a55b4fe0240f27a05c13336e39a1b4dc50e864836828c1a2915

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    apruve (1.1.2)
+    apruve (1.1.3)
       addressable (~> 2.3)
       faraday (>= 0.8.6, <= 0.9.0)
       faraday_middleware (~> 0.9)
@@ -123,4 +123,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.12.5
+   1.13.7

data/lib/apruve/resources.rb

@@ -6,9 +6,11 @@ require_relative 'resources/order'
 require_relative 'resources/order_item'
 require_relative 'resources/invoice'
 require_relative 'resources/invoice_item'
+require_relative 'resources/invoice_return'
 require_relative 'resources/shipment'
 require_relative 'resources/shipment_item'
 require_relative 'resources/merchant'
 require_relative 'resources/subscription'
 require_relative 'resources/subscription_adjustment'
-require_relative 'resources/webhook_endpoint'
+require_relative 'resources/webhook_endpoint'
+require_relative 'resources/corporate_account'

data/lib/apruve/resources/corporate_account.rb

@@ -0,0 +1,11 @@
+module Apruve
+  class CorporateAccount < Apruve::ApruveObject
+    attr_accessor :id, :merchant_uuid, :customer_uuid, :type, :created_at, :updated_at, :payment_term_strategy_name,
+                  :disabled_at, :name, :creditor_term_id, :payment_method_id, :status, :trusted_merchant
+
+    def self.find(merchant_id, email)
+      response = Apruve.get("merchants/#{merchant_id}/corporate_accounts?email=#{email}")
+      return CorporateAccount.new(response.body.empty? ? {} : response.body[0])
+    end
+  end
+end

data/lib/apruve/resources/invoice_return.rb

@@ -0,0 +1,37 @@
+module Apruve
+  class InvoiceReturn < Apruve::ApruveObject
+    attr_accessor :id, :invoice_id, :amount_cents, :currency, :uuid, :reason, :merchant_notes, :created_by_id,
+                  :created_at, :updated_at
+
+    def self.find(invoice_id, id)
+      response = Apruve.get("invoices/#{invoice_id}/invoice_returns/#{id}")
+      logger.debug response.body
+      InvoiceReturn.new(response.body)
+    end
+
+    def validate
+      errors = []
+      errors << 'amount_cents must be set' if amount_cents.nil?
+      errors << 'reason must be set' if reason.nil?
+      raise Apruve::ValidationError.new(errors) if errors.length > 0
+    end
+
+    def self.find_all(invoice_id)
+      response = Apruve.get("invoices/#{invoice_id}/invoice_returns")
+      response.body.map { |invoice_return| InvoiceReturn.new(invoice_return) }
+    end
+
+    def update!
+      validate
+      response = Apruve.put("invoices/#{self.invoice_id}/invoice_returns/#{self.id}", self.to_json)
+      logger.debug response.body
+    end
+
+    def save!
+      validate
+      response = Apruve.post("invoices/#{self.invoice_id}/invoice_returns", self.to_json)
+      logger.debug response.body
+      self.id = response.body['id']
+    end
+  end
+end

data/lib/apruve/resources/order.rb

@@ -1,7 +1,7 @@
 module Apruve
   class Order < Apruve::ApruveObject
-    attr_accessor :id, :merchant_id, :customer_id, :merchant_order_id, :status, :amount_cents, :currency, :tax_cents,
-                  :shipping_cents, :expire_at, :order_items, :accepts_payments_via, :accepts_payment_terms, :payment_terms,
+    attr_accessor :id, :merchant_id, :shopper_id, :merchant_order_id, :status, :amount_cents, :currency, :tax_cents,
+                  :shipping_cents, :expire_at, :order_items, :accepts_payments_via, :accepts_payment_terms, :payment_term,
                   :created_at, :updated_at, :final_state_at, :default_payment_method, :links, :finalize_on_create, :invoice_on_create
 
     def self.find(id)
@@ -54,9 +54,18 @@ module Apruve
     def validate
       errors = []
       errors << 'merchant_id must be set' if merchant_id.nil?
+      errors << 'payment_term must be supplied' if payment_term.nil?
       raise Apruve::ValidationError.new(errors) if errors.length > 0
     end
 
+    def save!
+      validate
+      response = Apruve.post('orders', self.to_json)
+      self.id = response.body['id']
+      self.status = response.body['status']
+      self.created_at = response.body['created_at']
+    end
+
     def value_string
       # add each field in the PR
       str = "#{merchant_id}#{merchant_order_id}#{amount_cents}#{currency}#{tax_cents}#{shipping_cents}#{expire_at}#{accepts_payment_terms}#{finalize_on_create}#{invoice_on_create}"

data/lib/apruve/version.rb

@@ -1,3 +1,3 @@
 module Apruve
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

data/spec/apruve/resources/corporate_account_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe Apruve::CorporateAccount do
+  before :each do
+    Apruve.configure('7ec4e1ae7c96fceba0d599da541912b7', 'local')
+  end
+
+  let (:id) { '89ea2488fe0a5c7bb38aa7f9b088874a' }
+  let (:merchant_uuid) { '89ea2488fe0a5c7bb38aa7f9b088874b' }
+  let (:customer_uuid) { '89ea2488fe0a5c7bb38aa7f9b088874c' }
+  let (:type) { 'CorporateAccount' }
+  let (:payment_term_strategy_name) { 'EOMNet15' }
+  let (:name) { 'A name' }
+  let (:email) { Faker::Internet.email }
+
+  let (:corporate_account) do
+    Apruve::CorporateAccount.new(
+        id: id,
+        merchant_uuid: merchant_uuid,
+        customer_uuid: customer_uuid,
+        type: type,
+        payment_term_strategy_name: payment_term_strategy_name,
+        name: name,
+    )
+  end
+  subject { corporate_account }
+
+  it { should respond_to(:id) }
+  it { should respond_to(:merchant_uuid) }
+  it { should respond_to(:customer_uuid) }
+  it { should respond_to(:type) }
+  it { should respond_to(:created_at) }
+  it { should respond_to(:updated_at) }
+  it { should respond_to(:payment_term_strategy_name) }
+  it { should respond_to(:disabled_at) }
+  it { should respond_to(:name) }
+  it { should respond_to(:creditor_term_id) }
+  it { should respond_to(:payment_method_id) }
+  it { should respond_to(:status) }
+  it { should respond_to(:trusted_merchant) }
+
+
+  describe '#find' do
+    describe 'success' do
+      let! (:stubs) do
+        faraday_stubs do |stub|
+          stub.get("/api/v4/merchants/#{merchant_uuid}/corporate_accounts?email=#{email}") { [200, {}, '{}'] }
+        end
+      end
+      it 'should do a get' do
+        Apruve::CorporateAccount.find(merchant_uuid, email)
+        stubs.verify_stubbed_calls
+      end
+    end
+
+    describe 'not found' do
+      let! (:stubs) do
+        faraday_stubs do |stub|
+          stub.get("/api/v4/merchants/#{merchant_uuid}/corporate_accounts?email=#{email}") { [404, {}, 'Not Found'] }
+        end
+      end
+      it 'should raise' do
+        expect { Apruve::CorporateAccount.find(merchant_uuid, email) }.to raise_error(Apruve::NotFound)
+        stubs.verify_stubbed_calls
+      end
+    end
+  end
+end

data/spec/apruve/resources/invoice_return_spec.rb

@@ -0,0 +1,165 @@
+require 'spec_helper'
+
+describe Apruve::InvoiceReturn do
+  before :each do
+    Apruve.configure('f5fbe71d68772d1f562ed6f598b995b3', 'local')
+  end
+
+  let (:id) { '89ea2488fe0a5c7bb38aa7f9b088874a' }
+  let (:invoice_id) { '89ea2488fe0a5c7bb38aa7f9b088874b' }
+  let (:amount_cents) { 12345 }
+  let (:currency) { 'USD' }
+  let (:reason) { 'DAMAGED' }
+
+  let (:invoice_return) do
+    Apruve::InvoiceReturn.new(
+        id: id,
+        invoice_id: invoice_id,
+        amount_cents: amount_cents,
+        currency: currency,
+        reason: reason
+    )
+  end
+  subject { invoice_return }
+
+  it { should respond_to(:id) }
+  it { should respond_to(:invoice_id) }
+  it { should respond_to(:amount_cents) }
+  it { should respond_to(:currency) }
+  it { should respond_to(:uuid) }
+  it { should respond_to(:reason) }
+  it { should respond_to(:merchant_notes) }
+  it { should respond_to(:created_by_id) }
+  it { should respond_to(:created_at) }
+  it { should respond_to(:updated_at) }
+
+  describe '#find' do
+    context 'successful response' do
+      let! (:stubs) do
+        faraday_stubs do |stub|
+          stub.get("api/v4/invoices/#{invoice_id}/invoice_returns/#{id}") { [200, {} , '{}'] }
+        end
+      end
+      it 'should get an invoice return' do
+        Apruve::InvoiceReturn.find(invoice_id, id)
+        stubs.verify_stubbed_calls
+      end
+    end
+
+    context 'when not found' do
+      let! (:stubs) do
+        faraday_stubs do |stub|
+          stub.get("api/v4/invoices/#{invoice_id}/invoice_returns/#{id}") { [404, {} , 'Not Found'] }
+        end
+      end
+      it 'should raise not found' do
+        expect { Apruve::InvoiceReturn.find(invoice_id, id) }.to raise_error(Apruve::NotFound)
+        stubs.verify_stubbed_calls
+      end
+    end
+  end
+
+  describe '#find_all' do
+    context 'successful response' do
+      let! (:stubs) do
+        faraday_stubs do |stub|
+          stub.get("api/v4/invoices/#{invoice_id}/invoice_returns") { [200, {} , '{}'] }
+        end
+      end
+      it 'should get all returns for an invoice' do
+        Apruve::InvoiceReturn.find_all(invoice_id)
+        stubs.verify_stubbed_calls
+      end
+    end
+
+    context 'when invoice not found' do
+      let! (:stubs) do
+        faraday_stubs do |stub|
+          stub.get("api/v4/invoices/#{invoice_id}/invoice_returns") { [404, {} , 'Not Found'] }
+        end
+      end
+      it 'should raise not found' do
+        expect { Apruve::InvoiceReturn.find_all(invoice_id) }.to raise_error(Apruve::NotFound)
+        stubs.verify_stubbed_calls
+      end
+    end
+  end
+
+  describe '#save' do
+    let (:response) do
+      {
+        id: id,
+        invoice_id: invoice_id,
+        amount_cents: amount_cents,
+        currency: currency,
+        reason: reason
+      }
+    end
+    context 'successful response' do
+      let! (:stubs) do
+        faraday_stubs do |stub|
+          stub.post(
+              "/api/v4/invoices/#{invoice_id}/invoice_returns",
+              invoice_return.to_json,
+          ) { [200, {}, response.to_json] }
+        end
+      end
+      it 'should post new invoice return' do
+        invoice_return.save!
+        expect(invoice_return.id).to eq id
+        stubs.verify_stubbed_calls
+      end
+    end
+
+    context 'when invoice not found' do
+      let! (:stubs) do
+        faraday_stubs do |stub|
+          stub.post(
+              "/api/v4/invoices/#{invoice_id}/invoice_returns",
+              invoice_return.to_json,
+          ) { [404, {}, 'Not Found'] }
+        end
+      end
+      it 'should raise not found' do
+        expect { invoice_return.save! }.to raise_error(Apruve::NotFound)
+        stubs.verify_stubbed_calls
+      end
+    end
+  end
+
+  describe '#update' do
+    let (:response) do
+      {
+          id: id,
+          invoice_id: invoice_id,
+          amount_cents: amount_cents,
+          currency: currency,
+          reason: reason
+      }
+    end
+
+    context 'successful response' do
+      let! (:stubs) do
+        faraday_stubs do |stub|
+          stub.put("/api/v4/invoices/#{invoice_id}/invoice_returns/#{id}", invoice_return.to_json) { [200, {}, response.to_json] }
+        end
+      end
+      it 'should put updated invoice return' do
+        invoice_return.update!
+        stubs.verify_stubbed_calls
+      end
+    end
+
+    context 'when invoice return not found' do
+      let! (:stubs) do
+        faraday_stubs do |stub|
+          stub.put("/api/v4/invoices/#{invoice_id}/invoice_returns/#{id}", invoice_return.to_json) { [404, {}, 'Not Found'] }
+        end
+      end
+      it 'should raise not found' do
+        expect { invoice_return.update! }.to raise_error(Apruve::NotFound)
+        stubs.verify_stubbed_calls
+      end
+    end
+  end
+end

data/spec/apruve/resources/order_spec.rb

@@ -2,14 +2,13 @@ require 'spec_helper'
 
 describe Apruve::Order do
   before :each do
-    Apruve.configure('f5fbe71d68772d1f562ed6f598b995b3', 'local')
+    Apruve.configure('7ec4e1ae7c96fceba0d599da541912b7', 'local')
   end
 
   let (:order_items) do
     [
         Apruve::OrderItem.new(
             title: 'line 1',
-            amount_cents: '1230',
             price_ea_cents: '123',
             quantity: 10,
             description: 'A line item',
@@ -20,22 +19,29 @@ describe Apruve::Order do
         ),
         Apruve::OrderItem.new(
             title: 'line 2',
-            amount_cents: '40'
+            price_ea_cents: '40'
         )
     ]
   end
 
+  let (:payment_term) do
+    {
+        corporate_account_id: '612e5383e4acc6c2213f3cae6208e868'
+    }
+  end
+
   let (:payment_request) do
     Apruve::Order.new(
-        merchant_id: '9999',
+        merchant_id: '9a9c3389fdc281b5c6c8d542a7e91ff6',
+        shopper_id: '9bc388fd08ce2835cfeb2e630316f7f1',
         merchant_order_id: 'ABC',
         amount_cents: 12340,
         tax_cents: 0,
         shipping_cents: 0,
-        expire_at: '2014-07-22T00:00:00+00:00',
         order_items: order_items,
         finalize_on_create: false,
-        invoice_on_create: false
+        invoice_on_create: false,
+        payment_term: payment_term
     )
   end
   subject { payment_request }
@@ -55,18 +61,17 @@ describe Apruve::Order do
 
   describe '#to_json' do
     let(:expected) do
-      "{\"merchant_id\":\"9999\",\"merchant_order_id\":\"ABC\",\"amount_cents\":12340,\"tax_cents\":0,"\
-      "\"shipping_cents\":0,\"expire_at\":\"2014-07-22T00:00:00+00:00\",\"order_items\":[{\"title\":\"line 1\",\"amount_cents\":\"1230\","\
-      "\"price_ea_cents\":\"123\",\"quantity\":10,\"description\":\"A line item\",\"variant_info\":\"small\","\
-      "\"sku\":\"LINE1SKU\",\"vendor\":\"acme, inc.\",\"view_product_url\":\"http://www.apruve.com/doc\"},"\
-      "{\"title\":\"line 2\",\"amount_cents\":\"40\"}],\"finalize_on_create\":false,\"invoice_on_create\":false}"
+      "{\"merchant_id\":\"9a9c3389fdc281b5c6c8d542a7e91ff6\",\"shopper_id\":\"9bc388fd08ce2835cfeb2e630316f7f1\",\"merchant_order_id\":\"ABC\","\
+      "\"amount_cents\":12340,\"tax_cents\":0,\"shipping_cents\":0,\"order_items\":[{\"title\":\"line 1\",\"price_ea_cents\":\"123\",\"quantity\":10,"\
+      "\"description\":\"A line item\",\"variant_info\":\"small\",\"sku\":\"LINE1SKU\",\"vendor\":\"acme, inc.\",\"view_product_url\":\"http://www.apruve.com/doc\""\
+      "},{\"title\":\"line 2\",\"price_ea_cents\":\"40\"}],\"finalize_on_create\":false,\"invoice_on_create\":false,\"payment_term\":{\"corporate_account_id\":\"612e5383e4acc6c2213f3cae6208e868\"}}"
     end
     its(:to_json) { should eq expected }
   end
 
   describe '#value_string' do
     let(:expected) do
-      '9999ABC12340002014-07-22T00:00:00+00:00falsefalseline 1123012310A line itemsmallLINE1SKUacme, inc.http://www.apruve.com/docline 240'
+      '9a9c3389fdc281b5c6c8d542a7e91ff6ABC1234000falsefalseline 112310A line itemsmallLINE1SKUacme, inc.http://www.apruve.com/docline 240'
     end
     its(:value_string) { should eq expected }
   end
@@ -82,7 +87,7 @@ describe Apruve::Order do
       end
     end
     describe 'with api_key' do
-      let (:hash) { '9aa1dda31ecd611ed759e132c2c4afec810409e49866db0090d8fa51fe4ad597' }
+      let (:hash) { 'a69b444d356b8afc68fc9c84e1686f645a539cc1975d07ef0d7a51e38a12b66c' }
       let (:api_key) { 'an_api_key' }
       before :each do
         Apruve.configure(api_key)
@@ -136,6 +141,38 @@ describe Apruve::Order do
     end
   end
 
+  describe '#save' do
+    let (:id) { '89ea2488fe0a5c7bb38aa7f9b088874a' }
+    let (:status) { 'pending' }
+    let (:api_url) { Faker::Internet.url }
+    let (:view_url) { Faker::Internet.url }
+    let (:response) do
+      {
+          id: id,
+          status: status,
+          api_url: api_url,
+          view_url: view_url
+      }
+    end
+    describe 'success' do
+      let! (:stubs) do
+        faraday_stubs do |stub|
+          stub.post(
+              "/api/v4/orders",
+              payment_request.to_json,
+          ) { [201, {}, response.to_json] }
+        end
+      end
+
+      it 'should do a post' do
+        payment_request.save!
+        expect(payment_request.id).to eq id
+        expect(payment_request.status).to eq status
+        stubs.verify_stubbed_calls
+      end
+    end
+  end
+
   describe '#finalize' do
     let (:id) { '89ea2488fe0a5c7bb38aa7f9b088874a' }
     describe 'success' do
@@ -192,7 +229,7 @@ describe Apruve::Order do
 
   describe '#update' do
     let (:id) { '89ea2488fe0a5c7bb38aa7f9b088874a' }
-    let (:order) { Apruve::Order.new id: id, merchant_id: 9999 }
+    let (:order) { Apruve::Order.new id: id, merchant_id: 9999, payment_term: payment_term }
     describe 'success' do
       let! (:stubs) do
         faraday_stubs do |stub|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apruve
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Apruve, Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,8 +109,10 @@ files:
 - lib/apruve/faraday_error_handler.rb
 - lib/apruve/resources.rb
 - lib/apruve/resources/apruve_object.rb
+- lib/apruve/resources/corporate_account.rb
 - lib/apruve/resources/invoice.rb
 - lib/apruve/resources/invoice_item.rb
+- lib/apruve/resources/invoice_return.rb
 - lib/apruve/resources/merchant.rb
 - lib/apruve/resources/order.rb
 - lib/apruve/resources/order_item.rb
@@ -127,7 +129,9 @@ files:
 - spec/apruve/apruve_spec.rb
 - spec/apruve/client_spec.rb
 - spec/apruve/config_spec.rb
+- spec/apruve/resources/corporate_account_spec.rb
 - spec/apruve/resources/invoice_item_spec.rb
+- spec/apruve/resources/invoice_return_spec.rb
 - spec/apruve/resources/invoice_spec.rb
 - spec/apruve/resources/merchant_spec.rb
 - spec/apruve/resources/order_item_spec.rb
@@ -167,7 +171,9 @@ test_files:
 - spec/apruve/apruve_spec.rb
 - spec/apruve/client_spec.rb
 - spec/apruve/config_spec.rb
+- spec/apruve/resources/corporate_account_spec.rb
 - spec/apruve/resources/invoice_item_spec.rb
+- spec/apruve/resources/invoice_return_spec.rb
 - spec/apruve/resources/invoice_spec.rb
 - spec/apruve/resources/merchant_spec.rb
 - spec/apruve/resources/order_item_spec.rb