ocean-rails 6.1.5 → 6.1.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/ocean/api.rb +7 -7
- data/lib/ocean/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: ec467811d141d7d9f66c6976800d9a0bd76353fe
|
|
4
|
+
data.tar.gz: f1e287782f85a2c099036bdb8f8dff9c2f1a60b1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9ebebf0cb54310cd1a0282c219866f6c465f3347a978b00f2da8706932f9ca37fe21447e92bd41e5d96509ab5705e108bcfe55012cfcc5a23a2dc737b258d714
|
|
7
|
+
data.tar.gz: f5b5c6cf3c760eb54b52bbe925213f0bc696d00a59034d4ba9b1afb7168bc28be7ae1673ecc07f588db2073e6899a72b3f082aad18023d938e80226b51a11c64
|
data/lib/ocean/api.rb
CHANGED
|
@@ -394,7 +394,7 @@ class Api
|
|
|
394
394
|
when 403
|
|
395
395
|
# Does not authenticate. Don't repeat the request.
|
|
396
396
|
nil
|
|
397
|
-
when 500
|
|
397
|
+
when 500, 503, 504
|
|
398
398
|
# Error. Don't repeat.
|
|
399
399
|
nil
|
|
400
400
|
else
|
|
@@ -533,8 +533,8 @@ class Api
|
|
|
533
533
|
# A URL not starting with a / will be internalized.
|
|
534
534
|
#
|
|
535
535
|
def self.async_job_body(href=nil, method=:get, body: {},
|
|
536
|
-
credentials:
|
|
537
|
-
token:
|
|
536
|
+
credentials: Api.credentials,
|
|
537
|
+
#token: Api.service_token,
|
|
538
538
|
steps: nil,
|
|
539
539
|
default_step_time: nil,
|
|
540
540
|
default_poison_limit: nil,
|
|
@@ -554,8 +554,8 @@ class Api
|
|
|
554
554
|
steps ||= []
|
|
555
555
|
end
|
|
556
556
|
h['steps'] = steps
|
|
557
|
-
h['credentials'] = credentials
|
|
558
|
-
h['token'] = token
|
|
557
|
+
h['credentials'] = credentials #|| Api.credentials
|
|
558
|
+
#h['token'] = token #|| Api.service_token
|
|
559
559
|
h['default_step_time'] = default_step_time if default_step_time
|
|
560
560
|
h['default_poison_limit'] = default_poison_limit if default_poison_limit
|
|
561
561
|
h['max_seconds_in_queue'] = max_seconds_in_queue if max_seconds_in_queue
|
|
@@ -582,7 +582,7 @@ class Api
|
|
|
582
582
|
def self.run_async_job(href=nil, method=nil, job: nil, **keywords, &block)
|
|
583
583
|
job ||= async_job_body(href, method, **keywords)
|
|
584
584
|
Api.request "/v1/async_jobs", :post,
|
|
585
|
-
body: job.to_json, x_api_token:
|
|
585
|
+
body: job.to_json, x_api_token: nil
|
|
586
586
|
rescue TimeoutError, NoResponseError => e
|
|
587
587
|
raise e unless block
|
|
588
588
|
block.call e
|
|
@@ -603,7 +603,7 @@ class Api
|
|
|
603
603
|
area: area,
|
|
604
604
|
name: name,
|
|
605
605
|
description: description
|
|
606
|
-
}
|
|
606
|
+
}
|
|
607
607
|
end
|
|
608
608
|
|
|
609
609
|
|
data/lib/ocean/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ocean-rails
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 6.1.
|
|
4
|
+
version: 6.1.6
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Peter Bengtson
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-06-
|
|
11
|
+
date: 2016-06-10 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: typhoeus
|