active_shipping 1.12.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0c2626c0d7b81afecb26e4f8ca1ff08c260565c
-  data.tar.gz: 3f1884f2a1aeb865d4ea8d1624567e173e9ee135
+  metadata.gz: 0f4f1610144f6b41f51175256c47cc12601216ef
+  data.tar.gz: ce74fa151c3ae1483368330c88970a0631d82cf3
 SHA512:
-  metadata.gz: 608079bfbaa0a14a8f58317e526bd902c878724b3cfaad4bd8fdc5fba712f5b6467c7ea1fce8896cd4d4e7b043fb7717a8d429ee41a439dbc2249dc589418746
-  data.tar.gz: 85f2435abf36e3b75d473ffd880bbcc545356cc7e1c1e1f9f8ff50fb7b71a99822d00d8237810999d6b088f7fe7dba6e4b73a31ba37ff26a55808e2c0f5ac0c1
+  metadata.gz: f11e65c4c3fc7efc64ca6d3715f8ec83ae978c44c617b39855c7f5ba3793ba24ba1fd8ba5631d44ead849e289b18bbeceb47694f82d3c1a19ca0353f28276180
+  data.tar.gz: f8f765528c38f1a08e8e72d59bb562452148dc471b2904ebd08798e8bb3e8812378610155e6b09bc52a3daa37c4c219ee25cdb64fb4d9b154de3c0d7bfe74514

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # ActiveShipping CHANGELOG
 
+### v1.12.1
+- Explicitly set ssl_version for USPS
+- Strip 9 digit origin zip code for USPS world rate requests
+
 ### v1.12.0
 - Update active_utils dependency to v3.3.0
 

data/lib/active_shipping/carriers/usps.rb

@@ -13,6 +13,7 @@ module ActiveShipping
     EventDetails = Struct.new(:description, :time, :zoneless_time, :location, :event_code)
     ONLY_PREFIX_EVENTS = ['DELIVERED','OUT FOR DELIVERY']
     self.retry_safe = true
+    self.ssl_version = :TLSv1_2
 
     cattr_reader :name
     @@name = "USPS"
@@ -421,7 +422,7 @@ module ActiveShipping
               xml.Length("%0.2f" % [package.inches(:length), 0.01].max)
               xml.Height("%0.2f" % [package.inches(:height), 0.01].max)
               xml.Girth("%0.2f" % [package.inches(:girth), 0.01].max)
-              xml.OriginZip(origin.zip)
+              xml.OriginZip(strip_zip(origin.zip))
               if commercial_type = commercial_type(options)
                 xml.public_send(COMMERCIAL_FLAG_NAME.fetch(commercial_type), 'Y')
               end

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "1.12.0"
+  VERSION = "1.12.1"
 end

data/test/test_helper.rb

@@ -134,6 +134,15 @@ module ActiveShipping::Test
                                       :zip => '90210',
                                       :phone => '1-310-285-1013',
                                       :fax => '1-310-275-8159'),
+        :beverly_hills_9_zip => Location.new(
+                                      :country => 'US',
+                                      :state => 'CA',
+                                      :city => 'Beverly Hills',
+                                      :address1 => '455 N. Rexford Dr.',
+                                      :address2 => '3rd Floor',
+                                      :zip => '90210-1234',
+                                      :phone => '1-310-285-1013',
+                                      :fax => '1-310-275-8159'),
         :real_home_as_commercial => Location.new(
                                       :country => 'US',
                                       :city => 'Tampa',

data/test/unit/carriers/usps_test.rb

@@ -15,6 +15,11 @@ class USPSTest < Minitest::Test
     ]
   end
 
+  def test_using_tls_and_not_ssl_v3
+    refute_equal :SSLv3, @carrier.ssl_version, 'SSLv3 is no longer supported by USPS Web Tools'
+    assert_equal :TLSv1_2, @carrier.ssl_version
+  end
+
   def test_tracking_request_should_create_correct_xml
     @carrier.expects(:commit).with(:track, xml_fixture('usps/tracking_request'),false).returns(@tracking_response)
     @carrier.find_tracking_info('9102901000462189604217', :destination_zip => '12345', :mailing_date => Date.new(2010,1,30))
@@ -386,6 +391,13 @@ class USPSTest < Minitest::Test
     assert request =~ /\>12345\</
   end
 
+  def test_strip_9_digit_zip_codes_world_rates
+    request = URI.decode(@carrier.send(:build_world_rate_request, location_fixtures[:beverly_hills_9_zip],
+                                        package_fixtures[:book], location_fixtures[:auckland], {}))
+    refute_match /\<OriginZip\>90210-1234/, request
+    assert_match /\<OriginZip\>90210/, request
+  end
+
   def test_maximum_weight
     assert Package.new(70 * 16, [5, 5, 5], :units => :imperial).mass == @carrier.maximum_weight
     assert Package.new((70 * 16) + 0.01, [5, 5, 5], :units => :imperial).mass > @carrier.maximum_weight

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_shipping
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quantified