ocean-rails 5.0.7 → 5.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d79bfcbbf4be753bd5372de2d2c51bbf738a054
-  data.tar.gz: b8daf05f832308be324854b51effb6a2a91de038
+  metadata.gz: 40050eb257fba2f83fd89c819244b4cad0d8c5e8
+  data.tar.gz: bbf7ecc4d993e7b9c5fa97da6d22b60a33c5e784
 SHA512:
-  metadata.gz: c34686625ae8e086b87f9e1773287ae25504dd97947cd386cd9e0cedbafb01ae27f9171b526d6b93e8a1a35aa711a1d904fd56904d35611e411ffed98f310957
-  data.tar.gz: ae82f068ff7652a216fb8323707ab9d0169bd432f1a3ef7ab3e3f3ec478a353043567c54ec476f2cebd1c038d5299cf422c8f1aadc8156821f7792e0bc05cc1d
+  metadata.gz: 25daad9c964b1e92cf7eb9504b46db6f3de4dd387617666f6dc5f5d27ff8582429d5d1626c32b5c69687db9e4422027f675550a406bce92bc961e3b776e6246f
+  data.tar.gz: 4b5097c0314c9daf4f3651a019529d6a0960d6c30c62ca278a8e6fca8d4ca15d474f141a007468c2c4467ec083fe7f1d496452d5714ded3725968b5d668545b9

data/lib/ocean/api.rb

@@ -161,8 +161,7 @@ class Api
   #
   # Automatic retries for GET requests are available:
   #
-  # +retries+, if given and > 0, specifies the number of retries to perform for GET requests.
-  #            Defaults to 0, meaning no retries.
+  # +retries+, if given and > 0, specifies the number of retries to perform for GET requests. Defaults to 0, meaning no retries.
   # +backoff_time+ (default 1) the initial time to wait between retries. 
   # +backoff_rate+ (default 0.9) the rate at which the time is increased.
   # +backoff_max+ (default 30) the maximum time to wait between retries.
@@ -172,6 +171,11 @@ class Api
   # settings will generate the progression 1, 1.9, 3.61, 6.859, 13.0321, 24.76099, 30, 30, 
   # 30, etc. To disable waiting between retries entirely, set +backoff_time+ to zero.
   #
+  # If a +postprocessor+ block is given, it will be called with the result of the response;
+  # whatever it returns will be returned as the result of the Api request.
+  # 
+  # +Api.request+ can be called inside a +simultaneously+ block.
+  #
   def self.request(url, http_method, args: nil, headers: {}, body: nil,
                    credentials: nil,
                    x_api_token: headers['X-API-Token'], 
@@ -179,7 +183,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],
-                   &block)
+                   &postprocessor)
     # Set up the request
     headers['Accept'] = "application/json"
     headers['Content-Type'] = "application/json" if [:post, :put].include?(http_method)
@@ -219,7 +223,7 @@ class Api
           # 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
+          response = postprocessor.call(response) if postprocessor
         when 300..399
           nil  # Done, redirect
         when 400, 419
@@ -282,13 +286,12 @@ class Api
   #    r << Api.request("http://foo.quux", :get, retries: 3)
   #  end
   #
-  # The value returned is an array of responses from the Api.request calls. If a request
-  # has a post-processor block, the result will not be the response but what the block
-  # returns.
+  # The value returned is an array of responses from the Api.request calls.
   #
   # TimeoutErrors and NoResponseError will not be raised in parallel mode.
   #
-  # Only Api.request is supported at the present time. Api::RemoteResource will follow.
+  # Only +Api.request+ is supported at the present time. Api::RemoteResource will follow,
+  # but requires a major internal reorganisation of Api::RemoteResource. It's underway.
   #
   def self.simultaneously (&block)
     raise "block required" unless block

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "5.0.7"
+  VERSION = "5.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 5.0.7
+  version: 5.0.8
 platform: ruby
 authors:
 - Peter Bengtson
@@ -16,84 +16,84 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.10
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack-attack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: ocean-dynamo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.4
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -267,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: This gem implements common Ocean behaviour for Ruby and Ruby on Rails.