friendly_shipping 0.3.4 → 0.4.0

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'friendly_shipping/services/ups_freight/rates_item_options'
+
+module FriendlyShipping
+  module Services
+    class UpsFreight
+      # Options for packages/pallets within a UPS Freight shipment
+      #
+      # @attribute [Symbol] handling _unit How this shipment is divided. Any of the keys in `HANDLING_UNIT_TYPES`
+      # @attribute [RatesItemOptions] item_options Options for each of the items on the pallet/in the carboy/etc.
+      class RatesPackageOptions < FriendlyShipping::PackageOptions
+        HANDLING_UNIT_TYPES = {
+          pallet: { code: "PLT", description: "Pallet", handling_unit_tag: 'One' },
+          skid: { code: "SKD", description: "Skid", handling_unit_tag: 'One' },
+          carboy: { code: "CBY", description: "Carboy", handling_unit_tag: 'One' },
+          totes: { code: "TOT", description: "Totes", handling_unit_tag: 'One' },
+          other: { code: "OTH", description: "Other", handling_unit_tag: 'Two' },
+          loose: { code: "LOO", description: "Loose", handling_unit_tag: 'Two' }
+        }.freeze
+
+        attr_reader :handling_unit_description,
+                    :handling_unit_tag,
+                    :handling_unit_code
+
+        def initialize(
+          handling_unit: :pallet,
+          **kwargs
+        )
+          @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)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module FriendlyShipping
+  module Services
+    class UpsFreight
+      ORIGIN_COUNTRIES = %w(
+        CA MX PR US
+      ).map { |country_code| Carmen::Country.coded(country_code) }.freeze
+
+      SHIPPING_METHODS = [
+        ['308', 'UPS Freight LTL'],
+        ['309', 'UPS Freight LTL - Guaranteed'],
+        ['334', 'UPS Freight LTL - Guaranteed A.M.'],
+        ['349', 'UPS Standard LTL']
+      ].freeze.map do |code, name|
+        FriendlyShipping::ShippingMethod.new(
+          name: name,
+          service_code: code,
+          origin_countries: ORIGIN_COUNTRIES,
+          multi_package: true
+        ).freeze
+      end
+    end
+  end
+end

data/lib/friendly_shipping/services/usps.rb

@@ -59,7 +59,7 @@ module FriendlyShipping
       #   can be serialized into an error message using `to_s`.
       def rate_estimates(shipment, shipping_method: nil, debug: false)
         rate_request_xml = SerializeRateRequest.call(shipment: shipment, login: login, shipping_method: shipping_method)
-        request = build_request(api: :rates_request, xml: rate_request_xml, debug: debug)
+        request = build_request(api: :rates, xml: rate_request_xml, debug: debug)
 
         client.post(request).bind do |response|
           ParseRateResponse.call(response: response, request: request, shipment: shipment)

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

@@ -9,7 +9,7 @@ module FriendlyShipping
 
         class << self
           def call(response_body, expected_root_tag)
-            xml = Nokogiri.XML(response_body)
+            xml = Nokogiri.XML(response_body, &:strict)
 
             if xml.root.nil? || ![expected_root_tag, 'Error'].include?(xml.root.name)
               Failure('Invalid document')

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

@@ -74,10 +74,6 @@ module FriendlyShipping
             ounces == 16 ? 15.999 : [ounces, 1].max
           end
 
-          def strip_zip(zip)
-            zip.to_s.scan(/\d{5}/).first || zip
-          end
-
           def girth(package)
             width, length = package.dimensions.sort.first(2)
             (width.scale(2) + length.scale(2)).convert_to(:inches).value.to_f

data/lib/friendly_shipping/shipment_options.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module FriendlyShipping
+  class ShipmentOptions
+    def initialize(
+      package_options: Set.new,
+      package_options_class: PackageOptions
+    )
+      @package_options = package_options
+      @package_options_class = package_options_class
+    end
+
+    def options_for_package(package)
+      package_options.detect do |package_option|
+        package_option.package_id == package.id
+      end || package_options_class.new(package_id: nil)
+    end
+
+    private
+
+    attr_reader :package_options, :package_options_class
+  end
+end

data/lib/friendly_shipping/shipping_method.rb

@@ -4,6 +4,13 @@ module FriendlyShipping
   class ShippingMethod
     attr_reader :name, :service_code, :carrier, :origin_countries
 
+    # @param [String] name The shipping method's name
+    # @param [String] service_code The shipping method's service code
+    # @param [Boolean] domestic Whether this is a domestic shipping method
+    # @param [Boolean] international Whether this is an international shipping method
+    # @param [Boolean] multi_package Whether this is a multi-package shipping method
+    # @param [FriendlyShipping::Carrier] carrier This shipping method's carrier
+    # @param [Array] origin_countries Countries this shipping method ships from
     def initialize(
       name: nil,
       service_code: nil,

data/lib/friendly_shipping/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friendly_shipping
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Martin Meyerhoff
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2019-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_uri
@@ -70,16 +70,16 @@ dependencies:
   name: physical
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -164,24 +164,36 @@ files:
 - lib/friendly_shipping/api_result.rb
 - lib/friendly_shipping/carrier.rb
 - lib/friendly_shipping/http_client.rb
+- lib/friendly_shipping/item_options.rb
 - lib/friendly_shipping/label.rb
+- lib/friendly_shipping/package_options.rb
 - lib/friendly_shipping/rate.rb
 - lib/friendly_shipping/request.rb
 - lib/friendly_shipping/response.rb
 - lib/friendly_shipping/services/ship_engine.rb
 - lib/friendly_shipping/services/ship_engine/bad_request.rb
 - lib/friendly_shipping/services/ship_engine/bad_request_handler.rb
+- lib/friendly_shipping/services/ship_engine/label_options.rb
+- lib/friendly_shipping/services/ship_engine/label_package_options.rb
 - lib/friendly_shipping/services/ship_engine/parse_carrier_response.rb
 - lib/friendly_shipping/services/ship_engine/parse_label_response.rb
 - lib/friendly_shipping/services/ship_engine/parse_rate_estimate_response.rb
 - lib/friendly_shipping/services/ship_engine/parse_void_response.rb
+- 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/ups.rb
+- lib/friendly_shipping/services/ups/label_billing_options.rb
+- lib/friendly_shipping/services/ups/label_item_options.rb
+- lib/friendly_shipping/services/ups/label_options.rb
+- lib/friendly_shipping/services/ups/label_package_options.rb
 - lib/friendly_shipping/services/ups/parse_address_classification_response.rb
 - lib/friendly_shipping/services/ups/parse_address_validation_response.rb
 - lib/friendly_shipping/services/ups/parse_city_state_lookup_response.rb
+- lib/friendly_shipping/services/ups/parse_money_element.rb
 - lib/friendly_shipping/services/ups/parse_rate_response.rb
+- lib/friendly_shipping/services/ups/parse_shipment_accept_response.rb
+- lib/friendly_shipping/services/ups/parse_shipment_confirm_response.rb
 - lib/friendly_shipping/services/ups/parse_xml_response.rb
 - lib/friendly_shipping/services/ups/serialize_access_request.rb
 - lib/friendly_shipping/services/ups/serialize_address_snippet.rb
@@ -189,7 +201,21 @@ files:
 - lib/friendly_shipping/services/ups/serialize_city_state_lookup_request.rb
 - lib/friendly_shipping/services/ups/serialize_package_node.rb
 - lib/friendly_shipping/services/ups/serialize_rating_service_selection_request.rb
+- lib/friendly_shipping/services/ups/serialize_shipment_accept_request.rb
+- lib/friendly_shipping/services/ups/serialize_shipment_address_snippet.rb
+- lib/friendly_shipping/services/ups/serialize_shipment_confirm_request.rb
 - lib/friendly_shipping/services/ups/shipping_methods.rb
+- lib/friendly_shipping/services/ups_freight.rb
+- lib/friendly_shipping/services/ups_freight/generate_commodity_information.rb
+- lib/friendly_shipping/services/ups_freight/generate_freight_rate_request_hash.rb
+- lib/friendly_shipping/services/ups_freight/generate_location_hash.rb
+- lib/friendly_shipping/services/ups_freight/generate_ups_security_hash.rb
+- lib/friendly_shipping/services/ups_freight/parse_freight_rate_response.rb
+- lib/friendly_shipping/services/ups_freight/parse_json_response.rb
+- lib/friendly_shipping/services/ups_freight/rates_item_options.rb
+- lib/friendly_shipping/services/ups_freight/rates_options.rb
+- lib/friendly_shipping/services/ups_freight/rates_package_options.rb
+- lib/friendly_shipping/services/ups_freight/shipping_methods.rb
 - lib/friendly_shipping/services/usps.rb
 - lib/friendly_shipping/services/usps/choose_package_rate.rb
 - lib/friendly_shipping/services/usps/machinable_package.rb
@@ -202,6 +228,7 @@ files:
 - lib/friendly_shipping/services/usps/serialize_city_state_lookup_request.rb
 - lib/friendly_shipping/services/usps/serialize_rate_request.rb
 - lib/friendly_shipping/services/usps/shipping_methods.rb
+- lib/friendly_shipping/shipment_options.rb
 - lib/friendly_shipping/shipping_method.rb
 - lib/friendly_shipping/version.rb
 homepage: https://github.com/friendly_cart/friendly_shipping