friendly_shipping 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 269d5f03467b9fc61a71f0585c7ff434156465e008d01e26e319666a15b13fb1
-  data.tar.gz: 006fe64631e6b7eef89c796d5474dafb71896e7eff8d081572c6a85a641fb537
+  metadata.gz: 7bc054d44e12f0d44f1240a8c831918fa7eec158f8cc66ffb104586a2a2f4180
+  data.tar.gz: 900e8bb08f94858c0b147d886f9eaeae72c3db74efe04b7cbe8a3d9e7184f4fe
 SHA512:
-  metadata.gz: b0ca75ff4a78b69b1da507dbc5fc9872629217f5a28fd37ea9645078bbda1b592beb74eb71b44b69c8e4649b878e1e715060ad545f8b8b8bdd19a3b256996112
-  data.tar.gz: 1945415f57c1ab8d22bf80e582b22938235965c1db3981c78ef3c6c76087507ae4c5a9e3db7a2a1e27899a9e90ef2a3d97b6cee24673b51698df0c07747aae49
+  metadata.gz: db80927fd83629f29a503512672dd39566e758b20e16d29d92332427e9eabd22aef9f9f03d286468fd36c78ea74dd06906a63b9e631bd7304f3f4cfa372e8718
+  data.tar.gz: 99930e58a990bc2e4a50027cbb5a4a379062f86ca21a897edb3761d594843444f54de3b1ac09b65b4b454c46f52d75941cee688f09f86e8230cb97ae73d0d76a

data/.env.template

@@ -5,8 +5,12 @@
 SHIPENGINE_API_KEY=ShipEngine API key
 SHIPENGINE_CARRIER_ID=Carrier ID from your ShipEngine account to run test labels with
 
+SHIPENGINE_LTL_CARRIER_ID=LTL carrier ID from your ShipEngine account to run tests with
+SHIPENGINE_LTL_CARRIER_SCAC=Standard Carrier Alpha Code from your ShipEngine account to run tests with
+
 UPS_KEY=UPS API access key
 UPS_LOGIN=UPS login name
 UPS_PASSWORD=UPS login password
+UPS_SHIPPER_NUMBER=UPS shipper number
 
 USPS_LOGIN=USPS login name

data/.env.test

@@ -0,0 +1,4 @@
+# .env.test
+
+SHIPENGINE_LTL_CARRIER_ID=abc-123-def
+SHIPENGINE_LTL_CARRIER_SCAC=UPGF

data/CHANGELOG.md

@@ -4,6 +4,17 @@ 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.8.1] - 2023-08-03
+- USPS Service: Fix international ounces remainder (#166)
+- UPS Service: Fix bug causing inflated international product costs (#167)
+- UPS Service: Add declared value to UPS package serializer (#168)
+- UPS Service: Add declared value to UPS label package options (#169)
+- TForce Service: Truncate long values in UPS Freight label request (#170)
+- USPS Service: Add new USPS Ground Advantage shipping method (#171)
+- ShipEngine Service: Basic ShipEngine LTL service class (#172)
+- UPS Service: Add new billing options for Non-Resident Importer (#174)
+- ShipEngine Service: Request quotes from ShipEngine LTL API (#175)
+
 ## [0.8.0] - 2023-04-18
 - Rails 7 support: Fix deprecation warning about ActiveSupport#sum (#164)
 - UPS Service: Truncate product descriptions (#163)

data/lib/friendly_shipping/services/ship_engine_ltl/bad_request.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module FriendlyShipping
+  module Services
+    class ShipEngineLTL
+      class BadRequest < ShipEngine::BadRequest; end
+    end
+  end
+end

data/lib/friendly_shipping/services/ship_engine_ltl/bad_request_handler.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'friendly_shipping/services/ship_engine_ltl/bad_request'
+
+module FriendlyShipping
+  module Services
+    class ShipEngineLTL
+      class BadRequestHandler
+        extend Dry::Monads::Result::Mixin
+
+        def self.call(error, original_request: nil, original_response: nil)
+          if error.http_code == 400
+            Failure(
+              ApiFailure.new(
+                BadRequest.new(error),
+                original_request: original_request,
+                original_response: original_response
+              )
+            )
+          else
+            Failure(
+              ApiFailure.new(
+                error,
+                original_request: original_request,
+                original_response: original_response
+              )
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/friendly_shipping/services/ship_engine_ltl/item_options.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module FriendlyShipping
+  module Services
+    class ShipEngineLTL
+      class ItemOptions < FriendlyShipping::ItemOptions
+        attr_reader :packaging_code,
+                    :freight_class,
+                    :nmfc_code,
+                    :stackable,
+                    :hazardous_materials
+
+        def initialize(
+          packaging_code: nil,
+          freight_class: nil,
+          nmfc_code: nil,
+          stackable: true,
+          hazardous_materials: false,
+          **kwargs
+        )
+          @packaging_code = packaging_code
+          @freight_class = freight_class
+          @nmfc_code = nmfc_code
+          @stackable = stackable
+          @hazardous_materials = hazardous_materials
+          super(**kwargs)
+        end
+      end
+    end
+  end
+end

data/lib/friendly_shipping/services/ship_engine_ltl/package_options.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'friendly_shipping/services/ups/label_item_options'
+
+module FriendlyShipping
+  module Services
+    class ShipEngineLTL
+      class PackageOptions < FriendlyShipping::PackageOptions
+        def initialize(**kwargs)
+          super(**kwargs.merge(item_options_class: ItemOptions))
+        end
+      end
+    end
+  end
+end

data/lib/friendly_shipping/services/ship_engine_ltl/parse_carrier_response.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module FriendlyShipping
+  module Services
+    class ShipEngineLTL
+      class ParseCarrierResponse
+        extend Dry::Monads::Result::Mixin
+
+        class << self
+          def call(request:, response:)
+            parsed_json = JSON.parse(response.body)
+            carriers = parsed_json.fetch('carriers', []).map do |carrier_data|
+              FriendlyShipping::Carrier.new(
+                id: carrier_data['carrier_id'],
+                name: carrier_data['name'],
+                data: {
+                  countries: carrier_data['countries'],
+                  features: carrier_data['features'],
+                  scac: carrier_data['scac']
+                }
+              )
+            end
+
+            if carriers.any?
+              Success(
+                ApiResult.new(
+                  carriers,
+                  original_request: request,
+                  original_response: response
+                )
+              )
+            else
+              errors = parsed_json.fetch('errors', [{ 'message' => 'Unknown error' }])
+              Failure(
+                ApiResult.new(
+                  errors.map { |e| e['message'] },
+                  original_request: request,
+                  original_response: response
+                )
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/friendly_shipping/services/ship_engine_ltl/parse_quote_response.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module FriendlyShipping
+  module Services
+    class ShipEngineLTL
+      class ParseQuoteResponse
+        extend Dry::Monads::Result::Mixin
+
+        class << self
+          def call(request:, response:)
+            parsed_json = JSON.parse(response.body)
+            rates = build_rates(parsed_json)
+            if rates.any?
+              Success(
+                ApiResult.new(
+                  rates,
+                  original_request: request,
+                  original_response: response
+                )
+              )
+            else
+              errors = parsed_json.fetch('errors', [{ 'message' => 'Unknown error' }])
+              Failure(
+                ApiResult.new(
+                  errors.map { |e| e['message'] },
+                  original_request: request,
+                  original_response: response
+                )
+              )
+            end
+          end
+
+          private
+
+          def build_rates(parsed_json)
+            total = build_total(parsed_json)
+            return [] unless total.positive?
+
+            [
+              FriendlyShipping::Rate.new(
+                shipping_method: build_shipping_method(parsed_json),
+                amounts: { total: total }
+              )
+            ]
+          end
+
+          def build_shipping_method(parsed_json)
+            description = parsed_json.dig("service", "carrier_description")
+            code = parsed_json.dig("service", "code")
+
+            FriendlyShipping::ShippingMethod.new(
+              name: description,
+              service_code: code,
+              multi_package: true
+            )
+          end
+
+          def build_total(parsed_json)
+            total_charges = parsed_json.fetch("charges", []).detect { |e| e['type'] == "total" }
+            return 0 unless total_charges
+
+            currency = Money::Currency.new(total_charges.dig("amount", "currency"))
+            value = total_charges.dig("amount", "value")
+            Money.new(value * currency.subunit_to_unit, currency)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/friendly_shipping/services/ship_engine_ltl/quote_options.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'friendly_shipping/shipment_options'
+
+module FriendlyShipping
+  module Services
+    class ShipEngineLTL
+      class QuoteOptions < ShipmentOptions
+        attr_reader :service_code,
+                    :pickup_date,
+                    :accessorial_service_codes,
+                    :packages_serializer_class
+
+        # @param [String] service_code
+        # @param [Time] pickup_date
+        # @param [Array<String>] accessorial_service_codes
+        # @param [Class] packages_serializer_class
+        def initialize(
+          service_code: nil,
+          pickup_date: nil,
+          accessorial_service_codes: [],
+          packages_serializer_class: SerializePackages,
+          **kwargs
+        )
+          @service_code = service_code
+          @pickup_date = pickup_date
+          @accessorial_service_codes = accessorial_service_codes
+          @packages_serializer_class = packages_serializer_class
+          super(**kwargs.merge(package_options_class: PackageOptions))
+        end
+      end
+    end
+  end
+end

data/lib/friendly_shipping/services/ship_engine_ltl/serialize_packages.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module FriendlyShipping
+  module Services
+    class ShipEngineLTL
+      class SerializePackages
+        class << self
+          # @param [Array<Physical::Package>] packages
+          # @param [FriendlyShipping::Services::ShipEngineLTL::QuoteOptions] options
+          def call(packages:, options:)
+            packages.flat_map do |package|
+              package_options = options.options_for_package(package)
+              package.items.map do |item|
+                item_options = package_options.options_for_item(item)
+                {
+                  code: item_options.packaging_code,
+                  freight_class: item_options.freight_class,
+                  nmfc_code: item_options.nmfc_code,
+                  description: item.description || "Commodities",
+                  dimensions: {
+                    width: item.width.convert_to(:inches).value.ceil,
+                    height: item.height.convert_to(:inches).value.ceil,
+                    length: item.length.convert_to(:inches).value.ceil,
+                    unit: "inches"
+                  },
+                  weight: {
+                    value: item.weight.convert_to(:pounds).value.ceil,
+                    unit: "pounds"
+                  },
+                  quantity: 1, # we don't support this yet
+                  stackable: item_options.stackable,
+                  hazardous_materials: item_options.hazardous_materials
+                }
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/friendly_shipping/services/ship_engine_ltl/serialize_quote_request.rb

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+module FriendlyShipping
+  module Services
+    class ShipEngineLTL
+      class SerializeQuoteRequest
+        class << self
+          # @param [Physical::Shipment] shipment
+          # @param [FriendlyShipping::Services::ShipEngineLTL::QuoteOptions] options
+          def call(shipment:, options:)
+            {
+              shipment: {
+                service_code: options.service_code,
+                pickup_date: options.pickup_date.strftime('%Y-%m-%d'),
+                packages: options.packages_serializer_class.call(packages: shipment.packages, options: options),
+                options: serialize_options(options),
+                ship_from: serialize_ship_address(shipment.origin),
+                ship_to: serialize_ship_address(shipment.destination),
+                bill_to: serialize_bill_address(shipment.origin),
+                requested_by: serialize_requested_by(shipment.origin),
+              }.compact,
+              shipment_measurements: serialize_shipment_measurements(shipment.packages)
+            }
+          end
+
+          private
+
+          # @param [FriendlyShipping::Services::ShipEngineLTL::QuoteOptions] options
+          def serialize_options(options)
+            options.accessorial_service_codes.map do |code|
+              { code: code }
+            end
+          end
+
+          # @param [Physical::Location] location
+          def serialize_ship_address(location)
+            {
+              account: location.properties.with_indifferent_access['account_number'],
+              address: serialize_address(location),
+              contact: serialize_contact(location)
+            }.compact
+          end
+
+          # @param [Physical::Location] location
+          def serialize_bill_address(location)
+            {
+              type: "shipper",
+              payment_terms: "prepaid",
+              account: location.properties.with_indifferent_access['account_number'],
+              address: serialize_address(location),
+              contact: serialize_contact(location)
+            }.compact
+          end
+
+          # @param [Physical::Location] location
+          def serialize_address(location)
+            {
+              company_name: location.company_name,
+              address_line1: location.address1,
+              city_locality: location.city,
+              state_province: location.region.code,
+              postal_code: location.zip,
+              country_code: location.country.code
+            }.compact
+          end
+
+          # @param [Physical::Location] location
+          def serialize_contact(location)
+            {
+              name: location.name,
+              phone_number: location.phone,
+              email: location.email
+            }.compact
+          end
+
+          # @param [Physical::Location] location
+          def serialize_requested_by(location)
+            {
+              company_name: location.company_name,
+              contact: serialize_contact(location)
+            }.compact
+          end
+
+          # @param [Array<Physical::Package>] packages
+          def serialize_shipment_measurements(packages)
+            {
+              total_linear_length: {
+                value: packages.sum(&:length).convert_to(:inches).value.ceil,
+                unit: "inches"
+              },
+              total_width: {
+                value: packages.map(&:width).max.convert_to(:inches).value.ceil,
+                unit: "inches"
+              },
+              total_height: {
+                value: packages.map(&:height).max.convert_to(:inches).value.ceil,
+                unit: "inches"
+              },
+              total_weight: {
+                value: +packages.sum(&:weight).convert_to(:pounds).value.ceil,
+                unit: "pounds"
+              }
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/friendly_shipping/services/ship_engine_ltl.rb

@@ -0,0 +1,133 @@
+# frozen_string_literal: true
+
+require 'dry/monads'
+require 'friendly_shipping/http_client'
+require 'friendly_shipping/services/ship_engine_ltl/bad_request_handler'
+require 'friendly_shipping/services/ship_engine_ltl/parse_carrier_response'
+require 'friendly_shipping/services/ship_engine_ltl/parse_quote_response'
+require 'friendly_shipping/services/ship_engine_ltl/serialize_packages'
+require 'friendly_shipping/services/ship_engine_ltl/serialize_quote_request'
+require 'friendly_shipping/services/ship_engine_ltl/quote_options'
+require 'friendly_shipping/services/ship_engine_ltl/package_options'
+require 'friendly_shipping/services/ship_engine_ltl/item_options'
+
+module FriendlyShipping
+  module Services
+    class ShipEngineLTL
+      include Dry::Monads::Result::Mixin
+
+      API_BASE = "https://api.shipengine.com/v-beta/ltl/"
+      API_PATHS = {
+        connections: "connections",
+        carriers: "carriers",
+        quotes: "quotes"
+      }.freeze
+
+      def initialize(
+        token:,
+        test: true,
+        client: FriendlyShipping::HttpClient.new(
+          error_handler: FriendlyShipping::Services::ShipEngineLTL::BadRequestHandler
+        )
+      )
+        @token = token
+        @test = test
+        @client = client
+      end
+
+      # Get configured LTL carriers from ShipEngine
+      #
+      # @return [Result<ApiResult<Array<Carrier>>>] LTL carriers configured in your account
+      def carriers(debug: false)
+        request = FriendlyShipping::Request.new(
+          url: API_BASE + API_PATHS[:carriers],
+          headers: request_headers,
+          debug: debug
+        )
+        client.get(request).bind do |response|
+          ParseCarrierResponse.call(request: request, response: response)
+        end
+      end
+
+      # Connect an LTL carrier to ShipEngine
+      #
+      # @param [Hash] credentials The carrier's connection information
+      # @param [String] scac Standard Carrier Alpha Code
+      #
+      # @return [Result<ApiResult<Hash>>] The unique carrier ID assigned by ShipEngine
+      def connect_carrier(credentials, scac, debug: false)
+        request = FriendlyShipping::Request.new(
+          url: API_BASE + API_PATHS[:connections] + "/#{scac}",
+          body: { credentials: credentials }.to_json,
+          headers: request_headers,
+          debug: debug
+        )
+        client.post(request).bind do |response|
+          Success(
+            ApiResult.new(
+              JSON.parse(response.body),
+              original_request: request,
+              original_response: response
+            )
+          )
+        end
+      end
+
+      # Update an existing LTL carrier in ShipEngine
+      #
+      # @param [Hash] credentials The carrier's connection information
+      # @param [String] scac Standard Carrier Alpha Code
+      # @param [String] carrier_id The carrier ID from ShipEngine that you want to update
+      #
+      # @return [Result<ApiResult<Hash>>] The unique carrier ID assigned by ShipEngine
+      def update_carrier(credentials, scac, carrier_id, debug: false)
+        request = FriendlyShipping::Request.new(
+          url: API_BASE + API_PATHS[:connections] + "/#{scac}/#{carrier_id}",
+          body: { credentials: credentials }.to_json,
+          headers: request_headers,
+          debug: debug
+        )
+        client.put(request).bind do |response|
+          Success(
+            ApiResult.new(
+              JSON.parse(response.body),
+              original_request: request,
+              original_response: response
+            )
+          )
+        end
+      end
+
+      # Request an LTL price quote from ShipEngine
+      #
+      # @param [String] carrier_id The carrier ID from ShipEngine that you want to quote against
+      # @param [Physical::Shipment] shipment The shipment to quote
+      # @param [FriendlyShipping::Services::ShipEngineLTL::QuoteOptions] options The options for the quote
+      #
+      # @return [Result<ApiResult<Hash>>] The price quote from ShipEngine
+      def request_quote(carrier_id, shipment, options, debug: false)
+        request = FriendlyShipping::Request.new(
+          url: API_BASE + API_PATHS[:quotes] + "/#{carrier_id}",
+          http_method: "POST",
+          body: SerializeQuoteRequest.call(shipment: shipment, options: options).to_json,
+          headers: request_headers,
+          debug: debug
+        )
+        client.post(request).bind do |response|
+          ParseQuoteResponse.call(request: request, response: response)
+        end
+      end
+
+      private
+
+      attr_reader :token, :test, :client
+
+      def request_headers
+        {
+          content_type: :json,
+          "api-key": token
+        }
+      end
+    end
+  end
+end

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

@@ -11,8 +11,10 @@ module FriendlyShipping
       #   values are _reference number values_. Example: `{ reference_numbers: { xn: 'my_reference_1 }`
       # @option delivery_confirmation [Symbol] Can be set to any key from PACKAGE_DELIVERY_CONFIRMATION_CODES.
       #   Only possible for domestic shipments or shipments between the US and Puerto Rico.
-      # @option shipper_release [Boolean] Indicates that the package may be released by driver without a signature from the
-      #   consignee. Default: false
+      # @option shipper_release [Boolean] Indicates that the package may be released by driver without a signature from
+      #   the consignee. Default: false
+      # @option declared_value [Boolean] When true, declared value (calculated as the sum of all items in the shipment)
+      #   will be included in the request. Default: false
       class LabelPackageOptions < FriendlyShipping::PackageOptions
         PACKAGE_DELIVERY_CONFIRMATION_CODES = {
           delivery_confirmation: 1,
@@ -20,17 +22,19 @@ module FriendlyShipping
           delivery_confirmation_adult_signature_required: 3
         }.freeze
 
-        attr_reader :reference_numbers, :shipper_release
+        attr_reader :reference_numbers, :shipper_release, :declared_value
 
         def initialize(
           reference_numbers: {},
           delivery_confirmation: nil,
           shipper_release: false,
+          declared_value: false,
           **kwargs
         )
           @reference_numbers = reference_numbers
           @delivery_confirmation = delivery_confirmation
           @shipper_release = shipper_release
+          @declared_value = declared_value
           super(**kwargs.merge(item_options_class: LabelItemOptions))
         end
 

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

@@ -10,7 +10,8 @@ module FriendlyShipping
           reference_numbers: {},
           delivery_confirmation_code: nil,
           shipper_release: false,
-          transmit_dimensions: true
+          transmit_dimensions: true,
+          declared_value: false
         )
           xml.Package do
             xml.PackagingType do
@@ -49,6 +50,15 @@ module FriendlyShipping
                   xml.DCISType(delivery_confirmation_code)
                 end
               end
+              if declared_value
+                xml.DeclaredValue do
+                  xml.CurrencyCode('USD')
+                  monetary_value = package.items.inject(Money.new(0, 'USD')) do |package_sum, item|
+                    package_sum + (item.cost || Money.new(0, 'USD'))
+                  end
+                  xml.MonetaryValue(monetary_value)
+                end
+              end
             end
 
             reference_numbers.each do |reference_code, reference_number|

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

@@ -106,6 +106,8 @@ module FriendlyShipping
                       xml.SoldTo do
                         sold_to_location = options.sold_to || shipment.destination
                         SerializeShipmentAddressSnippet.call(xml: xml, location: sold_to_location)
+                        xml.AccountNumber(options.sold_to.account_number) if options.sold_to.try(:account_number).present?
+                        xml.TaxIdentificationNumber(options.sold_to.tax_id_number) if options.sold_to.try(:tax_id_number).present?
                       end
                     end
 
@@ -124,7 +126,7 @@ module FriendlyShipping
 
                     contents_description = shipment.packages.flat_map do |package|
                       package.items.map(&:description)
-                    end.compact.join(', ').slice(0, 50)
+                    end.compact.uniq.join(', ').slice(0, 50)
 
                     unless contents_description.empty?
                       xml.Description(contents_description)
@@ -160,7 +162,8 @@ module FriendlyShipping
                       package: package,
                       reference_numbers: reference_numbers,
                       delivery_confirmation_code: delivery_confirmation_code,
-                      shipper_release: package_options.shipper_release
+                      shipper_release: package_options.shipper_release,
+                      declared_value: package_options.declared_value
                     )
                   end
                 end
@@ -263,7 +266,7 @@ module FriendlyShipping
                   xml.CommodityCode(item_options.commodity_code)
                   xml.OriginCountryCode(item_options.country_of_origin || shipment.origin.country.code)
                   xml.Unit do
-                    xml.Value(cost * items.length)
+                    xml.Value(cost)
                     xml.Number(items.length)
                     xml.UnitOfMeasurement do
                       xml.Code(item_options.product_unit_of_measure_code)

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

@@ -7,17 +7,17 @@ module FriendlyShipping
         class << self
           def call(location:)
             {
-              Name: location.company_name.presence || location.name,
+              Name: truncate(location.company_name.presence || location.name),
               Address: {
                 AddressLine: address_line(location),
-                City: location.city,
+                City: truncate(location.city, length: 29),
                 StateProvinceCode: location.region&.code,
                 PostalCode: location.zip,
                 CountryCode: location.country&.code
               },
-              AttentionName: location.name,
+              AttentionName: truncate(location.name),
               Phone: {
-                Number: location.phone
+                Number: truncate(location.phone, length: 14)
               }.compact.presence
             }.compact
           end
@@ -29,8 +29,12 @@ module FriendlyShipping
               location.address1,
               location.address2,
               location.address3
-            ].compact.reject(&:empty?)
-            address_lines.size > 1 ? address_lines : address_lines.first
+            ].compact.reject(&:empty?).map { |e| truncate(e) }
+            address_lines.size > 1 ? address_lines : truncate(address_lines.first)
+          end
+
+          def truncate(value, length: 35)
+            value && value[0..(length - 1)]
           end
         end
       end

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

@@ -94,7 +94,8 @@ module FriendlyShipping
 
             rate_value =
               if commercial_rate_requested_or_rate_is_zero && commercial_rate_available
-                rate_node.at(COMMERCIAL_RATE_TAG)&.text&.to_d || rate_node.at(COMMERCIAL_PLUS_RATE_TAG).text.to_d
+                commercial_rate = rate_node.at(COMMERCIAL_RATE_TAG)&.text.to_d
+                commercial_rate.zero? ? rate_node.at(COMMERCIAL_PLUS_RATE_TAG).text.to_d : commercial_rate
               else
                 rate_node.at(RATE_TAG).text.to_d
               end

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

@@ -106,10 +106,12 @@ module FriendlyShipping
           # “0” = All Mail Classes
           # “1” = Priority Mail Express
           # “2” = Priority Mail
-          # “3” = First Class Mail
+          # “3” = First-Class - replaced by Ground Advantage (up to 15.999 oz)
           # “4” = Marketing Mail
           # “5” = Periodicals
           # “6” = Package Services
+          # “7” = Parcel Select Ground - replaced by Ground Advantage (1-70 lbs)
+          # “9” = Ground Advantage (1-70 lbs)
           #
           # However, no shipping methods really map to "Marketing Mail" or "Periodicals".
           # This will likely be somewhat more work in the future.
@@ -117,7 +119,9 @@ module FriendlyShipping
             '1' => 'Priority Mail Express',
             '2' => 'Priority Mail',
             '3' => 'First-Class',
-            '6' => 'Package Services'
+            '6' => 'Package Services',
+            '7' => 'Parcel Select Ground',
+            '9' => 'Ground Advantage'
           }.freeze
 
           # This code carries a few details about the shipment:

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

@@ -35,11 +35,13 @@ module FriendlyShipping
           hold_for_pickup: '2',
           sunday_holiday_delivery: '23'
         },
-        priority_mail_cubic: '999'
+        priority_mail_cubic: '999',
+        ground_advantage: '1058'
       }.freeze
 
       SHIPPING_METHODS = [
         ['FIRST CLASS', 'First-Class'],
+        ['GROUND ADVANTAGE', 'Ground Advantage', CLASS_IDS[:ground_advantage]],
         ['PACKAGE SERVICES', 'Package Services'],
         ['PRIORITY', 'Priority Mail'],
         ['PRIORITY MAIL EXPRESS', 'Priority Mail Express', CLASS_IDS[:priority_mail_express].values],
@@ -55,7 +57,7 @@ module FriendlyShipping
           service_code: code,
           domestic: true,
           international: false,
-          data: { class_ids: class_ids }
+          data: { class_ids: Array(class_ids) }
         )
       end.freeze
     end

data/lib/friendly_shipping/services/usps_international/parse_package_rate.rb

@@ -47,7 +47,8 @@ module FriendlyShipping
 
             rate_value =
               if commercial_rate_requested_or_rate_is_zero && commercial_rate_available
-                rate_node.at(COMMERCIAL_RATE_TAG)&.text&.to_d || rate_node.at(COMMERCIAL_PLUS_RATE_TAG).text.to_d
+                commercial_rate = rate_node.at(COMMERCIAL_RATE_TAG)&.text.to_d
+                commercial_rate.zero? ? rate_node.at(COMMERCIAL_PLUS_RATE_TAG).text.to_d : commercial_rate
               else
                 rate_node.at(RATE_TAG).text.to_d
               end

data/lib/friendly_shipping/services/usps_international/serialize_rate_request.rb

@@ -56,12 +56,12 @@ module FriendlyShipping
           end
 
           def ounces_for(package)
-            ounces = package.weight.convert_to(:ounces).value.to_f.round(2).ceil
+            ounces = (package.weight.convert_to(:ounces).value.to_f % 16).round(2).ceil
             ounces == 16 ? 15.999 : [ounces, 1].max
           end
 
           def pounds_for(package)
-            package.weight.convert_to(:pounds).value.to_f.round(2).ceil
+            package.weight.convert_to(:pounds).value.to_f.floor
           end
 
           def girth(package)

data/lib/friendly_shipping/version.rb

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

data/lib/friendly_shipping.rb

@@ -17,6 +17,7 @@ require "friendly_shipping/api_result"
 require "friendly_shipping/api_failure"
 
 require "friendly_shipping/services/ship_engine"
+require 'friendly_shipping/services/ship_engine_ltl'
 require "friendly_shipping/services/ups"
 require "friendly_shipping/services/ups_freight"
 require "friendly_shipping/services/usps"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_shipping
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Martin Meyerhoff
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-18 00:00:00.000000000 Z
+date: 2023-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-monads
@@ -256,6 +256,7 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".env.template"
+- ".env.test"
 - ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
@@ -298,6 +299,16 @@ files:
 - lib/friendly_shipping/services/ship_engine/rate_estimates_options.rb
 - lib/friendly_shipping/services/ship_engine/serialize_label_shipment.rb
 - lib/friendly_shipping/services/ship_engine/serialize_rate_estimate_request.rb
+- lib/friendly_shipping/services/ship_engine_ltl.rb
+- lib/friendly_shipping/services/ship_engine_ltl/bad_request.rb
+- lib/friendly_shipping/services/ship_engine_ltl/bad_request_handler.rb
+- lib/friendly_shipping/services/ship_engine_ltl/item_options.rb
+- lib/friendly_shipping/services/ship_engine_ltl/package_options.rb
+- lib/friendly_shipping/services/ship_engine_ltl/parse_carrier_response.rb
+- lib/friendly_shipping/services/ship_engine_ltl/parse_quote_response.rb
+- lib/friendly_shipping/services/ship_engine_ltl/quote_options.rb
+- lib/friendly_shipping/services/ship_engine_ltl/serialize_packages.rb
+- lib/friendly_shipping/services/ship_engine_ltl/serialize_quote_request.rb
 - lib/friendly_shipping/services/ups.rb
 - lib/friendly_shipping/services/ups/label.rb
 - lib/friendly_shipping/services/ups/label_billing_options.rb
@@ -406,7 +417,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: An integration layer for shipping services