sdr-client 0.18.0 → 0.23.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop.yml +2 -0
- data/README.md +8 -1
- data/exe/sdr +65 -59
- data/lib/sdr_client.rb +3 -0
- data/lib/sdr_client/cli.rb +3 -1
- data/lib/sdr_client/connection.rb +41 -0
- data/lib/sdr_client/deposit.rb +8 -5
- data/lib/sdr_client/deposit/file.rb +3 -2
- data/lib/sdr_client/deposit/file_set.rb +2 -1
- data/lib/sdr_client/deposit/model_process.rb +11 -34
- data/lib/sdr_client/deposit/process.rb +15 -35
- data/lib/sdr_client/deposit/request.rb +4 -4
- data/lib/sdr_client/deposit/upload_files.rb +1 -1
- data/lib/sdr_client/deposit/upload_resource.rb +62 -0
- data/lib/sdr_client/login.rb +2 -2
- data/lib/sdr_client/model_deposit.rb +2 -3
- data/lib/sdr_client/version.rb +1 -1
- data/sdr-client.gemspec +1 -1
- metadata +7 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 26eecb6134b706eb60ac7623c53576d6ae93f18d7bb9399b8e18c07f04e6da99
|
4
|
+
data.tar.gz: 9c2a3d384225a21571ef5618e0bf1606599a44f429a0c81735c8c7f0f04172a3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: adadb90117ec098b281ff87b03796fd20fed3772fd03e3aa165f8c97b8c05a5510ed7980d9321effa15757cd505bbae8ba30bbdb3dd2c57257b24ce7bf40aa0e
|
7
|
+
data.tar.gz: 06ee1f2f6b22e364cfe1fe32059619b527026e7f9dd2dd2e05a6e30865c07946d8e9d1c8b98d1fbb91b68f7867400534a9eb83c3406942e54438947c2eed1ed3
|
data/.rubocop.yml
CHANGED
data/README.md
CHANGED
@@ -21,8 +21,15 @@ Log in:
|
|
21
21
|
sdr --service-url http://sdr-api-server:3000 login
|
22
22
|
```
|
23
23
|
|
24
|
+
Register a new object:
|
25
|
+
```
|
26
|
+
sdr --service-url https://sdr-api-server:3000 register --label 'hey there' \
|
27
|
+
--admin-policy 'druid:bk123gh4567' \
|
28
|
+
--collection 'druid:gh456kw9876' \
|
29
|
+
--source-id 'googlebooks:stanford_12345' file1.png file2.png
|
30
|
+
```
|
24
31
|
|
25
|
-
Deposit a new object:
|
32
|
+
Deposit (register + accession) a new object:
|
26
33
|
```
|
27
34
|
sdr --service-url https://sdr-api-server:3000 deposit --label 'hey there' \
|
28
35
|
--admin-policy 'druid:bk123gh4567' \
|
data/exe/sdr
CHANGED
@@ -27,7 +27,10 @@ global = OptionParser.new do |opts|
|
|
27
27
|
|
28
28
|
COMMANDS
|
29
29
|
deposit
|
30
|
-
|
30
|
+
accession object into the SDR
|
31
|
+
|
32
|
+
register
|
33
|
+
create a draft object in SDR
|
31
34
|
|
32
35
|
login
|
33
36
|
Will prompt for email & password and exchange it for an login token, which it saves in ~/.sdr/token
|
@@ -40,77 +43,80 @@ end
|
|
40
43
|
global.order!
|
41
44
|
command = ARGV.shift
|
42
45
|
|
43
|
-
|
44
|
-
'
|
45
|
-
|
46
|
-
|
47
|
-
end
|
46
|
+
deposit_options = OptionParser.new do |opts|
|
47
|
+
opts.on('--label LABEL', 'The object label') do |label|
|
48
|
+
options[:label] = label
|
49
|
+
end
|
48
50
|
|
49
|
-
|
50
|
-
|
51
|
-
|
51
|
+
opts.on('--admin-policy ADMIN_POLICY', 'The druid identifier of the admin policy object') do |apo|
|
52
|
+
options[:apo] = apo
|
53
|
+
end
|
52
54
|
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
end
|
55
|
+
opts.on('--type TYPE', 'The object type to create. ' \
|
56
|
+
'One of: "image", "book", "document", "map", "manuscript", "media", ' \
|
57
|
+
'"three_dimensional", "collection", or "admin_policy"') do |type|
|
58
|
+
if %w[image book document map manuscript media three_dimensional collection admin_policy].include?(type)
|
59
|
+
options[:type] = "http://cocina.sul.stanford.edu/models/#{type}.jsonld"
|
59
60
|
end
|
61
|
+
end
|
60
62
|
|
61
|
-
|
62
|
-
|
63
|
-
|
63
|
+
opts.on('--collection COLLECTION', 'The druid identifier of the collection object') do |collection|
|
64
|
+
options[:collection] = collection
|
65
|
+
end
|
64
66
|
|
65
|
-
|
66
|
-
|
67
|
-
|
67
|
+
opts.on('--catkey CATKEY', 'The catkey for this item') do |catkey|
|
68
|
+
options[:catkey] = catkey
|
69
|
+
end
|
68
70
|
|
69
|
-
|
70
|
-
|
71
|
-
|
71
|
+
opts.on('--source-id SOURCE_ID', 'The source id for this object') do |source_id|
|
72
|
+
options[:source_id] = source_id
|
73
|
+
end
|
72
74
|
|
73
|
-
|
74
|
-
|
75
|
-
|
75
|
+
opts.on('--copyright COPYRIGHT', 'The copyright statement') do |copyright|
|
76
|
+
options[:copyright] = copyright
|
77
|
+
end
|
76
78
|
|
77
|
-
|
78
|
-
|
79
|
-
|
79
|
+
opts.on('--use-statement STATEMENT', 'The use and reproduction statement') do |use_statement|
|
80
|
+
options[:use_statement] = use_statement
|
81
|
+
end
|
80
82
|
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
83
|
+
opts.on('--viewing-direction DIRECTION', 'The viewing direction (if a book). ' \
|
84
|
+
'Either "left-to-right" or "right-to-left"') do |viewing_direction|
|
85
|
+
options[:viewing_direction] = viewing_direction if %w[left-to-right right-to-left].include?(viewing_direction)
|
86
|
+
end
|
85
87
|
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
88
|
+
opts.on('--access LEVEL', 'The access level for this object. ' \
|
89
|
+
'Either "world", "stanford", "location-based", "citation-only" or "dark"') do |level|
|
90
|
+
options[:access] = level if %w[world stanford location-based citation-only dark].include?(level)
|
91
|
+
end
|
90
92
|
|
91
|
-
|
92
|
-
|
93
|
-
|
93
|
+
opts.on('--files-metadata FILES_METADATA', 'A JSON object representing per-file metadata') do |files_metadata|
|
94
|
+
options[:files_metadata] = JSON.parse(files_metadata)
|
95
|
+
end
|
94
96
|
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
97
|
+
opts.on('--strategy STRATEGY',
|
98
|
+
'The strategy to use for distributing files into filesets. Either "default" or "filename"') do |strategy|
|
99
|
+
strategy_class = case strategy
|
100
|
+
when 'filename'
|
101
|
+
SdrClient::Deposit::MatchingFileGroupingStrategy
|
102
|
+
when 'default'
|
103
|
+
SdrClient::Deposit::SingleFileGroupingStrategy
|
104
|
+
else
|
105
|
+
warn "Unknown strategy #{strategy}"
|
106
|
+
exit(1)
|
107
|
+
end
|
108
|
+
options[:grouping_strategy] = strategy_class
|
109
|
+
end
|
108
110
|
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
111
|
+
opts.on('-h', '--help', 'Display this screen') do
|
112
|
+
puts opts
|
113
|
+
exit
|
114
|
+
end
|
115
|
+
end
|
116
|
+
|
117
|
+
subcommands = {
|
118
|
+
'deposit' => deposit_options,
|
119
|
+
'register' => deposit_options,
|
114
120
|
'login' => OptionParser.new
|
115
121
|
}
|
116
122
|
|
data/lib/sdr_client.rb
CHANGED
@@ -4,6 +4,8 @@ require 'dry/monads'
|
|
4
4
|
require 'faraday'
|
5
5
|
require 'active_support'
|
6
6
|
require 'active_support/core_ext/object/json'
|
7
|
+
require 'active_support/core_ext/hash/indifferent_access'
|
8
|
+
require 'cocina/models'
|
7
9
|
|
8
10
|
require 'sdr_client/version'
|
9
11
|
require 'sdr_client/deposit'
|
@@ -12,6 +14,7 @@ require 'sdr_client/credentials'
|
|
12
14
|
require 'sdr_client/login'
|
13
15
|
require 'sdr_client/login_prompt'
|
14
16
|
require 'sdr_client/cli'
|
17
|
+
require 'sdr_client/connection'
|
15
18
|
|
16
19
|
module SdrClient
|
17
20
|
class Error < StandardError; end
|
data/lib/sdr_client/cli.rb
CHANGED
@@ -6,7 +6,9 @@ module SdrClient
|
|
6
6
|
def self.start(command, options)
|
7
7
|
case command
|
8
8
|
when 'deposit'
|
9
|
-
SdrClient::Deposit.run(options)
|
9
|
+
SdrClient::Deposit.run(accession: true, **options)
|
10
|
+
when 'register'
|
11
|
+
SdrClient::Deposit.run(accession: false, **options)
|
10
12
|
when 'login'
|
11
13
|
status = SdrClient::Login.run(options)
|
12
14
|
puts status.value if status.failure?
|
@@ -0,0 +1,41 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module SdrClient
|
4
|
+
# The connection to the server
|
5
|
+
class Connection
|
6
|
+
include Dry::Monads[:result]
|
7
|
+
|
8
|
+
def initialize(url:, token: Credentials.read)
|
9
|
+
@url = url
|
10
|
+
@token = token
|
11
|
+
end
|
12
|
+
|
13
|
+
def connection
|
14
|
+
@connection ||= Faraday.new(url: url) do |conn|
|
15
|
+
conn.authorization :Bearer, token
|
16
|
+
conn.adapter :net_http
|
17
|
+
end
|
18
|
+
end
|
19
|
+
|
20
|
+
# This is only available to certain blessed accounts (argo) as it gives the
|
21
|
+
# token that allows you to act as any other user. Thus the caller must authenticate
|
22
|
+
# the user (e.g. using Shibboleth) before calling this method with their email address.
|
23
|
+
# @param [String] the email address of the person to proxy to.
|
24
|
+
# @return [Result] the token for the account
|
25
|
+
def proxy(to)
|
26
|
+
response = connection.post("/v1/auth/proxy?to=#{to}")
|
27
|
+
case response.status
|
28
|
+
when 200
|
29
|
+
Success(response.body)
|
30
|
+
else
|
31
|
+
Failure("Status: #{response.status}\n#{response.body}")
|
32
|
+
end
|
33
|
+
end
|
34
|
+
|
35
|
+
delegate :put, :post, to: :connection
|
36
|
+
|
37
|
+
private
|
38
|
+
|
39
|
+
attr_reader :url, :token
|
40
|
+
end
|
41
|
+
end
|
data/lib/sdr_client/deposit.rb
CHANGED
@@ -23,10 +23,9 @@ module SdrClient
|
|
23
23
|
url:,
|
24
24
|
files: [],
|
25
25
|
files_metadata: {},
|
26
|
+
accession: false,
|
26
27
|
grouping_strategy: SingleFileGroupingStrategy,
|
27
28
|
logger: Logger.new(STDOUT))
|
28
|
-
token = Credentials.read
|
29
|
-
|
30
29
|
augmented_metadata = FileMetadataBuilder.build(files: files, files_metadata: files_metadata)
|
31
30
|
metadata = Request.new(label: label,
|
32
31
|
type: type,
|
@@ -41,8 +40,11 @@ module SdrClient
|
|
41
40
|
embargo_access: embargo_access,
|
42
41
|
viewing_direction: viewing_direction,
|
43
42
|
files_metadata: augmented_metadata)
|
44
|
-
|
45
|
-
|
43
|
+
connection = Connection.new(url: url)
|
44
|
+
Process.new(metadata: metadata, connection: connection, files: files,
|
45
|
+
grouping_strategy: grouping_strategy,
|
46
|
+
accession: accession,
|
47
|
+
logger: logger).run
|
46
48
|
end
|
47
49
|
# rubocop:enable Metrics/MethodLength
|
48
50
|
# rubocop:enable Metrics/ParameterLists
|
@@ -57,6 +59,7 @@ require 'sdr_client/deposit/file'
|
|
57
59
|
require 'sdr_client/deposit/file_metadata_builder'
|
58
60
|
require 'sdr_client/deposit/file_set'
|
59
61
|
require 'sdr_client/deposit/request'
|
60
|
-
require 'sdr_client/deposit/upload_files'
|
61
62
|
require 'sdr_client/deposit/metadata_builder'
|
62
63
|
require 'sdr_client/deposit/process'
|
64
|
+
require 'sdr_client/deposit/upload_files'
|
65
|
+
require 'sdr_client/deposit/upload_resource'
|
@@ -34,9 +34,10 @@ module SdrClient
|
|
34
34
|
administrative: {
|
35
35
|
sdrPreserve: @preserve,
|
36
36
|
shelve: @shelve
|
37
|
-
}
|
37
|
+
},
|
38
|
+
version: 1,
|
39
|
+
hasMessageDigests: message_digests
|
38
40
|
}.tap do |json|
|
39
|
-
json['hasMessageDigests'] = message_digests unless message_digests.empty?
|
40
41
|
json['hasMimeType'] = @mime_type if @mime_type
|
41
42
|
json['use'] = @use if @use
|
42
43
|
end
|
@@ -6,19 +6,18 @@ module SdrClient
|
|
6
6
|
module Deposit
|
7
7
|
# The process for doing a deposit from a Cocina Model
|
8
8
|
class ModelProcess
|
9
|
-
DRO_PATH = '/v1/resources'
|
10
9
|
# @param [Cocina::Model::RequestDRO] request_dro for depositing
|
11
|
-
# @param [
|
12
|
-
# @param [String] token the bearer auth token for the server
|
10
|
+
# @param [Connection] connection the connection to use
|
13
11
|
# @param [Array<String>] files a list of file names to upload
|
12
|
+
# @param [Boolean] accession should the accessionWF be started
|
14
13
|
# @param [Logger] logger the logger to use
|
15
|
-
def initialize(request_dro:,
|
16
|
-
|
14
|
+
def initialize(request_dro:, connection:,
|
15
|
+
files: [], accession:, logger: Logger.new(STDOUT))
|
17
16
|
@files = files
|
18
|
-
@
|
19
|
-
@token = token
|
17
|
+
@connection = connection
|
20
18
|
@request_dro = request_dro
|
21
19
|
@logger = logger
|
20
|
+
@accession = accession
|
22
21
|
end
|
23
22
|
|
24
23
|
def run
|
@@ -30,12 +29,15 @@ module SdrClient
|
|
30
29
|
connection: connection,
|
31
30
|
mime_types: mime_types).run
|
32
31
|
new_request_dro = with_external_identifiers(upload_responses)
|
33
|
-
|
32
|
+
UploadResource.run(accession: @accession,
|
33
|
+
metadata: new_request_dro.to_json,
|
34
|
+
logger: logger,
|
35
|
+
connection: connection)
|
34
36
|
end
|
35
37
|
|
36
38
|
private
|
37
39
|
|
38
|
-
attr_reader :request_dro, :files, :
|
40
|
+
attr_reader :request_dro, :files, :logger, :connection
|
39
41
|
|
40
42
|
def check_files_exist
|
41
43
|
logger.info('checking to see if files exist')
|
@@ -59,31 +61,6 @@ module SdrClient
|
|
59
61
|
end
|
60
62
|
end
|
61
63
|
|
62
|
-
# @return [Hash<Symbol,String>] the result of the metadata call
|
63
|
-
def upload_request_dro(request_json)
|
64
|
-
logger.info("Starting upload metadata: #{request_json}")
|
65
|
-
response = connection.post(DRO_PATH, request_json, 'Content-Type' => 'application/json')
|
66
|
-
unexpected_response(response) unless response.status == 201
|
67
|
-
|
68
|
-
logger.info("Response from server: #{response.body}")
|
69
|
-
|
70
|
-
{ druid: JSON.parse(response.body)['druid'], background_job: response.headers['Location'] }
|
71
|
-
end
|
72
|
-
|
73
|
-
def unexpected_response(response)
|
74
|
-
raise "There was an error with your request: #{response.body}" if response.status == 400
|
75
|
-
raise 'There was an error with your credentials. Perhaps they have expired?' if response.status == 401
|
76
|
-
|
77
|
-
raise "unexpected response: #{response.status} #{response.body}"
|
78
|
-
end
|
79
|
-
|
80
|
-
def connection
|
81
|
-
@connection ||= Faraday.new(url: url) do |conn|
|
82
|
-
conn.authorization :Bearer, token
|
83
|
-
conn.adapter :net_http
|
84
|
-
end
|
85
|
-
end
|
86
|
-
|
87
64
|
# Map of filenames to mimetypes
|
88
65
|
def mime_types
|
89
66
|
@mime_types ||=
|
@@ -6,25 +6,26 @@ module SdrClient
|
|
6
6
|
module Deposit
|
7
7
|
# The process for doing a deposit
|
8
8
|
class Process
|
9
|
-
DRO_PATH = '/v1/resources'
|
10
9
|
# @param [Request] metadata information about the object
|
11
10
|
# @param [Class] grouping_strategy class whose run method groups an array of uploads
|
12
|
-
# @param [String]
|
13
|
-
# @param [String] token the bearer auth token for the server
|
11
|
+
# @param [String] connection the server connection to use
|
14
12
|
# @param [Array<String>] files a list of file names to upload
|
13
|
+
# @param [Boolean] accession should the accessionWF be started
|
15
14
|
# @param [Logger] logger the logger to use
|
15
|
+
#
|
16
16
|
# rubocop:disable Metrics/ParameterLists
|
17
|
-
def initialize(metadata:, grouping_strategy: SingleFileGroupingStrategy,
|
18
|
-
|
17
|
+
def initialize(metadata:, grouping_strategy: SingleFileGroupingStrategy,
|
18
|
+
connection:, files: [], accession:, logger: Logger.new(STDOUT))
|
19
19
|
@files = files
|
20
|
-
@
|
21
|
-
@token = token
|
20
|
+
@connection = connection
|
22
21
|
@metadata = metadata
|
23
22
|
@logger = logger
|
24
23
|
@grouping_strategy = grouping_strategy
|
24
|
+
@accession = accession
|
25
25
|
end
|
26
26
|
# rubocop:enable Metrics/ParameterLists
|
27
27
|
|
28
|
+
# rubocop:disable Metrics/AbcSize
|
28
29
|
def run
|
29
30
|
check_files_exist
|
30
31
|
upload_responses = UploadFiles.new(files: files,
|
@@ -35,12 +36,17 @@ module SdrClient
|
|
35
36
|
grouping_strategy: grouping_strategy,
|
36
37
|
logger: logger)
|
37
38
|
request = metadata_builder.with_uploads(upload_responses)
|
38
|
-
|
39
|
+
model = Cocina::Models.build_request(request.as_json.with_indifferent_access)
|
40
|
+
UploadResource.run(accession: @accession,
|
41
|
+
metadata: JSON.generate(model.to_h),
|
42
|
+
logger: logger,
|
43
|
+
connection: connection)
|
39
44
|
end
|
45
|
+
# rubocop:enable Metrics/AbcSize
|
40
46
|
|
41
47
|
private
|
42
48
|
|
43
|
-
attr_reader :metadata, :files, :
|
49
|
+
attr_reader :metadata, :files, :connection, :logger, :grouping_strategy
|
44
50
|
|
45
51
|
def check_files_exist
|
46
52
|
logger.info('checking to see if files exist')
|
@@ -49,32 +55,6 @@ module SdrClient
|
|
49
55
|
end
|
50
56
|
end
|
51
57
|
|
52
|
-
# @return [Hash<Symbol,String>] the result of the metadata call
|
53
|
-
def upload_metadata(metadata)
|
54
|
-
logger.info("Starting upload metadata: #{metadata}")
|
55
|
-
request_json = JSON.generate(metadata)
|
56
|
-
response = connection.post(DRO_PATH, request_json, 'Content-Type' => 'application/json')
|
57
|
-
unexpected_response(response) unless response.status == 201
|
58
|
-
|
59
|
-
logger.info("Response from server: #{response.body}")
|
60
|
-
|
61
|
-
{ druid: JSON.parse(response.body)['druid'], background_job: response.headers['Location'] }
|
62
|
-
end
|
63
|
-
|
64
|
-
def unexpected_response(response)
|
65
|
-
raise "There was an error with your request: #{response.body}" if response.status == 400
|
66
|
-
raise 'There was an error with your credentials. Perhaps they have expired?' if response.status == 401
|
67
|
-
|
68
|
-
raise "unexpected response: #{response.status} #{response.body}"
|
69
|
-
end
|
70
|
-
|
71
|
-
def connection
|
72
|
-
@connection ||= Faraday.new(url: url) do |conn|
|
73
|
-
conn.authorization :Bearer, token
|
74
|
-
conn.adapter :net_http
|
75
|
-
end
|
76
|
-
end
|
77
|
-
|
78
58
|
def mime_types
|
79
59
|
@mime_types ||=
|
80
60
|
Hash[
|
@@ -49,10 +49,10 @@ module SdrClient
|
|
49
49
|
type: type,
|
50
50
|
administrative: administrative,
|
51
51
|
identification: identification,
|
52
|
-
structural: structural
|
53
|
-
|
54
|
-
|
55
|
-
|
52
|
+
structural: structural,
|
53
|
+
version: 1,
|
54
|
+
label: label.nil? ? ':auto' : label
|
55
|
+
}
|
56
56
|
end
|
57
57
|
|
58
58
|
# @return [Request] a clone of this request with the file_sets added
|
@@ -9,7 +9,7 @@ module SdrClient
|
|
9
9
|
BLOB_PATH = '/v1/direct_uploads'
|
10
10
|
# @param [Array<String>] files a list of filepaths to upload
|
11
11
|
# @param [Logger] logger the logger to use
|
12
|
-
# @param [
|
12
|
+
# @param [Connection] connection
|
13
13
|
# @param [Hash<String,String] mime_types a map of filenames to mime types
|
14
14
|
def initialize(files:, mime_types:, logger:, connection:)
|
15
15
|
@files = files
|
@@ -0,0 +1,62 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module SdrClient
|
4
|
+
module Deposit
|
5
|
+
# Uploads a resource (metadata) to the server
|
6
|
+
class UploadResource
|
7
|
+
DRO_PATH = '/v1/resources'
|
8
|
+
|
9
|
+
def self.run(accession:, metadata:, logger:, connection:)
|
10
|
+
new(accession: accession, metadata: metadata, logger: logger, connection: connection).run
|
11
|
+
end
|
12
|
+
|
13
|
+
# @param [Boolean] accession should the accessionWF be started
|
14
|
+
# @param [String] metadata
|
15
|
+
# @param [Hash<Symbol,String>] the result of the metadata call
|
16
|
+
def initialize(accession:, metadata:, logger:, connection:)
|
17
|
+
@accession = accession
|
18
|
+
@metadata = metadata
|
19
|
+
@logger = logger
|
20
|
+
@connection = connection
|
21
|
+
end
|
22
|
+
|
23
|
+
# @param [Hash<Symbol,String>] the result of the metadata call
|
24
|
+
# @return [Hash<Symbol,String>] the result of the metadata call
|
25
|
+
def run
|
26
|
+
response = metadata_request
|
27
|
+
unexpected_response(response) unless response.status == 201
|
28
|
+
|
29
|
+
logger.info("Response from server: #{response.body}")
|
30
|
+
|
31
|
+
{ druid: JSON.parse(response.body)['druid'], background_job: response.headers['Location'] }
|
32
|
+
end
|
33
|
+
|
34
|
+
private
|
35
|
+
|
36
|
+
attr_reader :metadata, :logger, :connection
|
37
|
+
|
38
|
+
def metadata_request
|
39
|
+
logger.debug("Starting upload metadata: #{metadata}")
|
40
|
+
|
41
|
+
connection.post(path, metadata, 'Content-Type' => 'application/json')
|
42
|
+
end
|
43
|
+
|
44
|
+
def unexpected_response(response)
|
45
|
+
raise "There was an error with your request: #{response.body}" if response.status == 400
|
46
|
+
raise 'There was an error with your credentials. Perhaps they have expired?' if response.status == 401
|
47
|
+
|
48
|
+
raise "unexpected response: #{response.status} #{response.body}"
|
49
|
+
end
|
50
|
+
|
51
|
+
def accession?
|
52
|
+
@accession
|
53
|
+
end
|
54
|
+
|
55
|
+
def path
|
56
|
+
path = DRO_PATH
|
57
|
+
path += '?accession=true' if accession?
|
58
|
+
path
|
59
|
+
end
|
60
|
+
end
|
61
|
+
end
|
62
|
+
end
|
data/lib/sdr_client/login.rb
CHANGED
@@ -7,12 +7,12 @@ module SdrClient
|
|
7
7
|
extend Dry::Monads[:result]
|
8
8
|
|
9
9
|
# @return [Result] the status of the call
|
10
|
-
def self.run(url:, login_service: LoginPrompt)
|
10
|
+
def self.run(url:, login_service: LoginPrompt, credential_store: Credentials)
|
11
11
|
request_json = JSON.generate(login_service.run)
|
12
12
|
response = Faraday.post(url + LOGIN_PATH, request_json, 'Content-Type' => 'application/json')
|
13
13
|
case response.status
|
14
14
|
when 200
|
15
|
-
|
15
|
+
credential_store.write(response.body)
|
16
16
|
Success()
|
17
17
|
when 400
|
18
18
|
Failure('Email address is not a valid email')
|
@@ -9,9 +9,8 @@ module SdrClient
|
|
9
9
|
files: [],
|
10
10
|
url:,
|
11
11
|
logger: Logger.new(STDOUT))
|
12
|
-
|
13
|
-
|
14
|
-
ModelProcess.new(request_dro: request_dro, url: url, token: token, files: files, logger: logger).run
|
12
|
+
connection = Connection.new(url: url)
|
13
|
+
ModelProcess.new(request_dro: request_dro, connection: connection, files: files, logger: logger).run
|
15
14
|
end
|
16
15
|
end
|
17
16
|
end
|
data/lib/sdr_client/version.rb
CHANGED
data/sdr-client.gemspec
CHANGED
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
|
|
28
28
|
spec.require_paths = ['lib']
|
29
29
|
|
30
30
|
spec.add_dependency 'activesupport'
|
31
|
-
spec.add_dependency 'cocina-models', '~> 0.
|
31
|
+
spec.add_dependency 'cocina-models', '~> 0.31.0'
|
32
32
|
spec.add_dependency 'dry-monads'
|
33
33
|
spec.add_dependency 'faraday', '>= 0.16'
|
34
34
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sdr-client
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.23.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Justin Coyne
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-04-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|
@@ -30,14 +30,14 @@ dependencies:
|
|
30
30
|
requirements:
|
31
31
|
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 0.
|
33
|
+
version: 0.31.0
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - "~>"
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: 0.
|
40
|
+
version: 0.31.0
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: dry-monads
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
@@ -189,6 +189,7 @@ files:
|
|
189
189
|
- lib/sdr-client.rb
|
190
190
|
- lib/sdr_client.rb
|
191
191
|
- lib/sdr_client/cli.rb
|
192
|
+
- lib/sdr_client/connection.rb
|
192
193
|
- lib/sdr_client/credentials.rb
|
193
194
|
- lib/sdr_client/deposit.rb
|
194
195
|
- lib/sdr_client/deposit/file.rb
|
@@ -206,6 +207,7 @@ files:
|
|
206
207
|
- lib/sdr_client/deposit/request.rb
|
207
208
|
- lib/sdr_client/deposit/single_file_grouping_strategy.rb
|
208
209
|
- lib/sdr_client/deposit/upload_files.rb
|
210
|
+
- lib/sdr_client/deposit/upload_resource.rb
|
209
211
|
- lib/sdr_client/login.rb
|
210
212
|
- lib/sdr_client/login_prompt.rb
|
211
213
|
- lib/sdr_client/model_deposit.rb
|
@@ -232,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
232
234
|
- !ruby/object:Gem::Version
|
233
235
|
version: '0'
|
234
236
|
requirements: []
|
235
|
-
rubygems_version: 3.
|
237
|
+
rubygems_version: 3.1.2
|
236
238
|
signing_key:
|
237
239
|
specification_version: 4
|
238
240
|
summary: The CLI for https://github.com/sul-dlss/sdr-api
|