active_shipping 1.14.0 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd3f080f7ff848e61dd530d4c4562c8010e76a01
-  data.tar.gz: 7b97efd00ca16978a0bf77b1a20c6244bf454de7
+  metadata.gz: b52cb7b75be25e1f18dd9fcb5cc212c2c590f79d
+  data.tar.gz: 493af87b593907f1ab99e5e1b9437d897ec128d0
 SHA512:
-  metadata.gz: 9d3acc9f7ed6d393ef7ad013e4f207a1dcdacf50b7ef1d06f5ba206575a2f8cea0bda68b02e02cea4b25635dd5932700186218d0aaf8bf3ac27623d421058a13
-  data.tar.gz: b4765b284a95d26de362fbbd4f0385a770a08a259e290d36e4d3443a3ea31f058f7c6547db74fa1ddd9fa0033d0f0253a9f74d09bd2299b38b3e1e156df13907
+  metadata.gz: c0a112df52dce5215b518506f3244b5bdb767d04581eb976ea3a8f97ec13bba9c8ab2f18e21405cb2929cd4e0c820925386e841dce84aaa6023288f145c939e7
+  data.tar.gz: c28eac1c26d272baf2116144b92e2b18d2fa15ae8090ef79fa8439a9b5a01a50c7ab87780e040445428750c7d53a2085ca0126f95f1aad557d3ceb4b1abe7f6d

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # ActiveShipping CHANGELOG
 
+### v1.14.1
+- Fix parsing of CanadaPostPWS service options response.
+
 ### v1.14.0
 - Update Correios default services list.
 - Fix CanadaPostPWS from generating an empty options tag.

data/lib/active_shipping/carriers/canada_post_pws.rb

@@ -214,14 +214,14 @@ module ActiveShipping
       restrictions_node = doc.root.at('restrictions')
       dimensions_node = restrictions_node.at('dimensional-restrictions')
       restrictions = {
-        :min_weight => restrictions_node.at("weight-restriction").attributes['min'].value.to_i,
-        :max_weight => restrictions_node.at("weight-restriction").attributes['max'].value.to_i,
-        :min_length => dimensions_node.at("length").attributes['min'].value.to_f,
-        :max_length => dimensions_node.at("length").attributes['max'].value.to_f,
-        :min_height => dimensions_node.at("height").attributes['min'].value.to_f,
-        :max_height => dimensions_node.at("height").attributes['max'].value.to_f,
-        :min_width => dimensions_node.at("width").attributes['min'].value.to_f,
-        :max_width => dimensions_node.at("width").attributes['max'].value.to_f
+        :min_weight => restrictions_node.at("weight-restriction").attributes['min'].try(:value).to_i,
+        :max_weight => restrictions_node.at("weight-restriction").attributes['max'].try(:value).to_i,
+        :min_length => dimensions_node.at("length").attributes['min'].try(:value).to_f,
+        :max_length => dimensions_node.at("length").attributes['max'].try(:value).to_f,
+        :min_height => dimensions_node.at("height").attributes['min'].try(:value).to_f,
+        :max_height => dimensions_node.at("height").attributes['max'].try(:value).to_f,
+        :min_width => dimensions_node.at("width").attributes['min'].try(:value).to_f,
+        :max_width => dimensions_node.at("width").attributes['max'].try(:value).to_f
       }
 
       {

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "1.14.0"
+  VERSION = "1.14.1"
 end

data/test/fixtures/xml/canadapost_pws/service_options_response_priority_worldwide.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<service>
+  <service-code>USA.PW.ENV</service-code>
+  <service-name>Priority Worldwide envelope USA</service-name>
+  <options>
+    <option>
+      <option-code>SO</option-code>
+      <option-name>Signature option</option-name>
+      <link rel="option" href="https://soa-gw.canadapost.ca/rs/ship/option/SO" media-type="application/vnd.cpc.ship.rate+xml"/>
+      <mandatory>true</mandatory>
+      <qualifier-required>false</qualifier-required>
+    </option>
+    <option>
+      <option-code>COV</option-code>
+      <option-name>Coverage</option-name>
+      <link rel="option" href="https://soa-gw.canadapost.ca/rs/ship/option/COV" media-type="application/vnd.cpc.ship.rate+xml"/>
+      <mandatory>false</mandatory>
+      <qualifier-required>true</qualifier-required>
+      <qualifier-max>100</qualifier-max>
+    </option>
+    <option>
+      <option-code>DC</option-code>
+      <option-name>Delivery confirmation</option-name>
+      <link rel="option" href="https://soa-gw.canadapost.ca/rs/ship/option/DC" media-type="application/vnd.cpc.ship.rate+xml"/>
+      <mandatory>true</mandatory>
+      <qualifier-required>false</qualifier-required>
+    </option>
+  </options>
+  <restrictions>
+    <weight-restriction/>
+    <dimensional-restrictions>
+      <length />
+      <width />
+      <height />
+      <length-plus-girth-max>300</length-plus-girth-max>
+    </dimensional-restrictions>
+    <can-ship-in-mailing-tube>false</can-ship-in-mailing-tube>
+    <can-ship-unpackaged>false</can-ship-unpackaged>
+    <allowed-as-return-service>false</allowed-as-return-service>
+  </restrictions>
+</service>

data/test/unit/carriers/canada_post_pws_rating_test.rb

@@ -343,6 +343,20 @@ class CanadaPostPwsRatingTest < Minitest::Test
     assert_equal 150, response[:restrictions][:max_width]
   end
 
+  def test_parse_find_service_options_response
+    body = xml_fixture('canadapost_pws/service_options_response_priority_worldwide')
+    response = @cp.parse_service_options_response(body)
+    assert_equal 3, response[:options].size
+    assert_equal 0, response[:restrictions][:min_weight]
+    assert_equal 0, response[:restrictions][:max_weight]
+    assert_equal 0, response[:restrictions][:min_length]
+    assert_equal 0, response[:restrictions][:min_height]
+    assert_equal 0, response[:restrictions][:min_width]
+    assert_equal 0, response[:restrictions][:max_length]
+    assert_equal 0, response[:restrictions][:max_height]
+    assert_equal 0, response[:restrictions][:max_width]
+  end
+
   def test_parse_find_option_response
     body = xml_fixture('canadapost_pws/option_response')
     response = @cp.parse_option_response(body)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_shipping
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.14.1
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-15 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quantified
@@ -266,6 +266,7 @@ files:
 - test/fixtures/xml/canadapost_pws/register_token_error.xml
 - test/fixtures/xml/canadapost_pws/register_token_response.xml
 - test/fixtures/xml/canadapost_pws/service_options_response.xml
+- test/fixtures/xml/canadapost_pws/service_options_response_priority_worldwide.xml
 - test/fixtures/xml/canadapost_pws/services_error.xml
 - test/fixtures/xml/canadapost_pws/services_response.xml
 - test/fixtures/xml/canadapost_pws/shipment_domestic.xml
@@ -502,6 +503,7 @@ test_files:
 - test/fixtures/xml/canadapost_pws/register_token_error.xml
 - test/fixtures/xml/canadapost_pws/register_token_response.xml
 - test/fixtures/xml/canadapost_pws/service_options_response.xml
+- test/fixtures/xml/canadapost_pws/service_options_response_priority_worldwide.xml
 - test/fixtures/xml/canadapost_pws/services_error.xml
 - test/fixtures/xml/canadapost_pws/services_response.xml
 - test/fixtures/xml/canadapost_pws/shipment_domestic.xml