shift-api-core 0.1.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 22e90c061afc5f050f592daba4e6aa3cd40a5e7b
-  data.tar.gz: b230e1daa6dc660f80290c7c945799e5d0b50e1d
+SHA256:
+  metadata.gz: '02480b0039e54bd391537d9944d2d9b2318e7026d63a46d23504671443f8c57e'
+  data.tar.gz: a242e65bcb3294a46b22bbba81dea3f4743d37d16d21b92403b445dd1545fe47
 SHA512:
-  metadata.gz: 0dbd4ed6ed783184ec2794f82f8d3105ed41bf285b7e1418eed2dc9e841256f7f934247ee52a876ded667bedf14aa7f102bed6784041ad6f8c66b609a7aa4447
-  data.tar.gz: 333d829672f168a424139bdfa700761aa73a53731dd2b8d5e006f09eeae70fba77c4421500a969b40c84564ecb356ac865cc27358fc067c7c6284f61f6b21809
+  metadata.gz: 78bbdd3c63a8fd364fe9da187293ebf300ed42b09aebf12770e03be491e0d61afc4b95ae630a44e2b50a92e8a38022722b87a022ac8fd471f7bf6cdfda06d7d6
+  data.tar.gz: fa22be8969a47f3ed231b83023e84e49c44a30936915bf413737e5a7eb973b7ec890818798ee2ba94d5239a638d4a06fb3eb936efe5323293c83b21354846a10

data/lib/shift/api/core/errors.rb

@@ -6,19 +6,24 @@ module Shift
       # world in case we ever migrate from it.
       module Errors
         class ApiError < StandardError
-          attr_reader :env
-          def initialize(env)
+          attr_reader :env, :original_exception
+          
+          def initialize(env, original_exception)
             @env = env
+            @original_exception = original_exception
           end
 
           def self.from_jsonapi_client(ex)
-            new(ex.env)
+            new(ex.env, ex)
           end
         end
 
         class ClientError < ApiError
         end
 
+        class ServiceUnavailable < ApiError
+        end
+
         class AccessDenied < ClientError
         end
 
@@ -29,10 +34,34 @@ module Shift
         end
 
         class ServerError < ApiError
+          # Replace message with more useful error from the API
           def message
-            "Internal server error"
+            default_message = "Internal Server Error\n#{env.response.body}"
+
+            api_errors = env.response.body["errors"]
+            return default_message if api_errors.nil?
+
+            api_exception = api_errors[0].dig("meta", "exception")
+            api_exception ? api_exception : default_message
+          end
+
+          # Prepend API backtrace to the backtrace from the gem
+          def backtrace
+            original_backtrace = super
+            return nil if original_backtrace.nil?
+
+            api_errors = env.response.body["errors"]
+            return original_backtrace if api_errors.nil?
+
+            api_backtrace = api_errors[0].dig("meta", "backtrace")
+            return original_backtrace if api_backtrace.nil?
+
+            api_backtrace.map { |entry| "/<shift_api>#{entry}" }.concat(original_backtrace)
           end
         end
+        
+        class InternalServerError < ServerError
+        end
 
         class Conflict < ServerError
           def message

data/lib/shift/api/core/version.rb

@@ -1,7 +1,7 @@
 module Shift
   module Api
     module Core
-      VERSION = "0.1.0"
+      VERSION = "0.4.0"
     end
   end
 end

data/shift-api-core.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.14'
+  spec.add_development_dependency 'bundler', '~> 2.2'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'webmock', '~> 2.3'
-  spec.add_runtime_dependency 'json_api_client', '~> 1.5'
+  spec.add_runtime_dependency 'json_api_client', '>= 1.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shift-api-core
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Shift Commerce Ltd
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: json_api_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.6.0
 description: Core gem for all shift commerce API gems
 email:
 - team@shiftcommerce.com
@@ -128,7 +128,7 @@ homepage: https://github.com/shiftcommerce
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -143,9 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Core gem for all shift commerce API gems
 test_files: []