ocean-rails 6.1.9 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aa07f06993d7d5bcca97664b436fa599df63372
-  data.tar.gz: d5bb586729852f34de19f3e8ab413280c9e3ce98
+  metadata.gz: a17bdb2d6c018961164c484b1e24303ebb9c7ce4
+  data.tar.gz: 6df358f9d7c6c54eb3cca885f08f8507ac12e32c
 SHA512:
-  metadata.gz: 285f47af63e281cfb1bb809989db96ffa6c5f9e5b118e6cda6459a1db8a122d7a1d00ebd04861f05b2f311823705201e98e2a6c8195b2df396f0872a44e20b35
-  data.tar.gz: 970fa7e163299998cdbac8bae04b0a920183925ddf5f899bad7a2224075ab6b164889dde88b5afc8dda98279233fe093c0513d5d74e8163e6cd26fc821ab408f
+  metadata.gz: 03acbd2140abffa3c359d74a6b4bdf11483a22a0a071b6c6ea3b0b0a953361a9f5e769ab952a2ae2e52ebe2a0cc735851606201c00d6765bcf4b6c4c1d3134bc
+  data.tar.gz: 8093e29eafd8532e1b4e89e1f60acae858922f4dd1b81114b33206fb9ed2a3b5059495ac82ef8b7aae5bee1fcd797a9d00d74c152b902c6923c6de7760b8c48d

data/lib/ocean/api.rb

@@ -143,7 +143,7 @@ class Api
   #
   # Api.request is designed to be the lowest common denominator for making any kind of
   # HTTP request, except parallel requests which will have a similar method (to which BAN
-  # and PURGE requests to Varnish is a special case).
+  # and PURGE requests to Varnish constitute a special case).
   #
   # In its present form it assumes the request is a JSON one. Eventually, keyword args will
   # provide abstract control of content type.
@@ -158,6 +158,7 @@ class Api
   # +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.
+  # +timeout+ sets the timeout of the request. It defaults to 0, meaning no timeout.
   #
   # Automatic retries for GET requests are available:
   #
@@ -183,6 +184,7 @@ class Api
                    ssl_verifypeer: true, ssl_verifyhost: 2,
                    retries: 0, backoff_time: 1, backoff_rate: 0.9, backoff_max: 30,
                    x_metadata: Thread.current[:metadata],
+                   timeout: 0,
                    &postprocessor)
     # Set up the request
     headers['Accept'] = "application/json"
@@ -211,7 +213,8 @@ class Api
                                       params: args, 
                                       body: body, 
                                       ssl_verifypeer: ssl_verifypeer,
-                                      ssl_verifyhost: ssl_verifyhost)
+                                      ssl_verifyhost: ssl_verifyhost,
+                                      timeout: timeout)
       # Define a callback to process the response and do retries
       request.on_complete do |typhoeus_response|
         response = Response.new typhoeus_response

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "6.1.9"
+  VERSION = "6.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 6.1.9
+  version: 6.2.0
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-16 00:00:00.000000000 Z
+date: 2016-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus