friendly_shipping 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 748717bbd3258962363ac3c25a9159cbcf384c91d8f5a356a1c405441bec7bac
-  data.tar.gz: cf66d120169edd0bdc1608a27c0a015da599ca7800e813245cb1af9b2ce7992d
+  metadata.gz: 4c32d3c28aea8a8cc0367288ea92fd4c1f29c5e18eb680a82f273e3f4319d14e
+  data.tar.gz: 6618acc12ea1a92156dbfd2864a812d4c44cebd2b4f4c05b13d3d19d20d6fc62
 SHA512:
-  metadata.gz: f5b2fe10990482d30af429f31bbb48acfafa3dec81adf728a18a29d3de20bafaf329d00c73bb8899ab21469b7068a67bdb848067980d4deee559cdd1cbe511bb
-  data.tar.gz: 483efd68ebd20f3554baa8a239d1372a3fea8805cbcd203e84f7ec2401fd135627c452c2002147b474635806748dffd926ead4f40030ce583fb8a01c6d60ef3a
+  metadata.gz: ef98ea7a648d25aba9d2d2df3d4d624a5c6413f1008d6bd9e2aff3520779aee02c24163242152698cdacf91a9c9b75a1686f950a53b1eb1aa406f6882c2864fe
+  data.tar.gz: 6e6d8669b5fa64c18cbf89a215e642042f1bcc31f35900a9836782bd80ca307e6bdeafdf36b8a946e0d3da3068338b1db69133827af0ec59cd2f538cb1c74492

data/CHANGELOG.md

@@ -4,6 +4,12 @@ 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.7.3] - 2023-01-24
+- UPS Service: Record USPS tracking code (#153)
+
+## [0.7.2] - 2023-01-24
+- ShipEngine Service: Allow sending a label image ID when creating labels (#152)
+
 ## [0.7.1] - 2023-01-20
 - ShipEngine Service: Include package dimensions even if package code given
 

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

@@ -10,22 +10,26 @@ module FriendlyShipping
       # @attribute label_format [Symbol] The format for the label. Possible Values: :png, :zpl and :pdf. Default :pdf
       # @attribute label_download_type [Symbol] Whether to download directly (`:inline`) or
       #   obtain a URL to the label (`:url`). Default :url
+      # @attribute label_image_id [String] Identifier for image uploaded to ShipEngine. Default: nil
       # @attribute package_options [Enumberable<LabelPackageOptions>] Package options for the packages in the shipment
       #
       class LabelOptions < FriendlyShipping::ShipmentOptions
         attr_reader :shipping_method,
+                    :label_download_type,
                     :label_format,
-                    :label_download_type
+                    :label_image_id
 
         def initialize(
           shipping_method:,
-          label_format: :pdf,
           label_download_type: :url,
+          label_format: :pdf,
+          label_image_id: nil,
           **kwargs
         )
           @shipping_method = shipping_method
-          @label_format = label_format
           @label_download_type = label_download_type
+          @label_format = label_format
+          @label_image_id = label_image_id
           super(**kwargs.merge(package_options_class: LabelPackageOptions))
         end
       end

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

@@ -25,6 +25,10 @@ module FriendlyShipping
               shipment_hash[:test_label] = true
             end
 
+            if options.label_image_id
+              shipment_hash[:label_image_id] = options.label_image_id
+            end
+
             shipment_hash
           end
 

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module FriendlyShipping
+  module Services
+    class Ups
+      class Label < FriendlyShipping::Label
+        attr_reader :usps_tracking_number
+
+        # @param [String] usps_tracking_number The label's usps tracking number. Limited to SUREPOST
+        def initialize(
+          usps_tracking_number: nil,
+          **params
+        )
+          @usps_tracking_number = usps_tracking_number
+          super(**params)
+        end
+      end
+    end
+  end
+end

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

@@ -36,8 +36,9 @@ module FriendlyShipping
               cost_breakdown = build_cost_breakdown(package)
               package_cost = cost_breakdown.values.any? ? cost_breakdown.values.sum : nil
               encoded_label_data = package.at('LabelImage/GraphicImage')&.text
-              FriendlyShipping::Label.new(
+              FriendlyShipping::Services::Ups::Label.new(
                 tracking_number: package.at('TrackingNumber').text,
+                usps_tracking_number: package.at('USPSPICNumber')&.text,
                 label_data: encoded_label_data ? Base64.decode64(encoded_label_data) : nil,
                 label_format: package.at('LabelImage/LabelImageFormat/Code')&.text,
                 cost: package_cost,

data/lib/friendly_shipping/services/ups.rb

@@ -19,6 +19,7 @@ require 'friendly_shipping/services/ups/parse_shipment_accept_response'
 require 'friendly_shipping/services/ups/parse_time_in_transit_response'
 require 'friendly_shipping/services/ups/parse_void_shipment_response'
 require 'friendly_shipping/services/ups/shipping_methods'
+require 'friendly_shipping/services/ups/label'
 require 'friendly_shipping/services/ups/label_options'
 require 'friendly_shipping/services/ups/rate_estimate_options'
 require 'friendly_shipping/services/ups/timing_options'

data/lib/friendly_shipping/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friendly_shipping
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.3
 platform: ruby
 authors:
 - Martin Meyerhoff
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-20 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-monads
@@ -296,6 +296,7 @@ files:
 - 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.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