easypost 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c4cdf8c957478f42068e095c2c3a84f6ec141c4
-  data.tar.gz: a44a1d79a8e7c2343038f95e0cc933298e03f837
+  metadata.gz: 9db550826374cb288e281d0e978fde363528ce88
+  data.tar.gz: e7d5c09d44c1c0a6d95c14ebfb82a4190fd7593a
 SHA512:
-  metadata.gz: eb9664b47721a6f14be45a0d7042875990e3454d7c21cde4be66d104dc7e9b8358be8ddf9106b1212086aa4cdc80d4a3bc1c32a9a2ca339edf2685112a322e52
-  data.tar.gz: a7956f59bd5ba39691e597486fc5fbad1aa2d90d3357cc63d5f3373177f2ba34fbb3d60f9aaa0f28b5e82d6187df2f5eec5747bb97c83cb0c3130e3b0f188565
+  metadata.gz: f40477ffd0190c181eb87b44ef6f0671ff2e83a0f63a9cf6564beb5259be875a6974e4bb3d3c9b4c00d23b4566ad700e556defedf3672be7b2e1917e303639be
+  data.tar.gz: 7879029aa4c3085e6b324c9fec65f0fbe7ff050eff1aacf60804b0eaccee4f13c8b37645544b9e5259f13dc774984b0b95482140f637642c2fe1e082a82d65ff

data/CHANGELOG

@@ -1,3 +1,10 @@
+=== 2.7.2 2018-01-31
+
+* Removed unused and unsupported code paths for Container model
+* Removed unused and unsupported code path for Stamp and Barcode methods on the Shipment model
+* Fixed a bug with non-model JSON object with an "id" key being treated as models and raising errors
+
+
 === 2.7.1 2017-05-25
 
 * Allow reports to be retrieved without passing a type

data/VERSION

@@ -1 +1 @@
-2.7.1
+2.7.2

data/lib/easypost.rb

@@ -23,7 +23,6 @@ require 'easypost/event'
 require 'easypost/batch'
 require 'easypost/tracker'
 require 'easypost/item'
-require 'easypost/container'
 require 'easypost/order'
 require 'easypost/pickup'
 require 'easypost/pickup_rate'

data/lib/easypost/shipment.rb

@@ -61,18 +61,6 @@ module EasyPost
       return self
     end
 
-    def stamp(params={})
-      response, api_key = EasyPost.request(:get, url + '/stamp', @api_key, params)
-
-      return response[:stamp_url]
-    end
-
-    def barcode(params={})
-      response, api_key = EasyPost.request(:get, url + '/barcode', @api_key, params)
-
-      return response[:barcode_url]
-    end
-
     def lowest_rate(carriers=[], services=[])
       lowest = nil
 

data/lib/easypost/util.rb

@@ -30,7 +30,6 @@ module EasyPost
         'Tracker' => Tracker,
         'Item' => Item,
         'Insurance' => Insurance,
-        'Container' => Container,
         'Order' => Order,
         'Pickup' => Pickup,
         'PickupRate' => PickupRate,
@@ -60,7 +59,6 @@ module EasyPost
         'trk' => Tracker,
         'item' => Item,
         'ins' => Insurance,
-        'container' => Container,
         'order' => Order,
         'pickup' => Pickup,
         'pickuprate' => PickupRate,
@@ -81,10 +79,18 @@ module EasyPost
       when Hash
         if cls_name = response[:object]
           cls = types[cls_name]
-        elsif response[:id] && cls_prefix = response[:id][0..response[:id].index('_')]
-          cls = prefixes[cls_prefix[0..-2]]
-        elsif response['id'] && cls_prefix = response['id'][0..response['id'].index('_')]
-          cls = prefixes[cls_prefix[0..-2]]
+        elsif response[:id]
+          if response[:id].index('_').nil?
+            cls = EasyPostObject
+          elsif cls_prefix = response[:id][0..response[:id].index('_')]
+            cls = prefixes[cls_prefix[0..-2]]
+          end
+        elsif response['id']
+          if response[:id].index('_').nil?
+            cls = EasyPostObject
+          elsif cls_prefix = response['id'][0..response['id'].index('_')]
+            cls = prefixes[cls_prefix[0..-2]]
+          end
         end
 
         cls ||= EasyPostObject

data/spec/shipment_spec.rb

@@ -13,6 +13,19 @@ describe EasyPost::Shipment do
       expect(shipment.from_address).to be_an_instance_of(EasyPost::Address)
 
     end
+
+    it 'creates a shipment object when options hash contains id' do
+
+      shipment = EasyPost::Shipment.create(
+        to_address: ADDRESS[:california],
+        from_address: EasyPost::Address.create(ADDRESS[:missouri]),
+        parcel: EasyPost::Parcel.create(PARCEL[:dimensions]),
+        options: OPTIONS[:mws]
+      )
+      expect(shipment).to be_an_instance_of(EasyPost::Shipment)
+      expect(shipment.options.fulfiller_order_items.first).to be_an_instance_of(EasyPost::EasyPostObject)
+
+    end
   end
 
   describe '#buy' do
@@ -102,44 +115,6 @@ describe EasyPost::Shipment do
     end
   end
 
-  describe '#stamp' do
-    it 'returns a stamp 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', 'UPS'], 'priority, express')
-      )
-
-      stamp_url = shipment.stamp
-
-      expect(stamp_url.length).to be > 0
-    end
-  end
-
-  describe '#barcode' do
-    it 'returns a barcode 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', ['Priority'])
-      )
-
-      barcode_url = shipment.barcode
-
-      expect(barcode_url.length).to be > 0
-    end
-  end
-
   describe '#lowest_rate' do
     context 'domestic shipment' do
       before :all do

data/spec/support/constant.rb

@@ -95,3 +95,12 @@ CUSTOMS_INFO = {
     restriction_comments: ''
   }
 }
+
+OPTIONS = {
+  mws: {
+    fulfiller_order_items: [{
+      id: '12345678901234',
+      quantity: 1
+    }]
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easypost
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Sawyer Bateman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-25 00:00:00.000000000 Z
+date: 2018-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -101,7 +101,6 @@ files:
 - lib/easypost/address.rb
 - lib/easypost/batch.rb
 - lib/easypost/carrier_account.rb
-- lib/easypost/container.rb
 - lib/easypost/customs_info.rb
 - lib/easypost/customs_item.rb
 - lib/easypost/error.rb
@@ -130,7 +129,6 @@ files:
 - spec/address_spec.rb
 - spec/batch_spec.rb
 - spec/carrier_account_spec.rb
-- spec/container_spec.rb
 - spec/insurance_spec.rb
 - spec/item_spec.rb
 - spec/order_spec.rb
@@ -170,7 +168,6 @@ test_files:
 - spec/address_spec.rb
 - spec/batch_spec.rb
 - spec/carrier_account_spec.rb
-- spec/container_spec.rb
 - spec/insurance_spec.rb
 - spec/item_spec.rb
 - spec/order_spec.rb

data/lib/easypost/container.rb

@@ -1,4 +0,0 @@
-module EasyPost
-  class Container < Resource
-  end
-end

data/spec/container_spec.rb

@@ -1,76 +0,0 @@
-require 'spec_helper'
-
-describe EasyPost::Container do
-  describe '#create' do
-    it 'creates a container object' do
-      container = EasyPost::Container.create(
-        name: "Spec Box 1",
-        length: 6.2,
-        width: 12.8,
-        height: 13.5,
-        max_weight: 40.55,
-        reference: "SPECBOX",
-      )
-      expect(container).to be_an_instance_of(EasyPost::Container)
-      expect(container.max_weight).to eq(40.55)
-    end
-
-    it 'fails to create a container object' do
-      expect { EasyPost::Container.create(
-        name: "Missing dimension",
-        length: 6,
-        width: 12,
-        max_weight: 40
-      ) }.to raise_exception(EasyPost::Error, /Invalid request, if one dimension is provided all three are required./)
-    end
-
-    it 'creates a container object with default values' do
-      container = EasyPost::Container.create(name: "Defaults Box")
-      expect(container).to be_an_instance_of(EasyPost::Container)
-      expect(container.id).to be
-      expect(container.name).to eq("Defaults Box")
-      expect(container.length).to eq(0.0)
-      expect(container.width).to eq(0.0)
-      expect(container.height).to eq(0.0)
-      expect(container.max_weight).to eq(0.0)
-      expect(container.type).to eq("BOX")
-    end
-  end
-
-  describe '#retrieve' do
-    it 'retrieves a user created container by public_id' do
-      container_1 = EasyPost::Container.create(
-        name: "My Box",
-        length: 6.2,
-        width: 12.8,
-        height: 13.5,
-        max_weight: 40.55,
-        reference: "SPECBOX",
-        type: "BAG",
-      )
-      container_2 = EasyPost::Container.retrieve(container_1.id)
-
-      expect(container_1).to be_an_instance_of(EasyPost::Container)
-      expect(container_2).to be_an_instance_of(EasyPost::Container)
-      expect(container_2.id).to eq(container_1.id)
-      expect(container_1.type).to eq("BAG")
-    end
-
-    it 'retrieves a user created container by reference' do
-      container_1 = EasyPost::Container.create(
-        name: "Spec Box 2",
-        length: 6.2,
-        width: 12.8,
-        height: 133.94,
-        max_weight: 40.55,
-        reference: "SPECBOX4",
-      )
-      container_2 = EasyPost::Container.retrieve("SPECBOX4")
-
-      expect(container_1).to be_an_instance_of(EasyPost::Container)
-      expect(container_2).to be_an_instance_of(EasyPost::Container)
-      expect(container_2.height).to eq(container_1.height)
-      expect(container_1.type).to eq("BOX")
-    end
-  end
-end