apruve 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47f7ecc818ee0cf07f527efb91970dcecad9ec29
-  data.tar.gz: 4fce1f67255250ffb15f04f6b2b1fbdd2e811e48
+  metadata.gz: 1f77ae16802dececd30e06bdbbd304c22bc9ff54
+  data.tar.gz: d85fef623412045ca74e915fea7ed579976e9f01
 SHA512:
-  metadata.gz: 618a2b76d3fe548200eb0c5f041fc340f294bd914a270f25df04c2d0c95b4b1f3c119d85ee7c91a9b4eaf2e42de57a1998c2d4ebf4d50d69f18b0a9df936d526
-  data.tar.gz: 3a29ee9936e59f006df4a007a524fbc7ea1354f9e3f82cc66a2e42171d2b05db74841f736812f915e9fb604db47e94251047354ae9a81a0121a4dc591cebe304
+  metadata.gz: 678517ef6ac88dc6c7baab6a2d1db526bac09f0a2b8e57179b17230bee7f99684bf56bd4f9b99523ec8c735cb4d8f6e52996d717b2f900cbb16ac2f962436885
+  data.tar.gz: 220c84012bb49de0d07853d3a4ba704530a61421da39e79d8806d7a10c74ad6dfe0ebf550b231c999507a09de0032f8bf130237bdbde65cf7741233a280d904a

data/lib/apruve.rb

@@ -47,22 +47,32 @@ module Apruve
 
     def get(*args, &block)
       self.client.get *args
+    rescue URI::InvalidURIError
+      handle_invalid_url(args[0])
     end
 
     def post(*args, &block)
       self.client.post *args
+    rescue URI::InvalidURIError
+      handle_invalid_url(args[0])
     end
 
     def put(*args, &block)
       self.client.put *args
+    rescue URI::InvalidURIError
+      handle_invalid_url(args[0])
     end
 
     def patch(*args, &block)
       self.client.patch *args
+    rescue URI::InvalidURIError
+      handle_invalid_url(args[0])
     end
 
     def unstore(*args, &block)
       self.client.delete *args
+    rescue URI::InvalidURIError
+      handle_invalid_url(args[0])
     end
 
     alias_method :delete, :unstore
@@ -72,6 +82,11 @@ module Apruve
 
     private
 
+    def handle_invalid_url(url)
+      client.config[:logger].warn 'Invalid URL'
+      raise Apruve::NotFound.new(body: {}, status: 404, headers: {}, url: url)
+    end
+
     def configure_environment(env)
       if env == PROD
         @config[:scheme] = 'https'

data/lib/apruve/resources.rb

@@ -7,6 +7,7 @@ require_relative 'resources/order_item'
 require_relative 'resources/invoice'
 require_relative 'resources/invoice_item'
 require_relative 'resources/shipment'
+require_relative 'resources/shipment_item'
 require_relative 'resources/merchant'
 require_relative 'resources/subscription'
 require_relative 'resources/subscription_adjustment'

data/lib/apruve/resources/shipment.rb

@@ -1,7 +1,7 @@
 module Apruve
   class Shipment < Apruve::ApruveObject
     attr_accessor :id, :invoice_id, :amount_cents, :currency, :shipper, :shipped_at,
-                  :tracking_number, :delivered_at, :merchant_notes, :invoice_items,
+                  :tracking_number, :delivered_at, :merchant_notes, :shipment_items,
                   :tax_cents, :shipping_cents, :status, :merchant_shipment_id
 
     def self.find(invoice_id, id)
@@ -12,14 +12,14 @@ module Apruve
     def initialize(params)
       super
       # hydrate payment items if appropriate
-      if @invoice_items.nil?
-        @invoice_items = []
-      elsif @invoice_items.is_a?(Array) && @invoice_items.first.is_a?(Hash)
+      if @shipment_items.nil?
+        @shipment_items = []
+      elsif @shipment_items.is_a?(Array) && @shipment_items.first.is_a?(Hash)
         hydrated_items = []
-        @invoice_items.each do |item|
-          hydrated_items << Apruve::OrderItem.new(item)
+        @shipment_items.each do |item|
+          hydrated_items << Apruve::ShipmentItem.new(item)
         end
-        @invoice_items = hydrated_items
+        @shipment_items = hydrated_items
       end
       @currency = Apruve.default_currency if currency.nil?
     end

data/lib/apruve/resources/shipment_item.rb

@@ -0,0 +1,22 @@
+module Apruve
+  class ShipmentItem < Apruve::ApruveObject
+    attr_accessor :title,
+                  :amount_cents,
+                  :price_ea_cents,
+                  :price_total_cents,
+                  :shipping_cents,
+                  :tax_cents,
+                  :quantity,
+                  :description,
+                  :variant_info,
+                  :sku,
+                  :vendor,
+                  :currency,
+                  :view_product_url,
+                  :price_ea_cents,
+                  :taxable,
+                  :shipment_id,
+                  :uuid
+
+  end
+end

data/lib/apruve/version.rb

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

data/spec/apruve/apruve_spec.rb

@@ -61,7 +61,7 @@ describe 'Apruve' do
     end
   end
 
-  describe '#get' do
+  describe 'URL actions' do
     let (:api_key) { 'an-api-key' }
     let (:url) { 'example.com' }
     before :each do
@@ -71,7 +71,46 @@ describe 'Apruve' do
       it 'should raise' do
         expect { Apruve.get('gibberish') }.to raise_error(Apruve::ServiceUnreachable)
       end
+    end
+
+    describe '#get' do
+      describe 'invalid URL' do
+        it 'should raise a Faraday error' do
+          expect { Apruve.get('#asldkjfsldfj#Asdlofjasod##') }.to raise_error(Apruve::NotFound)
+        end
+      end
+    end
+
+    describe '#post' do
+      describe 'invalid URL' do
+        it 'should raise a Faraday error' do
+          expect { Apruve.get('#asldkjfsldfj#Asdlofjasod##') }.to raise_error(Apruve::NotFound)
+        end
+      end
+    end
 
+    describe '#patch' do
+      describe 'invalid URL' do
+        it 'should raise a Faraday error' do
+          expect { Apruve.get('#asldkjfsldfj#Asdlofjasod##') }.to raise_error(Apruve::NotFound)
+        end
+      end
+    end
+
+    describe '#unstore' do
+      describe 'invalid URL' do
+        it 'should raise a Faraday error' do
+          expect { Apruve.get('#asldkjfsldfj#Asdlofjasod##') }.to raise_error(Apruve::NotFound)
+        end
+      end
+    end
+
+    describe '#put' do
+      describe 'invalid URL' do
+        it 'should raise a Faraday error' do
+          expect { Apruve.get('#asldkjfsldfj#Asdlofjasod##') }.to raise_error(Apruve::NotFound)
+        end
+      end
     end
   end
 

data/spec/apruve/resources/shipment_item_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Apruve::ShipmentItem do
+  let (:shipment_item) {Apruve::ShipmentItem.new}
+  subject { shipment_item }
+
+  it { should respond_to(:title) }
+  it { should respond_to(:price_ea_cents) }
+  it { should respond_to(:price_total_cents) }
+  it { should respond_to(:shipping_cents) }
+  it { should respond_to(:tax_cents) }
+  it { should respond_to(:quantity) }
+  it { should respond_to(:description) }
+  it { should respond_to(:variant_info) }
+  it { should respond_to(:sku) }
+  it { should respond_to(:vendor) }
+  it { should respond_to(:currency) }
+  it { should respond_to(:view_product_url) }
+  it { should respond_to(:price_ea_cents) }
+  it { should respond_to(:taxable) }
+  it { should respond_to(:shipment_id) }
+  it { should respond_to(:uuid) }
+
+end

data/spec/apruve/resources/shipment_spec.rb

@@ -46,7 +46,7 @@ describe Apruve::Shipment do
   it { should respond_to(:shipped_at) }
   it { should respond_to(:delivered_at) }
   it { should respond_to(:merchant_notes) }
-  it { should respond_to(:invoice_items) }
+  it { should respond_to(:shipment_items) }
   it { should respond_to(:tax_cents) }
   it { should respond_to(:shipping_cents) }
   it { should respond_to(:status) }
@@ -54,7 +54,7 @@ describe Apruve::Shipment do
 
   describe '#to_json' do
     let(:expected) do
-      '{"amount_cents":1234578,"merchant_notes":"foo","id":"91ac96c0ffc9577ecb634ad726b1874e","invoice_id":"2d1bd4f93a1b9ed034e36783adb29bed","shipper":"shipper name","shipped_at":"2016-11-11T00:00:00-06:00","delivered_at":"2016-11-11T00:00:00-06:00","tracking_number":"1234abcd","currency":"USD","tax_cents":1234,"shipping_cents":12345,"status":"fulfilled","merchant_shipment_id":"ZZ1234567","invoice_items":[]}'
+      '{"amount_cents":1234578,"merchant_notes":"foo","id":"91ac96c0ffc9577ecb634ad726b1874e","invoice_id":"2d1bd4f93a1b9ed034e36783adb29bed","shipper":"shipper name","shipped_at":"2016-11-11T00:00:00-06:00","delivered_at":"2016-11-11T00:00:00-06:00","tracking_number":"1234abcd","currency":"USD","tax_cents":1234,"shipping_cents":12345,"status":"fulfilled","merchant_shipment_id":"ZZ1234567","shipment_items":[]}'
     end
     its(:to_json) { should eq expected }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apruve
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Apruve, Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-30 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,6 +115,7 @@ files:
 - lib/apruve/resources/order.rb
 - lib/apruve/resources/order_item.rb
 - lib/apruve/resources/shipment.rb
+- lib/apruve/resources/shipment_item.rb
 - lib/apruve/resources/subscription.rb
 - lib/apruve/resources/subscription_adjustment.rb
 - lib/apruve/resources/validation_error.rb
@@ -131,6 +132,7 @@ files:
 - spec/apruve/resources/merchant_spec.rb
 - spec/apruve/resources/order_item_spec.rb
 - spec/apruve/resources/order_spec.rb
+- spec/apruve/resources/shipment_item_spec.rb
 - spec/apruve/resources/shipment_spec.rb
 - spec/apruve/resources/subscription_adjustment_spec.rb
 - spec/apruve/resources/subscription_spec.rb
@@ -170,9 +172,11 @@ test_files:
 - spec/apruve/resources/merchant_spec.rb
 - spec/apruve/resources/order_item_spec.rb
 - spec/apruve/resources/order_spec.rb
+- spec/apruve/resources/shipment_item_spec.rb
 - spec/apruve/resources/shipment_spec.rb
 - spec/apruve/resources/subscription_adjustment_spec.rb
 - spec/apruve/resources/subscription_spec.rb
 - spec/apruve/resources/webhook_endpoint_spec.rb
 - spec/apruve/response/apruve_exception_middleware_spec.rb
 - spec/spec_helper.rb
+has_rdoc: