active_shipping 1.12.1 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f4f1610144f6b41f51175256c47cc12601216ef
-  data.tar.gz: ce74fa151c3ae1483368330c88970a0631d82cf3
+  metadata.gz: 1fd6c7d9c3034275ed5d1256c1b96d86f909be32
+  data.tar.gz: 649f6a67c3161c234757a340238445e74a729e23
 SHA512:
-  metadata.gz: f11e65c4c3fc7efc64ca6d3715f8ec83ae978c44c617b39855c7f5ba3793ba24ba1fd8ba5631d44ead849e289b18bbeceb47694f82d3c1a19ca0353f28276180
-  data.tar.gz: f8f765528c38f1a08e8e72d59bb562452148dc471b2904ebd08798e8bb3e8812378610155e6b09bc52a3daa37c4c219ee25cdb64fb4d9b154de3c0d7bfe74514
+  metadata.gz: 510db67fcf7f0c7f49d0d79b385920719d766bff67fc234793209e68a2d0b2f04f8de73aa61a83e8d1df095358346759af8996741418f1cab879f76a5a195322
+  data.tar.gz: 0da3ec56e0d924538c1afd526190718ad5fdf306f0a91c1fb87e141a3815442bbd07fdf0054bc912bfd78ff0874fe9e12e9b83bd3fc20c7018c2f3cb51c359af

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # ActiveShipping CHANGELOG
 
+### v1.13.0
+- Add default location for CanadaPost PWS
+- Patch UPS to use old Kosovo country code
+- Add option to not include tax in rates for CP PWS
+
 ### v1.12.1
 - Explicitly set ssl_version for USPS
 - Strip 9 digit origin zip code for USPS world rate requests

data/lib/active_shipping/carriers/canada_post_pws.rb

@@ -64,11 +64,21 @@ module ActiveShipping
       [:api_key, :secret]
     end
 
+    def self.default_location
+      {
+        :country     => 'CA',
+        :province    => 'ON',
+        :city        => 'Ottawa',
+        :address1    => '61A York St',
+        :postal_code => 'K1N5T2'
+      }
+    end
+
     def find_rates(origin, destination, line_items = [], options = {}, package = nil, services = [])
       url = endpoint + "rs/ship/price"
       request  = build_rates_request(origin, destination, line_items, options, package, services)
       response = ssl_post(url, request, headers(options, RATE_MIMETYPE, RATE_MIMETYPE))
-      parse_rates_response(response, origin, destination)
+      parse_rates_response(response, origin, destination, !!options[:exclude_tax])
     rescue ActiveUtils::ResponseError, ActiveShipping::ResponseError => e
       error_response(e.response.body, CPPWSRateResponse)
     end
@@ -263,7 +273,7 @@ module ActiveShipping
       builder.to_xml
     end
 
-    def parse_rates_response(response, origin, destination)
+    def parse_rates_response(response, origin, destination, exclude_tax)
       doc = Nokogiri.XML(response)
       doc.remove_namespaces!
       raise ActiveShipping::ResponseError, "No Quotes" unless doc.at('price-quotes')
@@ -271,7 +281,7 @@ module ActiveShipping
       rates = doc.root.xpath('price-quote').map do |node|
         service_name  = node.at("service-name").text
         service_code  = node.at("service-code").text
-        total_price   = node.at('price-details/due').text
+        total_price   = price_from_node(node, exclude_tax)
         expected_date = expected_date_from_node(node)
         options = {
           :service_code   => service_code,
@@ -284,6 +294,14 @@ module ActiveShipping
       CPPWSRateResponse.new(true, "", {}, :rates => rates)
     end
 
+    def price_from_node(node, exclude_tax)
+      price = node.at('price-details/due').text
+      return price unless exclude_tax
+      children = node.at('price-details/taxes').children
+      tax_total_cents = children.sum { |node| node.elem? ? Package.cents_from(node.text) : 0 }
+      Package.cents_from(price) - tax_total_cents
+    end
+
     # tracking
 
     def parse_tracking_response(response)

data/lib/active_shipping/carriers/ups.rb

@@ -129,6 +129,10 @@ module ActiveShipping
 
     IMPERIAL_COUNTRIES = %w(US LR MM)
 
+    COUNTRY_MAPPING = {
+      'XK' => 'KV'
+    }.freeze
+
     DEFAULT_SERVICE_NAME_TO_CODE = Hash[UPS::DEFAULT_SERVICES.to_a.map(&:reverse)]
     DEFAULT_SERVICE_NAME_TO_CODE['UPS 2nd Day Air'] = "02"
     DEFAULT_SERVICE_NAME_TO_CODE['UPS 3 Day Select'] = "12"
@@ -672,7 +676,7 @@ module ActiveShipping
           xml.StateProvinceCode(location.province) unless location.province.blank?
           # StateProvinceCode required for negotiated rates but not otherwise, for some reason
           xml.PostalCode(location.postal_code) unless location.postal_code.blank?
-          xml.CountryCode(location.country_code(:alpha2)) unless location.country_code(:alpha2).blank?
+          xml.CountryCode(mapped_country_code(location.country_code(:alpha2))) unless location.country_code(:alpha2).blank?
           xml.ResidentialAddressIndicator(true) unless location.commercial? # the default should be that UPS returns residential rates for destinations that it doesn't know about
           # not implemented: Shipment/(Shipper|ShipTo|ShipFrom)/Address/ResidentialAddressIndicator element
         end
@@ -684,7 +688,7 @@ module ActiveShipping
         xml.AddressArtifactFormat do
           xml.PoliticalDivision2(location.city)
           xml.PoliticalDivision1(location.province)
-          xml.CountryCode(location.country_code(:alpha2))
+          xml.CountryCode(mapped_country_code(location.country_code(:alpha2)))
           xml.PostcodePrimaryLow(location.postal_code)
           xml.ResidentialAddressIndicator(true) unless location.commercial?
         end
@@ -787,7 +791,7 @@ module ActiveShipping
             xml.ThirdParty do
               xml.Address do
                 xml.PostalCode(options[:billing_zip])
-                xml.CountryCode(options[:billing_country])
+                xml.CountryCode(mapped_country_code(options[:billing_country]))
               end
             end
           end
@@ -1002,7 +1006,7 @@ module ActiveShipping
             xml.PoliticalDivision2(location.city)
             xml.PoliticalDivision1(location.state)
             xml.PostcodePrimaryLow(location.postal_code)
-            xml.CountryCode(location.country_code)
+            xml.CountryCode(mapped_country_code(location.country_code))
           end
         end
       end
@@ -1024,7 +1028,7 @@ module ActiveShipping
         if xml.at('AddressClassification/Code').present?
           classification_code = xml.at('AddressClassification/Code').text
         end
-        
+
         classification = case classification_code
         when "1"
           :commercial
@@ -1056,7 +1060,7 @@ module ActiveShipping
       return nil unless address
       country = address.at('CountryCode').try(:text)
       country = 'US' if country == 'ZZ' # Sometimes returned by SUREPOST in the US
-      
+
       address_lines = address.css('AddressLine')
 
       Location.new(
@@ -1203,5 +1207,9 @@ module ActiveShipping
       origin.country_code == destination.country_code ||
       [['US','PR'], ['PR','US']].include?([origin,destination].map(&:country_code))
     end
+
+    def mapped_country_code(country_code)
+      COUNTRY_MAPPING[country_code].presence || country_code
+    end
   end
 end

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "1.12.1"
+  VERSION = "1.13.0"
 end

data/test/test_helper.rb

@@ -267,8 +267,14 @@ module ActiveShipping::Test
                                       :city => 'Melbourne',
                                       :state => 'VIC',
                                       :address1 => '192 George Street',
-                                      :postal_code => '3108')
+                                      :postal_code => '3108'),
+        :kosovo => Location.new(
+                                      :country => 'XK',
+                                      :city => 'Prishtinë',
+                                      :address1 => 'Ahmet Krasniqi',
+                                      :postal_code => '10000')
       }
+
     end
 
     def line_item_fixture

data/test/unit/carriers/canada_post_pws_rating_test.rb

@@ -112,6 +112,25 @@ class CanadaPostPwsRatingTest < Minitest::Test
     assert_equal @dest.to_s, Location.new(rate.destination).to_s
   end
 
+  def test_find_rates_excluding_tax
+    response = xml_fixture('canadapost_pws/rates_info')
+    expected_headers = {
+      'Authorization'   => "#{@cp.send(:encoded_authorization)}",
+      'Accept-Language' => 'en-CA',
+      'Accept'          => 'application/vnd.cpc.ship.rate+xml',
+      'Content-Type'    => 'application/vnd.cpc.ship.rate+xml'
+    }
+    CanadaPostPWS.any_instance.expects(:ssl_post).with(anything, anything, expected_headers).returns(response).twice
+
+    rates_tax_response = @cp.find_rates(@home_params, @dest_params, [@pkg1, @pkg2], {})
+    rates_no_tax_response = @cp.find_rates(@home_params, @dest_params, [@pkg1, @pkg2], {exclude_tax: true})
+
+    expected = [139, 407, 139, 240] #taken from fixture, tax in centsÏ
+    assert_equal rates_no_tax_response.rates.size, rates_tax_response.rates.size
+    expected.zip(rates_no_tax_response.rates, rates_tax_response.rates).each do |expected, no_tax, tax|
+      assert_equal expected, tax.total_price - no_tax.total_price
+    end
+  end
   # build rates
 
   def test_build_rates_request
@@ -283,7 +302,7 @@ class CanadaPostPwsRatingTest < Minitest::Test
 
   def test_parse_rates_response
     body = xml_fixture('canadapost_pws/rates_info')
-    rates_response = @cp.parse_rates_response(body, @home, @dest)
+    rates_response = @cp.parse_rates_response(body, @home, @dest, false)
 
     assert_equal 4, rates_response.rates.count
     rate = rates_response.rates.first
@@ -297,7 +316,7 @@ class CanadaPostPwsRatingTest < Minitest::Test
   def test_parse_rates_response_with_invalid_response_raises
     body = xml_fixture('canadapost_pws/rates_info_error')
     exception = assert_raises ActiveShipping::ResponseError do
-      @response = @cp.parse_rates_response(body, @home, @dest)
+      @response = @cp.parse_rates_response(body, @home, @dest, false)
     end
     assert_equal "No Quotes", exception.message
   end

data/test/unit/carriers/ups_test.rb

@@ -656,4 +656,47 @@ class UPSTest < Minitest::Test
     assert_equal :invalid, response.validity
   end
 
+  def test_kosovo_location_node
+    xml_builder = Nokogiri::XML::Builder.new do |xml|
+      @carrier.send(:build_location_node,
+                    xml,
+                    "KosovoRequest",
+                    location_fixtures[:kosovo],
+                    {}
+      )
+    end
+    request = Nokogiri::XML(xml_builder.to_xml)
+    assert_equal 'KV', request.search('/KosovoRequest/Address/CountryCode').text
+  end
+
+  def test_kosovo_build_address_artifact_format_location
+    xml_builder = Nokogiri::XML::Builder.new do |xml|
+      @carrier.send(:build_address_artifact_format_location,
+                    xml,
+                    "KosovoRequest",
+                    location_fixtures[:kosovo]
+      )
+    end
+    request = Nokogiri::XML(xml_builder.to_xml)
+    assert_equal 'KV', request.search('/KosovoRequest/AddressArtifactFormat/CountryCode').text
+  end
+
+  def test_kosovo_build_address_validation_request
+    xml = @carrier.send(:build_address_validation_request, location_fixtures[:kosovo])
+    request = Nokogiri::XML(xml)
+    assert_equal 'KV', request.search('/AddressValidationRequest/AddressKeyFormat/CountryCode').text
+  end
+
+  def test_kosovo_build_billing_info_node
+    options = {bill_third_party: true, bill_to_consignee: true, billing_account: 12345,
+               billing_zip: 12345, billing_country: 'XK'}
+    xml_builder = Nokogiri::XML::Builder.new do |xml|
+      @carrier.send(:build_billing_info_node,
+                    xml,
+                    options
+      )
+    end
+    request = Nokogiri::XML(xml_builder.to_xml)
+    assert_equal 'KV', request.search('/BillThirdParty/BillThirdPartyConsignee/ThirdParty/Address/CountryCode').text
+  end
 end

metadata

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