easypost 2.1.0 → 2.1.1

data/spec/container_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe EasyPost::Container do
-
   describe '#create' do
     it 'creates a container object' do
       container = EasyPost::Container.create(
@@ -73,15 +72,5 @@ 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/order_spec.rb

@@ -1,11 +1,8 @@
 require 'spec_helper'
 
 describe EasyPost::Order do
-
   describe '#create' do
-
     it 'creates an order out of a single shipment' do
-
       order = EasyPost::Order.create(
         to_address: ADDRESS[:california],
         from_address: ADDRESS[:missouri],
@@ -37,84 +34,19 @@ describe EasyPost::Order do
     it 'creates and buys an international order out of two shipments' do
 
       order = EasyPost::Order.create(
-        # to_address: ADDRESS[:canada],
         to_address: ADDRESS[:california],
         from_address: ADDRESS[:missouri],
-        customs_info: CUSTOMS_INFO[:shirt],
+        customs_info: EasyPost::CustomsInfo.create(CUSTOMS_INFO[:shirt]),
         shipments: [{
           parcel: {length: 8, width: 6, height: 4, weight: 12}
         },{
           parcel: {length: 8, width: 6, height: 4, weight: 24}
         }]
       )
-      order.buy(carrier: "fedex", service: "FEDEX_GROUND")
+      order.buy(carrier: "usps", service: "ParcelSelect")
 
       expect(order).to be_an_instance_of(EasyPost::Order)
       expect(order.shipments.first).to be_an_instance_of(EasyPost::Shipment)
     end
-
-
-    # it 'creates an order object out of a single item' do
-    #   order = EasyPost::Order.create(
-    #     :to_address   => ADDRESS[:california],
-    #     :from_address => ADDRESS[:missouri],
-    #     :containers   => "*", # only uses your containers
-    #     :items        => [ITEM[:shirt]]
-    #   )
-    #   expect(order).to be_an_instance_of(EasyPost::Order)
-    #   expect(order.shiments.first).to be_an_instance_of(EasyPost::Shipment)
-    #   expect(order.shiments.first.from_address).to be_an_instance_of(EasyPost::Address)
-    #   expect(order.shiments.length).to eq(1)
-    # end
-
-    # it 'creates an order object out of multiple items' do
-    #   order = EasyPost::Order.create(
-    #     :to_address   => ADDRESS[:california],
-    #     :from_address => ADDRESS[:missouri],
-    #     :containers   => ["USPS.FLAT_RATE.*", "USPS.REGIONAL_RATE.*"],
-    #     :items        => [ITEM[:shirt], ITEM[:pants]]
-    #   )
-    #   expect(order).to be_an_instance_of(EasyPost::Order)
-    #   expect(order.shiments.first).to be_an_instance_of(EasyPost::Shipment)
-    #   expect(order.shiments.first.from_address).to be_an_instance_of(EasyPost::Address)
-    # end
-
-    # it 'creates an order object with options' do
-    #   order = EasyPost::Order.create(
-    #     :to_address   => ADDRESS[:california],
-    #     :from_address => ADDRESS[:missouri],
-    #     :containers   => [{id: "container_USPSFR01"}, "USPS.REGIONAL_RATE.*"],
-    #     :items        => [ITEM[:shirt], ITEM[:pants]],
-    #     :options      => {alcohol: true}
-    #   )
-    #   expect(order).to be_an_instance_of(EasyPost::Order)
-    #   expect(order.shiments.first).to be_an_instance_of(EasyPost::Shipment)
-    #   expect(order.shiments.first.options[:alcohol]).to be_true
-    # end
-
-    # it 'creates an order object with custom item and passed without array' do
-    #   item = EasyPost::Item.create(
-    #     name: "Test Item",
-    #     sku: "1234567890",
-    #     length: 6.0,
-    #     width: 8.0,
-    #     height: 10,
-    #     weight: 13,
-    #     value: 13.00
-    #   ))
-    #   item.value = 9.99
-
-    #   order = EasyPost::Order.create(
-    #     :to_address   => ADDRESS[:california],
-    #     :from_address => ADDRESS[:missouri],
-    #     :containers   => EasyPost::Container::ALL,
-    #     :items        => item
-    #   )
-    #   expect(order.shiments.first.item).to be_an_instance_of(EasyPost::Item)
-    #   expect(order.shiments.first.item.value).to eq(9.99)
-    #   expect(order.shiments.first.item.sku).to eq("1234567890")
-
-    # end
   end
-
 end

data/spec/pickup_spec.rb

@@ -1,15 +1,16 @@
 require 'spec_helper'
 
 describe EasyPost::Pickup do
+  before { EasyPost.api_key = "cueqNZUb3ldeWTNX7MU3Mel8UXtaAMUi" }
 
   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]
+        to_address: ADDRESS[:california],
+        from_address: ADDRESS[:missouri],
+        parcel: PARCEL[:dimensions]
       )
-      shipment.buy(:rate => shipment.lowest_rate("ups", "ground"))
+      shipment.buy(rate: shipment.lowest_rate("ups", "NextDayAirEarlyAM"))
       pickup = EasyPost::Pickup.create(
         address: ADDRESS[:missouri],
         reference: "12345678",
@@ -22,16 +23,15 @@ describe EasyPost::Pickup do
 
       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]
+        to_address: ADDRESS[:california],
+        from_address: ADDRESS[:missouri],
+        parcel: PARCEL[:dimensions]
       )
-      shipment.buy(:rate => shipment.lowest_rate("ups", "ground"))
+      shipment.buy(rate: shipment.lowest_rate("ups", "NextDayAirEarlyAM"))
       expect { pickup = EasyPost::Pickup.create(
         address: ADDRESS[:california],
         reference: "12345678",
@@ -46,11 +46,11 @@ describe EasyPost::Pickup do
   describe '#buy' do
     it 'buys a pickup rate' do
       shipment = EasyPost::Shipment.create(
-        :to_address   => ADDRESS[:california],
-        :from_address => ADDRESS[:missouri],
-        :parcel       => PARCEL[:dimensions]
+        to_address: ADDRESS[:california],
+        from_address: ADDRESS[:missouri],
+        parcel: PARCEL[:dimensions]
       )
-      shipment.buy(:rate => shipment.lowest_rate("ups", "ground"))
+      shipment.buy(rate: shipment.lowest_rate("ups", "NextDayAirEarlyAM"))
       pickup = EasyPost::Pickup.create(
         address: ADDRESS[:california],
         reference: "buy12345678",
@@ -65,5 +65,4 @@ describe EasyPost::Pickup do
       expect(pickup.confirmation).not_to be_empty
     end
   end
-
 end

data/spec/shipment_spec.rb

@@ -1,14 +1,13 @@
 require 'spec_helper'
 
 describe EasyPost::Shipment do
-
   describe '#create' do
     it 'creates a shipment object' do
 
       shipment = EasyPost::Shipment.create(
-        :to_address   => ADDRESS[:california],
-        :from_address => ADDRESS[:missouri],
-        :parcel       => PARCEL[:dimensions]
+        to_address: ADDRESS[:california],
+        from_address: EasyPost::Address.create(ADDRESS[:missouri]),
+        parcel: EasyPost::Parcel.create(PARCEL[:dimensions])
       )
       expect(shipment).to be_an_instance_of(EasyPost::Shipment)
       expect(shipment.from_address).to be_an_instance_of(EasyPost::Address)
@@ -20,20 +19,35 @@ describe EasyPost::Shipment do
     it 'purchases postage for an international shipment' do
 
       shipment = EasyPost::Shipment.create(
-        :to_address   => ADDRESS[:canada],
-        :from_address => ADDRESS[:california],
-        :parcel       => PARCEL[:dimensions],
-        :customs_info => CUSTOMS_INFO[:shirt]
+        to_address: EasyPost::Address.create(ADDRESS[:canada]),
+        from_address: ADDRESS[:california],
+        parcel: EasyPost::Parcel.create(PARCEL[:dimensions]),
+        customs_info: EasyPost::CustomsInfo.create(CUSTOMS_INFO[:shirt])
       )
       expect(shipment).to be_an_instance_of(EasyPost::Shipment)
 
       shipment.buy(
-        :rate => shipment.lowest_rate("usps")
+        rate: shipment.lowest_rate("usps")
       )
       expect(shipment.postage_label.label_url.length).to be > 0
     end
 
     it 'purchases postage for a domestic shipment' do
+      shipment = EasyPost::Shipment.create(
+        to_address: EasyPost::Address.create(ADDRESS[:missouri]),
+        from_address: ADDRESS[:california],
+        parcel: EasyPost::Parcel.create(PARCEL[:dimensions])
+      )
+      expect(shipment).to be_an_instance_of(EasyPost::Shipment)
+
+      shipment.buy(
+        rate: shipment.lowest_rate("usps")
+      )
+      expect(shipment.postage_label.label_url.length).to be > 0
+    end
+  end
+
+  it 'creates and returns a tracker with shipment purchase' do
       shipment = EasyPost::Shipment.create(
         :to_address   => ADDRESS[:missouri],
         :from_address => ADDRESS[:california],
@@ -44,21 +58,23 @@ describe EasyPost::Shipment do
       shipment.buy(
         :rate => shipment.lowest_rate("usps")
       )
-      expect(shipment.postage_label.label_url.length).to be > 0
-    end
+
+      tracker = shipment.tracker
+      expect(tracker.shipment_id).to eq(shipment.id)
+      expect(tracker.tracking_details.length).to be > 0
   end
 
   describe '#stamp' do
     it 'returns a stamp for a domestic shipment' do
       shipment = EasyPost::Shipment.create(
-        :to_address   => ADDRESS[:missouri],
-        :from_address => ADDRESS[:california],
-        :parcel       => PARCEL[:dimensions]
+        to_address: EasyPost::Address.create(ADDRESS[:missouri]),
+        from_address: ADDRESS[:california],
+        parcel: EasyPost::Parcel.create(PARCEL[:dimensions])
       )
       expect(shipment).to be_an_instance_of(EasyPost::Shipment)
 
       shipment.buy(
-        :rate => shipment.lowest_rate(['USPS', 'UPS'], 'priority, express')
+        rate: shipment.lowest_rate(['USPS', 'UPS'], 'priority, express')
       )
 
       stamp_url = shipment.stamp
@@ -70,14 +86,14 @@ describe EasyPost::Shipment do
   describe '#barcode' do
     it 'returns a barcode for a domestic shipment' do
       shipment = EasyPost::Shipment.create(
-        :to_address   => ADDRESS[:missouri],
-        :from_address => ADDRESS[:california],
-        :parcel       => PARCEL[:dimensions]
+        to_address: EasyPost::Address.create(ADDRESS[:missouri]),
+        from_address: ADDRESS[:california],
+        parcel: EasyPost::Parcel.create(PARCEL[:dimensions])
       )
       expect(shipment).to be_an_instance_of(EasyPost::Shipment)
 
       shipment.buy(
-        :rate => shipment.lowest_rate('usps', ['Priority'])
+        rate: shipment.lowest_rate('usps', ['Priority'])
       )
 
       barcode_url = shipment.barcode
@@ -90,9 +106,9 @@ describe EasyPost::Shipment do
     context 'domestic shipment' do
       before :all do
         @shipment = EasyPost::Shipment.create(
-        :to_address   => ADDRESS[:missouri],
-        :from_address => ADDRESS[:california],
-        :parcel       => PARCEL[:dimensions]
+          to_address: EasyPost::Address.create(ADDRESS[:missouri]),
+        from_address: ADDRESS[:california],
+        parcel: EasyPost::Parcel.create(PARCEL[:dimensions])
       )
       end
 
@@ -103,5 +119,4 @@ describe EasyPost::Shipment do
       end
     end
   end
-
 end

data/spec/spec_helper.rb

@@ -1,96 +1,10 @@
 require 'open-uri'
 require 'easypost'
-EasyPost.api_key = 'cueqNZUb3ldeWTNX7MU3Mel8UXtaAMUi'
-EasyPost.api_base = 'http://ep-vm-whatever:5000/v2'
 
-ADDRESS = {}
-ADDRESS[:california] = {
-  :company => 'EasyPost',
-  :street1 => '164 Townsend Street',
-  :street2 => 'Unit 1',
-  :city    => 'San Francisco',
-  :state   => 'CA',
-  :zip     => '94107',
-  :phone   => '415-123-4567'
-}
+Dir["./spec/support/**/*.rb"].each { |f| require f }
 
-ADDRESS[:california_no_phone] = {
-  :company => 'EasyPost',
-  :street1 => '164 Townsend Street',
-  :street2 => 'Unit 1',
-  :city    => 'San Francisco',
-  :state   => 'CA',
-  :zip     => '94107'
-}
-
-
-ADDRESS[:missouri] = EasyPost::Address.create(
-  :company => 'Airport Shipping',
-  :street1 => '601 Brasilia Avenue',
-  :city    => 'Kansas City',
-  :state   => 'MO',
-  :zip     => '64153',
-  :phone   => '314-924-0383',
-  :email   => 'kansas_shipping@example.com'
-)
-
-ADDRESS[:canada] = EasyPost::Address.create(
-  :name    => 'Sawyer Bateman',
-  :street1 => '58 Larkspur Cres.',
-  :city    => 'St. Albert',
-  :state   => 'AB',
-  :zip     => 'T8N2M4',
-  :country => 'CA',
-  :phone   => '780-123-4567'
-)
-
-ADDRESS[:canada_no_phone] = {
-  :name    => 'Sawyer Bateman',
-  :street1 => '58 Larkspur Cres.',
-  :city    => 'St. Albert',
-  :state   => 'AB',
-  :zip     => 't8n2m4',
-  :country => 'CA',
-  :phone   => '780-273-8374'
-}
-
-PARCEL = {}
-PARCEL[:dimensions] = EasyPost::Parcel.create(
-  :width  => 12,
-  :length => 16.5,
-  :height => 9.5,
-  :weight => 40.1
-)
-
-PARCEL[:dimensions_light] = EasyPost::Parcel.create(
-  :width  => 15.2,
-  :length => 18,
-  :height => 9.5,
-  :weight => 3
-)
-
-PARCEL[:predefined_medium_flat_rate_box] = EasyPost::Parcel.create(
-  :predefined_package => 'MediumFlatRateBox',
-  :weight => 17
-)
-
-CUSTOMS_INFO = {}
-CUSTOMS_INFO[:shirt] = EasyPost::CustomsInfo.create(
-  :integrated_form_type => 'form_2976',
-  :customs_certify => true,
-  :customs_signer => 'Dr. Pepper',
-  :contents_type => 'gift',
-  :contents_explanation => '', # only required when contents_type => 'other'
-  :eel_pfc => 'NOEEI 30.37(a)',
-  :non_delivery_option => 'abandon',
-  :restriction_type => 'none',
-  :restriction_comments => '',
-  :customs_items => [{
-    :description => 'EasyPost T-shirts',
-    :quantity => 2,
-    :value => 23.56,
-    :weight => 20,
-    :origin_country => 'us',
-    :hs_tariff_number => 123456
-  }]
-)
+RSpec.configure do |config|
+  config.before(:each) do
+    EasyPost.api_key = 'cueqNZUb3ldeWTNX7MU3Mel8UXtaAMUi'
+  end
+end

data/spec/support/constant.rb

@@ -0,0 +1,87 @@
+ADDRESS = {
+  california: {
+    company: 'EasyPost',
+    street1: '164 Townsend Street',
+    street2: 'Unit 1',
+    city: 'San Francisco',
+    state: 'CA',
+    zip: '94107',
+    phone: '415-123-4567'
+  },
+  california_no_phone: {
+    company: 'EasyPost',
+    street1: '164 Townsend Street',
+    street2: 'Unit 1',
+    city: 'San Francisco',
+    state: 'CA',
+    zip: '94107'
+  },
+  missouri: {
+    company: 'Airport Shipping',
+    street1: '601 Brasilia Avenue',
+    city: 'Kansas City',
+    state: 'MO',
+    zip: '64153',
+    phone: '314-924-0383',
+    email: 'kansas_shipping@example.com'
+  },
+  canada: {
+    name: 'Sawyer Bateman',
+    street1: '58 Larkspur Cres.',
+    city: 'St. Albert',
+    state: 'AB',
+    zip: 'T8N2M4',
+    country: 'CA',
+    phone: '780-123-4567'
+  },
+  canada_no_phone: {
+    name: 'Sawyer Bateman',
+    street1: '58 Larkspur Cres.',
+    city: 'St. Albert',
+    state: 'AB',
+    zip: 't8n2m4',
+    country: 'CA',
+    phone: '780-273-8374'
+  }
+}
+
+PARCEL = {
+  dimensions: {
+    width: 12,
+    length: 16.5,
+    height: 9.5,
+    weight: 40.1
+  },
+  dimensions_light: {
+    width: 15.2,
+    length: 18,
+    height: 9.5,
+    weight: 3
+  },
+  predefined_medium_flat_rate_box: {
+    predefined_package: 'MediumFlatRateBox',
+    weight: 17
+  }
+}
+
+CUSTOMS_INFO = {
+  shirt: {
+    integrated_form_type: 'form_2976',
+    customs_certify: true,
+    customs_signer: 'Dr. Pepper',
+    contents_type: 'gift',
+    contents_explanation: '', # only required when contents_type: 'other'
+    eel_pfc: 'NOEEI 30.37(a)',
+    non_delivery_option: 'abandon',
+    restriction_type: 'none',
+    restriction_comments: '',
+    customs_items: [{
+      description: 'EasyPost T-shirts',
+      quantity: 2,
+      value: 23.56,
+      weight: 20,
+      origin_country: 'us',
+      hs_tariff_number: 123456
+    }]
+  }
+}