easypost 2.0.12 → 2.0.13

data/.gitignore

@@ -2,6 +2,7 @@
 *.rbc
 .bundle
 .config
+Gemfile.lock
 coverage
 InstalledFiles
 lib/bundler/man

data/CHANGELOG

@@ -1,3 +1,9 @@
+=== 2.0.13 2014-10-30
+
+* Added Pickup, PickupRate resources.
+* Added ability to pass api_key to a few resources that were missing it.
+
+
 === 2.0.12 2014-07-07
 
 * Added Item, Container, and Order resources.

data/VERSION

@@ -1 +1 @@
-2.0.12
+2.0.13

data/lib/easypost.rb

@@ -24,6 +24,8 @@ require 'easypost/tracker'
 require 'easypost/item'
 require 'easypost/container'
 require 'easypost/order'
+require 'easypost/pickup'
+require 'easypost/pickup_rate'
 
 require 'easypost/error'
 
@@ -31,6 +33,8 @@ module EasyPost
   @@api_key = nil
   @@api_base = 'https://api.easypost.com/v2'
   @@api_version = nil
+  @@open_timeout = 30
+  @@timeout = 60
 
   def self.api_url(url='')
     @@api_base + url
@@ -60,12 +64,22 @@ module EasyPost
     @@api_version
   end
 
+  def self.http_config
+    @@http_config ||= {
+      timeout: 60,
+      open_timeout: 30,
+      verify_ssl: false
+    }
+  end
+
+  def self.http_config=(http_config_params)
+    self.http_config.merge!(http_config_params)
+  end
+
   def self.request(method, url, api_key, params={}, headers={})
     api_key ||= @@api_key
     raise Error.new('No API key provided.') unless api_key
 
-    ssl_opts = { :verify_ssl => false }
-
     params = Util.objects_to_ids(params)
     url = self.api_url(url)
     case method.to_s.downcase.to_sym
@@ -86,14 +100,14 @@ module EasyPost
       :content_type => 'application/x-www-form-urlencoded'
     }.merge(headers)
 
-    opts = {
-      :method => method,
-      :url => url,
-      :headers => headers,
-      :open_timeout => 30,
-      :payload => payload,
-      :timeout => 60
-    }.merge(ssl_opts)
+    opts = http_config.merge(
+      {
+        :method => method,
+        :url => url,
+        :headers => headers,
+        :payload => payload
+      }
+    )
 
     begin
       response = execute_request(opts)

data/lib/easypost/address.rb

@@ -1,10 +1,11 @@
 module EasyPost
   class Address < Resource
 
-    def self.create_and_verify(params={})
+    def self.create_and_verify(params={}, carrier=nil, api_key=nil)
       wrapped_params = {}
       wrapped_params[self.class_name().to_sym] = params
-      response, api_key = EasyPost.request(:post, url + '/create_and_verify', @api_key, wrapped_params)
+      wrapped_params[:carrier] = carrier
+      response, api_key = EasyPost.request(:post, url + '/create_and_verify', api_key, wrapped_params)
 
       if response.has_key?(:address)
         if response.has_key?(:message)
@@ -17,8 +18,8 @@ module EasyPost
       end
     end
 
-    def verify(params={})
-      response, api_key = EasyPost.request(:get, url + '/verify', @api_key, params)
+    def verify(params={}, carrier=nil)
+      response, api_key = EasyPost.request(:get, url + '/verify?carrier=' + String(carrier), @api_key, params)
 
       if response.has_key?(:address)
         if response.has_key?(:message)

data/lib/easypost/batch.rb

@@ -1,10 +1,10 @@
 module EasyPost
   class Batch < Resource
 
-    def self.create_and_buy(params={})
+    def self.create_and_buy(params={}, api_key=nil)
       wrapped_params = {}
       wrapped_params[self.class_name().to_sym] = params
-      response, api_key = EasyPost.request(:post, url + '/create_and_buy', @api_key, wrapped_params)
+      response, api_key = EasyPost.request(:post, url + '/create_and_buy', api_key, wrapped_params)
 
       return Util.convert_to_easypost_object(response, api_key)
     end

data/lib/easypost/item.rb

@@ -1,8 +1,8 @@
 module EasyPost
   class Item < Resource
 
-    def self.retrieve_reference(params={})
-      response, api_key = EasyPost.request(:get, url + '/retrieve_reference', @api_key, params)
+    def self.retrieve_reference(params={}, api_key=nil)
+      response, api_key = EasyPost.request(:get, url + '/retrieve_reference', api_key, params)
       return EasyPost::Util::convert_to_easypost_object(response, api_key) if response
     end
 

data/lib/easypost/pickup.rb

@@ -0,0 +1,19 @@
+module EasyPost
+  class Pickup < Resource
+
+    def buy(params={})
+      if params.instance_of?(EasyPost::PickupRate)
+        temp = params.clone
+        params = {}
+        params[:carrier] = temp.carrier
+        params[:service] = temp.service
+      end
+
+      response, api_key = EasyPost.request(:post, url + '/buy', @api_key, params)
+      self.refresh_from(response, @api_key, true)
+
+      return self
+    end
+
+  end
+end

data/lib/easypost/pickup_rate.rb

@@ -0,0 +1,5 @@
+module EasyPost
+  class PickupRate < Resource
+
+  end
+end

data/lib/easypost/shipment.rb

@@ -71,9 +71,7 @@ module EasyPost
 
       self.get_rates unless self.rates
 
-      if !carriers.is_a?(Array)
-        carriers = carriers.split(',')
-      end
+      carriers = carriers.is_a?(String) ? carriers.split(',') : Array(carriers)
       carriers.map!(&:downcase)
       carriers.map!(&:strip)
 
@@ -86,9 +84,7 @@ module EasyPost
         end
       end
 
-      if !services.is_a?(Array)
-        services = services.split(',')
-      end
+      services = services.is_a?(String) ? services.split(',') : Array(services)
       services.map!(&:downcase)
       services.map!(&:strip)
 

data/lib/easypost/util.rb

@@ -30,6 +30,8 @@ module EasyPost
         'Item' => Item,
         'Container' => Container,
         'Order' => Order,
+        'Pickup' => Pickup,
+        'PickupRate' => PickupRate,
         'PostageLabel' => PostageLabel }
 
       prefixes = { 'adr' => Address,
@@ -46,6 +48,8 @@ module EasyPost
         'item' => Item,
         'container' => Container,
         'order' => Order,
+        'pickup' => Pickup,
+        'pickuprate' => PickupRate,
         'pl' => PostageLabel }
 
       case response

data/spec/address_spec.rb

@@ -37,6 +37,22 @@ describe EasyPost::Address do
       expect(verified_address[:message]).to be_nil
     end
 
+    it 'verifies an address using fedex' do
+      address = EasyPost::Address.create(ADDRESS[:california].reject {|k,v| k == :street2})
+
+      expect(address.company).to eq('EasyPost')
+      expect(address.street1).to eq('164 Townsend Street')
+      expect(address.city).to eq('San Francisco')
+      expect(address.state).to eq('CA')
+      expect(address.zip).to eq('94107')
+      expect(address.country).to eq('US')
+      expect(address.street2).to be_nil
+
+      verified_address = address.verify(carrier: :fedex)
+      expect(verified_address).to be_an_instance_of(EasyPost::Address)
+      expect(verified_address[:message].length).to be > 0
+    end
+
     it 'is not able to verify address' do
       address = EasyPost::Address.create(
         :company => 'Simpler Postage Inc',
@@ -47,7 +63,7 @@ describe EasyPost::Address do
         :zip     => '941abc07'
       )
 
-      expect { verified_address = address.verify() }.to raise_error(EasyPost::Error, /Address Not Found./)
+      expect { verified_address = address.verify() }.to raise_error(EasyPost::Error, /Unable to verify address./)
     end
   end
 end

data/spec/fedex/domestic_spec.rb

@@ -159,6 +159,16 @@ describe 'fedex domestic' do
     expect(order.shipments[1].postage_label.label_url).to be
   end
 
+  it 'buys a label using a thid party account number' do
+    shipment = EasyPost::Shipment.create(
+      :to_address   => ADDRESS[:california],
+      :from_address => ADDRESS[:missouri],
+      :parcel       => PARCEL[:dimensions],
+      :options      => {:bill_third_party_account => "12345678"}
+    )
+    expect { shipment.buy(rate: shipment.lowest_rate("fedex")) }.to raise_error(EasyPost::Error, /ShippingChargesPayment Payor - The payor's account number is invalid/)
+  end
+
   after(:all) do
     begin
       expect(@rates[:residential_evening].rate.to_i).to be > @rates[:residential].rate.to_i

data/spec/pickup_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+describe EasyPost::Pickup do
+
+  describe '#create' do
+    it 'creates a pickup and returns rates' do
+      shipment = EasyPost::Shipment.create(
+        :to_address   => ADDRESS[:california],
+        :from_address => ADDRESS[:missouri],
+        :parcel       => PARCEL[:dimensions]
+      )
+      shipment.buy(:rate => shipment.lowest_rate("ups", "ground"))
+      pickup = EasyPost::Pickup.create(
+        address: ADDRESS[:missouri],
+        reference: "12345678",
+        min_datetime: DateTime.now(),
+        max_datetime: DateTime.now() + 14400,
+        is_account_address: false,
+        instructions: "",
+        shipment: shipment
+      )
+
+      expect(pickup).to be_an_instance_of(EasyPost::Pickup)
+      expect(pickup.pickup_rates.first).to be_an_instance_of(EasyPost::PickupRate)
+
+    end
+
+    it 'fails to create a pickup' do
+      shipment = EasyPost::Shipment.create(
+        :to_address   => ADDRESS[:california],
+        :from_address => ADDRESS[:missouri],
+        :parcel       => PARCEL[:dimensions]
+      )
+      shipment.buy(:rate => shipment.lowest_rate("ups", "ground"))
+      expect { pickup = EasyPost::Pickup.create(
+        address: ADDRESS[:california],
+        reference: "12345678",
+        max_datetime: DateTime.now() + 14400,
+        is_account_address: false,
+        instructions: "",
+        shipment: shipment
+      ) }.to raise_exception(EasyPost::Error, /Invalid request, 'min_datetime' is required./)
+    end
+  end
+
+  describe '#buy' do
+    it 'buys a pickup rate' do
+      shipment = EasyPost::Shipment.create(
+        :to_address   => ADDRESS[:california],
+        :from_address => ADDRESS[:missouri],
+        :parcel       => PARCEL[:dimensions]
+      )
+      shipment.buy(:rate => shipment.lowest_rate("ups", "ground"))
+      pickup = EasyPost::Pickup.create(
+        address: ADDRESS[:california],
+        reference: "buy12345678",
+        min_datetime: DateTime.now(),
+        max_datetime: DateTime.now() + 14400,
+        is_account_address: false,
+        instructions: "",
+        shipment: shipment
+      )
+      pickup.buy(pickup.pickup_rates.first)
+
+      expect(pickup.confirmation).not_to be_empty
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'open-uri'
 require 'easypost'
 EasyPost.api_key = 'cueqNZUb3ldeWTNX7MU3Mel8UXtaAMUi'
-EasyPost.api_base = 'http://easypost-vm:5000/v2'
+EasyPost.api_base = 'http://ep-vm-whatever:5000/v2'
 
 ADDRESS = {}
 ADDRESS[:california] = {

data/spec/ups/domestic_spec.rb

@@ -54,6 +54,21 @@ describe 'ups domestic' do
     expect(shipment.postage_label.label_url).to end_with(".epl2")
   end
 
+  # it 'buys an order with shipment level cod', focus: true do
+  #   order = EasyPost::Order.create(
+  #     to_address: ADDRESS[:california],
+  #     from_address: ADDRESS[:missouri],
+  #     options: {cod_amount: 19.99},
+  #     shipments: [{
+  #       parcel: {length: 8, width: 6, height: 4, weight: 12}
+  #     },{
+  #       parcel: {length: 8, width: 6, height: 4, weight: 12}
+  #     }]
+  #   )
+  #   p order
+  #   # order.buy(carrier: "ups", service: "Ground")
+  # end
+
   after(:all) do
     begin
       expect(@rates[:next_day_air].rate.to_i).to be > @rates[:ground].rate.to_i

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easypost
 version: !ruby/object:Gem::Version
-  version: 2.0.12
+  version: 2.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -75,7 +75,6 @@ files:
 - .gitignore
 - CHANGELOG
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -94,6 +93,8 @@ files:
 - lib/easypost/object.rb
 - lib/easypost/order.rb
 - lib/easypost/parcel.rb
+- lib/easypost/pickup.rb
+- lib/easypost/pickup_rate.rb
 - lib/easypost/postage_label.rb
 - lib/easypost/rate.rb
 - lib/easypost/refund.rb
@@ -110,6 +111,7 @@ files:
 - spec/fedex/international_spec.rb
 - spec/item_spec.rb
 - spec/order_spec.rb
+- spec/pickup_spec.rb
 - spec/shipment_spec.rb
 - spec/spec_helper.rb
 - spec/ups/domestic_spec.rb

data/Gemfile.lock

@@ -1,30 +0,0 @@
-PATH
-  remote: .
-  specs:
-    easypost (2.0.11)
-      multi_json (>= 1.0.4, < 2)
-      rest-client (~> 1.4)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.2.4)
-    mime-types (1.25.1)
-    multi_json (1.8.4)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  easypost!
-  rspec (~> 2.13.0)