active_shipping 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 167a59476f3013546de9f351d4d62b045ce18695
-  data.tar.gz: 5a8d406aad880b511e8102fe462a3e344a1660d7
+  metadata.gz: 1d7d90329e0d2d80ee6f1eb5ae1f2bdc1f16b6dc
+  data.tar.gz: ba9ce52d2f832b124ef5ccd67f4140888eac68d4
 SHA512:
-  metadata.gz: 0a21b4a2467b1ead50736c57cd9b3da5494090e6f4866e78d9f91a8cbeff1e89ac1dd7ff82187677ee6f897f718cc4fabd48fb7f8e49b998b5e6e7e51f045fab
-  data.tar.gz: fce0b6be9e67015c62b6ed7651243ad7e09791ca20502509e29c72138a47c400dfca855f4f6203a5f27796916d09467b2931690f5d6440652913d5b13068c019
+  metadata.gz: 549c8f94cc474cd8e00050433bf1b0fddcdb41c2d6afd8a894151e607bb8f33c3f4a77c2c486d9088ed785cde069de5fab9ca012fa2691e4936b81aafb82c2f6
+  data.tar.gz: e7999cb24985d89f9de6896ae7534619c6f354c72ba5cd0ac85869d6ffd858255a647d1824d131ee3d327127195a685a3ac5414ceecf2d5d219effc7d108e658

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # ActiveShipping CHANGELOG
 
+### v1.2.1
+
+- Fix compatibility with latest USPS WEBTOOLS international rate schema changes.
+
 ### v1.2.0
 
 - Added support for buying labels with FedEx

data/lib/active_shipping.rb

@@ -21,10 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-require 'active_support'
-require 'active_support/json'
-require 'active_support/core_ext/enumerable'
-require 'active_support/core_ext/class/attribute_accessors'
+require 'active_support/all'
 require 'active_utils'
 
 require 'nokogiri'

data/lib/active_shipping/carriers/usps.rb

@@ -234,7 +234,7 @@ module ActiveShipping
     def extract_event_details(node)
       description = node.at('Event').text.upcase
 
-      if prefix = ONLY_PREFIX_EVENTS.find { |p| description.starts_with?(p) }
+      if prefix = ONLY_PREFIX_EVENTS.find { |p| description.start_with?(p) }
         description = prefix
       end
 
@@ -291,7 +291,7 @@ module ActiveShipping
     end
 
     def world_rates(origin, destination, packages, options = {})
-      request = build_world_rate_request(packages, destination, options)
+      request = build_world_rate_request(origin, packages, destination, options)
       # never use test mode; rate requests just won't work on test servers
       parse_rate_response(origin, destination, packages, commit(:world_rates, request, false), options)
     end
@@ -371,10 +371,11 @@ module ActiveShipping
     #
     # package.options[:mail_type] -- one of [:package, :postcard, :matter_for_the_blind, :envelope].
     #                                 Defaults to :package.
-    def build_world_rate_request(packages, destination, options)
+    def build_world_rate_request(origin, packages, destination, options)
       country = COUNTRY_NAME_CONVERSIONS[destination.country.code(:alpha2).value] || destination.country.name
       xml_builder = Nokogiri::XML::Builder.new do |xml|
         xml.IntlRateV2Request('USERID' => @options[:login]) do
+          xml.Revision(2)
           Array(packages).each_with_index do |package, id|
             xml.Package('ID' => id) do
               xml.Pounds(0)
@@ -402,6 +403,9 @@ module ActiveShipping
               if commercial_type = commercial_type(options)
                 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)
             end
           end
         end

data/lib/active_shipping/version.rb

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

data/test/fixtures/xml/usps/world_rate_request_with_value.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <IntlRateV2Request USERID="login">
+  <Revision>2</Revision>
   <Package ID="0">
     <Pounds>0</Pounds>
     <Ounces>120</Ounces>
@@ -16,5 +17,8 @@
     <Length>15.00</Length>
     <Height>4.50</Height>
     <Girth>29.00</Girth>
+    <OriginZip>90210</OriginZip>
+    <AcceptanceDateTime>2015-06-01T20:34:29Z</AcceptanceDateTime>
+    <DestinationPostalCode>K1P 1J1</DestinationPostalCode>
   </Package>
 </IntlRateV2Request>

data/test/fixtures/xml/usps/world_rate_request_without_value.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <IntlRateV2Request USERID="login">
+  <Revision>2</Revision>
   <Package ID="0">
     <Pounds>0</Pounds>
     <Ounces>9</Ounces>
@@ -16,5 +17,8 @@
     <Length>7.48</Length>
     <Height>0.79</Height>
     <Girth>12.60</Girth>
+    <OriginZip>90210</OriginZip>
+    <AcceptanceDateTime>2015-06-01T20:34:29Z</AcceptanceDateTime>
+    <DestinationPostalCode>K1P 1J1</DestinationPostalCode>
   </Package>
 </IntlRateV2Request>

data/test/unit/carriers/usps_test.rb

@@ -233,14 +233,14 @@ class USPSTest < Minitest::Test
     expected_request = xml_fixture('usps/world_rate_request_without_value')
     @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_fixtures[:ottawa], package_fixtures[:book], :test => true)
+    @carrier.find_rates(location_fixtures[:beverly_hills], location_fixtures[:ottawa], package_fixtures[:book], :test => true, :acceptance_time => Time.parse("2015-06-01T20:34:29Z"))
   end
 
   def test_build_world_rate_request_with_package_value
     expected_request = xml_fixture('usps/world_rate_request_with_value')
     @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_fixtures[:ottawa], package_fixtures[:american_wii], :test => true)
+    @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_initialize_options_requirements

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_shipping
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - James MacAulay
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quantified