3scale-api 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e802565c57ee82f45f6684a5764b0bd438e9171e746f8128e4691b1fbd974a5d
-  data.tar.gz: d979da1bce6a4f1f969e0bf8a1d9bc5ba661648b485acaaf1ce51f39f91723ac
+  metadata.gz: ea3ac51993c3762a0a40625807148fdba4dbf390aa032bc97183f660220bf410
+  data.tar.gz: 3f5c198b2fbe44894007990f4f7e6d926400c4f89597acf9533a281c2fb77cd7
 SHA512:
-  metadata.gz: 65ae26fc85839d07a9df0fa0da510c8b259af601a5b163f843c9c0096a23e28198b639adcfa33ffdfbf8ee2baf40b5e2c817a47bbef2148d94c5997581d65366
-  data.tar.gz: 702fb4b87d60a01954d8c6c0ae668ec75e6df24b0bdac3d646883b7231654a9fdd80f79af621d79725bbfd43c089b1f5f2601f8da70c9b96c4116b0addeb1ffd
+  metadata.gz: a5e4aff97c1716b24cdd5ba27385cf2babe88183dcc4894fcad0ca0df3e03df150e77fb80ff01485cca4bea47c4f6bade61a8c31aebdac8bd312aede6799af29
+  data.tar.gz: 2b86b756c210e5cc8270279d9f8ae258624ae6656594864d63d082b492b91b76e4c62a822ae6654243ba4585565acf6055906327303f71ec6e915b6603f22a16

data/lib/3scale/api/http_client.rb

@@ -68,16 +68,22 @@ module ThreeScale
 
       class NotFoundError < ResponseError; end
 
+      class UnknownFormatError < StandardError; end
+
       def forbidden!(response)
-        raise ForbiddenError.new(response)
+        raise ForbiddenError.new(response, format_response(response))
       end
 
       def notfound!(response)
-        raise NotFoundError.new(response)
+        raise NotFoundError.new(response, format_response(response))
       end
 
       def unexpected!(response)
-        raise UnexpectedResponseError.new(response, response.inspect)
+        raise UnexpectedResponseError.new(response, format_response(response))
+      end
+
+      def unknownformat!
+        raise UnknownFormatError, "unknown format #{format}"
       end
 
       def serialize(body)
@@ -91,7 +97,7 @@ module ThreeScale
       def parser
         case format
         when :json then JSONParser
-        else "unknown format #{format}"
+        else unknownformat!
         end
       end
 
@@ -108,6 +114,16 @@ module ThreeScale
         path
       end
 
+      def format_response(response)
+        body = response.body if text_based?(response)
+        "#{response.inspect} body=#{body}"
+      end
+
+      def text_based?(response)
+        response.content_type =~ /^text/ ||
+          response.content_type =~ /^application/ && !['application/octet-stream', 'application/pdf'].include?(response.content_type)
+      end
+
       module JSONParser
         module_function
 

data/lib/3scale/api/version.rb

@@ -1,5 +1,5 @@
 module ThreeScale
   module API
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.2.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: 3scale-api
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Michal Cichra
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,8 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: API Client for 3scale APIs