active_shipping 1.13.2 → 1.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eac04ea30bfda9ffec4adfe13de0c4dabd4ebe69
-  data.tar.gz: 960fc2506a4e244125d53136cbeaaa777f10fca3
+  metadata.gz: f7ada26d664d2d94b53b1dcb1268109f8efadaa3
+  data.tar.gz: 5b3ca7781a192d331afb9a5b780233a60181db02
 SHA512:
-  metadata.gz: a2ba4217456c82b4d5b7ce05d93f1191a856781e97ecba893173d02ca055ce9213cdab4d7e0d808ea1900a0d80e8e771c3ec1b74664ec366adaad6a62a9f773c
-  data.tar.gz: ed16ffc04b809427a91e2739247c4e09bf45c85543a6650564bb780dd96d3c077f631123f4179fe6218283ddbb1acf0d662b317b74121e0616bbeab4a529f781
+  metadata.gz: 684c2b83d4c3d74159095d3d0d184f2023c2f42e2481efd16f8a923ec68199db61ded9dbf09529537f325ac7b0da37fb7943091b92ea9c039de3afe082486e5a
+  data.tar.gz: e2b2e6cfca043f95987876b252f2059f20a5e62d1552e357c11e55ffeddbaf1d93fb92c8a7cca69a36f28c3191e189c9f2f36c620138d5ac3d83f22698b9906d

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # ActiveShipping CHANGELOG
 
+### v1.13.3
+- CanadaPostPWS no longer modifies locations passed to it
+
+### v1.13.2
+- Bump active_utils to 3.3.1
+- Allow activesupport <5.2.0
+
+### v1.13.1
+- Fix up UPS tracker parsing for Kosovo (KV)
+
 ### v1.13.0
 - Add default location for CanadaPost PWS
 - Patch UPS to use old Kosovo country code

data/lib/active_shipping/carriers/canada_post_pws.rb

@@ -359,9 +359,6 @@ module ActiveShipping
     # :cod, :cod_amount, :insurance, :insurance_amount, :signature_required, :pa18, :pa19, :hfp, :dns, :lad
     #
     def build_shipment_request(origin, destination, package, line_items = [], options = {})
-      origin = sanitize_location(origin)
-      destination = sanitize_location(destination)
-
       builder = Nokogiri::XML::Builder.new do |xml|
         xml.public_send('non-contract-shipment', :xmlns => "http://www.canadapost.ca/ws/ncshipment") do
           xml.public_send('delivery-spec') do
@@ -385,7 +382,8 @@ module ActiveShipping
       xml.public_send('service-code', options[:service])
     end
 
-    def shipment_sender_node(xml, location, options)
+    def shipment_sender_node(xml, sender, options)
+      location = location_from_hash(sender)
       xml.public_send('sender') do
         xml.public_send('name', location.name)
         xml.public_send('company', location.company) if location.company.present?
@@ -396,12 +394,13 @@ module ActiveShipping
           xml.public_send('city', location.city)
           xml.public_send('prov-state', location.province)
           # xml.public_send('country-code', location.country_code)
-          xml.public_send('postal-zip-code', location.postal_code)
+          xml.public_send('postal-zip-code', get_sanitized_postal_code(location))
         end
       end
     end
 
-    def shipment_destination_node(xml, location, options)
+    def shipment_destination_node(xml, destination, options)
+      location = location_from_hash(destination)
       xml.public_send('destination') do
         xml.public_send('name', location.name)
         xml.public_send('company', location.company) if location.company.present?
@@ -412,7 +411,7 @@ module ActiveShipping
           xml.public_send('city', location.city)
           xml.public_send('prov-state', location.province) unless location.province.blank?
           xml.public_send('country-code', location.country_code)
-          xml.public_send('postal-zip-code', location.postal_code)
+          xml.public_send('postal-zip-code', get_sanitized_postal_code(location))
         end
       end
     end
@@ -446,7 +445,7 @@ module ActiveShipping
     end
 
     def shipment_customs_node(xml, destination, line_items, options)
-      return unless destination.country_code != 'CA'
+      return unless location_from_hash(destination).country_code != 'CA'
 
       xml.public_send('customs') do
         currency = options[:currency] || "CAD"
@@ -690,24 +689,25 @@ module ActiveShipping
     end
 
     def origin_node(xml, location)
-      origin = sanitize_location(location)
-      xml.public_send("origin-postal-code", origin.zip)
+      origin = location_from_hash(location)
+      xml.public_send("origin-postal-code", get_sanitized_postal_code(origin))
     end
 
     def destination_node(xml, location)
-      destination = sanitize_location(location)
+      destination = location_from_hash(location)
+      postal_code = get_sanitized_postal_code(destination)
       case destination.country_code
         when 'CA'
           xml.public_send('destination') do
             xml.public_send('domestic') do
-              xml.public_send('postal-code', destination.postal_code)
+              xml.public_send('postal-code', postal_code)
             end
           end
 
         when 'US'
           xml.public_send('destination') do
             xml.public_send('united-states') do
-              xml.public_send('zip-code', destination.postal_code)
+              xml.public_send('zip-code', postal_code)
             end
           end
 
@@ -776,17 +776,13 @@ module ActiveShipping
       DateTime.strptime((options[:shipping_date] || Time.now).to_s, "%Y-%m-%d")
     end
 
-    def sanitize_location(location)
-      location_hash = location.is_a?(Location) ? location.to_hash : location
-      location_hash = sanitize_zip(location_hash)
-      Location.new(location_hash)
+    def location_from_hash(location)
+      return location if location.is_a?(Location)
+      return Location.new(location)
     end
 
-    def sanitize_zip(hash)
-      [:postal_code, :zip].each do |attr|
-        hash[attr].gsub!(/\s+/, '') if hash[attr]
-      end
-      hash
+    def get_sanitized_postal_code(location)
+      location.try(:postal_code).try(:gsub, /\s+/, '')
     end
 
     def sanitize_weight_kg(kg)

data/lib/active_shipping/version.rb

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

metadata

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