easyship 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a715ea30361416f3bc58cee44919e36a7ac7dbe85f1f615c2a74350f889bdef
-  data.tar.gz: 297a361bdad68de29061c1cf6aaa09db8aad1573aa9356c069784b564526ca7f
+  metadata.gz: 1c6c501de616b3a63e0d2115bcd85edd664d19457e15cee9ddc39b90460faf06
+  data.tar.gz: c28725fd205ad6c7943bc3af5ec230c6dfa0a3a9a605a36caaab01d9ff6b4120
 SHA512:
-  metadata.gz: bf0c4bded300aa2b72ab47b5ddbd16ba5733c3f515bc403e74322bd4dd5b10b0c9a214aeb629bb257fe0078952b4b5ad0ec4d75e05794666207fcef57d420084
-  data.tar.gz: 394cc54f2400a0f1b86a66340c19e03a42298fe31dc1764ee5c443b8e8fa4e1ddc2af3be5123e2ba4efc781f843c6ab2739481d850d28e83155d178886a8b1a0
+  metadata.gz: d3e59ba1d63fccd367093dd0d0cfa2c4e853be57820384e7ab033929f808adffca7313633009dc6b7804d3c54d8130ab3f8da45586e31c59865a903c4b906e38
+  data.tar.gz: db7d3fb69ea674cfc5a9ee6527193ce637bf123b74d51f104a821de4f0c9273d3cb4d25621e8ea6b885f852f16c09e2c87485e6845b04bb4e1f70ad4aff319d2

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 ## [Unreleased]
 
+
+## [v0.1.4](https://github.com/mmarusyk/easyship/tree/v0.1.4) - 2024-10-16
+
+### Fixed
+- Handle JSON::Parser Error
+
+## [v0.1.3](https://github.com/mmarusyk/easyship/tree/v0.1.3) - 2024-06-27
+
+### Fixed
+- Error from v1 is not handled by @mmarusyk
+
 ## [v0.1.2](https://github.com/mmarusyk/easyship/tree/v0.1.2) - 2024-06-24
 
 ### Features

data/lib/easyship/error.rb

@@ -7,6 +7,7 @@ module Easyship
   class Error
     # rubocop:disable Style::MutableConstant Style::MissingElse
     ERRORS = {
+      400 => Easyship::Errors::BadRequestError,
       401 => Easyship::Errors::InvalidTokenError,
       402 => Easyship::Errors::PaymentRequiredError,
       404 => Easyship::Errors::ResourceNotFoundError,

data/lib/easyship/errors/bad_request_error.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require_relative 'client_error'
+
+module Easyship
+  module Errors
+    # Raised when Easyship returns the HTTP status code 400
+    class BadRequestError < ClientError; end
+  end
+end

data/lib/easyship/handlers/response_body_handler.rb

@@ -7,7 +7,9 @@ module Easyship
       def self.handle_response(response)
         body = response.body
 
-        JSON.parse(body, symbolize_names: true) unless body.nil? || body.empty?
+        JSON.parse(body, symbolize_names: true)
+      rescue JSON::ParserError
+        nil
       end
     end
   end

data/lib/easyship/middleware/error_handler_middleware.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
 require_relative '../error'
+
 module Easyship
   module Middleware
     # Response middleware that raises an error based on the response status code
     class ErrorHandlerMiddleware < Faraday::Middleware
       def on_complete(env)
         status_code = env[:status].to_i
-        body = JSON.parse(env[:body], symbolize_names: true) if json?(env[:body])
+        body = response_body(env[:body])
 
         handle_status_code(status_code, body)
       end
@@ -29,8 +30,6 @@ module Easyship
 
         if body.key?(:error) && body[:error].is_a?(Hash)
           format_body_error(body)
-        elsif body.key?(:errors) && body[:errors].is_a?(Array)
-          format_body_errors_array(body)
         elsif body.key?(:errors)
           format_body_errors(body)
         else
@@ -46,20 +45,20 @@ module Easyship
         body[:error]
       end
 
-      def format_body_errors_array(body)
-        { details: body[:errors], message: body[:errors].map { |error| error[:message] }.join(', ') }
-      end
-
       def format_body_errors(body)
-        { details: body[:errors], message: body[:errors] }
+        errors = Array(body[:errors])
+
+        { details: errors, message: errors.join(', ') }
       end
 
       def format_by_default(body)
         { details: body, message: 'Something went wrong.' }
       end
 
-      def json?(body)
-        !body.nil? && body.is_a?(String)
+      def response_body(body)
+        JSON.parse(body, symbolize_names: true)
+      rescue JSON::ParserError
+        nil
       end
     end
   end

data/lib/easyship/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Easyship
-  VERSION = '0.1.2'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easyship
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Michael Marusyk
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-24 00:00:00.000000000 Z
+date: 2024-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -45,6 +45,7 @@ files:
 - lib/easyship/client.rb
 - lib/easyship/configuration.rb
 - lib/easyship/error.rb
+- lib/easyship/errors/bad_request_error.rb
 - lib/easyship/errors/client_error.rb
 - lib/easyship/errors/easyship_error.rb
 - lib/easyship/errors/invalid_token_error.rb
@@ -82,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: A Ruby client for integrating with Easyship's API for shipping and logistics