ocean-rails 2.14.0 → 2.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93da2aaae658c8d687731caf9767b5aaf2b16437
-  data.tar.gz: 9ca92f90ec4f77bb28eca4caec17af0d9f16f60e
+  metadata.gz: 0b26499445f8caadefff6944958ddf4f2913faa7
+  data.tar.gz: c4407bf04564b7bc71f4d509e7b5d590b84bc66e
 SHA512:
-  metadata.gz: d8e471acbac49e52dca44a319c08cb6df22a64f8e85b1c1255aa9b60fc32d01df1b0befca5d1bbb27e2dbb566dbd71780009b7e7b5ef541f93eeedca755e87e7
-  data.tar.gz: 87b58bd0d2d2b4701c3b666972d748a7c4c6be2d3d1921e5f5004a7f50f71f961bab6591765e4dada345f122630316f7e93dcafab050feefed84418c267b3c87
+  metadata.gz: 2f1d3e976221fc58e16ef706284bc0416e6f361c41a279f7d2cf9122dc5fb20a44a1e6cbdf6da3d17ddb7b616a19a8fa602648a4b44da349bec0fea773bbe520
+  data.tar.gz: 9be5c92fd768279e594f4cdb259fd1beda5e54273dc25ef30877f54cc98c92065fbfc8859b52a17a0ba43ad962765767aedb776bc1229a7eac1e4eb2b39c733b

data/lib/ocean/api.rb

@@ -130,10 +130,13 @@ class Api
   # +headers+, if given, is a hash of extra HTTP headers for the request.
   # +body+, if given, is the body of the request (:post, :put) as a string.
   # +x_api_token+, if given, is a string which will be used as an X-API-Token header.
+  # +reauthentication+ (true by default), controls whether 400 and 419 will trigger reauth.
   # +ssl_verifypeer+ (true by default), controls SSL peer verification.
+  # +ssl_verifyhost+ (2 by default), controls SSL host verification.
   #
   def self.request(url, http_method, args: nil, headers: {}, body: nil,
                    x_api_token: headers['X-API-Token'], 
+                   reauthentication: true,
                    ssl_verifypeer: true, ssl_verifyhost: 2)
     # Set up the request
     headers['Accept'] = "application/json"
@@ -160,11 +163,11 @@ class Api
       elsif response.status == 0
         # Could not get an http response, something's wrong.
         raise Api::NoResponseError, "Api.request could not obtain a response"
-      elsif [400, 419].include?(response.status) && x_api_token.present?
+      elsif [400, 419].include?(response.status) && reauthentication && x_api_token.present? 
         # Re-authenticate and retry
         Api.reset_service_token
         headers['X-API-Token'] = Api.service_token
-        x_api_token = false   # This prevents us from ending up here twice
+        reauthentication = false   # This prevents us from ending up here twice
       else
         # Failed
         break

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "2.14.0"
+  VERSION = "2.14.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.14.1
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus