Merge pull request #278 from friendlycart/ups/add-extended-area-surcharge-code

Add UPS surcharge code 495 to money hash parser

Author: pelargir

lib/friendly_shipping/services/rl/parse_rate_quote_response.rb

@@ -34,10 +34,10 @@ def call(request:, response:)
             end
           end
 
-          private
-
           # The currency to use when parsing the rate quotes.
-          CURRENCY = Money::Currency.new('USD').freeze
+          CURRENCY = Money::Currency.new('USD')
+
+          private
 
           # Builds {Rate} instances from the parsed JSON.
           #

lib/friendly_shipping/services/ups_json/parse_money_hash.rb

@@ -105,6 +105,7 @@ def self.call(money_hash, key_name)
           "470" => "COMMITTED DELIVERY WINDOW",
           "480" => "SECURITY SURCHARGE",
           "492" => "CUSTOMER TRANSACTION FEE",
+          "495" => "EXTENDED AREA SURCHARGE",
           "500" => "SHIPMENT COD",
           "510" => "LIFT GATE FOR PICKUP",
           "511" => "LIFT GATE FOR DELIVERY",

lib/friendly_shipping/services/usps_international/parse_rate_response.rb

@@ -51,11 +51,11 @@ def call(request:, response:, shipment:, options:)
             end
           end
 
-          private
-
           PACKAGE_NODE_XPATH = '//Package'
           SERVICE_NODE_NAME = 'Service'
 
+          private
+
           # Iterate over all packages and parse the rates for each package
           #
           # @param [Nokogiri::XML::Node] xml The XML document containing packages and rates

lib/friendly_shipping/services/usps_ship/parse_rate_estimates_response.rb

@@ -35,7 +35,7 @@ def call(request:, response:)
 
             success(rates, request, response)
           rescue JSON::ParserError, KeyError => e
-            failure(e.message, request, response)
+            failure(e, request, response)
           end
 
           private

spec/friendly_shipping/services/usps_ship/parse_rate_estimates_response_spec.rb

@@ -47,7 +47,7 @@
     it "returns failure" do
       failure = call.failure
       expect(failure).to be_a(FriendlyShipping::ApiResult)
-      expect(failure.data).to eq("unexpected token at 'malformed json'")
+      expect(failure.data).to be_a(JSON::ParserError)
       expect(failure.original_request).to eq(request)
       expect(failure.original_response).to eq(response)
     end

spec/friendly_shipping/services/usps_ship/parse_timings_response_spec.rb

@@ -64,7 +64,6 @@
       failure = call.failure
       expect(failure).to be_a(FriendlyShipping::ApiResult)
       expect(failure.data).to be_a(JSON::ParserError)
-      expect(failure.data.message).to eq("unexpected token at 'malformed json'")
       expect(failure.original_request).to eq(request)
       expect(failure.original_response).to eq(response)
     end