active_shipping 1.8.5 → 1.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c7ade2aff35261434a4a9fcc35ad03cf7b9d077
-  data.tar.gz: 321fa9f5911fa55e862413fc07280b7624563708
+  metadata.gz: a5f2cfecba695cbe25301c9243cef963e973709a
+  data.tar.gz: 918729e4323f336d6a8200756ddc139e1cd4e3e7
 SHA512:
-  metadata.gz: 186c310a5a6bb1ddddd3394361f44049c8b6969d1043371ce0955f2c1e75e214f2b9a70b64bf114756679dc1e169d13dc4f8f8afbec1b2cb6741f7ed9fa55953
-  data.tar.gz: bfb64ef1fd04b168e6a34cebfd448468dcb895fe9eb025c2203317a96166e5afe44c3fc81d5d47041eae54991ac9e00888b58de7ba3dd4cce4951125c8c640d4
+  metadata.gz: aaf1f5071b74e714997db24d095b38cd04dd92e06fe75ce6dbda35ec36b0c854a82c261fdd8a14b5578d64b562bf93a25cdf5ddce02654fdb947dab1ae10cf1c
+  data.tar.gz: eff96dd47c928524bd3f6d7e15617a04a6e30d10f79c684913d5a25d1e858f53cd3be81a61af8bc5a17bd53c2b8588851d3022d5317cffd8ca9c28e832369dc8

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # ActiveShipping CHANGELOG
 
+### v1.8.6
+- Fix UPS TrackResponse with no status code
+- Stop FedEx from raising for successful responses with no statuses
+- Raise appropriate exception response for FedEx errors
+
 ### v1.8.5
 - Fix UPS TrackResponse parsing for missing elements
 

data/lib/active_shipping/carriers/fedex.rb

@@ -137,7 +137,11 @@ module ActiveShipping
     DEFAULT_LABEL_STOCK_TYPE = 'PAPER_7X4.75'
 
     # Available return formats for image data when creating labels
-    LABEL_FORMATS = ['DPL', 'EPL2', 'PDF', 'ZPLII', 'PNG'] 
+    LABEL_FORMATS = %w(DPL EPL2 PDF ZPLII PNG).freeze
+
+    TRANSIENT_TRACK_RESPONSE_CODES = %w(9035 9040 9041 9045 9050 9055 9060 9065 9070 9075 9085 9086 9090).freeze
+
+    UNRECOVERABLE_TRACK_RESPONSE_CODES = %w(9080 9081 9082 9095 9100).freeze
 
     def self.service_name_for_code(service_code)
       SERVICE_TYPES[service_code] || "FedEx #{service_code.titleize.sub(/Fedex /, '')}"
@@ -603,36 +607,31 @@ module ActiveShipping
 
 
         first_notification = tracking_details.at('Notification')
-        if first_notification.at('Severity').text == 'ERROR'
-          case first_notification.at('Code').text
-          when '9040'
+        severity = first_notification.at('Severity').text
+        if severity == 'ERROR' || severity == 'FAILURE'
+          message = first_notification.try(:text)
+          code = first_notification.at('Code').try(:text)
+          case code
+          when *TRANSIENT_TRACK_RESPONSE_CODES
             raise ActiveShipping::ShipmentNotFound, first_notification.at('Message').text
           else
             raise ActiveShipping::ResponseContentError, StandardError.new(first_notification.at('Message').text)
           end
-        elsif first_notification.at('Severity').text == 'FAILURE'
-          case first_notification.at('Code').text
-          when '9045'
-            raise ActiveShipping::ResponseContentError, StandardError.new(first_notification.at('Message').text)
-          end
         end
 
         tracking_number = tracking_details.at('TrackingNumber').text
         status_detail = tracking_details.at('StatusDetail')
-        if status_detail.nil?
-          raise ActiveShipping::Error, "Tracking response does not contain status information"
-        end
-
-        status_code = status_detail.at('Code').try(:text)
-        if status_code.nil?
-          raise ActiveShipping::Error, "Tracking response does not contain status code"
-        end
+        if status_detail.blank?
+          status_code, status, status_description, delivery_signature = nil
+        else
+          status_code = status_detail.at('Code').try(:text)
+          status_description = status_detail.at('AncillaryDetails/ReasonDescription').try(:text) || status_detail.at('Description').try(:text)
 
-        status_description = (status_detail.at('AncillaryDetails/ReasonDescription') || status_detail.at('Description')).text
-        status = TRACKING_STATUS_CODES[status_code]
+          status = TRACKING_STATUS_CODES[status_code]
 
-        if status_code == 'DL' && tracking_details.at('AvailableImages').try(:text) == 'SIGNATURE_PROOF_OF_DELIVERY'
-          delivery_signature = tracking_details.at('DeliverySignatureName').text
+          if status_code == 'DL' && tracking_details.at('AvailableImages').try(:text) == 'SIGNATURE_PROOF_OF_DELIVERY'
+            delivery_signature = tracking_details.at('DeliverySignatureName').try(:text)
+          end
         end
 
         if origin_node = tracking_details.at('OriginLocationAddress')

data/lib/active_shipping/carriers/ups.rb

@@ -816,16 +816,18 @@ module ActiveShipping
         # Build status hash
         status_nodes = first_package.css('Activity > Status > StatusType')
 
-        # Prefer a delivery node
-        status_node = status_nodes.detect { |x| x.at('Code').text == 'D' }
-        status_node ||= status_nodes.first
+        if status_nodes.present?
+          # Prefer a delivery node
+          status_node = status_nodes.detect { |x| x.at('Code').text == 'D' }
+          status_node ||= status_nodes.first
 
-        status_code = status_node.at('Code').text
-        status_description = status_node.at('Description').text
-        status = TRACKING_STATUS_CODES[status_code]
+          status_code = status_node.at('Code').try(:text)
+          status_description = status_node.at('Description').try(:text)
+          status = TRACKING_STATUS_CODES[status_code]
 
-        if status_description =~ /out.*delivery/i
-          status = :out_for_delivery
+          if status_description =~ /out.*delivery/i
+            status = :out_for_delivery
+          end
         end
 
         origin, destination = %w(Shipper ShipTo).map do |location|

data/lib/active_shipping/rate_estimate.rb

@@ -6,21 +6,21 @@ module ActiveShipping
   #   The origin of the shipment
   #   @return [ActiveShipping::Location]
   #
-  # @!attribute desination
-  #   The desination of the shipment
+  # @!attribute destination
+  #   The destination of the shipment
   #   @return [ActiveShipping::Location]
   #
   # @!attribute package_rates
-  #   A list of rates for all the packages in the shipment.
+  #   A list of rates for all the packages in the shipment
   #   @return [Array<{:rate => Integer, :package => ActiveShipping::Package}>]
   #
   # @!attribute carrier
-  #   The name of the carrier (i.e. , e.g. 'USPS', 'FedEx')
+  #   The name of the carrier (e.g. 'USPS', 'FedEx')
   #   @return [String]
   #   @see ActiveShipping::Carrier.name
   #
   # @!attribute service_name
-  #   The name of the shipping service (e.g. `"First Class Ground"`)
+  #   The name of the shipping service (e.g. 'First Class Ground')
   #   @return [String]
   #
   # @!attribute service_code
@@ -28,26 +28,26 @@ module ActiveShipping
   #   @return [String]
   #
   # @!attribute description
-  #   Public description of the shipping service (e.g. "2 days delivery")
+  #   Public description of the shipping service (e.g. '2 days delivery')
   #   @return [String]
   #
   # @!attribute shipping_date
   #   The date on which the shipment will be expected. Normally, this means that the
-  #   delivery date range can only pe prmoised if the shipment is handed over on or
+  #   delivery date range can only be promised if the shipment is handed over on or
   #   before this date.
   #   @return [Date]
   #
   # @!attribute delivery_date
-  #   The date on which the shipment will be delivered. This is usually only availablee
-  #   for express shipments; in order cases a {#delivery_range} is given instead.
+  #   The date on which the shipment will be delivered. This is usually only available
+  #   for express shipments; in other cases a {#delivery_range} is given instead.
   #   @return [Date]
   #
   # @!attribute delivery_range
-  #   The minimum and maximum date of when the shipment is expected to be delivered.
+  #   The minimum and maximum date of when the shipment is expected to be delivered
   #   @return [Array<Date>]
   #
   # @!attribute currency
-  #   ISO4217 currency code of the quoted rate estimates, e.g. `CAD`, `EUR`, or `USD`.
+  #   ISO4217 currency code of the quoted rate estimates (e.g. `CAD`, `EUR`, or `USD`)
   #   @return [String]
   #   @see http://en.wikipedia.org/wiki/ISO_4217
   #
@@ -60,11 +60,11 @@ module ActiveShipping
   #   @return [Integer]
   #
   # @!attribute phone_required
-  #   Specifies if a phone number is required for the shipping rate.
+  #   Specifies if a phone number is required for the shipping rate
   #   @return [Boolean]
   #
   # @!attribute insurance_price
-  #   The price of insurance in cents.
+  #   The price of insurance in cents
   #   @return [Integer]
   #
   # @!attribute delivery_category
@@ -184,7 +184,7 @@ module ActiveShipping
     private
 
     # Returns a Date object for a given input
-    # @param [String, Date, Time, DateTime, ...] The object to infer a date from.
+    # @param date [String, Date, Time, DateTime, ...] The object to infer a date from.
     # @return [Date, nil] The Date object absed on the input, or `nil` if no date
     #   could be determined.
     def date_for(date)

data/lib/active_shipping/rate_response.rb

@@ -2,9 +2,9 @@ module ActiveShipping
 
   # The `RateResponse` object is returned by the {ActiveShipping::Carrier#find_rates}
   # call. The most important method is {#rates}, which will return a list of possible
-  # shipping options with ane stiated price.
+  # shipping options with an estimated price.
   #
-  # @note Some carriers provide more information that others, so not all attributes
+  # @note Some carriers provide more information than others, so not all attributes
   #   will be set, depending on what carrier you are using.
   #
   # @!attribute rates

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "1.8.5"
+  VERSION = "1.8.6"
 end

data/test/fixtures/xml/fedex/tracking_response_failure_code_9080.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TrackReply xmlns="http://fedex.com/ws/track/v7" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
+  <HighestSeverity>SUCCESS</HighestSeverity>
+  <Notifications>
+    <Severity>SUCCESS</Severity>
+    <Source>trck</Source>
+    <Code>0</Code>
+    <Message>Request was successfully processed.</Message>
+    <LocalizedMessage>Request was successfully processed.</LocalizedMessage>
+  </Notifications>
+  <TransactionDetail>
+    <CustomerTransactionId>ActiveShipping</CustomerTransactionId>
+  </TransactionDetail>
+  <Version>
+    <ServiceId>trck</ServiceId>
+    <Major>7</Major>
+    <Intermediate>0</Intermediate>
+    <Minor>0</Minor>
+  </Version>
+  <CompletedTrackDetails>
+    <HighestSeverity>SUCCESS</HighestSeverity>
+    <Notifications>
+      <Severity>SUCCESS</Severity>
+      <Source>trck</Source>
+      <Code>0</Code>
+      <Message>Request was successfully processed.</Message>
+      <LocalizedMessage>Request was successfully processed.</LocalizedMessage>
+    </Notifications>
+    <DuplicateWaybill>false</DuplicateWaybill>
+    <MoreData>false</MoreData>
+    <TrackDetails>
+      <Notification>
+        <Severity>FAILURE</Severity>
+        <Source>trck</Source>
+        <Code>9080</Code>
+        <Message>Sorry, we are unable to process your tracking request.  Please contact Customer Service at 1.800.Go.FedEx(R) 800.463.3339.</Message>
+        <LocalizedMessage>Sorry, we are unable to process your tracking request.  Please contact Customer Service at 1.800.Go.FedEx(R) 800.463.3339.</LocalizedMessage>
+      </Notification>
+      <StatusDetail>
+        <Location>
+          <Residential>false</Residential>
+        </Location>
+      </StatusDetail>
+      <PackageSequenceNumber>0</PackageSequenceNumber>
+      <PackageCount>0</PackageCount>
+      <DeliveryAttempts>0</DeliveryAttempts>
+      <TotalUniqueAddressCountInConsolidation>0</TotalUniqueAddressCountInConsolidation>
+      <RedirectToHoldEligibility>INELIGIBLE</RedirectToHoldEligibility>
+    </TrackDetails>
+  </CompletedTrackDetails>
+</TrackReply>

data/test/fixtures/xml/ups/no_status_node_success.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<TrackResponse>
+  <Response>
+    <ResponseStatusCode>1</ResponseStatusCode>
+    <ResponseStatusDescription>Success</ResponseStatusDescription>
+  </Response>
+  <Shipment>
+    <Shipper/>
+    <ShipmentWeight>
+      <UnitOfMeasurement>
+        <Code>LBS</Code>
+      </UnitOfMeasurement>
+      <Weight>0.00</Weight>
+    </ShipmentWeight>
+    <Service>
+      <Code>YW</Code>
+      <Description>UPS SUREPOST</Description>
+    </Service>
+    <ShipmentIdentificationNumber>1Z5FX0076803466397</ShipmentIdentificationNumber>
+    <DeliveryDateUnavailable>
+      <Type>Scheduled Delivery</Type>
+      <Description>Scheduled Delivery Date is not currently available, please try back later</Description>
+    </DeliveryDateUnavailable>
+    <Package>
+      <TrackingNumber>1Z5FX0076803466397</TrackingNumber>
+      <PackageWeight>
+        <UnitOfMeasurement>
+          <Code>LBS</Code>
+        </UnitOfMeasurement>
+        <Weight>0.00</Weight>
+      </PackageWeight>
+    </Package>
+  </Shipment>
+</TrackResponse>

data/test/unit/carriers/fedex_test.rb

@@ -327,11 +327,11 @@ class FedExTest < Minitest::Test
     end
   end
 
-  def test_response_failure_code_9045
+  def test_response_transient_failure
     mock_response = xml_fixture('fedex/tracking_response_failure_code_9045')
     @carrier.expects(:commit).returns(mock_response)
 
-    error = assert_raises(ActiveShipping::ResponseContentError) do
+    error = assert_raises(ActiveShipping::ShipmentNotFound) do
       @carrier.find_tracking_info('123456789013')
     end
 
@@ -339,6 +339,18 @@ class FedExTest < Minitest::Test
     assert_equal msg, error.message
   end
 
+  def test_response_terminal_failure
+    mock_response = xml_fixture('fedex/tracking_response_failure_code_9080')
+    @carrier.expects(:commit).returns(mock_response)
+
+    error = assert_raises(ActiveShipping::ResponseContentError) do
+      @carrier.find_tracking_info('123456789013')
+    end
+
+    msg = 'Sorry, we are unable to process your tracking request.  Please contact Customer Service at 1.800.Go.FedEx(R) 800.463.3339.'
+    assert_equal msg, error.message
+  end
+
   def test_parsing_response_without_notifications
     mock_response = xml_fixture('fedex/reply_without_notifications')
 
@@ -539,25 +551,27 @@ class FedExTest < Minitest::Test
   def test_tracking_info_with_empty_status_detail
     mock_response = xml_fixture('fedex/tracking_response_empty_status_detail')
     @carrier.expects(:commit).returns(mock_response)
+    response = @carrier.find_tracking_info('123456789012')
 
-    error = assert_raises(ActiveShipping::Error) do
-      @carrier.find_tracking_info('123456789012')
-    end
-
-    msg = 'Tracking response does not contain status information'
-    assert_equal msg, error.message
+    assert_equal '123456789012', response.tracking_number
+    assert_nil response.status_code
+    assert_nil response.status
+    assert_nil response.status_description
+    assert_nil response.delivery_signature
+    assert_empty response.shipment_events
   end
 
-  def test_tracking_info_with_invalid_status_code
-    mock_response = xml_fixture('fedex/tracking_response_invalid_status_code')
+  def test_tracking_info_with_missing_status_code
+    mock_response = xml_fixture('fedex/tracking_response_missing_status_code')
     @carrier.expects(:commit).returns(mock_response)
 
-    error = assert_raises(ActiveShipping::Error) do
-      @carrier.find_tracking_info('123456789012')
-    end
-
-    msg = 'Tracking response does not contain status code'
-    assert_equal msg, error.message
+    response = @carrier.find_tracking_info('123456789012')
+    assert_equal '123456789012', response.tracking_number
+    assert_nil response.status_code
+    assert_nil response.status
+    assert_nil response.status_description
+    assert_nil response.delivery_signature
+    assert_empty response.shipment_events
   end
 
   def test_create_shipment

data/test/unit/carriers/ups_test.rb

@@ -166,6 +166,13 @@ class UPSTest < Minitest::Test
     assert_equal Time.parse('2015-01-29 00:00:00 UTC'), response.scheduled_delivery_date
   end
 
+  def test_find_tracking_info_should_handle_no_status_node
+    @carrier.expects(:commit).returns(xml_fixture('ups/no_status_node_success'))
+    response = @carrier.find_tracking_info('1Z5FX0076803466397')
+    assert_equal 'Success', response.params.fetch("Response").fetch("ResponseStatusDescription")
+    assert_empty response.shipment_events
+  end
+
   def test_response_parsing_an_oversize_package
     mock_response = xml_fixture('ups/package_exceeds_maximum_length')
     @carrier.expects(:commit).returns(mock_response)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_shipping
 version: !ruby/object:Gem::Version
-  version: 1.8.5
+  version: 1.8.6
 platform: ruby
 authors:
 - James MacAulay
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quantified
@@ -293,9 +293,10 @@ files:
 - test/fixtures/xml/fedex/tracking_response_delivered_with_signature.xml
 - test/fixtures/xml/fedex/tracking_response_empty_status_detail.xml
 - test/fixtures/xml/fedex/tracking_response_failure_code_9045.xml
+- test/fixtures/xml/fedex/tracking_response_failure_code_9080.xml
 - test/fixtures/xml/fedex/tracking_response_in_transit.xml
-- test/fixtures/xml/fedex/tracking_response_invalid_status_code.xml
 - test/fixtures/xml/fedex/tracking_response_invalid_tracking_number.xml
+- test/fixtures/xml/fedex/tracking_response_missing_status_code.xml
 - test/fixtures/xml/fedex/tracking_response_multiple_results.xml
 - test/fixtures/xml/fedex/tracking_response_not_found.xml
 - test/fixtures/xml/fedex/tracking_response_shipment_exception.xml
@@ -333,6 +334,7 @@ files:
 - test/fixtures/xml/ups/delivery_dates_response.xml
 - test/fixtures/xml/ups/example_tracking_response.xml
 - test/fixtures/xml/ups/in_transit_shipment.xml
+- test/fixtures/xml/ups/no_status_node_success.xml
 - test/fixtures/xml/ups/out_for_delivery_shipment.xml
 - test/fixtures/xml/ups/package_exceeds_maximum_length.xml
 - test/fixtures/xml/ups/rate_single_service.xml
@@ -514,9 +516,10 @@ test_files:
 - test/fixtures/xml/fedex/tracking_response_delivered_with_signature.xml
 - test/fixtures/xml/fedex/tracking_response_empty_status_detail.xml
 - test/fixtures/xml/fedex/tracking_response_failure_code_9045.xml
+- test/fixtures/xml/fedex/tracking_response_failure_code_9080.xml
 - test/fixtures/xml/fedex/tracking_response_in_transit.xml
-- test/fixtures/xml/fedex/tracking_response_invalid_status_code.xml
 - test/fixtures/xml/fedex/tracking_response_invalid_tracking_number.xml
+- test/fixtures/xml/fedex/tracking_response_missing_status_code.xml
 - test/fixtures/xml/fedex/tracking_response_multiple_results.xml
 - test/fixtures/xml/fedex/tracking_response_not_found.xml
 - test/fixtures/xml/fedex/tracking_response_shipment_exception.xml
@@ -554,6 +557,7 @@ test_files:
 - test/fixtures/xml/ups/delivery_dates_response.xml
 - test/fixtures/xml/ups/example_tracking_response.xml
 - test/fixtures/xml/ups/in_transit_shipment.xml
+- test/fixtures/xml/ups/no_status_node_success.xml
 - test/fixtures/xml/ups/out_for_delivery_shipment.xml
 - test/fixtures/xml/ups/package_exceeds_maximum_length.xml
 - test/fixtures/xml/ups/rate_single_service.xml