active_shipping 1.13.4 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 053fd1f8bb1f8703c987c04bae54890113da7279
-  data.tar.gz: a13860a75c2feb3ea8ce4586473c3a560c3a800e
+  metadata.gz: cd3f080f7ff848e61dd530d4c4562c8010e76a01
+  data.tar.gz: 7b97efd00ca16978a0bf77b1a20c6244bf454de7
 SHA512:
-  metadata.gz: cebea6659ce0cf9a316149886521fe07fc6563c894bdc6dd6ccc5b407c950118272d3cbcba0d35f00d63b5a5c02c4d5238eaa78223865d77d2cf73ef3cf02bb4
-  data.tar.gz: 69d7a363705c521bda896ead248d6605209815d7ee9b410c39be15ea4f53f0da4c955f02f7e594ae3acac0a049cdf6cb14a22161d538bfa81f30bef773688a23
+  metadata.gz: 9d3acc9f7ed6d393ef7ad013e4f207a1dcdacf50b7ef1d06f5ba206575a2f8cea0bda68b02e02cea4b25635dd5932700186218d0aaf8bf3ac27623d421058a13
+  data.tar.gz: b4765b284a95d26de362fbbd4f0385a770a08a259e290d36e4d3443a3ea31f058f7c6547db74fa1ddd9fa0033d0f0253a9f74d09bd2299b38b3e1e156df13907

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # ActiveShipping CHANGELOG
 
+### v1.14.0
+- Update Correios default services list.
+- Fix CanadaPostPWS from generating an empty options tag.
+- Allow contract-number on CanadaPost merchant detail's response to be nil.
+- Fix a flakey UPS remote test that would fail only on Fridays.
+
 ### v1.13.4
 - Upcase postal code for CanadaPostPWS
 - Fix failing USPS test

data/lib/active_shipping/carriers/canada_post_pws.rb

@@ -526,7 +526,7 @@ module ActiveShipping
       raise "No Merchant Info" if doc.root.at('customer-number').blank?
       options = {
         :customer_number => doc.root.at('customer-number').text,
-        :contract_number => doc.root.at('contract-number').text,
+        :contract_number => doc.root.at('contract-number').try(:text),
         :username => doc.root.at('merchant-username').text,
         :password => doc.root.at('merchant-password').text,
         :has_default_credit_card => doc.root.at('has-default-credit-card').text == 'true'
@@ -728,39 +728,43 @@ module ActiveShipping
 
     def shipping_options_node(xml, available_options, options = {})
       return if (options.symbolize_keys.keys & available_options).empty?
-      xml.public_send('options') do
-
-        if options[:cod] && options[:cod_amount]
-          xml.public_send('option') do
-            xml.public_send('option-code', 'COD')
-            xml.public_send('option-amount', options[:cod_amount])
-            xml.public_send('option-qualifier-1', options[:cod_includes_shipping]) unless options[:cod_includes_shipping].blank?
-            xml.public_send('option-qualifier-2', options[:cod_method_of_payment]) unless options[:cod_method_of_payment].blank?
+
+      options_doc = Nokogiri::XML::Builder.new do |options_xml|
+        options_xml.public_send('options') do
+          if options[:cod] && options[:cod_amount]
+            options_xml.public_send('option') do
+              options_xml.public_send('option-code', 'COD')
+              options_xml.public_send('option-amount', options[:cod_amount])
+              options_xml.public_send('option-qualifier-1', options[:cod_includes_shipping]) unless options[:cod_includes_shipping].blank?
+              options_xml.public_send('option-qualifier-2', options[:cod_method_of_payment]) unless options[:cod_method_of_payment].blank?
+            end
           end
-        end
 
-        if options[:cov]
-          xml.public_send('option') do
-            xml.public_send('option-code', 'COV')
-            xml.public_send('option-amount', options[:cov_amount]) unless options[:cov_amount].blank?
+          if options[:cov]
+            options_xml.public_send('option') do
+              options_xml.public_send('option-code', 'COV')
+              options_xml.public_send('option-amount', options[:cov_amount]) unless options[:cov_amount].blank?
+            end
           end
-        end
 
-        if options[:d2po]
-          xml.public_send('option') do
-            xml.public_send('option-code', 'D2PO')
-            xml.public_send('option-qualifier-2'. options[:d2po_office_id]) unless options[:d2po_office_id].blank?
+          if options[:d2po]
+            options_xml.public_send('option') do
+              options_xml.public_send('option-code', 'D2PO')
+              options_xml.public_send('option-qualifier-2'. options[:d2po_office_id]) unless options[:d2po_office_id].blank?
+            end
           end
-        end
 
-        [:so, :dc, :pa18, :pa19, :hfp, :dns, :lad, :rase, :rts, :aban].each do |code|
-          if options[code]
-            xml.public_send('option') do
-              xml.public_send('option-code', code.to_s.upcase)
+          [:so, :dc, :pa18, :pa19, :hfp, :dns, :lad, :rase, :rts, :aban].each do |code|
+            if options[code]
+              options_xml.public_send('option') do
+                options_xml.public_send('option-code', code.to_s.upcase)
+              end
             end
           end
         end
       end
+
+      xml.parent << options_doc.doc.at("options") if options_doc.doc.at("options").children.any?
     end
 
     def expected_date_from_node(node)

data/lib/active_shipping/carriers/correios.rb

@@ -21,8 +21,10 @@ module ActiveShipping
 
     protected
 
-    DEFAULT_SERVICES = [41106, 40010]
+    DEFAULT_SERVICES = ['04510', '04014']
     AVAILABLE_SERVICES = {
+      '04510' => 'PAC sem contrato',
+      '04014' => 'SEDEX sem contrato',
       41106 => 'PAC sem contrato',
       41068 => 'PAC com contrato',
       41300 => 'PAC para grandes formatos',

data/lib/active_shipping/version.rb

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

data/test/fixtures/xml/canadapost_pws/merchant_details_response_no_contract_number.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<merchant-info xmlns="http://www.canadapost.ca/ws/merchant/registration">
+  <customer-number>1234567890</customer-number>
+  <merchant-username>1234567890123456</merchant-username>
+  <merchant-password>12343567890123456789012</merchant-password>
+  <has-default-credit-card>true</has-default-credit-card>
+</merchant-info>

data/test/remote/ups_test.rb

@@ -387,7 +387,8 @@ class RemoteUPSTest < Minitest::Test
     assert response.success?
     refute_empty response.delivery_estimates
     ww_express_estimate = response.delivery_estimates.select {|de| de.service_name == "UPS Worldwide Express"}.first
-    assert_equal 1.business_days.after(today), ww_express_estimate.date
+    expected_estimate = today.friday? ? today + 1 : 1.business_days.after(today)
+    assert_equal expected_estimate, ww_express_estimate.date
   end
 
   def test_void_shipment

data/test/unit/carriers/canada_post_pws_register_test.rb

@@ -58,6 +58,20 @@ class CanadaPostPwsRegisterTest < Minitest::Test
     assert_equal false, response.has_default_credit_card
   end
 
+  def test_retrieve_merchant_details_without_contract_number
+    endpoint = @cp.endpoint + "ot/token/1234567890"
+    response = xml_fixture('canadapost_pws/merchant_details_response_no_contract_number')
+    @cp.expects(:ssl_get).with(endpoint, anything).returns(response)
+
+    response = @cp.retrieve_merchant_details(:token_id => '1234567890')
+    assert response.is_a?(CPPWSMerchantDetailsResponse)
+    assert_equal "1234567890", response.customer_number
+    assert_nil response.contract_number
+    assert_equal "1234567890123456", response.username
+    assert_equal "12343567890123456789012", response.password
+    assert_equal true, response.has_default_credit_card
+  end
+
   def test_retrieve_merchant_with_error
     endpoint = @cp.endpoint + "ot/token/1234567890"
     response = xml_fixture('canadapost_pws/merchant_details_error')

data/test/unit/carriers/canada_post_pws_shipping_test.rb

@@ -120,6 +120,18 @@ class CanadaPostPwsShippingTest < Minitest::Test
     refute request.blank?
   end
 
+  def test_create_shipment_request_with_incomplete_options_hash
+    bad_shipping_opts = { :cod_amount => 50.00, :cov_amount => 100.00 }
+    options = @default_options.merge(bad_shipping_opts)
+    request = @cp.build_shipment_request(@home_params, @paris_params, @pkg1, @line_item1, options)
+    refute request.blank?
+
+    doc = Nokogiri.XML(request)
+    doc.remove_namespaces!
+
+    assert_nil doc.at('non-contract-shipment').at('delivery-spec').at('options')
+  end
+
   def test_create_shipment_request_with_options
     options = @default_options.merge(@shipping_opts1)
     request = @cp.build_shipment_request(@home_params, @paris_params, @pkg1, @line_item1, options)

data/test/unit/carriers/correios_test.rb

@@ -124,7 +124,7 @@ class CorreiosTest < Minitest::Test
       "sCdMaoPropria=S",
       "nVlValorDeclarado=10%2C5",
       "sCdAvisoRecebimento=S",
-      "nCdServico=41106%2C40010",
+      "nCdServico=04510%2C04014",
       "sCepOrigem=01415000",
       "sCepDestino=38700000",
       "nVlPeso=0.25",
@@ -220,7 +220,7 @@ class CorreiosTest < Minitest::Test
     services = Correios.available_services
 
     assert_kind_of Hash, services
-    assert_equal 19, services.size
+    assert_equal 21, services.size
     assert_equal 'PAC sem contrato', services[41106]
     assert_equal 'PAC com contrato', services[41068]
     assert_equal 'PAC para grandes formatos', services[41300]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_shipping
 version: !ruby/object:Gem::Version
-  version: 1.13.4
+  version: 1.14.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quantified
@@ -256,6 +256,7 @@ files:
 - test/fixtures/xml/canadapost_pws/dnc_tracking_details_en.xml
 - test/fixtures/xml/canadapost_pws/merchant_details_error.xml
 - test/fixtures/xml/canadapost_pws/merchant_details_response.xml
+- test/fixtures/xml/canadapost_pws/merchant_details_response_no_contract_number.xml
 - test/fixtures/xml/canadapost_pws/option_response.xml
 - test/fixtures/xml/canadapost_pws/option_response_no_conflicts.xml
 - test/fixtures/xml/canadapost_pws/rates_info.xml
@@ -491,6 +492,7 @@ test_files:
 - test/fixtures/xml/canadapost_pws/dnc_tracking_details_en.xml
 - test/fixtures/xml/canadapost_pws/merchant_details_error.xml
 - test/fixtures/xml/canadapost_pws/merchant_details_response.xml
+- test/fixtures/xml/canadapost_pws/merchant_details_response_no_contract_number.xml
 - test/fixtures/xml/canadapost_pws/option_response.xml
 - test/fixtures/xml/canadapost_pws/option_response_no_conflicts.xml
 - test/fixtures/xml/canadapost_pws/rates_info.xml