datasift 3.7.0 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad4fb49dafd82b2670d5d7d7e6b165f06d3dd9a7
-  data.tar.gz: f4575e31b0542ffe614e6021aa760c13ca08328c
+  metadata.gz: 9ba6751afecf874d13f2de17e8c27efed61693d9
+  data.tar.gz: 2a4d7e76cd1b84214e66f4f252e4608401389845
 SHA512:
-  metadata.gz: 3d9f023a5938ce6c8d1b6a858a9aab453561f7f097eef24b41021f93350b22df584af6c457cbcc034e34b868a7a61051b37eabcc885bd3376c7a44199451eec1
-  data.tar.gz: 93e354f5f7fbd9fb6f43d10d00b47f01356225b91fd2c29725244c194bdeb8f35254b0381f5f27234ad31ee3323b5728f9da6f310b5c188edb014ea634b322ec
+  metadata.gz: c4d5ab192c4a5663021854de9081eb602c4efde77731792160b9922cd8f608001d8c43d604e6f33b95688b7e799595b088f13002183f4d9a85e4755f1f7533c9
+  data.tar.gz: 3f54eee95ed7329d8fd3f46250859e8c36e06c0c5c7bdaea7c08993197160fb0f3dce8e48ebc02a1c9c87b8266469e38b0fddee9199cc4bd68d5c82a8729437d

data/CHANGELOG.md

@@ -7,6 +7,12 @@ CHANGELOG
 * Designed to make the most of DataSift's latest API version and features
 * Designed for Ruby 2.3+. Use features like keyword parameters across the board
 
+## v.3.7.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.7.0 (2016-08-04)
 ### Added
 * Support for an `analyze_queries` parameter for Account Identity Limits
@@ -27,6 +33,12 @@ CHANGELOG
 * Support for the [/pylon/update](http://dev.datasift.com/docs/platform/api/rest-api/endpoints/pylonupdate) API endpoint
 * Support for [API v1.3](http://dev.datasift.com/docs/platform/api/api-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` API endpoint

data/VERSION

@@ -1 +1 @@
-3.7.0
+3.7.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.7.0
+  version: 3.7.1
 platform: ruby
 authors:
 - DataSift
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client