easypost 2.0.15 → 2.1.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 131297bd3896582b77eebf257940afee1118215c
-  data.tar.gz: 7ef855b3b817a0ba6b7314c4f7d92594640a066a
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDRiZmUzZDYxMmEzNmNlNWRhNjMxNzZkYjdhMzQ4MGZjZTMxOTM5Mw==
+  data.tar.gz: !binary |-
+    ZTcxNzNjN2ZhMzYxODA3NmFhMGY5NzQ4NTg2ZTk5NmNjOTAwODI5ZA==
 SHA512:
-  metadata.gz: 48f352fc1099de1a4995e96b1dc077133f4bba456407baf89d73263990278676d204da5979f8b3cf3e87154798b1d799f42c03d3714484727640d9a5f544718e
-  data.tar.gz: 3a9ea6325239c5649348d8c08c9c73648ab469b6509eade346c2914584f8fa1dbd5ba4e071d19f4a6cd90137bfd9bb6b1c452b076a20499c2f8177ff3b5ce78c
+  metadata.gz: !binary |-
+    MzlmYzQ1YjZkMjQ0YWMzYTVjMzU5ZDI4NzJhYzAzODcxYmQ0MDBiMDVjYTAw
+    OTQ2NjE0YjQwMzcyZmY4ZTkyMzcwYjMxODBjM2I3Y2ZhMmQ0NzAzMThhOWNm
+    OTEzYjVkNzMzNmFmZTMyNmMyODBjNjJiYzRkZmM3N2Q0NDcxNjU=
+  data.tar.gz: !binary |-
+    NjNlMmY0ZmI5MDdjNWI1ODM0MDBkZTBhMjQ0OTk3NDhkMjIxNTNlMTZhOWQ0
+    OGVlYjVlYjRkMjhkMThiMDZlMmRhZmM4NTIxMWJmMWI4NTc1ODRmMDNjMzk1
+    ODExMzE1MmE0OWMxOTY4ZWRmMTg3YThiOWE4NGE2NWY1Mzk5ZGU=

data/.gitignore

@@ -25,5 +25,4 @@ doc/
 Icon
 ._*
 .Spotlight-V100
-.Trashes
-vendor/
+.Trashes

data/CHANGELOG

@@ -1,20 +1,3 @@
-=== 2.0.15 2015-04-15
-
-* Added tracker to shipment buy response
-* Updated tracker tests
-
-
-=== 2.0.14 2015-04-15
-
-* Added User and CarrierAccount models with CRUD functionality
-
-
-=== 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/README.md

@@ -1,8 +1,5 @@
 # EasyPost Ruby Client Library
 
-[<img src="https://circleci.com/gh/EasyPost/easypost-ruby.png?circle-token=80adb5236ed1fdce20810b055af79c63c3d5796b">](https://circleci.com/gh/EasyPost/easypost-ruby)
-
-
 EasyPost is a simple shipping API. You can sign up for an account at https://easypost.com
 
 Installation

data/VERSION

@@ -1 +1 @@
-2.0.15
+2.1.0

data/lib/easypost.rb

@@ -26,8 +26,6 @@ require 'easypost/container'
 require 'easypost/order'
 require 'easypost/pickup'
 require 'easypost/pickup_rate'
-require 'easypost/carrier_account'
-require 'easypost/user'
 
 require 'easypost/error'
 
@@ -70,8 +68,7 @@ module EasyPost
     @@http_config ||= {
       timeout: 60,
       open_timeout: 30,
-      verify_ssl: false,
-      ssl_version: "TLSv1",
+      verify_ssl: false
     }
   end
 

data/lib/easypost/address.rb

@@ -14,16 +14,12 @@ module EasyPost
         verified_address = EasyPost::Util::convert_to_easypost_object(response[:address], api_key)
         return verified_address
       else
-        raise_verification_failure
+        raise Error.new("Unable to verify address.")
       end
     end
 
     def verify(params={}, carrier=nil)
-      begin
-        response, api_key = EasyPost.request(:get, url + '/verify?carrier=' + String(carrier), @api_key, params)
-      rescue
-        raise_verification_failure
-      end
+      response, api_key = EasyPost.request(:get, url + '/verify?carrier=' + String(carrier), @api_key, params)
 
       if response.has_key?(:address)
         if response.has_key?(:message)
@@ -32,14 +28,11 @@ module EasyPost
         verified_address = EasyPost::Util::convert_to_easypost_object(response[:address], api_key)
         return verified_address
       else
-        raise_verification_failure
+        raise Error.new("Unable to verify address.")
       end
 
       return self
     end
 
-    def raise_verification_failure
-      raise Error.new("Unable to verify address.")
-    end
   end
 end

data/lib/easypost/object.rb

@@ -32,11 +32,11 @@ module EasyPost
       @api_key = api_key
 
       added = Set.new(values.keys - @values.keys)
-
+      
       instance_eval do
         add_accessors(added)
       end
-
+      
       values.each do |k, v|
         @values[k] = Util.convert_to_easypost_object(v, api_key)
         @transient_values.delete(k)

data/lib/easypost/util.rb

@@ -32,9 +32,7 @@ module EasyPost
         'Order' => Order,
         'Pickup' => Pickup,
         'PickupRate' => PickupRate,
-        'PostageLabel' => PostageLabel,
-        'CarrierAccount' => CarrierAccount,
-        'User' => User }
+        'PostageLabel' => PostageLabel }
 
       prefixes = { 'adr' => Address,
         'sf' => ScanForm,
@@ -52,9 +50,7 @@ module EasyPost
         'order' => Order,
         'pickup' => Pickup,
         'pickuprate' => PickupRate,
-        'pl' => PostageLabel,
-        'ca' => CarrierAccount,
-        'user' => User }
+        'pl' => PostageLabel }
 
       case response
       when Array

data/spec/address_spec.rb

@@ -55,15 +55,15 @@ describe EasyPost::Address do
 
     it 'is not able to verify address' do
       address = EasyPost::Address.create(
-        company: 'Simpler Postage Inc',
-        street1: '388 Junk Teerts',
-        street2: 'Apt 20',
-        city: 'San Francisco',
-        state: 'CA',
-        zip: '941abc07'
+        :company => 'Simpler Postage Inc',
+        :street1 => '388 Junk Teerts',
+        :street2 => 'Apt 20',
+        :city    => 'San Francisco',
+        :state   => 'CA',
+        :zip     => '941abc07'
       )
 
-      expect { verified_address = address.verify() }.to raise_error(EasyPost::Error, /Unable to verify addres/)
+      expect { verified_address = address.verify() }.to raise_error(EasyPost::Error, /Unable to verify address./)
     end
   end
 end

data/spec/batch_spec.rb

@@ -1,48 +1,61 @@
 require 'spec_helper'
 
 describe EasyPost::Batch do
+
   describe '#create' do
     it 'creates a batch object' do
       batch = EasyPost::Batch.create({
-        shipment: [{
-          from_address: ADDRESS[:california],
-          to_address: EasyPost::Address.create(ADDRESS[:missouri]),
-          parcel: EasyPost::Parcel.create(PARCEL[:dimensions])
+        :shipment => [{
+          :from_address => ADDRESS[:california],
+          :to_address   => ADDRESS[:missouri],
+          :parcel       => PARCEL[:dimensions]
         }, {
-          from_address: ADDRESS[:california],
-          to_address: EasyPost::Address.create(ADDRESS[:canada]),
-          parcel: EasyPost::Parcel.create(PARCEL[:dimensions]),
+          :from_address => ADDRESS[:california],
+          :to_address   => ADDRESS[:canada],
+          :parcel       => PARCEL[:dimensions],
         }],
-        reference: "batch123456789"
+        :reference => "batch123456789"
       })
       expect(batch).to be_an_instance_of(EasyPost::Batch)
       expect(batch.num_shipments).to eq(2)
       expect(batch.reference).to eq("batch123456789")
       expect(batch.state).to eq("creating")
+
+      # sleeps_left = 10
+      # while (batch.state == "creating" && sleeps_left > 0) do
+      #   sleep(3)
+      #   batch.refresh
+      #   sleeps_left -= 1
+      # end
+
+      # expect(batch.state).to equal("created")
+      # expect(batch.status[:created]).to equal(2)
+
     end
   end
 
   describe '#create_and_buy' do
     it 'creates a batch object and delayed jobs for purchasing the postage_labels' do
       batch = EasyPost::Batch.create({
-        shipment: [{
-          from_address: ADDRESS[:california],
-          to_address: EasyPost::Address.create(ADDRESS[:missouri]),
-          parcel: EasyPost::Parcel.create(PARCEL[:dimensions]),
-          carrier: "usps",
-          service: "priority"
+        :shipment => [{
+          :from_address => ADDRESS[:california],
+          :to_address   => ADDRESS[:missouri],
+          :parcel       => PARCEL[:dimensions],
+          :carrier      => "usps",
+          :service      => "priority"
         }, {
-          from_address: ADDRESS[:california],
-          to_address: EasyPost::Address.create(ADDRESS[:canada]),
-          parcel: EasyPost::Parcel.create(PARCEL[:dimensions]),
-          carrier: "usps",
-          service: "prioritymailinternational"
+          :from_address => ADDRESS[:california],
+          :to_address   => ADDRESS[:canada],
+          :parcel       => PARCEL[:dimensions],
+          :carrier      => "usps",
+          :service      => "prioritymailinternational"
         }],
-        reference: "batch123456789"
+        :reference => "batch123456789"
       })
       expect(batch).to be_an_instance_of(EasyPost::Batch)
       expect(batch.state).to eq("creating")
       expect(batch.num_shipments).to eq(2)
     end
   end
+
 end

data/spec/container_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe EasyPost::Container do
+
   describe '#create' do
     it 'creates a container object' do
       container = EasyPost::Container.create(
@@ -72,5 +73,15 @@ describe EasyPost::Container do
       expect(container_2.height).to eq(container_1.height)
       expect(container_1.type).to eq("BOX")
     end
+
+    it 'retrieves global containers' do
+      container_1 = EasyPost::Container.retrieve("container_USPSFR03")
+      container_2 = EasyPost::Container.retrieve("container_USPSFR02")
+
+      expect(container_1).to be_an_instance_of(EasyPost::Container)
+      expect(container_2).to be_an_instance_of(EasyPost::Container)
+      expect(container_1.reference).to eq(container_2.reference)
+    end
   end
+
 end

data/spec/fedex/domestic_spec.rb

@@ -0,0 +1,180 @@
+require 'spec_helper'
+
+describe 'fedex domestic' do
+  before(:all) do
+    @rates = {}
+  end
+
+  it 'buys a commercial ground label' do
+    shipment = EasyPost::Shipment.create(
+      :to_address   => ADDRESS[:california],
+      :from_address => ADDRESS[:missouri],
+      :parcel       => PARCEL[:dimensions]
+    )
+    shipment.buy(:rate => shipment.lowest_rate("fedex", "FEDEX_GROUND"))
+    label = open(shipment.postage_label.label_url)
+
+    expect(shipment).to be_an_instance_of(EasyPost::Shipment)
+    expect(shipment.selected_rate).to be_an_instance_of(EasyPost::Rate)
+    expect(shipment.selected_rate.service).to eq("FEDEX_GROUND")
+    expect(shipment.postage_label.label_url).to end_with(".png")
+    expect(shipment.tracking_code).to start_with("8000")
+    expect(label.size).to be > 5000
+
+    @rates[:commercial] = shipment.selected_rate
+  end
+
+   it 'buys a residential ground label' do
+    shipment = EasyPost::Shipment.create(
+      :to_address   => ADDRESS[:california],
+      :from_address => ADDRESS[:missouri],
+      :parcel       => PARCEL[:dimensions],
+      :options      => {:residential_to_address => true}
+    )
+    shipment.buy(:rate => shipment.lowest_rate("fedex", "GROUND_HOME_DELIVERY"))
+    label = open(shipment.postage_label.label_url)
+
+    expect(shipment.selected_rate.service).to eq("GROUND_HOME_DELIVERY")
+    expect(shipment.tracking_code).to start_with("8000")
+    expect(label.size).to be > 5000
+
+    @rates[:residential] = shipment.selected_rate
+  end
+
+  it 'buys a ground evening delivery label' do
+    shipment = EasyPost::Shipment.create(
+      :to_address   => ADDRESS[:california],
+      :from_address => ADDRESS[:missouri],
+      :parcel       => PARCEL[:dimensions],
+      :options      => {:residential_to_address => true,
+                        :delivery_time_preference => "evening"}
+    )
+    shipment.buy(:rate => shipment.lowest_rate("fedex", "GROUND_HOME_DELIVERY"))
+
+    expect(shipment.postage_label.label_url).to end_with(".png")
+
+    @rates[:residential_evening] = shipment.selected_rate
+  end
+
+  it 'raises error without recipient phone number' do
+    shipment = EasyPost::Shipment.create(
+      :to_address   => ADDRESS[:california_no_phone],
+      :from_address => ADDRESS[:missouri],
+      :parcel       => PARCEL[:dimensions]
+    )
+
+    expect { shipment.buy(rate: shipment.lowest_rate("fedex")) }.to raise_error(EasyPost::Error, /Unable to buy FedEx shipment without recipient phone number./)
+  end
+
+  it 'buys a label for an alcoholic shipment with epl2 label' do
+    shipment = EasyPost::Shipment.create(
+      :to_address   => ADDRESS[:california],
+      :from_address => ADDRESS[:missouri],
+      :parcel       => PARCEL[:dimensions],
+      :options      => {
+        :alcohol      => 1,
+        :label_format => "epl2"
+      }
+    )
+    shipment.buy(:rate => shipment.lowest_rate("fedex", "PRIORITY_OVERNIGHT"))
+
+    expect(shipment.postage_label.label_url).to end_with(".epl2")
+  end
+
+  it 'buys a label for a ground cod shipment' do
+    shipment = EasyPost::Shipment.create(
+      :to_address   => ADDRESS[:california],
+      :from_address => ADDRESS[:missouri],
+      :parcel       => PARCEL[:dimensions]
+    )
+    shipment_cod = EasyPost::Shipment.create(
+      :to_address   => ADDRESS[:california],
+      :from_address => ADDRESS[:missouri],
+      :parcel       => PARCEL[:dimensions],
+      :options      => {cod_amount: 19.99}
+    )
+    shipment_cod.buy(rate: shipment_cod.lowest_rate("fedex", "FEDEX_GROUND"))
+
+    expect(shipment.lowest_rate("fedex", "FEDEX_GROUND").rate.to_f).to be < (shipment_cod.lowest_rate("fedex", "FEDEX_GROUND").rate.to_f)
+    expect(shipment.lowest_rate("fedex", "PRIORITY_OVERNIGHT").rate.to_f).to be < (shipment_cod.lowest_rate("fedex", "PRIORITY_OVERNIGHT").rate.to_f)
+    expect(shipment_cod.postage_label.label_url).to be
+  end
+
+  it 'buys a label for a ground multi-parcel cod shipment' do
+    order = EasyPost::Order.create(
+      to_address: ADDRESS[:california],
+      from_address: ADDRESS[:missouri],
+      shipments: [{
+        parcel: {length: 8, width: 6, height: 4, weight: 12},
+        options: {cod_amount: 14.99}
+      },{
+        parcel: {length: 8, width: 6, height: 4, weight: 12},
+        options: {cod_amount: 18.75}
+      }]
+    )
+    order.buy(carrier: "fedex", service: "FEDEX_GROUND")
+
+    expect(order).to be_an_instance_of(EasyPost::Order)
+    expect(order.shipments.first).to be_an_instance_of(EasyPost::Shipment)
+    expect(order.shipments[0].postage_label.label_url).to be
+    expect(order.shipments[1].postage_label.label_url).to be
+  end
+
+  it 'buys a label for an express cod shipment' do
+    shipment = EasyPost::Shipment.create(
+      :to_address   => ADDRESS[:california],
+      :from_address => ADDRESS[:missouri],
+      :parcel       => PARCEL[:dimensions]
+    )
+    shipment_cod = EasyPost::Shipment.create(
+      :to_address   => ADDRESS[:california],
+      :from_address => ADDRESS[:missouri],
+      :parcel       => PARCEL[:dimensions],
+      :options      => {cod_amount: 19.99}
+    )
+    shipment_cod.buy(rate: shipment_cod.lowest_rate("fedex", "PRIORITY_OVERNIGHT"))
+
+    expect(shipment.lowest_rate("fedex", "FEDEX_GROUND").rate.to_f).to be < (shipment_cod.lowest_rate("fedex", "FEDEX_GROUND").rate.to_f)
+    expect(shipment.lowest_rate("fedex", "PRIORITY_OVERNIGHT").rate.to_f).to be < (shipment_cod.lowest_rate("fedex", "PRIORITY_OVERNIGHT").rate.to_f)
+    expect(shipment_cod.postage_label.label_url).to be
+  end
+
+  it 'buys a label for an express multi-parcel cod shipment' do
+    order = EasyPost::Order.create(
+      to_address: ADDRESS[:california],
+      from_address: ADDRESS[:missouri],
+      shipments: [{
+        parcel: {length: 8, width: 6, height: 4, weight: 12},
+        options: {cod_amount: 14.99}
+      },{
+        parcel: {length: 8, width: 6, height: 4, weight: 12},
+        options: {cod_amount: 18.75}
+      }]
+    )
+    order.buy(carrier: "fedex", service: "PRIORITY_OVERNIGHT")
+
+    expect(order).to be_an_instance_of(EasyPost::Order)
+    expect(order.shipments.first).to be_an_instance_of(EasyPost::Shipment)
+    expect(order.shipments[0].postage_label.label_url).to be
+    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
+      expect(@rates[:residential].rate.to_i).to be > @rates[:commercial].rate.to_i
+    rescue
+    end
+  end
+
+end