breacan 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0984b1ef88360f43d44cc08a769c1b65269cfa8
-  data.tar.gz: f01791668c85b71f6a426a582b9dba47722f76c7
+  metadata.gz: 866f53e65dc0fa0ae9c7a169826f9526f1ca7e1d
+  data.tar.gz: 2373e47e6cc067ef3066a120d216e6701c365005
 SHA512:
-  metadata.gz: ef74fddb9c0d0fadb39263ca232c772cd904055ee5041bd9b1d4d67cd1e49968d89233e37f6de433ec5182a447f974a7ee6c950959c118bbd5273c3b9b1aa916
-  data.tar.gz: c034707c3abd69a10780c52dc9d77966ce794c3508ad66d9d1f376d35e1bcc1f9122c37ec6a5f7b3151e3ba3c2b7367154eeb3b378d4a128a4b7bf99c855bdd8
+  metadata.gz: 9274790635979a54746753d15cb54a51b776a2be37dd9176dad7419971e74d2e5209353b5589a8d7e10b259ccd506d54719e74bccc55f03acdfcca27ac086f0a
+  data.tar.gz: 943f4c3d3a5ebb6a2385133ea40e2762b22c650431e19f488f211b1cea834152b40ab41664a8b6995e53c2df6a801fc8ecca5cc9f7f59735b79320f520141908

data/lib/breacan/error.rb

@@ -1,26 +1,31 @@
 module Breacan
   class Error < StandardError
-    def self.from_body(body)
-      if klass = case body[:error]
-        when 400      then Breacan::BadRequest
-        when 401      then Breacan::Unauthorized
-        when 403      then Breacan::Forbidden
-        when 404      then Breacan::NotFound
-        when 406      then Breacan::NotAcceptable
-        when 409      then Breacan::Conflict
-        when 415      then Breacan::UnsupportedMediaType
-        when 422      then Breacan::UnprocessableEntity
-        when 400..499 then Breacan::ClientError
-        when 500      then Breacan::InternalServerError
-        when 501      then Breacan::NotImplemented
-        when 502      then Breacan::BadGateway
-        when 503      then Breacan::ServiceUnavailable
-        when 500..599 then Breacan::ServerError
-        end
+    def self.from_response(response)
+      status = response[:status].to_i
+      if klass = case status
+                 when 400      then Breacan::BadRequest
+                 when 401      then Breacan::Unauthorized
+                 when 403      then Breacan::Forbidden
+                 when 404      then Breacan::NotFound
+                 when 406      then Breacan::NotAcceptable
+                 when 409      then Breacan::Conflict
+                 when 415      then Breacan::UnsupportedMediaType
+                 when 422      then Breacan::UnprocessableEntity
+                 when 400..499 then Breacan::ClientError
+                 when 500      then Breacan::InternalServerError
+                 when 501      then Breacan::NotImplemented
+                 when 502      then Breacan::BadGateway
+                 when 503      then Breacan::ServiceUnavailable
+                 when 500..599 then Breacan::ServerError
+                 end
         klass.new(response)
       end
     end
 
+    def self.from_body(response, body)
+      Breacan::BadRequest.new(response) unless body[:ok]
+    end
+
     def initialize(response = nil)
       @response = response
       super(build_error_message)
@@ -77,7 +82,7 @@ module Breacan
     end
 
     def redact_url(url_string)
-      %w[client_secret access_token].each do |token|
+      %w[token client_secret access_token].each do |token|
         url_string.gsub!(/#{token}=\S+/, "#{token}=(redacted)") if url_string.include? token
       end
       url_string

data/lib/breacan/response/custom.rb

@@ -1,6 +1,5 @@
 require 'faraday'
 require 'breacan/error'
-require 'json'
 
 module Breacan
   module Response
@@ -8,16 +7,20 @@ module Breacan
       private
 
       def on_complete(res)
-        if error = Breacan::Error.from_body(res)
+        if error = Breacan::Error.from_response(res)
           raise error
         end
 
         return if res[:body].empty?
 
-        body = JSON.load(res[:body])
-        if body['ok']
+        body = Sawyer::Agent.serializer.decode(res[:body])
+        if body[:ok]
           res[:body].gsub!('"ok":true,', '')
         end
+
+        if error = Breacan::Error.from_body(res, body)
+          raise error
+        end
       end
     end
 

data/lib/breacan/version.rb

@@ -1,3 +1,3 @@
 module Breacan
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: breacan
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - linyows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sawyer