shipengine_ruby 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e71d0f701b2d46e93397277c9fde2775529325ec32bf087c76662ca670f0da1
-  data.tar.gz: 7b0a8fab8dbe86a732683aa2c1a1c98071e13e492f3e1b8fd68e5bc3ca037b9f
+  metadata.gz: 623cec2a7f40bf13f4f6094812d11e4b5a929bf8ce81f67a8472493fdef3bd6d
+  data.tar.gz: 84cd4bf666bb3c72f89b3c0a051ba2362e41bfe07092f90c3234700877491b3d
 SHA512:
-  metadata.gz: 9f1710164c2a76e9f6c35baf03c5d58964574e80e1d148d558f0b7869b59876c1be5b3a9a1a53a1a0c345578a11971a8e960a2a2e1666969faea4c00b4dbf059
-  data.tar.gz: f4171710c30681741120ab9e0f20e31cd82f5c1f48b51f9b46764ed819b45872bc80175f4f96f9b619abd34b4250aa0acc60c33cbd91a6c700bee45982a60667
+  metadata.gz: 062cc63359517d87dc76ffd2a0c6853da7eff55e6c0565b1f4452ad2029c1a51fce1f619fdccdc0472e38655550adc9ab1cc3afabea39f189456e21167abd294
+  data.tar.gz: d7eb59f62036b13b3b632f75c11bfd1285a6eef21a96d4aff3b31f3b4d1ae96b06baa75f962b1ff9172d25ce9ec141a39ecec0e8e93c9599ec0b35b127ff21bc

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.7.7

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    shipengine_ruby (0.0.5)
+    shipengine_ruby (0.0.7)
       faraday (~> 1.0)
       faraday_middleware (~> 1.0)
-      hashie (~> 3.4)
+      hashie (~> 5.0)
 
 GEM
   remote: https://rubygems.org/
@@ -16,7 +16,7 @@ GEM
     crack (0.4.5)
       rexml
     diff-lcs (1.5.0)
-    faraday (1.10.2)
+    faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -42,9 +42,9 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     hashdiff (1.0.1)
-    hashie (3.6.0)
+    hashie (5.0.0)
     method_source (1.0.0)
-    multipart-post (2.2.3)
+    multipart-post (2.3.0)
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)

data/lib/shipengine/enums/webhooks_types.rb

@@ -1,42 +1,49 @@
 # frozen_string_literal: true
 
-module ShipEngine
+module  ShipEngine
   module Enums
     module WebhooksTypes
       ##
       # Batch completed
       # #/
       API_BATCH = "batch"
+      API_BATCH_RESOURCE_TYPE = "API_BATCH"
 
       ##
       # Shipment rate updated
       # #/
       API_RATE = "rate"
+      API_RATE_RESOURCE_TYPE = "API_RATE"
 
       ##
       # Any tracking event
       # #/
       API_TRACK = "track"
+      API_TRACK_RESOURCE_TYPE = "API_TRACK"
 
       ##
       # Carrier connected
       # #/
       API_CARRIER_CONNECTED = "carrier_connected"
+      API_CARRIER_CONNECTED_RESOURCE_TYPE = "API_CARRIER_CONNECTED"
 
       ##
       # Sales Orders imported (Beta)
       # #/
       API_SALES_ORDERS_IMPORTED = "sales_orders_imported"
+      API_SALES_ORDERS_IMPORTED_RESOURCE_TYPE = "API_SALES_ORDERS_IMPORTED"
 
       ##
       # Order Source refresh complete (Beta)
       # #/
       API_ORDER_SOURCE_REFRESH_COMPLETE = "order_source_refresh_complete"
+      API_ORDER_SOURCE_REFRESH_COMPLETE_RESOURCE_TYPE = "API_ORDER_SOURCE_REFRESH_COMPLETE"
 
       ##
       # A requested report is ready
       # #/
       API_REPORT_COMPLETE = "report_complete"
+      API_REPORT_COMPLETE_RESOURCE_TYPE = "API_REPORT_COMPLETE"
 
       ALL = [
         API_BATCH,

data/lib/shipengine/exceptions.rb

@@ -8,12 +8,13 @@ module ShipEngine
   module Exceptions
     class ShipEngineError < StandardError
       # message is inherited
-      attr_reader :source, :type, :code, :url
+      attr_reader :source, :type, :code, :request_id, :url
 
-      def initialize(message:, source:, type:, code:, url: nil)
+      def initialize(message:, source:, type:, code:, request_id: nil, url: nil)
         code = ShipEngine::Errors::ErrorCode.get(code) if code.is_a?(String)
         source = ShipEngine::Errors::ErrorSource.get(source) if source.is_a?(String)
         super(message)
+        @request_id = request_id
         @source = source
         @type = type
         @code = code
@@ -46,32 +47,34 @@ module ShipEngine
           source: source,
           message: message,
           type: ShipEngine::Errors::ErrorType.get(:VALIDATION),
-        )
+          )
       end
     end
 
     class SystemError < ShipEngineError
-      def initialize(message:, code:, source: nil, url: nil)
+      def initialize(message:, code:, source: nil, url: nil, request_id: nil)
         super(
           url: url,
           code: code,
           source: source,
           message: message,
+          request_id: request_id,
           type: ShipEngine::Errors::ErrorType.get(:SYSTEM),
-        )
+          )
       end
     end
 
     class RateLimitError < SystemError
       attr_reader :retries
 
-      def initialize(retries: nil, message: "You have exceeded the rate limit.", source: nil)
+      def initialize(retries: nil, message: "You have exceeded the rate limit.", source: nil, request_id: nil)
         super(
           message: message,
           code: ShipEngine::Errors::ErrorCode.get(:RATE_LIMIT_EXCEEDED),
           source: source,
+          request_id: request_id,
           url: URI("https://www.shipengine.com/docs/rate-limits"),
-        )
+          )
         @retries = retries
       end
     end

data/lib/shipengine/faraday/raise_http_exception.rb

@@ -14,11 +14,13 @@ module ShipEngine
               source: error_source(response[:body]),
               type: error_type(response[:body]),
               code: error_code(response[:body]),
+              request_id: error_request_id(response[:body]),
               url: response[:url].to_s
             )
           elsif [429].include?(status_code)
             raise ShipEngine::Exceptions::RateLimitError.new(
               retries: env.request_headers["Retries"].to_i,
+              request_id: error_request_id(response[:body]),
               source: error_source(response[:body])
             )
           end
@@ -78,6 +80,18 @@ module ShipEngine
           body["errors"][0]["error_code"]
         end
       end
+
+      def error_request_id(body)
+        if !body.nil? && !body.empty? && body.is_a?(String)
+          body = JSON.parse(body)
+        end
+
+        if body.nil?
+          nil
+        elsif body["request_id"]
+          body["request_id"]
+        end
+      end
     end
   end
 end

data/lib/shipengine/version.rb

@@ -2,6 +2,6 @@
 
 module ShipEngine
   module VERSION
-    VERSION = "0.0.5"
+    VERSION = "0.0.7"
   end
 end

data/shipengine.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency("faraday", "~> 1.0")
   spec.add_runtime_dependency("faraday_middleware", "~> 1.0")
-  spec.add_runtime_dependency("hashie", "~> 3.4")
+  spec.add_runtime_dependency("hashie", "~> 5.0")
 
   spec.add_development_dependency("bundler", "~> 1.17")
   spec.add_development_dependency("pry", "~> 0.14")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipengine_ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Mohammed Abdel Raouf
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-10 00:00:00.000000000 Z
+date: 2023-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +174,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".tool-versions"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -241,8 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby SDK for ShipEngine