active_shipping 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a07fa58ed94231189659050981cff9cd14bebe39
-  data.tar.gz: 1578bdf8fc0512fee2909bd8b24d2ae5f120ee4a
+  metadata.gz: 5868e8cfd35acb6845aa850d2a8e12999cc0a71b
+  data.tar.gz: 998bba416cc03877b6da20f141fff0272b5f9543
 SHA512:
-  metadata.gz: 638e7db8b10b0ecc916c272a0bc14067edd447b2edf738013a23fdaee4c6d32eea0ffc8880b1c6c19c7360ace2b22663f5c9301fb58e5d1c6d0d5b267315e98a
-  data.tar.gz: 8f36922200fa5aa2432426bd1757dab15a7e3961ddf533b36000f5c7c168f5291718d5b814f98d89ab9acdd195e0121a485cbef7d14a87d733e25ffc68c46d32
+  metadata.gz: 8ecbdea4269a2eeb54d54e45219dbbddd4518fcc65a88cee70575d0c8c40814ec1dbd99986bc715e6bb10e66ab16d3da3ee534e209b4a94ea0557053f5eeb372
+  data.tar.gz: 4b27e759684cea1e91286dfc062cc5ab167ae9696053b0b252e8c4b0804d7aee04c5ba2f1bf7cbf6bd3a8bc7d63ddc9e37c4317c58c70e9cfb1f84ffaa0f53ee

data/lib/active_shipping/carriers/fedex.rb

@@ -539,23 +539,19 @@ module ActiveShipping
 
     def extract_address(document, possible_node_names)
       node = nil
+      args = {}
       possible_node_names.each do |name|
         node = document.at(name)
         break if node
       end
 
-      args = if node && node.at('CountryCode')
-        {
-          :country => node.at('CountryCode').text,
-          :province => node.at('StateOrProvinceCode').text,
-          :city => node.at('City').text
-        }
-      else
-        {
-          :country => ActiveUtils::Country.new(:alpha2 => 'ZZ', :name => 'Unknown or Invalid Territory', :alpha3 => 'ZZZ', :numeric => '999'),
-          :province => 'unknown',
-          :city => 'unknown'
-        }
+      if node
+        args[:country] =
+          node.at('CountryCode').try(:text) ||
+          ActiveUtils::Country.new(:alpha2 => 'ZZ', :name => 'Unknown or Invalid Territory', :alpha3 => 'ZZZ', :numeric => '999')
+
+        args[:province] = node.at('StateOrProvinceCode').try(:text) || 'unknown'
+        args[:city] = node.at('City').try(:text) || 'unknown'
       end
 
       Location.new(args)

data/lib/active_shipping/carriers/ups.rb

@@ -65,6 +65,7 @@ module ActiveShipping
       "84" => "UPS Today Intercity",
       "85" => "UPS Today Express",
       "86" => "UPS Today Express Saver"
+
     }
 
     CANADA_ORIGIN_SERVICES = {
@@ -133,6 +134,15 @@ module ActiveShipping
       parse_rate_response(origin, destination, packages, response, options)
     end
 
+    # Retrieves tracking information for a previous shipment
+    #
+    # @note Override with whatever you need to get a shipping label
+    #
+    # @param tracking_number [String] The unique identifier of the shipment to track.
+    # @param options [Hash] Carrier-specific parameters.
+    # @option options [Boolean] :mail_innovations Set this to true to track a Mail Innovations Package
+    # @return [ActiveShipping::TrackingResponse] The response from the carrier. This
+    #   response should a list of shipment tracking events if successful.
     def find_tracking_info(tracking_number, options = {})
       options = @options.update(options)
       access_request = build_access_request
@@ -514,11 +524,13 @@ module ActiveShipping
     def build_tracking_request(tracking_number, options = {})
       xml_builder = Nokogiri::XML::Builder.new do |xml|
         xml.TrackRequest do
+          xml.TrackingOption(options[:tracking_option]) if options[:tracking_option]
           xml.Request do
             xml.RequestAction('Track')
             xml.RequestOption('1')
           end
           xml.TrackingNumber(tracking_number.to_s)
+          xml.TrackingOption('03') if options[:mail_innovations]
         end
       end
       xml_builder.to_xml

data/lib/active_shipping/carriers/usps.rb

@@ -256,7 +256,7 @@ module ActiveShipping
           xml.ClientIp { xml.text(@options[:client_ip] || '127.0.0.1') }
           xml.SourceId { xml.text(@options[:source_id] || 'active_shipping') }
           xml.TrackID('ID' => tracking_number) do
-            xml.DestinationZipCode { xml.text(@options[:destination_zip])} if @options[:destination_zip]
+            xml.DestinationZipCode { xml.text(strip_zip(@options[:destination_zip]))} if @options[:destination_zip]
             if @options[:mailing_date]
               formatted_date = @options[:mailing_date].strftime('%Y-%m-%d')
               xml.MailingDate { xml.text(formatted_date)} 

data/lib/active_shipping/rate_estimate.rb

@@ -58,11 +58,15 @@ module ActiveShipping
     attr_reader :origin, :destination, :package_rates,
                 :carrier, :service_name, :service_code,
                 :shipping_date, :delivery_date, :delivery_range,
-                :currency, :negotiated_rate, :insurance_price
+                :currency, :negotiated_rate, :insurance_price,
+                :estimate_reference, :expires_at, :pickup_time
 
     def initialize(origin, destination, carrier, service_name, options = {})
       @origin, @destination, @carrier, @service_name = origin, destination, carrier, service_name
       @service_code = options[:service_code]
+      @estimate_reference = options[:estimate_reference]
+      @pickup_time = options[:pickup_time]
+      @expires_at = options[:expires_at]
       if options[:package_rates]
         @package_rates = options[:package_rates].map { |p| p.update(:rate => Package.cents_from(p[:rate])) }
       else

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/test/fixtures/xml/fedex/tracking_response_with_blank_state.xml

@@ -0,0 +1,107 @@
+<?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>SUCCESS</Severity>
+            <Source>trck</Source>
+            <Code>0</Code>
+            <Message>Request was successfully processed.</Message>
+            <LocalizedMessage>Request was successfully processed.</LocalizedMessage>
+        </Notification>
+        <TrackingNumber>798701052354</TrackingNumber>
+        <TrackingNumberUniqueIdentifier>2456777000~798701052354~FX</TrackingNumberUniqueIdentifier>
+        <StatusDetail>
+            <Code>DL</Code>
+            <Description>Delivered</Description>
+            <Location>
+                <Residential>false</Residential>
+            </Location>
+        </StatusDetail>
+        <CarrierCode>FDXE</CarrierCode>
+        <OperatingCompanyOrCarrierDescription>FedEx Express</OperatingCompanyOrCarrierDescription>
+        <Service>
+            <Type>PRIORITY_OVERNIGHT</Type>
+            <Description>FedEx International Priority</Description>
+        </Service>
+        <PackageSequenceNumber>0</PackageSequenceNumber>
+        <PackageCount>0</PackageCount>
+        <SpecialHandlings>
+            <Type>DELIVER_WEEKDAY</Type>
+            <Description>Deliver Weekday</Description>
+            <PaymentType>OTHER</PaymentType>
+        </SpecialHandlings>
+        <SpecialHandlings>
+            <Type>RESIDENTIAL_DELIVERY</Type>
+            <Description>Residential Delivery</Description>
+            <PaymentType>OTHER</PaymentType>
+        </SpecialHandlings>
+        <ShipTimestamp>2014-04-30T15:27:00+00:00</ShipTimestamp>
+        <DestinationAddress>
+            <City>SAITAMA</City>
+            <CountryCode>JP</CountryCode>
+            <CountryName>Japan</CountryName>
+            <Residential>false</Residential>
+        </DestinationAddress>
+        <ActualDeliveryTimestamp>2014-05-08T19:02:00+00:00</ActualDeliveryTimestamp>
+        <ActualDeliveryAddress>
+            <City>SAITAMA</City>
+            <CountryCode>JP</CountryCode>
+            <CountryName>Japan</CountryName>
+            <Residential>false</Residential>
+        </ActualDeliveryAddress>
+        <DeliveryAttempts>0</DeliveryAttempts>
+        <DeliverySignatureName>..SAITOU</DeliverySignatureName>
+        <TotalUniqueAddressCountInConsolidation>0</TotalUniqueAddressCountInConsolidation>
+        <Signature>
+            <Notifications>
+                <Severity>ERROR</Severity>
+                <Source>trck</Source>
+                <Code>4550</Code>
+                <Message>Signature images are not available for display for shipments to this country.</Message>
+                <LocalizedMessage>Signature images are not available for display for shipments to this country.</LocalizedMessage>
+            </Notifications>
+        </Signature>
+        <RedirectToHoldEligibility>INELIGIBLE</RedirectToHoldEligibility>
+        <Events>
+            <Timestamp>2014-05-08T19:02:00+00:00</Timestamp>
+            <EventType>DL</EventType>
+            <EventDescription>Delivered</EventDescription>
+            <Address>
+                <City>SAITAMA</City>
+                <PostalCode>34800</PostalCode>
+                <CountryCode>JP</CountryCode>
+                <Residential>false</Residential>
+            </Address>
+            <ArrivalLocation>DELIVERY_LOCATION</ArrivalLocation>
+        </Events>
+    </TrackDetails>
+</CompletedTrackDetails>
+</TrackReply>

data/test/fixtures/xml/ups/access_request.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<AccessRequest>
+  <AccessLicenseNumber>key</AccessLicenseNumber>
+  <UserId>login</UserId>
+  <Password>password</Password>
+</AccessRequest>

data/test/fixtures/xml/ups/tracking_request.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<TrackRequest>
+  <TrackingOption>03</TrackingOption>
+  <Request>
+    <RequestAction>Track</RequestAction>
+    <RequestOption>1</RequestOption>
+  </Request>
+  <TrackingNumber>1Z5FX0076803466397</TrackingNumber>
+</TrackRequest>

data/test/remote/correios_test.rb

@@ -23,6 +23,8 @@ class RemoteCorreiosTest < Minitest::Test
     assert_equal 1, response.params["responses"].size
     assert_equal 2, response.rates.size
     assert_equal 1, response.raw_responses.size
+  rescue ActiveUtils::ConnectionError
+    skip("This API is unreliable and often times out.")
   end
 
   def test_poster_and_book_request
@@ -34,6 +36,8 @@ class RemoteCorreiosTest < Minitest::Test
     assert_equal 2, response.params["responses"].size
     assert_equal 2, response.rates.size
     assert_equal 2, response.raw_responses.size
+  rescue ActiveUtils::ConnectionError
+    skip("This API is unreliable and often times out.")
   end
 
   def test_book_request_with_specific_services
@@ -45,6 +49,8 @@ class RemoteCorreiosTest < Minitest::Test
     assert_equal 1, response.params["responses"].size
     assert_equal 3, response.rates.size
     assert_equal 1, response.raw_responses.size
+  rescue ActiveUtils::ConnectionError
+    skip("This API is unreliable and often times out.")
   end
 
   def test_response_prices
@@ -57,11 +63,17 @@ class RemoteCorreiosTest < Minitest::Test
     total_price = response.rates.sum(&:price)
 
     assert total_price == book_price + poster_price
+  rescue ActiveUtils::ConnectionError
+    skip("This API is unreliable and often times out.")
   end
 
   def test_invalid_zip
     error = assert_raises(ActiveShipping::ResponseError) do
-      @carrier.find_rates(@saopaulo, @invalid_city, [@book])
+      begin
+        @carrier.find_rates(@saopaulo, @invalid_city, [@book])
+      rescue ActiveUtils::ConnectionError
+        skip("This API is unreliable and often times out.")
+      end
     end
 
     assert_kind_of RateResponse, error.response
@@ -72,7 +84,11 @@ class RemoteCorreiosTest < Minitest::Test
 
   def test_valid_book_and_invalid_book
     error = assert_raises(ActiveShipping::ResponseError) do
-      @carrier.find_rates(@saopaulo, @riodejaneiro, [@book, @invalid_book])
+      begin
+        @carrier.find_rates(@saopaulo, @riodejaneiro, [@book, @invalid_book])
+      rescue ActiveUtils::ConnectionError
+        skip("This API is unreliable and often times out.")
+      end
     end
 
     assert_kind_of RateResponse, error.response

data/test/unit/carriers/fedex_test.rb

@@ -312,6 +312,21 @@ class FedExTest < Minitest::Test
     assert_equal nil, response.delivery_signature
   end
 
+  def test_state_degrades_to_unknown
+    mock_response = xml_fixture('fedex/tracking_response_with_blank_state')
+    @carrier.expects(:commit).returns(mock_response)
+
+    response = @carrier.find_tracking_info('798701052354')
+
+    destination_address = ActiveShipping::Location.new(
+      city: 'SAITAMA',
+      country: 'Japan',
+      state: 'unknown'
+    )
+
+    assert_equal destination_address.to_hash, response.destination.to_hash
+  end
+
   def test_tracking_info_for_in_transit
     mock_response = xml_fixture('fedex/tracking_response_in_transit')
     @carrier.expects(:commit).returns(mock_response)

data/test/unit/carriers/ups_test.rb

@@ -21,6 +21,12 @@ class UPSTest < Minitest::Test
     assert UPS.new(:login => 'blah', :password => 'bloo', :key => 'kee')
   end
 
+  def test_find_tracking_info_should_create_correct_xml
+    xml_request = xml_fixture('ups/access_request') + xml_fixture('ups/tracking_request')
+    @carrier.expects(:commit).with(:track, xml_request, true).returns(@tracking_response)
+    @carrier.find_tracking_info('1Z5FX0076803466397', :tracking_option => '03', :test => true)
+  end
+
   def test_find_tracking_info_should_return_a_tracking_response
     @carrier.expects(:commit).returns(@tracking_response)
     assert_equal 'ActiveShipping::TrackingResponse', @carrier.find_tracking_info('1Z5FX0076803466397').class.name

data/test/unit/carriers/usps_test.rb

@@ -14,6 +14,11 @@ class USPSTest < Minitest::Test
     @carrier.find_tracking_info('9102901000462189604217', :destination_zip => '12345', :mailing_date => Date.new(2010,1,30))
   end
 
+  def test_tracking_request_should_handle_9_digit_zip
+    @carrier.expects(:commit).with(:track, xml_fixture('usps/tracking_request'),false).returns(@tracking_response)
+    @carrier.find_tracking_info('9102901000462189604217', :destination_zip => '12345-4444', :mailing_date => Date.new(2010,1,30))
+  end
+
   def test_tracking_failure_should_raise_exception
     @carrier.expects(:commit).returns(@tracking_response_failure)
     e = assert_raises ResponseError do

data/test/unit/rate_estimate_test.rb

@@ -29,4 +29,10 @@ class RateEstimateTest < Minitest::Test
       RateEstimate.new(nil, nil, nil, nil, :currency => 'FAKE')
     end
   end
+
+  def test_estimate_reference_is_set
+    est = RateEstimate.new(@origin, @destination, @carrier, @service_name, @options.merge(estimate_reference: "somefakeref"))
+
+    assert_equal "somefakeref", est.estimate_reference
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_shipping
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - James MacAulay
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-25 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quantified
@@ -263,6 +263,7 @@ files:
 - 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
+- test/fixtures/xml/fedex/tracking_response_with_blank_state.xml
 - test/fixtures/xml/fedex/unknown_fedex_document_reply.xml
 - test/fixtures/xml/kunaki/invalid_state_response.xml
 - test/fixtures/xml/kunaki/no_valid_items_response.xml
@@ -290,6 +291,7 @@ files:
 - test/fixtures/xml/stamps/purchase_postage_response.xml
 - test/fixtures/xml/stamps/track_shipment_request.xml
 - test/fixtures/xml/stamps/track_shipment_response.xml
+- test/fixtures/xml/ups/access_request.xml
 - test/fixtures/xml/ups/delivered_shipment_with_refund.xml
 - test/fixtures/xml/ups/delivered_shipment_without_events_tracking_response.xml
 - test/fixtures/xml/ups/delivery_dates_response.xml
@@ -305,6 +307,7 @@ files:
 - test/fixtures/xml/ups/test_real_home_as_residential_destination_response.xml
 - test/fixtures/xml/ups/test_real_home_as_residential_destination_response_with_insured.xml
 - test/fixtures/xml/ups/test_real_home_as_residential_destination_with_origin_account_response.xml
+- test/fixtures/xml/ups/tracking_request.xml
 - test/fixtures/xml/ups/triple_accept_response.xml
 - test/fixtures/xml/ups/triple_confirm_response.xml
 - test/fixtures/xml/usps/beverly_hills_to_new_york_book_commercial_base_rate_response.xml
@@ -448,6 +451,7 @@ test_files:
 - 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
+- test/fixtures/xml/fedex/tracking_response_with_blank_state.xml
 - test/fixtures/xml/fedex/unknown_fedex_document_reply.xml
 - test/fixtures/xml/kunaki/invalid_state_response.xml
 - test/fixtures/xml/kunaki/no_valid_items_response.xml
@@ -475,6 +479,7 @@ test_files:
 - test/fixtures/xml/stamps/purchase_postage_response.xml
 - test/fixtures/xml/stamps/track_shipment_request.xml
 - test/fixtures/xml/stamps/track_shipment_response.xml
+- test/fixtures/xml/ups/access_request.xml
 - test/fixtures/xml/ups/delivered_shipment_with_refund.xml
 - test/fixtures/xml/ups/delivered_shipment_without_events_tracking_response.xml
 - test/fixtures/xml/ups/delivery_dates_response.xml
@@ -490,6 +495,7 @@ test_files:
 - test/fixtures/xml/ups/test_real_home_as_residential_destination_response.xml
 - test/fixtures/xml/ups/test_real_home_as_residential_destination_response_with_insured.xml
 - test/fixtures/xml/ups/test_real_home_as_residential_destination_with_origin_account_response.xml
+- test/fixtures/xml/ups/tracking_request.xml
 - test/fixtures/xml/ups/triple_accept_response.xml
 - test/fixtures/xml/ups/triple_confirm_response.xml
 - test/fixtures/xml/usps/beverly_hills_to_new_york_book_commercial_base_rate_response.xml