frederick_api 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3655ceb3d6aec4c8649bc0389c9f998c25df9280
-  data.tar.gz: '01974c4215719d6843f2375c75ed91254550d78c'
+  metadata.gz: dcd5376c71e168c4a465fea05d201c98fdeb34a8
+  data.tar.gz: c32d4ff431afc095213e192113857e7cf64008c7
 SHA512:
-  metadata.gz: 324ba1bf6232d75d8e0f6979d0f14d180aecac348147ef948d9877b15e3637729ae466b5871ff08325d858063719cee2cd239d72bf8cb2ad2249048ec665137d
-  data.tar.gz: 5d6421390051455d9a1b6e77545a5295d0207d65d93d8692000dbce6a0066d10060ad8cdce762e7374016c483c2da60b5d832872c55c9044e920e4519e324a82
+  metadata.gz: 25a914b9aa9e5d2db5cb6c0fff20e7fa3ac9fd81723bfb036dd4a17beb486ea4c1a72afc1a46e2fb40c93001a86f24859110192a8bdcd79c01fa6f12870a44c0
+  data.tar.gz: ec3f75966e35fea113626823e6e5b8429280377ace75231a63d6ce4caf4873d3b5afe4b16426518091f80ae20463af2f1645d7c795434c065372c0efc3558935

data/lib/frederick_api.rb

@@ -7,6 +7,7 @@ require 'active_support/concern'
 
 # FrederickAPI libs
 require 'frederick_api/configuration'
+require 'frederick_api/v2/errors/errors'
 require 'frederick_api/v2/helpers/has_many'
 require 'frederick_api/v2/helpers/paginator'
 require 'frederick_api/v2/helpers/query_builder'

data/lib/frederick_api/v2/errors/errors.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module FrederickAPI
+  module V2
+    module Errors
+      # Base exception class for client errors (i.e. validation, bad request)
+      class Error < JsonApiClient::Errors::ClientError
+        attr_reader :errors
+
+        # Initialize with a JsonApiClient::ResultSet or a Resource
+        def initialize(result)
+          # @env is used in base class JsonApiClient::Errors::Error
+          @env = result
+          @errors = result.errors || []
+        end
+
+        def to_s
+          return "Client Error: #{self.errors.first['detail']}" if self.errors.any?
+          super
+        end
+      end
+
+      class BadRequest < Error; end
+      class UnprocessableEntity < Error; end
+
+      ERROR_CODES = {
+        '400' => BadRequest,
+        '422' => UnprocessableEntity
+      }.freeze
+    end
+  end
+end

data/lib/frederick_api/v2/helpers/requestor.rb

@@ -23,11 +23,20 @@ module FrederickAPI
 
         # Retry once on unhandled server errors
         def request(type, path, params)
-          super
+          handle_errors(super)
         rescue JsonApiClient::Errors::ConnectionError, JsonApiClient::Errors::ServerError => ex
           raise ex if ex.is_a?(JsonApiClient::Errors::NotFound) || ex.is_a?(JsonApiClient::Errors::Conflict)
-          super
+          handle_errors(super)
         end
+
+        private
+
+          def handle_errors(result)
+            return result unless result.has_errors?
+            error_klass = FrederickAPI::V2::Errors::ERROR_CODES[result.errors.first[:status]] ||
+              FrederickAPI::V2::Errors::Error
+            raise error_klass, result
+          end
       end
     end
   end

data/lib/frederick_api/v2/resource.rb

@@ -18,6 +18,10 @@ module FrederickAPI
         super
       end
 
+      def has_errors?
+        self.errors.present?
+      end
+
       def self.all_records
         self.all.pages.all_records
       end

data/lib/frederick_api/version.rb

@@ -2,5 +2,5 @@
 
 module FrederickAPI
   # Current gem version
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frederick_api
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Frederick Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-10 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client
@@ -41,6 +41,7 @@ files:
 - lib/frederick_api/v2/contact_list.rb
 - lib/frederick_api/v2/contact_property.rb
 - lib/frederick_api/v2/contact_type.rb
+- lib/frederick_api/v2/errors/errors.rb
 - lib/frederick_api/v2/helpers/has_many.rb
 - lib/frederick_api/v2/helpers/paginator.rb
 - lib/frederick_api/v2/helpers/query_builder.rb