active_shipping 1.13.3 → 1.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7ada26d664d2d94b53b1dcb1268109f8efadaa3
-  data.tar.gz: 5b3ca7781a192d331afb9a5b780233a60181db02
+  metadata.gz: 053fd1f8bb1f8703c987c04bae54890113da7279
+  data.tar.gz: a13860a75c2feb3ea8ce4586473c3a560c3a800e
 SHA512:
-  metadata.gz: 684c2b83d4c3d74159095d3d0d184f2023c2f42e2481efd16f8a923ec68199db61ded9dbf09529537f325ac7b0da37fb7943091b92ea9c039de3afe082486e5a
-  data.tar.gz: e2b2e6cfca043f95987876b252f2059f20a5e62d1552e357c11e55ffeddbaf1d93fb92c8a7cca69a36f28c3191e189c9f2f36c620138d5ac3d83f22698b9906d
+  metadata.gz: cebea6659ce0cf9a316149886521fe07fc6563c894bdc6dd6ccc5b407c950118272d3cbcba0d35f00d63b5a5c02c4d5238eaa78223865d77d2cf73ef3cf02bb4
+  data.tar.gz: 69d7a363705c521bda896ead248d6605209815d7ee9b410c39be15ea4f53f0da4c955f02f7e594ae3acac0a049cdf6cb14a22161d538bfa81f30bef773688a23

data/.gitignore

@@ -12,3 +12,4 @@ test/fixtures/live_credentials.yml
 doc/
 .idea
 .bundle
+.byebug_history

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # ActiveShipping CHANGELOG
 
+### v1.13.4
+- Upcase postal code for CanadaPostPWS
+- Fix failing USPS test
+- add .byebug_history to .gitignore
+
 ### v1.13.3
 - CanadaPostPWS no longer modifies locations passed to it
 

data/lib/active_shipping/carriers/canada_post_pws.rb

@@ -782,7 +782,8 @@ module ActiveShipping
     end
 
     def get_sanitized_postal_code(location)
-      location.try(:postal_code).try(:gsub, /\s+/, '')
+      return nil if location.nil? || location.postal_code.nil?
+      location.postal_code.gsub(/\s+/, '').upcase
     end
 
     def sanitize_weight_kg(kg)

data/lib/active_shipping/version.rb

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

data/test/remote/usps_test.rb

@@ -12,12 +12,12 @@ class RemoteUSPSTest < Minitest::Test
   end
 
    def test_tracking_with_attempted_delivery
-    response = @carrier.find_tracking_info('CJ509046330US', test: false)
+    response = @carrier.find_tracking_info('LZ117228611US', test: false)
     assert response.success?, response.message
-    assert_equal 10,response.shipment_events.size
+    assert_equal 15,response.shipment_events.size
     assert_equal 'DELIVERED', response.shipment_events.last.message
-    assert_equal Time.parse('2016-04-21 13:46:00 UTC'), response.attempted_delivery_date
-    assert_equal Time.parse('2016-04-25 17:13:00 UTC'), response.actual_delivery_date
+    assert_equal Time.parse('2017-03-31 11:37:00 UTC'), response.attempted_delivery_date
+    assert_equal Time.parse('2017-04-03 14:05:00 UTC'), response.actual_delivery_date
   end
 
   def test_tracking_with_bad_number

data/test/unit/carriers/canada_post_pws_test.rb

@@ -0,0 +1,59 @@
+require 'test_helper'
+
+class CanadaPostPwsTest < Minitest::Test
+
+  def setup
+    credentials = { platform_id: 123, api_key: '456', secret: '789' }
+    @cp = CanadaPostPWS.new(credentials)
+  end
+
+  def test_get_sanitized_postal_code_location_nil
+    postal_code = @cp.send(:get_sanitized_postal_code, nil)
+
+    assert_nil postal_code
+  end
+
+  def test_get_sanitized_postal_code_postal_code_nil
+    location = Location.new(name: 'Test test')
+
+    assert_nil location.postal_code
+
+    postal_code = @cp.send(:get_sanitized_postal_code, location)
+
+    assert_nil postal_code
+  end
+
+  def test_get_sanitized_postal_code_spaces
+    location = Location.new(postal_code: '    K2P     1L4    ')
+
+    postal_code = @cp.send(:get_sanitized_postal_code, location)
+
+    assert_equal 'K2P1L4', postal_code
+  end
+
+  def test_get_sanitized_postal_code_lowercase
+    location = Location.new(postal_code: 'k2p 1l4')
+
+    postal_code = @cp.send(:get_sanitized_postal_code, location)
+
+    assert_equal 'K2P1L4', postal_code
+  end
+
+  def test_get_sanitzied_postal_code_proper
+    location = Location.new(postal_code: 'K2P1L4')
+
+    postal_code = @cp.send(:get_sanitized_postal_code, location)
+
+    assert_equal 'K2P1L4', postal_code
+  end
+
+  def test_get_sanitzied_postal_code_does_not_alter_original
+    location = Location.new(postal_code: 'K2P  1l4')
+
+    assert_equal 'K2P  1l4', location.postal_code
+
+    @cp.send(:get_sanitized_postal_code, location)
+
+    assert_equal 'K2P  1l4', location.postal_code
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_shipping
 version: !ruby/object:Gem::Version
-  version: 1.13.3
+  version: 1.13.4
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quantified
@@ -411,6 +411,7 @@ files:
 - test/unit/carriers/canada_post_pws_rating_test.rb
 - test/unit/carriers/canada_post_pws_register_test.rb
 - test/unit/carriers/canada_post_pws_shipping_test.rb
+- test/unit/carriers/canada_post_pws_test.rb
 - test/unit/carriers/canada_post_pws_tracking_test.rb
 - test/unit/carriers/canada_post_test.rb
 - test/unit/carriers/correios_test.rb
@@ -645,6 +646,7 @@ test_files:
 - test/unit/carriers/canada_post_pws_rating_test.rb
 - test/unit/carriers/canada_post_pws_register_test.rb
 - test/unit/carriers/canada_post_pws_shipping_test.rb
+- test/unit/carriers/canada_post_pws_test.rb
 - test/unit/carriers/canada_post_pws_tracking_test.rb
 - test/unit/carriers/canada_post_test.rb
 - test/unit/carriers/correios_test.rb