ocean-rails 4.0.4 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e13cc2480ac989b37242e14182c41931b25b5ff
-  data.tar.gz: e84d495747487e35a951cc80eb1c53508d742351
+  metadata.gz: 5349c1dc1cf8eeaf2c770d4e814b545390033d2f
+  data.tar.gz: 8e6790b74505ad7133671bfe3b7b7c44f2edebcb
 SHA512:
-  metadata.gz: c75d7190f2c20ada7c2349e625523fb2bf5161bd7e805d680d5bd4b2872605850fa3e65cd067022aad9f2ad3b18be0e0203c4b9215839df3d1c716562594a2ae
-  data.tar.gz: 17e85cd0ce7257bbedac4b231e4222f62e563bc21089ee43a29c448f68314ea94f41e82a175d04417f3065953b4295f8c36958bd4d469df8ea9b8050b3596925
+  metadata.gz: 1e2081aff6a3aef06d4f7c88c7320c7a27a3d18e64c3615ee19d260c7ca3d372a53c8198c1d9b26e016ffcfc632891bfe9d640a15d852d494ef684162c4e3b72
+  data.tar.gz: 597f1ab3c2a6dc78aa8d25d68b32d09a11a8b049c7648b232b60637d90603428fe365c75b35446432c176c768695b6626d3295a26d0c528cc7af6a6a19157715

data/lib/ocean/api.rb

@@ -181,11 +181,13 @@ class Api
     headers['X-API-Token'] = x_api_token if x_api_token.present?
     headers['X-Metadata'] = x_metadata if x_metadata.present?
 
-    retries = 0 unless http_method.to_s.upcase == "GET"
+    retries = 0 unless ["GET", "HEAD"].include? http_method.to_s.upcase
 
     @hydra ||= Typhoeus::Hydra.hydra
-    request = nil   # For clarity
+
+    request = nil   
     response = nil
+    response_getter = lambda { response }
 
     url = url.first == "/" ? "#{INTERNAL_OCEAN_API_URL}#{url}" : Api.internalize_uri(url)
 
@@ -199,18 +201,18 @@ class Api
                                       body: body, 
                                       ssl_verifypeer: ssl_verifypeer,
                                       ssl_verifyhost: ssl_verifyhost)
-
       # Define a callback to process the response and do retries
       request.on_complete do |typhoeus_response|
-        response = Response.new(typhoeus_response)
+        response = Response.new typhoeus_response
         case response.status
         when 100..199
           enqueue_request.call  # Ignore and retry
         when 200..299, 304
-          # Success, call the post-processor if any
-          if block
-            response = block.call response
-          end
+          # Success, call the post-processor if any. Any further Api.request
+          # calls done by the post-processor will use the same response
+          # accessors, which means the final result will be what the last
+          # post-processor to finish returns.
+          response = block.call(response) if block
         when 300..399
           nil  # Done, redirect
         when 400, 419
@@ -231,11 +233,11 @@ class Api
         when 400..499
           nil  # Done, fail
         else
-          # Retry if there are any retries left
+          # We got a 5xx. Retry if there are any retries left
           if retries > 0
             retries -= 1
             sleep backoff_time
-            backoff_time = [backoff_time + backoff_time * backoff_rate, 30].min
+            backoff_time = [backoff_time + backoff_time * backoff_rate, backoff_max].min
             enqueue_request.call
           else
             nil  # Done, don't retry
@@ -251,27 +253,27 @@ class Api
 
     # So create and enqueue the request
     enqueue_request.call
-    # Run it, unless we're accumulating calls inside an Api.simultaneously block
-    unless @inside_simultaneously
-      # The next line blocks until completed, possibly after several retries
-      @hydra.run
-      if response.is_a?(Response)
-        # Raise any exceptions
-        raise Api::TimeoutError, "Api.request timed out" if response.timed_out?
-        raise Api::NoResponseError, "Api.request could not obtain a response" if response.status == 0
-      end
-      return response
+    # If doing parallel calls, return a lambda which returns the final response
+    return response_getter if Api.simultaneously?
+    # Run it now. Blocks until completed, possibly after any number of retries
+    @hydra.run
+    if response.is_a?(Response)
+      # Raise any exceptions
+      raise Api::TimeoutError, "Api.request timed out" if response.timed_out?
+      raise Api::NoResponseError, "Api.request could not obtain a response" if response.status == 0
     end
-    # Return nil: we have no response yet
-    nil
+    response_getter.call
   end
 
 
   def self.simultaneously (&block)
     raise "block required" unless block
     @inside_simultaneously = true   
+    results = []
     @hydra = nil 
-    block.call
+    block.call(results)
+    @hydra.run if @hydra
+    results.map(&:call)
   ensure
     @inside_simultaneously = false
   end

data/lib/ocean/api_remote_resource.rb

@@ -163,6 +163,7 @@ class Api
       @headers = nil
       @credentials = credentials
       @x_api_token = x_api_token
+      @collection = false
   	end
 
     #

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "4.0.4"
+  VERSION = "4.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.5
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -283,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: This gem implements common Ocean behaviour for Ruby and Ruby on Rails.