friendly_shipping 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bb403d6836f79ac9aa2640acde019549c1bad34f811b83a89200fc42d2988d0
-  data.tar.gz: cafc834f0f658fcbb642b05a63b0ae7a5199c4cb931a763d0fbe818e6120b507
+  metadata.gz: 752559509e8e61f905718631a73a9df4944367d3c3c24c292a49d8536eded1cd
+  data.tar.gz: 0ece2fb1fae5a77c20ddde481bc6995f143bdd02ead0cf1d82f718c649864010
 SHA512:
-  metadata.gz: d57c7d63efe4b830468831b40dd0f983fd4c500da0a0a7bb27d75b0f789041fdf39f22ce737d4bbf9c5c8853fc0207133df1188b64a73e5389d6898dfc15add0
-  data.tar.gz: d582a29e16a2d99bd397bb955ade4b0d220a93e749b0f0cbb96d645aa71c7ece47197b74fd5a65c2d2cd95988612b6f71c3599220aea4a97b3ae73606be4cb72
+  metadata.gz: c64b6cf5cc60a948b64cc30b889c88874f6aa5cd1d448f5e9168e8cf98771e3e25d8c710322c0b6752fa7932fac2eefe720d322eea6cd60ea74fe4b606136f4a
+  data.tar.gz: 18ee11e1c30eecb0a5e41ad81edda69081a7100bd40d05ce715dc2e8761f9961a12f21d54f63151b90cb6134fc6beb2d703256792caa3647a8396a5713902d02

data/CHANGELOG.md

@@ -4,6 +4,15 @@ 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.5.2] - 2020-01-31
+
+### Added
+- USPS Service: Added rectangular boolean to rate options class (#89)
+- USPS Service: Added readable body to request class (#88)
+
+### Removed
+- USPS Service: Drop deprecated rectangular container (#89)
+
 ## [0.5.1] - 2020-01-28
 
 ### Changed

data/lib/friendly_shipping/request.rb

@@ -6,13 +6,19 @@ module FriendlyShipping
 
     # @param [String] url The HTTP request URL
     # @param [String] body The HTTP request body
+    # # @param [String] readable_body Human-readable HTTP request body
     # @param [Hash] headers The HTTP request headers
     # @param [Boolean] debug Whether to debug the request
-    def initialize(url:, body: nil, headers: {}, debug: false)
+    def initialize(url:, body: nil, readable_body: nil, headers: {}, debug: false)
       @url = url
       @body = body
+      @readable_body = readable_body
       @headers = headers
       @debug = debug
     end
+
+    def readable_body
+      @readable_body.presence || @body
+    end
   end
 end

data/lib/friendly_shipping/services/ups.rb

@@ -74,6 +74,7 @@ module FriendlyShipping
         request = FriendlyShipping::Request.new(
           url: url,
           body: access_request_xml + rate_request_xml,
+          readable_body: rate_request_xml,
           debug: debug
         )
 
@@ -95,6 +96,7 @@ module FriendlyShipping
         request = FriendlyShipping::Request.new(
           url: time_in_transit_url,
           body: access_request_xml + time_in_transit_request_xml,
+          readable_body: time_in_transit_request_xml,
           debug: debug
         )
 
@@ -114,6 +116,7 @@ module FriendlyShipping
         ship_confirm_request = FriendlyShipping::Request.new(
           url: ship_confirm_url,
           body: access_request_xml + ship_confirm_request_xml,
+          readable_body: ship_confirm_request_xml,
           debug: debug
         )
 
@@ -132,6 +135,7 @@ module FriendlyShipping
           ship_accept_request = FriendlyShipping::Request.new(
             url: ship_accept_url,
             body: access_request_xml + ship_accept_request_xml,
+            readable_body: ship_accept_request_xml,
             debug: debug
           )
 
@@ -153,6 +157,7 @@ module FriendlyShipping
         request = FriendlyShipping::Request.new(
           url: url,
           body: access_request_xml + address_validation_request_xml,
+          readable_body: address_validation_request_xml,
           debug: debug
         )
 
@@ -170,6 +175,7 @@ module FriendlyShipping
         request = FriendlyShipping::Request.new(
           url: url,
           body: access_request_xml + address_validation_request_xml,
+          readable_body: address_validation_request_xml,
           debug: debug
         )
 
@@ -188,6 +194,7 @@ module FriendlyShipping
         request = FriendlyShipping::Request.new(
           url: url,
           body: access_request_xml + city_state_lookup_request_xml,
+          readable_body: city_state_lookup_request_xml,
           debug: debug
         )
 
@@ -202,6 +209,7 @@ module FriendlyShipping
         request = FriendlyShipping::Request.new(
           url: url,
           body: access_request_xml + void_request_xml,
+          readable_body: void_request_xml,
           debug: debug
         )
         client.post(request).bind do |response|

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

@@ -15,7 +15,8 @@ module FriendlyShipping
                     :first_class_mail_type,
                     :hold_for_pickup,
                     :shipping_method,
-                    :transmit_dimensions
+                    :transmit_dimensions,
+                    :rectangular
 
         def initialize(
           box_name: :variable,
@@ -24,6 +25,7 @@ module FriendlyShipping
           hold_for_pickup: false,
           shipping_method: nil,
           transmit_dimensions: true,
+          rectangular: true,
           **kwargs
         )
           @box_name = CONTAINERS.key?(box_name) ? box_name : :variable
@@ -32,6 +34,7 @@ module FriendlyShipping
           @hold_for_pickup = hold_for_pickup
           @shipping_method = shipping_method
           @transmit_dimensions = transmit_dimensions
+          @rectangular = rectangular
           super kwargs
         end
 

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

@@ -10,8 +10,8 @@ module FriendlyShipping
 
         class << self
           # @param [Physical::Shipment] shipment The shipment we want to get rates for
-          #   shipment.packages[0].properties[:box_name] Can be :rectangular, :variable,
-          #     or a flat rate container defined in CONTAINERS.
+          #   shipment.packages[0].properties[:box_name] Can be :variable or a
+          #     flat rate container defined in CONTAINERS.
           # @param [String] login The USPS login code
           # @param [FriendlyShipping::Services::Usps::RateEstimateOptions] options The options
           #   object to use with this request.
@@ -37,7 +37,13 @@ module FriendlyShipping
                       xml.Width("%<width>0.2f" % { width: package.width.convert_to(:inches).value.to_f })
                       xml.Length("%<length>0.2f" % { length: package.length.convert_to(:inches).value.to_f })
                       xml.Height("%<height>0.2f" % { height: package.height.convert_to(:inches).value.to_f })
-                      xml.Girth("%<girth>0.2f" % { girth: girth(package) })
+
+                      # When girth is present, the package is treated as non-rectangular
+                      # when calculating dimensional weight. This results in a smaller
+                      # dimensional weight than a rectangular package would have.
+                      unless package_options.rectangular
+                        xml.Girth("%<girth>0.2f" % { girth: girth(package) })
+                      end
                     end
                     xml.Machinable(machinable(package))
                   end

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

@@ -5,7 +5,6 @@ module FriendlyShipping
     class Usps
       CONTAINERS = {
         variable: 'VARIABLE',
-        rectangular: 'RECTANGULAR',
         large_flat_rate_box: 'LG FLAT RATE BOX',
         medium_flat_rate_box: 'MD FLAT RATE BOX',
         small_flat_rate_box: 'SM FLAT RATE BOX',
@@ -18,7 +17,7 @@ module FriendlyShipping
         window_flat_rate_envelope: 'WINDOW FLAT RATE ENVELOPE',
         small_flat_rate_envelope: 'SM FLAT RATE ENVELOPE',
         cubic_soft_pack: 'CUBIC SOFT PACK',
-        cubic_parcels: 'CUBIC_PARCELS'
+        cubic_parcels: 'CUBIC PARCELS'
       }.freeze
 
       FIRST_CLASS_MAIL_TYPES = {

data/lib/friendly_shipping/services/usps.rb

@@ -112,6 +112,7 @@ module FriendlyShipping
         FriendlyShipping::Request.new(
           url: base_url,
           body: "API=#{RESOURCES[api]}&XML=#{CGI.escape xml}",
+          readable_body: xml,
           debug: debug
         )
       end

data/lib/friendly_shipping/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friendly_shipping
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Martin Meyerhoff
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-28 00:00:00.000000000 Z
+date: 2020-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_uri
@@ -376,7 +376,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: An integration layer for shipping services