datasift 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fead364f5c1631d28e826b6ab3a1bc0feaf570b
-  data.tar.gz: 66b66356edcf1446051e3fc4fd8e35c72f5bf561
+  metadata.gz: fe305d23648d41d808a86c13411481f7bdf75129
+  data.tar.gz: 6e90471c5872a20097cc4170422bc9695aca777f
 SHA512:
-  metadata.gz: f8a5b9f74d8c5bb4d00271b921b1167e9ab2be70b254837042e368340d771546d995f83870ba9e743c2d17f40ac1f7824aef37d10291382ab369649c99ac26f3
-  data.tar.gz: 0a032a3711190b06f10ac7c3c1cc288ae4b4dd4af46eb0b8c7c2a006fa74b372c2406dc80b215654a725fc3026d67dbb198011311e3c3c6840530940ce1c508c
+  metadata.gz: b25f41df2312e59b7850ac67fabedce030d8fd2f3c5ff0fc0bec6b7770deab01e8066f081d4d2cbcee239e14dd68c3f8e264abf245e8cb533a4b2a30f9ac536d
+  data.tar.gz: 6a44062ecb3affee0d7e2ecfa4f3b230f692d3f3aceb78994588ae4cb3ebb6a3176acd4cc10f7df4682b6618e290d132b521cda6f9c64d1c494c53af48ab1a98

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 CHANGELOG
 ================================
+## v.3.5.1 (2016-10-06)
+### Added
+* Explicit support for 500 and 502 responses from the API
+### Fixes
+* Resolves [#86](https://github.com/datasift/datasift-ruby/issues/86); not handling 502 responses well
+
 ## v.3.5.0 (2015-11-13)
 ### Added
 * Support for the [/account/usage](http://dev.datasift.com/pylon/docs/api/acct-api-endpoints/get-accountusage) API endpoint

data/VERSION

@@ -1 +1 @@
-3.5.0
+3.5.1

data/lib/datasift.rb

@@ -230,8 +230,14 @@ module DataSift
       begin
         code = e.http_code
         body = e.http_body
+        error = nil
         if code && body
-          error = MultiJson.load(body)
+          begin
+            error = MultiJson.load(body)
+          rescue MultiJson::ParseError
+            # In cases where we receive 502 responses, Nginx may send HTML rather than JSON
+            error = body
+          end
           response_on_error = {
             :data => nil,
             :datasift => {
@@ -303,6 +309,10 @@ module DataSift
       raise UnprocessableEntityError.new(code, body, response)
     when 429
       raise TooManyRequestsError.new(code, body, response)
+    when 500
+      raise InternalServerError.new(code, body, response)
+    when 502
+      raise BadGatewayError.new(code, body, response)
     when 503
       raise ServiceUnavailableError.new(code, body, response)
     when 504

data/lib/errors.rb

@@ -68,6 +68,14 @@ end
 class TooManyRequestsError < DataSiftError
 end
 
+# Standard error returned when receiving a 500 response from the API
+class InternalServerError < DataSiftError
+end
+
+# Standard error returned when receiving a 502 response from the API
+class BadGatewayError < DataSiftError
+end
+
 # Standard error returned when receiving a 503 response from the API
 class ServiceUnavailableError < DataSiftError
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datasift
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - DataSift
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -202,9 +202,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: DataSift is a simple wrapper for the DataSift API.
 test_files: []
-has_rdoc: