ocean-rails 4.0.5 → 4.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5349c1dc1cf8eeaf2c770d4e814b545390033d2f
-  data.tar.gz: 8e6790b74505ad7133671bfe3b7b7c44f2edebcb
+  metadata.gz: caa92be6dd839f0a86cc455f0c2a9a6dfd7f9401
+  data.tar.gz: 54bcb04237e1e9e28430806718ce2dd16f7f47d5
 SHA512:
-  metadata.gz: 1e2081aff6a3aef06d4f7c88c7320c7a27a3d18e64c3615ee19d260c7ca3d372a53c8198c1d9b26e016ffcfc632891bfe9d640a15d852d494ef684162c4e3b72
-  data.tar.gz: 597f1ab3c2a6dc78aa8d25d68b32d09a11a8b049c7648b232b60637d90603428fe365c75b35446432c176c768695b6626d3295a26d0c528cc7af6a6a19157715
+  metadata.gz: 7f87081cbe39166be45ca4c86502d3f955aeacc29c5198be2f1f422c4f3c2f75544eeee81c902af9b2bd3427f2fe4349be1e7a3b1797e9f5e9102433e102095b
+  data.tar.gz: 10851d77fc255e898fd6c851355a16cdf262d645d1615c4191546b7916dda9f1cb6799b306a33396e6499fae6fc9d8ca718a0447c39fb6e13c209c0bb72ae6af

data/lib/ocean/api.rb

@@ -262,16 +262,34 @@ class Api
       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
-    response_getter.call
+    response
   end
 
 
+  # 
+  # Api.simultaneously is used for making requests in parallel. For example:
+  #
+  #  results = Api.simultaneously do |r|
+  #    r << Api.request("http://foo.bar", :get, retries: 3)
+  #    r << Api.request("http://foo.baz", :get, retries: 3)
+  #    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.
+  #
+  # TimeoutErrors and NoResponseError will not be raised in parallel mode.
+  #
+  # Only Api.request is supported at the present time. Api::RemoteResource will follow.
+  #
   def self.simultaneously (&block)
     raise "block required" unless block
     @inside_simultaneously = true   
     results = []
     @hydra = nil 
     block.call(results)
+    Typhoeus::Config.memoize = true   
     @hydra.run if @hydra
     results.map(&:call)
   ensure
@@ -351,11 +369,13 @@ class Api
   # If not successful, +nil+ is returned.
   #
   def self.authenticate(username=API_USER, password=API_PASSWORD)
-    response = Api.request "/v1/authentications", :post,
-                           headers: {'X-API-Authenticate' => credentials(username, password)}
-    case response.status
+    # response = request "/v1/authentications", :post,
+    #                    headers: {'X-API-Authenticate' => credentials(username, password)}
+    response = Typhoeus.post "#{INTERNAL_OCEAN_API_URL}/v1/authentications", 
+                 body: "", headers: {'X-API-Authenticate' => credentials(username, password)}
+    case response.code
     when 201
-      token = response.body['authentication']['token']
+      token = JSON.parse(response.body)['authentication']['token']
       @service_token = token if username == API_USER && password == API_PASSWORD
       token
     when 400
@@ -379,11 +399,6 @@ class Api
   # authentication. The encoding can be reversed and is intended only to lightly mask the
   # credentials so that they're not immediately apparent when reading logs.
   #
-  def self.encode_credentials(username=nil, password=nil)
-    ActiveSupport::Deprecation.warn "Api.encode_credentials is deprecated, use Api.credentials instead", caller
-    credentials username, password
-  end
-  
   def self.credentials(username=nil, password=nil)
     raise "Only specifying the username is not allowed" if username && !password
     username ||= API_USER

data/lib/ocean/api_remote_resource.rb

@@ -174,11 +174,11 @@ class Api
     end
 
     #
-    # Returns a resource attribute. If the resource isn't present, +get!+ will used to
+    # Returns a resource attribute. If the resource isn't present, +get!+ will be used to
     # retrieve it.
     #
     def [](key)
-      get!
+      get! unless present?
       resource[key]
     end
 
@@ -267,8 +267,8 @@ class Api
     #
     def self.get(*args)
       rr = new(*args)
-      rr.get! rescue nil
-      rr
+      x = rr.get! rescue nil
+      x || rr
     end
 
 
@@ -412,11 +412,10 @@ class Api
     #
     def refresh!
       if present? && etag.present?
-        _conditional_get
+        _conditional_get || self
       else
         get!
       end
-      self
     end
 
     #
@@ -427,11 +426,10 @@ class Api
     #
     def refresh
       if present? && etag.present?
-        _conditional_get rescue nil
+        (_conditional_get rescue nil) || self
       else
         get
       end
-      self
     end
 
 
@@ -453,11 +451,19 @@ class Api
 
     def _retrieve
       credentials, token = _credentials(self)
-      response = Api.request Api.internalize_uri(uri), :get, args: args,
-                             headers: {}, 
-                             credentials: credentials, x_api_token: token,
-                             retries: retries, backoff_time: backoff_time, backoff_rate: backoff_rate, 
-                             backoff_max: backoff_max
+      response = Api.request(Api.internalize_uri(uri), :get, args: args,
+                               headers: {}, 
+                               credentials: credentials, x_api_token: token,
+                               retries: retries, backoff_time: backoff_time, backoff_rate: backoff_rate, 
+                               backoff_max: backoff_max) do |x| 
+        x                            # Remove this line,
+        # _post_retrieve x           # uncomment this line,
+      end
+      _post_retrieve response        # and delete this line.
+    end
+
+    def _post_retrieve (response)
+      return response if Api.simultaneously?
       self.response = response
       self.status = response.status
       self.status_message = response.message
@@ -469,7 +475,7 @@ class Api
         raise UnparseableJson
       end
       _setup raw, response
-      self
+      #self
     end
 
 
@@ -511,6 +517,7 @@ class Api
       self.headers = response.headers
       self.etag = headers['ETag']
       self.present = true
+      self
     end
 
 

data/lib/ocean/version.rb

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

metadata

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