active_shipping 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d7d90329e0d2d80ee6f1eb5ae1f2bdc1f16b6dc
-  data.tar.gz: ba9ce52d2f832b124ef5ccd67f4140888eac68d4
+  metadata.gz: 04f69978f627aaebea9a3ddd7cb9fea8f3bfa503
+  data.tar.gz: fc82de023d281c9f6d20f40ae0c4e7566a4a9d9a
 SHA512:
-  metadata.gz: 549c8f94cc474cd8e00050433bf1b0fddcdb41c2d6afd8a894151e607bb8f33c3f4a77c2c486d9088ed785cde069de5fab9ca012fa2691e4936b81aafb82c2f6
-  data.tar.gz: e7999cb24985d89f9de6896ae7534619c6f354c72ba5cd0ac85869d6ffd858255a647d1824d131ee3d327127195a685a3ac5414ceecf2d5d219effc7d108e658
+  metadata.gz: e5348f5e0ab81dd551e0b899fc8f62302013be5b0873e84de37cdb6e813c403d0e8526d0e0f58e38c3c419899caf7df7caa1f7eff29b893a6917681af07d5990
+  data.tar.gz: 922f4675449eb2bf37ee8b7917589b679b09146d4174fb48661ba9e5fe64285ddf205475a8018490f67acc18563d73eb080d2b4e80f1f8e14bbf21cb8be6142b

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # ActiveShipping CHANGELOG
 
+### v1.2.2
+
+- Fix "RECTANGULAR" errors with small USPS US->US package rate requests
+- Fix error tracking USPS packages to other countries
+- Fix USPS rate requests to destinations with only a country.
+
 ### v1.2.1
 
 - Fix compatibility with latest USPS WEBTOOLS international rate schema changes.

data/lib/active_shipping/carriers/usps.rb

@@ -246,7 +246,9 @@ module ActiveShipping
 
       country_node = node.at('EventCountry')
       country = country_node ? country_node.text : ''
-      country = 'USA' if country.empty?
+      country = 'UNITED STATES' if country.empty?
+      # USPS returns upcased country names which ActiveUtils doesn't recognize without translation
+      country = find_country_code_case_insensitive(country)
 
       time = Time.parse(timestamp)
       zoneless_time = Time.utc(time.year, time.month, time.mday, time.hour, time.min, time.sec)
@@ -343,8 +345,11 @@ module ActiveShipping
               xml.ZipDestination(strip_zip(destination_zip))
               xml.Pounds(0)
               xml.Ounces("%0.1f" % [package.ounces, 1].max)
-              xml.Container(CONTAINERS[package.options[:container]] || (package.cylinder? ? 'NONRECTANGULAR' : 'RECTANGULAR'))
-              xml.Size(USPS.size_code_for(package))
+              size_code = USPS.size_code_for(package)
+              container = CONTAINERS[package.options[:container]]
+              container ||= (package.cylinder? ? 'NONRECTANGULAR' : 'RECTANGULAR') if size_code == 'LARGE'
+              xml.Container(container)
+              xml.Size(size_code)
               xml.Width("%0.2f" % package.inches(:width))
               xml.Length("%0.2f" % package.inches(:length))
               xml.Height("%0.2f" % package.inches(:height))
@@ -404,8 +409,10 @@ module ActiveShipping
                 xml.public_send(COMMERCIAL_FLAG_NAME.fetch(commercial_type), 'Y')
               end
               xml.OriginZip(origin.zip)
-              xml.AcceptanceDateTime((options[:acceptance_time] || Time.now.utc).iso8601)
-              xml.DestinationPostalCode(destination.zip)
+              if destination.zip.present?
+                xml.AcceptanceDateTime((options[:acceptance_time] || Time.now.utc).iso8601)
+                xml.DestinationPostalCode(destination.zip)
+              end
             end
           end
         end
@@ -420,7 +427,7 @@ module ActiveShipping
 
       xml = Nokogiri.XML(response)
 
-      if error = xml.at('/Error')
+      if error = xml.at_xpath('/Error | //ServiceErrors/ServiceError')
         success = false
         message = error.at('Description').text
       else
@@ -642,6 +649,13 @@ module ActiveShipping
       response_status_node(document).text
     end
 
+    def find_country_code_case_insensitive(name)
+      upcase_name = name.upcase
+      country = ActiveUtils::Country::COUNTRIES.detect { |c| c[:name].upcase == upcase_name }
+      raise ActiveShipping::Error, "No country found for #{name}" unless country
+      country[:alpha2]
+    end
+
     def commit(action, request, test = false)
       ssl_get(request_url(action, request, test))
     end

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/test/fixtures/xml/usps/api_error_rate_response.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<IntlRateV2Response>
+  <Package ID="0">
+    <!-- Other successful Services, Prohibitions, etc were here -->
+    <Service ID="15">
+      <Pounds>0</Pounds>
+      <Ounces>9</Ounces>
+      <MailType>Package</MailType>
+      <Container>RECTANGULAR</Container>
+      <Size>REGULAR</Size>
+      <Width>5.51</Width>
+      <Length>7.48</Length>
+      <Height>0.79</Height>
+      <Girth>12.60</Girth>
+      <Country>CANADA</Country>
+      <Postage>10.30</Postage>
+      <ExtraServices/>
+      <ValueOfContents>0.00</ValueOfContents>
+      <InsComment>SERVICE</InsComment>
+      <SvcCommitments>Varies by destination</SvcCommitments>
+      <SvcDescription>First-Class Package International Service&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;</SvcDescription>
+      <MaxDimensions>Other than rolls: Max. length 24", max length, height and depth (thickness) combined 36"&lt;br&gt;Rolls: Max. length 36". Max length and twice the diameter combined 42"</MaxDimensions>
+      <MaxWeight>4</MaxWeight>
+    </Service>
+    <Service ID="2">
+      <Pounds>0</Pounds>
+      <Ounces>9</Ounces>
+      <MailType>Package</MailType>
+      <Container>RECTANGULAR</Container>
+      <Size>REGULAR</Size>
+      <Width>5.51</Width>
+      <Length>7.48</Length>
+      <Height>0.79</Height>
+      <Girth>12.60</Girth>
+      <Country>CANADA</Country>
+      <Postage>0.00</Postage>
+      <ExtraServices>
+        <ExtraService>
+          <ServiceID/>
+          <ServiceName/>
+          <Available>False</Available>
+          <Price/>
+        </ExtraService>
+      </ExtraServices>
+      <ServiceErrors>
+        <ServiceError>
+          <Id>50050</Id>
+          <Description>This is a test response with the format of a real error.</Description>
+        </ServiceError>
+      </ServiceErrors>
+    </Service>
+  </Package>
+</IntlRateV2Response>

data/test/fixtures/xml/usps/tracking_response_alt.xml

@@ -31,7 +31,7 @@
       <Event>Out for Delivery, in truck</Event>
       <EventState>ON</EventState>
       <EventZIPCode>61536</EventZIPCode>
-      <EventCountry>Canada</EventCountry>
+      <EventCountry>CANADA</EventCountry>
       <FirmName/>
       <Name/>
       <AuthorizedAgent>false</AuthorizedAgent>

data/test/fixtures/xml/usps/us_rate_request.xml

@@ -7,7 +7,7 @@
     <ZipDestination>10017</ZipDestination>
     <Pounds>0</Pounds>
     <Ounces>8.8</Ounces>
-    <Container>RECTANGULAR</Container>
+    <Container/>
     <Size>REGULAR</Size>
     <Width>5.51</Width>
     <Length>7.48</Length>

data/test/fixtures/xml/usps/us_rate_request_large.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<RateV4Request USERID="login">
+  <Package ID="0">
+    <Service>ALL</Service>
+    <FirstClassMailType/>
+    <ZipOrigination>90210</ZipOrigination>
+    <ZipDestination>10017</ZipDestination>
+    <Pounds>0</Pounds>
+    <Ounces>800.0</Ounces>
+    <Container>RECTANGULAR</Container>
+    <Size>LARGE</Size>
+    <Width>24.00</Width>
+    <Length>36.00</Length>
+    <Height>24.00</Height>
+    <Girth>96.00</Girth>
+    <Machinable>FALSE</Machinable>
+  </Package>
+</RateV4Request>

data/test/fixtures/xml/usps/world_rate_request_only_country.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<IntlRateV2Request USERID="login">
+  <Revision>2</Revision>
+  <Package ID="0">
+    <Pounds>0</Pounds>
+    <Ounces>120</Ounces>
+    <MailType>Package</MailType>
+    <GXG>
+      <POBoxFlag>N</POBoxFlag>
+      <GiftFlag>N</GiftFlag>
+    </GXG>
+    <ValueOfContents>269.99</ValueOfContents>
+    <Country>Czech Republic</Country>
+    <Container>RECTANGULAR</Container>
+    <Size>LARGE</Size>
+    <Width>10.00</Width>
+    <Length>15.00</Length>
+    <Height>4.50</Height>
+    <Girth>29.00</Girth>
+    <OriginZip>90210</OriginZip>
+  </Package>
+</IntlRateV2Request>

data/test/remote/usps_test.rb

@@ -12,10 +12,11 @@ class RemoteUSPSTest < Minitest::Test
   end
 
   def test_tracking
-    skip '<#<ActiveShipping::ResponseError: There is no record of that mail item. If it was mailed recently, it may not yet be tracked. Please try again later.>>.'
-
-    @carrier.find_tracking_info('EJ958083578US', :test => true)
+    response = @carrier.find_tracking_info('LN284529912US', :test => true)
     assert response.success?, response.message
+    assert_equal 9,response.shipment_events.size
+    assert_equal 'DELIVERED', response.shipment_events.last.message
+    assert_equal Time.parse('2015-06-01 13:36:00 UTC'), response.actual_delivery_date
   end
 
   def test_tracking_with_bad_number

data/test/unit/carriers/usps_test.rb

@@ -214,6 +214,7 @@ class USPSTest < Minitest::Test
 
   def test_build_us_rate_request_uses_proper_container
     expected_request = xml_fixture('usps/us_rate_request')
+    expected_request.gsub!('<Container/>','<Container>RECTANGULAR</Container>')
     @carrier.expects(:commit).with(:us_rates, expected_request, false).returns(expected_request)
     @carrier.expects(:parse_rate_response)
     package = package_fixtures[:book]
@@ -221,7 +222,7 @@ class USPSTest < Minitest::Test
     @carrier.find_rates(location_fixtures[:beverly_hills], location_fixtures[:new_york], package, :test => true, :container => :rectangular)
   end
 
-  def test_build_us_rate_request_uses_proper_container_when_none_is_specified
+  def test_build_us_rate_request_uses_no_container_on_small_packages
     expected_request = xml_fixture('usps/us_rate_request')
     @carrier.expects(:commit).with(:us_rates, expected_request, false).returns(expected_request)
     @carrier.expects(:parse_rate_response)
@@ -229,6 +230,14 @@ class USPSTest < Minitest::Test
     @carrier.find_rates(location_fixtures[:beverly_hills], location_fixtures[:new_york], package, :test => true)
   end
 
+  def test_build_us_rate_request_uses_proper_container_when_none_is_specified
+    expected_request = xml_fixture('usps/us_rate_request_large')
+    @carrier.expects(:commit).with(:us_rates, expected_request, false).returns(expected_request)
+    @carrier.expects(:parse_rate_response)
+    package = package_fixtures[:big_half_pound]
+    @carrier.find_rates(location_fixtures[:beverly_hills], location_fixtures[:new_york], package, :test => true)
+  end
+
   def test_build_world_rate_request
     expected_request = xml_fixture('usps/world_rate_request_without_value')
     @carrier.expects(:commit).with(:world_rates, expected_request, false).returns(expected_request)
@@ -243,6 +252,13 @@ class USPSTest < Minitest::Test
     @carrier.find_rates(location_fixtures[:beverly_hills], location_fixtures[:ottawa], package_fixtures[:american_wii], :test => true, :acceptance_time => Time.parse("2015-06-01T20:34:29Z"))
   end
 
+  def test_build_world_rate_request_only_country
+    expected_request = xml_fixture('usps/world_rate_request_only_country')
+    @carrier.expects(:commit).with(:world_rates, expected_request, false).returns(expected_request)
+    @carrier.expects(:parse_rate_response)
+    @carrier.find_rates(location_fixtures[:beverly_hills], Location.new(:country => 'CZ'), package_fixtures[:american_wii], :test => true)
+  end
+
   def test_initialize_options_requirements
     assert_raises(ArgumentError) { USPS.new }
     assert USPS.new(:login => 'blah')
@@ -281,6 +297,21 @@ class USPSTest < Minitest::Test
     assert_equal ordered_service_names, response.rates.map(&:service_name).sort
   end
 
+  def test_parse_international_rate_response_errors
+    fixture_xml = xml_fixture('usps/api_error_rate_response')
+    @carrier.expects(:commit).returns(fixture_xml)
+
+    error = assert_raises(ResponseError) do
+      @carrier.find_rates(
+        location_fixtures[:beverly_hills], # imperial (U.S. origin)
+        location_fixtures[:ottawa],
+        package_fixtures[:american_wii],
+        :test => true
+      )
+    end
+    assert_equal 'This is a test response with the format of a real error.', error.message
+  end
+
   def test_parse_max_dimension_sentences
     limits = {
       "Max. length 46\", width 35\", height 46\" and max. length plus girth 108\"" =>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_shipping
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - James MacAulay
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quantified
@@ -312,6 +312,7 @@ files:
 - 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/api_error_rate_response.xml
 - test/fixtures/xml/usps/beverly_hills_to_new_york_book_commercial_base_rate_response.xml
 - test/fixtures/xml/usps/beverly_hills_to_new_york_book_commercial_plus_rate_response.xml
 - test/fixtures/xml/usps/beverly_hills_to_new_york_book_rate_response.xml
@@ -331,6 +332,8 @@ files:
 - test/fixtures/xml/usps/tracking_response_not_available.xml
 - test/fixtures/xml/usps/tracking_response_test_error.xml
 - test/fixtures/xml/usps/us_rate_request.xml
+- test/fixtures/xml/usps/us_rate_request_large.xml
+- test/fixtures/xml/usps/world_rate_request_only_country.xml
 - test/fixtures/xml/usps/world_rate_request_with_value.xml
 - test/fixtures/xml/usps/world_rate_request_without_value.xml
 - test/remote/canada_post_pws_platform_test.rb
@@ -502,6 +505,7 @@ test_files:
 - 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/api_error_rate_response.xml
 - test/fixtures/xml/usps/beverly_hills_to_new_york_book_commercial_base_rate_response.xml
 - test/fixtures/xml/usps/beverly_hills_to_new_york_book_commercial_plus_rate_response.xml
 - test/fixtures/xml/usps/beverly_hills_to_new_york_book_rate_response.xml
@@ -521,6 +525,8 @@ test_files:
 - test/fixtures/xml/usps/tracking_response_not_available.xml
 - test/fixtures/xml/usps/tracking_response_test_error.xml
 - test/fixtures/xml/usps/us_rate_request.xml
+- test/fixtures/xml/usps/us_rate_request_large.xml
+- test/fixtures/xml/usps/world_rate_request_only_country.xml
 - test/fixtures/xml/usps/world_rate_request_with_value.xml
 - test/fixtures/xml/usps/world_rate_request_without_value.xml
 - test/remote/canada_post_pws_platform_test.rb