grac 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 280ed2bb063aec54e36cdbae1273eed77bf6d7a8
-  data.tar.gz: a3f5f241c7b34fe9f1bb22de72b15b199038def1
+  metadata.gz: c4258aeb15110d2f08abd1deecca0f6564d7fdf8
+  data.tar.gz: 539a32d74b6ee5af8a338e23a13e52bc0cf6c8dc
 SHA512:
-  metadata.gz: 00fac6601b78e14c03f9f6e12010675187d664d59c46e928ac84dee53b65a4cc66f03c526b9c1ecd89976b95fc39d76ded2f35faab1c4fd0b050c717ee64e884
-  data.tar.gz: 36cc32054886343c9d792eab5b7b24aeeb3a7c935c703b0742dd6d6317b6bff49ddea6d783a60b5f509bea9f7b35cad1cf1d7378a49baeed8a26b2a47f3d53f1
+  metadata.gz: 5c07949577cc3d0afd62a0fe6c78893e1077399d6c25385253b712114201c7d2d71af2dd2c6b04ca014d0cb900407b7e8f6ac60e81051ed6a1ff72d0632832c7
+  data.tar.gz: 1d2f35dd0bafdf139751827345cd87c4d3f11c50d4bf471958e5a40a4033274fe81bc69dc27c109c6af32cf606f3a5b3786eefc178a83592394186ed60236e14

data/lib/grac.rb

@@ -1,2 +1,2 @@
-require 'grac/version'
-require 'grac/client'
+require_relative 'grac/version'
+require_relative 'grac/client'

data/lib/grac/client.rb

@@ -126,16 +126,32 @@ module Grac
           return true
         when 0
           raise Exception::RequestFailed.new(method, response.effective_url, response.return_message)
-        when 400
-          raise Exception::BadRequest.new(method, response.effective_url, response.parsed_or_raw_body)
-        when 403
-          raise Exception::Forbidden.new(method, response.effective_url, response.parsed_or_raw_body)
-        when 404
-          raise Exception::NotFound.new(method, response.effective_url, response.parsed_or_raw_body)
-        when 409
-          raise Exception::Conflict.new(method, response.effective_url, response.parsed_or_raw_body)
         else
-          raise Exception::ServiceError.new(method, response.effective_url, response.parsed_or_raw_body)
+          begin
+            # The Response class doesn't have enough information to create a proper exception, so
+            # catch its exception and raise a proper one.
+            parsed_body = response.parsed_json
+          rescue Exception::InvalidContent
+            raise Exception::ErrorWithInvalidContent.new(
+              method,
+              response.effective_url,
+              response.code,
+              response.body,
+              'json'
+            )
+          end
+          case response.code
+          when 400
+            raise Exception::BadRequest.new(method, response.effective_url, parsed_body)
+          when 403
+            raise Exception::Forbidden.new(method, response.effective_url, parsed_body)
+          when 404
+            raise Exception::NotFound.new(method, response.effective_url, parsed_body)
+          when 409
+            raise Exception::Conflict.new(method, response.effective_url, parsed_body)
+          else
+            raise Exception::ServiceError.new(method, response.effective_url, parsed_body)
+          end
       end
     end
 

data/lib/grac/exception.rb

@@ -70,5 +70,26 @@ module Grac
 
       alias_method :to_s, :message
     end
+
+    class ErrorWithInvalidContent < StandardError
+      def initialize(method, url, status, raw_body, expected_type)
+        @method = (method || "").upcase
+        @url = url
+        @status = status
+        @raw_body = raw_body
+        @expected_type = expected_type
+      end
+
+      def message
+        "#{@method} '#{@url}': Got HTTP #{@status}, failed to parse as '#{@expected_type}'. " \
+        "Raw Body: '#{@raw_body}'"
+      end
+
+      def inspect
+        "#{self.class.name}: #{message}"
+      end
+
+      alias_method :to_s, :message
+    end
   end
 end

data/lib/grac/version.rb

@@ -1,3 +1,3 @@
 module Grac
-  VERSION = "2.2.2"
+  VERSION = "2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grac
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Tobias Schoknecht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake