active_shipping 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 592608c29fbeaad3bfc7f21fa36ed5099d903a9a
-  data.tar.gz: 4bf3a6fb28099af32c2f18d734ae79a4e6ba4463
+  metadata.gz: a07fa58ed94231189659050981cff9cd14bebe39
+  data.tar.gz: 1578bdf8fc0512fee2909bd8b24d2ae5f120ee4a
 SHA512:
-  metadata.gz: 56aa07c21b4a2fc856e0c4fe98fa4a10a196fd7bb4b708551434f45e61e5707d62bcc11425791ec07d3d5c86e4db7c40a7b67dfeeec01f870c2e7266e986d6a8
-  data.tar.gz: bf184014cff572470b44061be4d873a614f9ba4ef3b1e908afe8885066f15cc360b78f24ba6bf00e44da1ffa8600bd938051f5a548b13833f240938606213e95
+  metadata.gz: 638e7db8b10b0ecc916c272a0bc14067edd447b2edf738013a23fdaee4c6d32eea0ffc8880b1c6c19c7360ace2b22663f5c9301fb58e5d1c6d0d5b267315e98a
+  data.tar.gz: 8f36922200fa5aa2432426bd1757dab15a7e3961ddf533b36000f5c7c168f5291718d5b814f98d89ab9acdd195e0121a485cbef7d14a87d733e25ffc68c46d32

data/lib/active_shipping/carriers/usps.rb

@@ -154,11 +154,6 @@ module ActiveShipping
       "WS" => "Western Samoa"
     }
 
-    STATUS_NODE_PATTERNS = %w(
-      Error/Description
-      */TrackInfo/Error/Description
-    )
-
     RESPONSE_ERROR_MESSAGES = [
       /There is no record of that mail item/,
       /This Information has not been included in this Test Server\./,
@@ -592,15 +587,13 @@ module ActiveShipping
     end
 
     def error_description_node(document)
-      STATUS_NODE_PATTERNS.each do |pattern|
-        if node = document.elements[pattern]
-          return node
-        end
-      end
+      document.xpath('//Error/Description')
     end
 
     def response_status_node(document)
-       track_summary_node(document) || error_description_node(document)
+       summary = track_summary_node(document)
+       return summary unless summary.empty?
+       error_description_node(document)
     end
 
     def has_error?(document)

data/lib/active_shipping/version.rb

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

data/test/unit/carriers/usps_test.rb

@@ -16,16 +16,18 @@ class USPSTest < Minitest::Test
 
   def test_tracking_failure_should_raise_exception
     @carrier.expects(:commit).returns(@tracking_response_failure)
-    assert_raises ResponseError do
+    e = assert_raises ResponseError do
       @carrier.find_tracking_info('abc123xyz', :test => true)
     end
+    assert_equal "The Postal Service could not locate the tracking information for your request. Please verify your tracking number and try again later.", e.message
   end
 
   def test_find_tracking_info_should_handle_not_found_error
     @carrier.expects(:commit).returns(xml_fixture('usps/tracking_response_test_error'))
-    assert_raises ResponseError do
+    e = assert_raises ResponseError do
       @carrier.find_tracking_info('9102901000462189604217', :test => true)
     end
+    assert_equal "This Information has not been included in this Test Server.", e.message
   end
 
   def test_find_tracking_info_should_handle_invalid_xml_error

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_shipping
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - James MacAulay
@@ -10,30 +10,8 @@ authors:
 - Jimmy Baker
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MQ8wDQYDVQQDDAZhZG1p
-  bnMxFzAVBgoJkiaJk/IsZAEZFgdzaG9waWZ5MRMwEQYKCZImiZPyLGQBGRYDY29t
-  MB4XDTE0MDUxNTIwMzM0OFoXDTE1MDUxNTIwMzM0OFowPzEPMA0GA1UEAwwGYWRt
-  aW5zMRcwFQYKCZImiZPyLGQBGRYHc2hvcGlmeTETMBEGCgmSJomT8ixkARkWA2Nv
-  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0/81O3e1vh5smcwp2G
-  MpLQ6q0kejQLa65bPYPxdzWA1SYOKyGfw+yR9LdFzsuKpwWzKq6zX35lj1IckWS4
-  bNBEQzxmufUxU0XPM02haFB8fOfDJzdXsWte9Ge4IFwahwn68gpMqN+BvxL+KMYz
-  Iut9YmN44d4LZdsENEIO5vmybuG2vYDz7R56qB0PA+Q2P2CdhymsBad2DQs69FBo
-  uico9V6VMYYctL9lCYdzu9IXrOYNTt88suKIVzzAlHOKeN0Ng5qdztFoTR8sfxDr
-  Ydg3KHl5n47wlpgd8R0f/4b5gGxW+v9pyJCgQnLlRu7DedVSvv7+GMtj3g9r3nhJ
-  KqECAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFI/o
-  maf34HXbUOQsdoLHacEKQgunMB0GA1UdEQQWMBSBEmFkbWluc0BzaG9waWZ5LmNv
-  bTAdBgNVHRIEFjAUgRJhZG1pbnNAc2hvcGlmeS5jb20wDQYJKoZIhvcNAQEFBQAD
-  ggEBADkK9aj5T0HPExsov4EoMWFnO+G7RQ28C30VAfKxnL2UxG6i4XMHVs6Xi94h
-  qXFw1ec9Y2eDUqaolT3bviOk9BB197+A8Vz/k7MC6ci2NE+yDDB7HAC8zU6LAx8Y
-  Iqvw7B/PSZ/pz4bUVFlTATif4mi1vO3lidRkdHRtM7UePSn2rUpOi0gtXBP3bLu5
-  YjHJN7wx5cugMEyroKITG5gL0Nxtu21qtOlHX4Hc4KdE2JqzCPOsS4zsZGhgwhPs
-  fl3hbtVFTqbOlwL9vy1fudXcolIE/ZTcxQ+er07ZFZdKCXayR9PPs64heamfn0fp
-  TConQSX2BnZdhIEYW+cKzEC/bLc=
-  -----END CERTIFICATE-----
-date: 2015-05-15 00:00:00.000000000 Z
+cert_chain: []
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quantified