friendly_shipping 0.9.0 → 0.10.1

data/lib/friendly_shipping/services/usps_ship/access_token.rb

@@ -7,29 +7,14 @@ module FriendlyShipping
     class USPSShip
       # Represents an access token returned by USPS Ship. The access token can be
       # used to make API requests. Once it expires, a new token must be created.
-      class AccessToken
+      class AccessToken < FriendlyShipping::AccessToken
         # @return [String] the token's type
         attr_reader :token_type
 
-        # @return [Integer] the token's expiration
-        attr_reader :expires_in
-
-        # @return [String] the raw JWT token
-        attr_reader :raw_token
-
         # @param token_type [String] the token's type (typically "Bearer")
-        # @param expires_in [Integer] the token's expiration
-        # @param raw_token [String] the raw JWT token
-        def initialize(token_type:, expires_in:, raw_token:)
+        def initialize(token_type:, **other_kwargs)
           @token_type = token_type
-          @expires_in = expires_in
-          @raw_token = raw_token
-        end
-
-        # Decodes and returns the raw JWT token.
-        # @return [Array<Hash>] the decoded token
-        def decoded_token
-          @_decoded_token = JWT.decode(raw_token, nil, false)
+          super(**other_kwargs)
         end
       end
     end

data/lib/friendly_shipping/services/usps_ship/api_error.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/api_error'
-
 module FriendlyShipping
   module Services
     class USPSShip

data/lib/friendly_shipping/services/usps_ship/machinable_package.rb

@@ -15,10 +15,11 @@ module FriendlyShipping
         MIN_WIDTH = Measured::Length(3, :inches)
         MIN_HEIGHT = Measured::Length(0.25, :inches)
 
-        MAX_LENGTH = Measured::Length(27, :inches)
-        MAX_WIDTH = Measured::Length(17, :inches)
-        MAX_HEIGHT = Measured::Length(17, :inches)
+        MAX_LENGTH = Measured::Length(22, :inches)
+        MAX_WIDTH = Measured::Length(18, :inches)
+        MAX_HEIGHT = Measured::Length(15, :inches)
 
+        MIN_WEIGHT = Measured::Weight(6, :ounces)
         MAX_WEIGHT = Measured::Weight(25, :pounds)
 
         # @param package [Physical::Package]
@@ -37,7 +38,8 @@ module FriendlyShipping
         def at_least_minimum
           package.length >= MIN_LENGTH &&
             package.width >= MIN_WIDTH &&
-            package.height >= MIN_HEIGHT
+            package.height >= MIN_HEIGHT &&
+            package.weight >= MIN_WEIGHT
         end
 
         # @return [Boolean]

data/lib/friendly_shipping/services/usps_ship/parse_rate_estimates_response.rb

@@ -12,7 +12,7 @@ module FriendlyShipping
           #
           # @param request [Request] the request that was used to obtain this response
           # @param response [Response] the response that USPS returned
-          # @return [Success<ApiResult<Array<Rate>>>, Failure<ApiFailure<String>>]
+          # @return [Success<ApiResult<Array<Rate>>>, Failure<ApiResult<String>>]
           def call(request:, response:)
             rates = JSON.parse(response.body)['rates'].map do |rate|
               shipping_method = SHIPPING_METHODS.detect { |sm| sm.service_code == rate['mailClass'] }
@@ -63,10 +63,10 @@ module FriendlyShipping
           # @param message [String]
           # @param request [Request]
           # @param response [Response]
-          # @return [Failure<ApiFailure<String>>]
+          # @return [Failure<ApiResult<String>>]
           def failure(message, request, response)
             Failure(
-              ApiFailure.new(
+              ApiResult.new(
                 message,
                 original_request: request,
                 original_response: response

data/lib/friendly_shipping/services/usps_ship/parse_timings_response.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/timing'
-
 module FriendlyShipping
   module Services
     class USPSShip
@@ -13,7 +11,7 @@ module FriendlyShipping
           #
           # @param request [Request] the request that was used to obtain this response
           # @param response [Response] the response that USPS returned
-          # @return [Success<ApiResult<Array<Timing>>>, Failure<ApiFailure<String>>]
+          # @return [Success<ApiResult<Array<Timing>>>, Failure<ApiResult<String>>]
           def call(request:, response:)
             timings = JSON.parse(response.body).map do |timing|
               shipping_method = SHIPPING_METHODS.detect { |sm| sm.service_code == timing['mailClass'] }
@@ -36,16 +34,14 @@ module FriendlyShipping
             end.compact
 
             if timings.empty?
-              failure("No timings were returned. Is the destination zip correct?", request, response)
+              failure(api_error("No timings were returned. Is the destination zip correct?"), request, response)
             else
               success(timings, request, response)
             end
           rescue JSON::ParserError => e
-            failure(e.message, request, response)
+            failure(e, request, response)
           end
 
-          private
-
           # @param timings [Array<Timing>]
           # @param request [Request]
           # @param response [Response]
@@ -60,19 +56,25 @@ module FriendlyShipping
             )
           end
 
-          # @param message [String]
+          # @param error [JSON::ParserError, FriendlyShipping::ApiError]
           # @param request [Request]
           # @param response [Response]
-          # @return [Failure<ApiFailure<String>>]
-          def failure(message, request, response)
+          # @return [Failure<ApiResult>]
+          def failure(error, request, response)
             Failure(
-              ApiFailure.new(
-                message,
+              ApiResult.new(
+                error,
                 original_request: request,
                 original_response: response
               )
             )
           end
+
+          private
+
+          def api_error(message)
+            FriendlyShipping::ApiError.new(nil, message)
+          end
         end
       end
     end

data/lib/friendly_shipping/services/usps_ship/rate_estimate_package_options.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/ups/rate_estimate_package_options'
-
 module FriendlyShipping
   module Services
     class USPSShip

data/lib/friendly_shipping/services/usps_ship/serialize_rate_estimates_request.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/usps/machinable_package'
-
 module FriendlyShipping
   module Services
     class USPSShip

data/lib/friendly_shipping/services/usps_ship.rb

@@ -1,20 +1,6 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/http_client'
-
-require 'friendly_shipping/services/usps_ship/access_token'
-require 'friendly_shipping/services/usps_ship/api_error'
-require 'friendly_shipping/services/usps_ship/shipping_methods'
-
-require 'friendly_shipping/services/usps_ship/rate_estimate_options'
-require 'friendly_shipping/services/usps_ship/rate_estimate_package_options'
-require 'friendly_shipping/services/usps_ship/timing_options'
-
-require 'friendly_shipping/services/usps_ship/serialize_rate_estimates_request'
-require 'friendly_shipping/services/usps_ship/machinable_package'
-
-require 'friendly_shipping/services/usps_ship/parse_rate_estimates_response'
-require 'friendly_shipping/services/usps_ship/parse_timings_response'
+require 'nokogiri'
 
 module FriendlyShipping
   module Services

data/lib/friendly_shipping/version.rb

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

data/lib/friendly_shipping.rb

@@ -2,32 +2,31 @@
 
 require "physical"
 require "money"
+require "dry/monads"
+require "restclient"
 
 # Explicitly configure the default rounding mode to avoid deprecation warnings
 Money.rounding_mode = BigDecimal::ROUND_HALF_EVEN
 
-require "friendly_shipping/version"
-require "friendly_shipping/inflections"
-require "friendly_shipping/request"
-require "friendly_shipping/response"
-require "friendly_shipping/carrier"
-require "friendly_shipping/shipping_method"
-require "friendly_shipping/structure_options"
-require "friendly_shipping/label"
-require "friendly_shipping/rate"
-require "friendly_shipping/api_result"
-require "friendly_shipping/api_failure"
+require "zeitwerk"
 
-require 'friendly_shipping/services/rl'
-require "friendly_shipping/services/ship_engine"
-require 'friendly_shipping/services/ship_engine_ltl'
-require "friendly_shipping/services/tforce_freight"
-require "friendly_shipping/services/ups"
-require "friendly_shipping/services/ups_freight"
-require "friendly_shipping/services/ups_json"
-require "friendly_shipping/services/usps"
-require "friendly_shipping/services/usps_international"
-require "friendly_shipping/services/usps_ship"
+loader = Zeitwerk::Loader.for_gem
+loader.inflector.inflect(
+  "rl" => "RL",
+  "parse_create_bol_response" => "ParseCreateBOLResponse",
+  "parse_print_bol_response" => "ParsePrintBOLResponse",
+  "serialize_create_bol_request" => "SerializeCreateBOLRequest",
+  "bol_structures_serializer" => "BOLStructuresSerializer",
+  "bol_packages_serializer" => "BOLPackagesSerializer",
+  "bol_options" => "BOLOptions",
+  "ship_engine_ltl" => "ShipEngineLTL",
+  "tforce_freight" => "TForceFreight",
+  "generate_create_bol_request_hash" => "GenerateCreateBOLRequestHash",
+  "parse_xml_response" => "ParseXMLResponse",
+  "usps_ship" => "USPSShip",
+  "shipping_methods" => "SHIPPING_METHODS"
+)
+loader.setup
 
 module FriendlyShipping
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_shipping
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Martin Meyerhoff
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-06 00:00:00.000000000 Z
+date: 2025-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-monads
@@ -130,13 +130,13 @@ files:
 - bin/setup
 - friendly_shipping.gemspec
 - lib/friendly_shipping.rb
+- lib/friendly_shipping/access_token.rb
 - lib/friendly_shipping/api_error.rb
 - lib/friendly_shipping/api_error_handler.rb
 - lib/friendly_shipping/api_failure.rb
 - lib/friendly_shipping/api_result.rb
 - lib/friendly_shipping/carrier.rb
 - lib/friendly_shipping/http_client.rb
-- lib/friendly_shipping/inflections.rb
 - lib/friendly_shipping/item_options.rb
 - lib/friendly_shipping/label.rb
 - lib/friendly_shipping/package_options.rb
@@ -300,6 +300,7 @@ files:
 - lib/friendly_shipping/services/ups_json/api_error.rb
 - lib/friendly_shipping/services/ups_json/generate_address_classification_payload.rb
 - lib/friendly_shipping/services/ups_json/generate_address_hash.rb
+- lib/friendly_shipping/services/ups_json/generate_city_state_lookup_payload.rb
 - lib/friendly_shipping/services/ups_json/generate_labels_payload.rb
 - lib/friendly_shipping/services/ups_json/generate_package_hash.rb
 - lib/friendly_shipping/services/ups_json/generate_rates_payload.rb
@@ -310,6 +311,7 @@ files:
 - lib/friendly_shipping/services/ups_json/label_options.rb
 - lib/friendly_shipping/services/ups_json/label_package_options.rb
 - lib/friendly_shipping/services/ups_json/parse_address_classification_response.rb
+- lib/friendly_shipping/services/ups_json/parse_city_state_lookup_response.rb
 - lib/friendly_shipping/services/ups_json/parse_json_response.rb
 - lib/friendly_shipping/services/ups_json/parse_labels_response.rb
 - lib/friendly_shipping/services/ups_json/parse_money_hash.rb
@@ -376,14 +378,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: An integration layer for shipping services

data/lib/friendly_shipping/inflections.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-# This is necessary for classes with acronyms to autoload in Rails
-if Object.const_defined?('ActiveSupport::Inflector')
-  ActiveSupport::Inflector.inflections(:en) do |inflect|
-    inflect.acronym 'BOL'
-    inflect.acronym 'RL'
-    inflect.acronym 'TForce'
-  end
-end