ocean-rails 6.1.5 → 6.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b498d045f13407db3e50fb87f43640d523221f7
-  data.tar.gz: c98366ff234bfa09a59729fc1b1758752b2d3409
+  metadata.gz: ec467811d141d7d9f66c6976800d9a0bd76353fe
+  data.tar.gz: f1e287782f85a2c099036bdb8f8dff9c2f1a60b1
 SHA512:
-  metadata.gz: 939304b05f3df6b4780fc565beb34d2a4a2be5be7fa97a72db46a766ca895e55cdba955264e58b7d89ebdc388ec021ed1d31a19ad85f32b52f7bbe5c4b619963
-  data.tar.gz: 38c0261b633547fee8e2236b90ff16e971a5d56b096a7b95bcc2d22f3648fcf3e0f097b88718bf47cc9794a61b25994b40bfdd6821cf903732262efcd319bb00
+  metadata.gz: 9ebebf0cb54310cd1a0282c219866f6c465f3347a978b00f2da8706932f9ca37fe21447e92bd41e5d96509ab5705e108bcfe55012cfcc5a23a2dc737b258d714
+  data.tar.gz: f5b5c6cf3c760eb54b52bbe925213f0bc696d00a59034d4ba9b1afb7168bc28be7ae1673ecc07f588db2073e6899a72b3f082aad18023d938e80226b51a11c64

data/lib/ocean/api.rb

@@ -394,7 +394,7 @@ class Api
     when 403
       # Does not authenticate. Don't repeat the request.
       nil 
-    when 500
+    when 500, 503, 504
       # Error. Don't repeat. 
       nil   
     else
@@ -533,8 +533,8 @@ class Api
   # A URL not starting with a / will be internalized.
   #
   def self.async_job_body(href=nil, method=:get, body: {},
-                          credentials: nil, 
-                          token: nil,
+                          credentials: Api.credentials, 
+                          #token: Api.service_token,
                           steps: nil,
                           default_step_time: nil, 
                           default_poison_limit: nil,
@@ -554,8 +554,8 @@ class Api
       steps ||= []
     end
     h['steps'] = steps
-    h['credentials'] = credentials || Api.credentials
-    h['token'] = token || Api.service_token
+    h['credentials'] = credentials #|| Api.credentials
+    #h['token'] = token #|| Api.service_token
     h['default_step_time'] = default_step_time if default_step_time
     h['default_poison_limit'] = default_poison_limit if default_poison_limit
     h['max_seconds_in_queue'] = max_seconds_in_queue if max_seconds_in_queue
@@ -582,7 +582,7 @@ class Api
   def self.run_async_job(href=nil, method=nil, job: nil, **keywords, &block)
     job ||= async_job_body(href, method, **keywords)
     Api.request "/v1/async_jobs", :post,
-      body: job.to_json, x_api_token: Api.service_token
+      body: job.to_json, x_api_token: nil
   rescue TimeoutError, NoResponseError => e
     raise e unless block
     block.call e
@@ -603,7 +603,7 @@ class Api
           area: area, 
           name: name, 
           description: description
-        }#.to_json
+        }
   end
 
 

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "6.1.5"
+  VERSION = "6.1.6"
 end

metadata

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