ups 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d62618324bb4d42efc9229e45d8aadf4b797d57f56849bb4687d8506797b74e5
-  data.tar.gz: bf5f9c912258731ecafaa692ac373a53b41ac762bcde6bdf4f71bf9777f320c7
+  metadata.gz: 6f299fda5bfe8460f0531eb9d9e63415485e2cbbcd765a354987b4fde149c6e3
+  data.tar.gz: 0fac23629a457243445d9dffd7f88fcb30aece68d93c1abce23712295289b121
 SHA512:
-  metadata.gz: 03237a9fb524ca471fc2d224edff0a8fda897f940d3eabc2d1d23f47ecf93a00e271b457946fdfa5302887fb17c6fb7e5b3b1d21ef080fd1f2a008c07d4e5dba
-  data.tar.gz: 9ac07d0a408b817931f3fd46112f7871a56f207f2b2430bf727e804170e853459397cfce8eaf75dcedd59de6afc335d2d92ce90378aefa656d9e66b0024715a0
+  metadata.gz: f1248beb741ad2d3761602dd0f3e24794d480d90d7e35622572eb096b03b86694cfbf49dbc7934687125e19a3a3f2ff57c4042e25510d67e0d04c05468268e4b
+  data.tar.gz: fd11af41e93dcb64e62d44c0602181ad774b805ad7a38c1ac374663d1c283b6c4ee241d2a859b88c1fd25f046a45d75bb37aa87605d420ff29f7c3dc695a06ea

data/lib/ups/models/package.rb

@@ -1,6 +1,6 @@
 module Ups
   class Package
-    attr_accessor :description, :packaging_type, :length, :width, :height, :weight, :dimension_unit, :weight_unit, :value
+    attr_accessor :description, :packaging_type, :length, :width, :height, :weight, :dimension_unit, :weight_unit, :insurance, :delivery_confirmation
 
     def initialize(attrs = {})
       attrs.map{|k,v| send("#{k}=", v) if respond_to?("#{k}=") }

data/lib/ups/models/rate_request.rb

@@ -1,6 +1,6 @@
 module Ups
   class RateRequest
-    attr_accessor :shipper, :ship_to, :ship_from, :packages, :service_code, :reference, :dcis_type
+    attr_accessor :shipper, :ship_to, :ship_from, :packages, :service_code, :reference
 
     def initialize(attrs = {})
       attrs.map{|k, v| send("#{k}=", v) if respond_to?("#{k}=") }

data/lib/ups/models/ship_request.rb

@@ -1,6 +1,6 @@
 module Ups
   class ShipRequest
-    attr_accessor :shipper, :ship_to, :ship_from, :packages, :service_code, :reference, :description, :label_format, :dcis_type
+    attr_accessor :shipper, :ship_to, :ship_from, :packages, :service_code, :reference, :description, :label_format
 
     def initialize(attrs = {})
       attrs.map{|k, v| send("#{k}=", v) if respond_to?("#{k}=") }

data/lib/ups/rating.rb

@@ -48,7 +48,7 @@ module Ups
                 }
               }
             },
-            Package: rate_request.packages.map { |pkg| package_hash(pkg, dcis_type: rate_request.dcis_type) },
+            Package: rate_request.packages.map { |pkg| package_hash(pkg) },
             Service: {
               Code: rate_request.service_code || "03"
             }
@@ -67,7 +67,7 @@ module Ups
       }
     end
 
-    def package_hash(package, dcis_type: 3)
+    def package_hash(package)
       base = {
         PackagingType: {
           Code: package.packaging_type || "02"
@@ -89,15 +89,24 @@ module Ups
         PackageServiceOptions: {
           DeclaredValue: {
             CurrencyCode: "USD",
-            MonetaryValue: package.value
+            MonetaryValue: package.insurance
           }
         }
       }
-      base.deep_merge!(signature_required(dcis_type)) if [2,3].include?(dcis_type.to_i)
+      base.deep_merge!(signature_required(package.delivery_confirmation)) if [2,3].include?(package&.delivery_confirmation.to_i)
       base
     end
 
-    def signature_required(type = '3')
+    def signature_required(type)
+      # https://github.com/UPS-API/api-documentation/blob/main/Rating.yaml
+      # DCISType fails if the value is nil, 0, or 1...
+      # but 2 and 3 work as expected. So we need to omit
+      # the key altogether if the value is not one of 2 or 3.
+      # {
+      #   1 => 'Unsupported', # this fails for some reason, so ignore it
+      #   2 => 'Delivery Confirmation Signature Required',
+      #   3 => 'Delivery Confirmation Adult Signature Required'
+      # }
       {
         PackageServiceOptions: {
           DeliveryConfirmation: {

data/lib/ups/shipping.rb

@@ -66,7 +66,7 @@ module Ups
               Code: ship_request.service_code || "02",
               Description: "Service Code"
             },
-            Package: ship_request.packages.map { |pkg| package_hash(pkg, dcis_type: ship_request.dcis_type) }
+            Package: ship_request.packages.map { |pkg| package_hash(pkg) }
           },
           LabelSpecification: {
             LabelImageFormat: {
@@ -88,7 +88,7 @@ module Ups
       }
     end
 
-    def package_hash(package, dcis_type: 3)
+    def package_hash(package)
       base = {
         Description: package.description || "Package",
         Packaging: {
@@ -111,15 +111,15 @@ module Ups
         PackageServiceOptions: {
           DeclaredValue: {
             CurrencyCode: "USD",
-            MonetaryValue: package.value
+            MonetaryValue: package.insurance
           }
         },
         InsuredValue: {
           CurrencyCode: "USD",
-          MonetaryValue: package.value
+          MonetaryValue: package.insurance
         }
       }
-      base.deep_merge!(signature_required(dcis_type)) if [2,3].include?(dcis_type.to_i)
+      base.deep_merge!(signature_required(package.delivery_confirmation)) if [2,3].include?(package&.delivery_confirmation.to_i)
       base
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ups
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - JD Warren
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-13 00:00:00.000000000 Z
+date: 2025-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty