friendly_shipping 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 040c918f1349ab0ca0eac9a810082c9b5e751f78ce3f8ccc60af7f5dcc7f81b2
-  data.tar.gz: '07479b91f4e7ad7bf983eec39da3b286d4959117f95f7e9caa062d95d2883785'
+  metadata.gz: c7315eaa32f0429125e0c992d06d2093d324416e0bf36ac79bb5e2a0d1fc7135
+  data.tar.gz: e7a15a667a37321ff006da9c5f2d3478bf9f3089a35ae84db4227a775178438c
 SHA512:
-  metadata.gz: 15b651d1056fee2933438df10c36fcae9c85deacaf0807e9745b8ccdcc04aa07be53f05e5d6f0737402d0c94591b267546b3878d2bbd8c27ccd499737745cd25
-  data.tar.gz: 0e683464058b2bf4881d4f9b10b3c887bf39d45b13f19fca170b40d3074573130b7e238422aefe27710c74fc7802633f30361f2ebbac73899b8424e6f64caad6
+  metadata.gz: f460abf860b45f6079d364a770f1035778ecc0c5d98dcf5409c5a9f4b244326d954dad6ee3d881927470dbcde089114e767fed5a1e884d56133c419af77e9e8d
+  data.tar.gz: b0e92858e9922f8f85b1f93d22d9b5cc13c5af55f864acc6d6e30caddae110b6a65f73c840b12129c1bd34ba65f67f195dcbf0bc756ead50dbd429cc8e184871

data/.rubocop-relaxed.yml

@@ -156,7 +156,7 @@ Metrics/ModuleLength:
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-Layout/LineLength:
+Metrics/LineLength:
   Enabled: false
 
 Metrics/MethodLength:

data/CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.9] - 2020-01-09
+
+### Changed
+- USPS Service: Add missing Commitment sequence (#68)
+- Code quality: Add double splats for Ruby 2.7 compatibility (#67)
+- UPS Service: Add more package-level detail to rate responses (#65)
+
 ## [0.4.8] - 2020-01-06
 
 ### Changed

data/lib/friendly_shipping/services/ship_engine/label_options.rb

@@ -26,7 +26,7 @@ module FriendlyShipping
           @shipping_method = shipping_method
           @label_format = label_format
           @label_download_type = label_download_type
-          super kwargs.merge(package_options_class: LabelPackageOptions)
+          super(**kwargs.merge(package_options_class: LabelPackageOptions))
         end
       end
     end

data/lib/friendly_shipping/services/ship_engine/label_package_options.rb

@@ -20,7 +20,7 @@ module FriendlyShipping
         def initialize(package_code: nil, messages: [], **kwargs)
           @package_code = package_code
           @messages = messages
-          super kwargs
+          super(**kwargs)
         end
       end
     end

data/lib/friendly_shipping/services/ship_engine/rate_estimates_options.rb

@@ -13,7 +13,7 @@ module FriendlyShipping
 
         def initialize(carriers:, **kwargs)
           @carriers = carriers
-          super kwargs
+          super(**kwargs)
         end
 
         def carrier_ids

data/lib/friendly_shipping/services/ups/label_item_options.rb

@@ -58,7 +58,7 @@ module FriendlyShipping
         )
           @commodity_code = commodity_code
           @product_unit_of_measure = product_unit_of_measure
-          super kwargs
+          super(**kwargs)
         end
 
         def product_unit_of_measure_code

data/lib/friendly_shipping/services/ups/label_options.rb

@@ -139,7 +139,7 @@ module FriendlyShipping
           @terms_of_shipment = terms_of_shipment
           @reason_for_export = reason_for_export
           @invoice_date = invoice_date
-          super kwargs.merge(package_options_class: package_options_class)
+          super(**kwargs.merge(package_options_class: package_options_class))
         end
 
         def delivery_confirmation_code

data/lib/friendly_shipping/services/ups/label_package_options.rb

@@ -31,7 +31,7 @@ module FriendlyShipping
           @reference_numbers = reference_numbers
           @delivery_confirmation = delivery_confirmation
           @shipper_release = shipper_release
-          super kwargs.merge(item_options_class: LabelItemOptions)
+          super(**kwargs.merge(item_options_class: LabelItemOptions))
         end
 
         def delivery_confirmation_code

data/lib/friendly_shipping/services/ups/parse_rate_response.rb

@@ -7,50 +7,72 @@ module FriendlyShipping
   module Services
     class Ups
       class ParseRateResponse
-        def self.call(request:, response:, shipment:)
-          parsing_result = ParseXMLResponse.call(response.body, 'RatingServiceSelectionResponse')
-          parsing_result.fmap do |xml|
-            FriendlyShipping::ApiResult.new(
-              build_rates(xml, shipment),
-              original_request: request,
-              original_response: response
-            )
+        class << self
+          def call(request:, response:, shipment:)
+            parsing_result = ParseXMLResponse.call(response.body, 'RatingServiceSelectionResponse')
+            parsing_result.fmap do |xml|
+              FriendlyShipping::ApiResult.new(
+                build_rates(xml, shipment),
+                original_request: request,
+                original_response: response
+              )
+            end
           end
-        end
 
-        def self.build_rates(xml, shipment)
-          xml.root.css('> RatedShipment').map do |rated_shipment|
-            service_code = rated_shipment.at('Service/Code').text
-            shipping_method = CARRIER.shipping_methods.detect do |sm|
-              sm.service_code == service_code && shipment.origin.country.in?(sm.origin_countries)
-            end
-            days_to_delivery = rated_shipment.at('GuaranteedDaysToDelivery').text.to_i
-
-            total = ParseMoneyElement.call(rated_shipment.at('TotalCharges')).last
-            insurance_price = ParseMoneyElement.call(rated_shipment.at('ServiceOptionsCharges'))&.last
-            negotiated_rate = ParseMoneyElement.call(
-              rated_shipment.at('NegotiatedRates/NetSummaryCharges/GrandTotal')
-            )&.last
-
-            rated_shipment_warnings = rated_shipment.css('RatedShipmentWarning').map { |e| e.text.strip }
-            if rated_shipment_warnings.any? { |e| e.match?(/to Residential/) }
-              new_address_type = 'residential'
-            elsif rated_shipment_warnings.any? { |e| e.match?(/to Commercial/) }
-              new_address_type = 'commercial'
+          def build_rates(xml, shipment)
+            xml.root.css('> RatedShipment').map do |rated_shipment|
+              service_code = rated_shipment.at('Service/Code').text
+              shipping_method = CARRIER.shipping_methods.detect do |sm|
+                sm.service_code == service_code && shipment.origin.country.in?(sm.origin_countries)
+              end
+              days_to_delivery = rated_shipment.at('GuaranteedDaysToDelivery').text.to_i
+
+              total = ParseMoneyElement.call(rated_shipment.at('TotalCharges')).last
+              insurance_price = ParseMoneyElement.call(rated_shipment.at('ServiceOptionsCharges'))&.last
+              negotiated_rate = ParseMoneyElement.call(
+                rated_shipment.at('NegotiatedRates/NetSummaryCharges/GrandTotal')
+              )&.last
+
+              rated_shipment_warnings = rated_shipment.css('RatedShipmentWarning').map { |e| e.text.strip }
+              if rated_shipment_warnings.any? { |e| e.match?(/to Residential/) }
+                new_address_type = 'residential'
+              elsif rated_shipment_warnings.any? { |e| e.match?(/to Commercial/) }
+                new_address_type = 'commercial'
+              end
+
+              FriendlyShipping::Rate.new(
+                shipping_method: shipping_method,
+                amounts: { total: total },
+                warnings: rated_shipment_warnings,
+                errors: [],
+                data: {
+                  insurance_price: insurance_price,
+                  negotiated_rate: negotiated_rate,
+                  days_to_delivery: days_to_delivery,
+                  new_address_type: new_address_type,
+                  packages: build_packages(rated_shipment)
+                }.compact
+              )
             end
+          end
 
-            FriendlyShipping::Rate.new(
-              shipping_method: shipping_method,
-              amounts: { total: total },
-              warnings: rated_shipment_warnings,
-              errors: [],
-              data: {
-                insurance_price: insurance_price,
-                negotiated_rate: negotiated_rate,
-                days_to_delivery: days_to_delivery,
-                new_address_type: new_address_type
+          private
+
+          def build_packages(rated_shipment)
+            rated_shipment.css('RatedPackage').map do |rated_package|
+              itemized_charges = rated_package.xpath('ItemizedCharges').map do |element|
+                ParseMoneyElement.call(element)
+              end.compact.to_h
+              {
+                transportation_charges: ParseMoneyElement.call(rated_package.at('TransportationCharges')).last,
+                base_service_charge: ParseMoneyElement.call(rated_package.at('BaseServiceCharge')).last,
+                service_options_charges: ParseMoneyElement.call(rated_package.at('ServiceOptionsCharges'))&.last,
+                itemized_charges: itemized_charges,
+                total_charges: ParseMoneyElement.call(rated_package.at('TotalCharges')).last,
+                weight: BigDecimal(rated_package.at('Weight').text),
+                billing_weight: BigDecimal(rated_package.at('BillingWeight/Weight').text)
               }.compact
-            )
+            end
           end
         end
       end

data/lib/friendly_shipping/services/ups_freight/rates_item_options.rb

@@ -64,7 +64,7 @@ module FriendlyShipping
           @packaging_description = PACKAGING_TYPES.fetch(packaging).fetch(:description)
           @freight_class = freight_class
           @nmfc_code = nmfc_code
-          super kwargs
+          super(**kwargs)
         end
       end
     end

data/lib/friendly_shipping/services/ups_freight/rates_options.rb

@@ -54,7 +54,7 @@ module FriendlyShipping
           @pickup_date = pickup_date
           @pickup_comments = pickup_comments
           @commodity_information_generator = commodity_information_generator
-          super kwargs.merge(package_options_class: RatesPackageOptions)
+          super(**kwargs.merge(package_options_class: RatesPackageOptions))
         end
       end
     end

data/lib/friendly_shipping/services/ups_freight/rates_package_options.rb

@@ -30,7 +30,7 @@ module FriendlyShipping
           @handling_unit_code = HANDLING_UNIT_TYPES.fetch(handling_unit).fetch(:code)
           @handling_unit_description = HANDLING_UNIT_TYPES.fetch(handling_unit).fetch(:description)
           @handling_unit_tag = "HandlingUnit#{HANDLING_UNIT_TYPES.fetch(handling_unit).fetch(:handling_unit_tag)}"
-          super kwargs.merge(item_options_class: RatesItemOptions)
+          super(**kwargs.merge(item_options_class: RatesItemOptions))
         end
       end
     end

data/lib/friendly_shipping/services/usps/parse_time_in_transit_response.rb

@@ -168,6 +168,11 @@ module FriendlyShipping
               commitment_time: '10:30 AM',
               destination_type: :hold_for_pickup
             },
+            'B0215' => {
+              commitment: '2-Day',
+              commitment_time: '3:00 PM',
+              destination_type: :hold_for_pickup
+            },
             'C0100' => {
               commitment: '1-Day',
               destination_type: :street

data/lib/friendly_shipping/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FriendlyShipping
-  VERSION = "0.4.8"
+  VERSION = "0.4.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friendly_shipping
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Martin Meyerhoff
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-06 00:00:00.000000000 Z
+date: 2020-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_uri