active_shipping 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2b3b32ee4d3b2d4cfc793fac7a4ce1c9acf9f16
-  data.tar.gz: 47b3f13704ccf330f1e53ada4ce01567f2ea0c06
+  metadata.gz: 787a6c033d0e874b93023c65650dd231b14388e3
+  data.tar.gz: eabb0d27b5948b93fc80f413002f41b3c9650809
 SHA512:
-  metadata.gz: fad1a5e48bb0aac07af0553f33d99a4a39ed01f7facf948404454af8b3a86649d0f5ae2077415780935b8631f6ffd58dcd353196e2eb2bceb12f04216a0d5e53
-  data.tar.gz: b8ea54fe809c44fbadb0802eeed34f73d729b8b1597f5e039e1a48ef417860c41b5ba730adcc8dc833753d3482c2e8d44344cddb1de86c83ce35f9b44d30f952
+  metadata.gz: 9b6b88bfd80ceca470c6b6246045aafe48c68778e74fe3d4993c285f0abb11d18e083b68639011cc0676d33939fc52afb4c3f9e64d0d4d8c6efab55f9ca0ba65
+  data.tar.gz: dc4afa712eb251fb20f251743f0b6c64c805e97c643c1735dd8142241994d35e554aec863edab5f2cd1db45ad93f5cb709e63287b4194033a13e0bbe9faf74a4

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # ActiveShipping CHANGELOG
 
+### v1.4.3
+
+- Fix UPS SurePost for < 1 pound packages
+- Use status type code in UPS tracking
+- Fix USPS and Fedex remote tests
+
 ### v1.4.2
 
 - Fix USPS rates for commercial shipments

data/lib/active_shipping/carriers/ups.rb

@@ -650,11 +650,19 @@ module ActiveShipping
         end
 
         xml.PackageWeight do
+          if (options[:service] || options[:service_code]) == DEFAULT_SERVICE_NAME_TO_CODE["UPS SurePost (USPS) < 1lb"]
+            # SurePost < 1lb uses OZS, not LBS
+            code = options[:imperial] ? 'OZS' : 'KGS'
+            weight = options[:imperial] ? package.oz : package.kgs
+          else
+            code = options[:imperial] ? 'LBS' : 'KGS'
+            weight = options[:imperial] ? package.lbs : package.kgs
+          end
           xml.UnitOfMeasurement do
-            xml.Code(options[:imperial] ? 'LBS' : 'KGS')
+            xml.Code(code)
           end
 
-          value = ((options[:imperial] ? package.lbs : package.kgs).to_f * 1000).round / 1000.0 # 3 decimals
+          value = ((weight).to_f * 1000).round / 1000.0 # 3 decimals
           xml.Weight([value, 0.1].max)
         end
 
@@ -764,9 +772,10 @@ module ActiveShipping
         unless activities.empty?
           shipment_events = activities.map do |activity|
             description = activity.at('Status/StatusType/Description').text
+            type_code = activity.at('Status/StatusType/Code').text
             zoneless_time = parse_ups_datetime(:time => activity.at('Time'), :date => activity.at('Date'))
             location = location_from_address_node(activity.at('ActivityLocation/Address'))
-            ShipmentEvent.new(description, zoneless_time, location)
+            ShipmentEvent.new(description, zoneless_time, location, nil, type_code)
           end
 
           shipment_events = shipment_events.sort_by(&:time)
@@ -776,7 +785,7 @@ module ActiveShipping
           # This adds an origin event to the shipment activity in such cases.
           if origin && !(shipment_events.count == 1 && status == :delivered)
             first_event = shipment_events[0]
-            origin_event = ShipmentEvent.new(first_event.name, first_event.time, origin)
+            origin_event = ShipmentEvent.new(first_event.name, first_event.time, origin, first_event.message, first_event.type_code)
 
             if within_same_area?(origin, first_event.location)
               shipment_events[0] = origin_event
@@ -795,7 +804,7 @@ module ActiveShipping
             unless destination
               destination = shipment_events[-1].location
             end
-            shipment_events[-1] = ShipmentEvent.new(shipment_events.last.name, shipment_events.last.time, destination)
+            shipment_events[-1] = ShipmentEvent.new(shipment_events.last.name, shipment_events.last.time, destination, shipment_events.last.message, shipment_events.last.type_code)
           end
         end
 

data/lib/active_shipping/carriers/usps.rb

@@ -22,11 +22,9 @@ module ActiveShipping
 
     TEST_DOMAINS = { # indexed by security; e.g. TEST_DOMAINS[USE_SSL[:rates]]
       true => 'secure.shippingapis.com',
-      false => 'testing.shippingapis.com'
+      false => 'stg-production.shippingapis.com'
     }
 
-    TEST_RESOURCE = 'ShippingAPITest.dll'
-
     API_CODES = {
       :us_rates => 'RateV4',
       :world_rates => 'IntlRateV2',
@@ -684,8 +682,7 @@ module ActiveShipping
     def request_url(action, request, test)
       scheme = USE_SSL[action] ? 'https://' : 'http://'
       host = test ? TEST_DOMAINS[USE_SSL[action]] : LIVE_DOMAIN
-      resource = test ? TEST_RESOURCE : LIVE_RESOURCE
-      "#{scheme}#{host}/#{resource}?API=#{API_CODES[action]}&XML=#{URI.encode(request)}"
+      "#{scheme}#{host}/#{LIVE_RESOURCE}?API=#{API_CODES[action]}&XML=#{URI.encode(request)}"
     end
 
     def strip_zip(zip)

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

data/test/credentials.yml

@@ -21,6 +21,13 @@ ups:
   origin_account: <%= ENV['ACTIVESHIPPING_UPS_ORIGIN_ACCOUNT'] %>
   origin_name: <%= ENV['ACTIVESHIPPING_UPS_ORIGIN_NAME'] %>
 
+ups_surepost:
+  login: <%= ENV['ACTIVESHIPPING_UPS_SUREPOST_LOGIN'] %>
+  key: <%= ENV['ACTIVESHIPPING_UPS_SUREPOST_KEY'] %>
+  password: <%= ENV['ACTIVESHIPPING_UPS_SUREPOST_PASSWORD'] %>
+  origin_account: <%= ENV['ACTIVESHIPPING_UPS_SUREPOST_ORIGIN_ACCOUNT'] %>
+  origin_name: <%= ENV['ACTIVESHIPPING_UPS_SUREPOST_ORIGIN_NAME'] %>
+
 ups_third_party_billing:
   account: <%= ENV['ACTIVESHIPPING_UPS_THIRD_PARTY_BILLING_ACCOUNT'] %>
   zip: <%= ENV['ACTIVESHIPPING_UPS_THIRD_PARTY_BILLING_POSTAL_CODE'] %>

data/test/remote/fedex_test.rb

@@ -216,28 +216,32 @@ class RemoteFedExTest < Minitest::Test
   ### find_tracking_info
 
   def test_find_tracking_info_for_delivered_shipment
-    # unfortunately, we have to use Fedex unique identifiers, because the test tracking numbers are overloaded.
-    response = @carrier.find_tracking_info('123456789012', unique_identifier: '2457178000~123456789012~FX')
+    response = @carrier.find_tracking_info('122816215025810')
     assert response.success?
     assert response.delivered?
-    assert_equal '123456789012', response.tracking_number
+    assert_equal '122816215025810', response.tracking_number
     assert_equal :delivered, response.status
     assert_equal 'DL', response.status_code
     assert_equal "Delivered", response.status_description
 
-    assert_equal Time.parse('2015-06-04 18:19:00 +0000'), response.ship_time
+    assert_equal Time.parse('Fri, 03 Jan 2014'), response.ship_time
     assert_equal nil, response.scheduled_delivery_date
-    assert_equal Time.parse('2015-06-08 23:33:00 +0000'), response.actual_delivery_date
+    assert_equal Time.parse('2014-01-09 18:31:00 +0000'), response.actual_delivery_date
 
-    assert_equal nil, response.origin
+    origin_address = ActiveShipping::Location.new(
+      city: 'SPOKANE',
+      country: 'US',
+      state: 'WA'
+    )
+    assert_equal origin_address.to_hash, response.origin.to_hash
 
     destination_address = ActiveShipping::Location.new(
-      city: 'unknown',
+      city: 'NORTON',
       country: 'US',
-      state: 'TN'
+      state: 'VA'
     )
     assert_equal destination_address.to_hash, response.destination.to_hash
-    assert_equal 1, response.shipment_events.length
+    assert_equal 11, response.shipment_events.length
   end
 
   def test_find_tracking_info_for_in_transit_shipment_1
@@ -293,7 +297,7 @@ class RemoteFedExTest < Minitest::Test
 
   def test_find_tracking_info_not_found
     assert_raises(ActiveShipping::ShipmentNotFound) do
-      @carrier.find_tracking_info('123456789013')
+      @carrier.find_tracking_info('199997777713')
     end
   end
 

data/test/remote/ups_surepost_test.rb

@@ -0,0 +1,33 @@
+require 'test_helper'
+
+class RemoteUPSSurepostTest < Minitest::Test
+  include ActiveShipping::Test::Credentials
+  include ActiveShipping::Test::Fixtures
+
+  def setup
+    @options = credentials(:ups_surepost).merge(:test => true)
+    @carrier = UPS.new(@options)
+  rescue NoCredentialsFound => e
+    skip(e.message)
+  end
+
+  def test_obtain_surpost_less_than_one_lb_shipping_label
+    response = @carrier.create_shipment(
+      location_fixtures[:beverly_hills],
+      location_fixtures[:new_york_with_name],
+      package_fixtures.values_at(:small_half_pound),
+      {
+        :test => true,
+        :service_code => "92"
+      }
+    )
+
+    assert response.success?
+
+    # All behavior specific to how a LabelResponse behaves in the
+    # context of UPS label data is a matter for unit tests.  If
+    # the data changes substantially, the create_shipment
+    # ought to raise an exception and this test will fail.
+    assert_instance_of ActiveShipping::LabelResponse, response
+  end
+end

data/test/remote/usps_test.rb

@@ -12,7 +12,7 @@ class RemoteUSPSTest < Minitest::Test
   end
 
   def test_tracking
-    response = @carrier.find_tracking_info('LN284529912US', :test => true)
+    response = @carrier.find_tracking_info('LN284529912US', test: false)
     assert response.success?, response.message
     assert_equal 9,response.shipment_events.size
     assert_equal 'DELIVERED', response.shipment_events.last.message
@@ -21,7 +21,7 @@ class RemoteUSPSTest < Minitest::Test
 
   def test_tracking_with_bad_number
     assert_raises(ResponseError) do
-      @carrier.find_tracking_info('abc123xyz')
+      @carrier.find_tracking_info('abc123xyz', test: false)
     end
   end
 

data/test/unit/carriers/ups_test.rb

@@ -128,6 +128,12 @@ class UPSTest < Minitest::Test
                   "DELIVERED"], response.shipment_events.map(&:name)
   end
 
+  def test_find_tracking_info_should_have_correct_type_codes_for_shipment_events
+    @carrier.expects(:commit).returns(@tracking_response)
+    response = @carrier.find_tracking_info('1Z5FX0076803466397')
+    assert_equal ["M", "I", "I", "I", "I", "I", "I", "D"], response.shipment_events.map(&:type_code)
+  end
+
   def test_add_origin_and_destination_data_to_shipment_events_where_appropriate
     @carrier.expects(:commit).returns(@tracking_response)
     response = @carrier.find_tracking_info('1Z5FX0076803466397')
@@ -536,4 +542,36 @@ class UPSTest < Minitest::Test
   def test_maximum_address_field_length
     assert_equal 35, @carrier.maximum_address_field_length
   end
+
+  def test_package_surepost_less_than_one_lb_service
+    xml_builder = Nokogiri::XML::Builder.new do |xml|
+      @carrier.send(:build_package_node,
+                    xml,
+                    package_fixtures[:small_half_pound],
+                    {
+                      :service => "92",
+                      :imperial => true
+                    }
+      )
+    end
+    request = Nokogiri::XML(xml_builder.to_xml)
+    assert_equal 'OZS', request.search('/Package/PackageWeight/UnitOfMeasurement/Code').text
+    assert_equal '8.0', request.search('/Package/PackageWeight/Weight').text
+  end
+
+  def test_package_surepost_less_than_one_lb_service_code
+    xml_builder = Nokogiri::XML::Builder.new do |xml|
+      @carrier.send(:build_package_node,
+                    xml,
+                    package_fixtures[:small_half_pound],
+                    {
+                      :service_code => "92",
+                      :imperial => true
+                    }
+      )
+    end
+    request = Nokogiri::XML(xml_builder.to_xml)
+    assert_equal 'OZS', request.search('/Package/PackageWeight/UnitOfMeasurement/Code').text
+    assert_equal '8.0', request.search('/Package/PackageWeight/Weight').text
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_shipping
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - James MacAulay
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quantified
@@ -371,6 +371,7 @@ files:
 - test/remote/new_zealand_post_test.rb
 - test/remote/shipwire_test.rb
 - test/remote/stamps_test.rb
+- test/remote/ups_surepost_test.rb
 - test/remote/ups_test.rb
 - test/remote/usps_returns_test.rb
 - test/remote/usps_test.rb
@@ -576,6 +577,7 @@ test_files:
 - test/remote/new_zealand_post_test.rb
 - test/remote/shipwire_test.rb
 - test/remote/stamps_test.rb
+- test/remote/ups_surepost_test.rb
 - test/remote/ups_test.rb
 - test/remote/usps_returns_test.rb
 - test/remote/usps_test.rb