sdr-client 0.38.0 → 0.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86f67e8ca2c7149cde2793a9af9a111e886b5baeeb6d1ee5a587836f193df4df
-  data.tar.gz: 7b4a8b2c31387f0070dd9f75670afb43bbd6b36319ae49b450319bfb2a36c99f
+  metadata.gz: 26baa82acd43ce90d9f556409abcfa15be27b50a13d9efd0c8c629414eaa7566
+  data.tar.gz: 4a4ba19d9ab9dc09ddd15b24a423fc9b1d768c6dfe8ffdef234a0fa23e096cd6
 SHA512:
-  metadata.gz: 9a5cdd8af6d06b4e29e61e3e1471c76354d33013144ef62ea3c9503574bc7b926d3e2a1dfba3d18cb873dc3b6ff86c2632208e8ffc929b7d8fe230eb0228b9e0
-  data.tar.gz: 8e2fd6e136621e5450b986c2eb3790052d36c411c98fe71174ce8542b61ca99d789bba811b3d7e1f4ed3c8b823f9bb6abb512e1a3fabdb738f57a8f0ded52089
+  metadata.gz: c99e5f7db5bc83a58430211991a32304523e5d5eeb55946dcb73d3e865b6c53214d0596f5a76552229ec675bd4a434e74f07a071366a811b913b85a16e0e2b80
+  data.tar.gz: 1022bda574d2d0af8c705f11c9cec66f22ca37b063e926aca18e8f3332643fc1c3540624f9778c222806459a1a658439b98d0ac60faac07ed3fa1955f50ea47f

data/README.md

@@ -45,3 +45,9 @@ sdr --service-url https://sdr-api-server:3000 deposit --label 'hey there' \
   --collection 'druid:gh456kw9876' \
   --source-id 'googlebooks:stanford_12345' image42.jp2 ocr.html
 ```
+
+View the object:
+```
+sdr --service-url https://sdr-api-server:3000 get druid:bw581ng3176
+{"type":"http://cocina.sul.stanford.edu/models/document.jsonld","externalIdentifier":"druid:bw581ng3176","label":"Something something better title","version":1,"access":{"access":"stanford","copyright":"This work is copyrighted by the creator.","download":"stanford","useAndReproductionStatement":"This document is available only to the Stanford faculty, staff and student community."},"administrative":{"hasAdminPolicy":"druid:zx485kb6348"},"description":{"title":[{"value":"Something something better title"}],"contributor":[{"name":[{"value":"Hodge, Amy"}],"type":"person","role":[{"value":"Author"},{"value":"author","uri":"http://id.loc.gov/vocabulary/relators/aut","source":{"code":"marcrelator","uri":"http://id.loc.gov/vocabulary/relators/"}},{"value":"Creator"}]}],"form":[{"structuredValue":[{"value":"Text","type":"type"},{"value":"Report","type":"subtype"}],"type":"resource type","source":{"value":"Stanford self-deposit resource types"}},{"value":"reports","type":"genre","uri":"http://vocab.getty.edu/aat/300027267","source":{"code":"aat"}},{"value":"text","type":"resource type","source":{"value":"MODS resource types"}}],"note":[{"value":";alkdfjlsadkjf;l","type":"summary"},{"value":"amyhodge@stanford.edu","type":"contact","displayLabel":"Contact"}],"subject":[{"value":"lkfj","type":"topic"},{"value":";kfj","type":"topic"},{"value":"fjwelkb","type":"topic"}]},"identification":{"sourceId":"hydrus:20"},"structural":{"contains":[{"type":"http://cocina.sul.stanford.edu/models/fileset.jsonld","externalIdentifier":"bw581ng3176_1","label":"Test file","version":1,"structural":{"contains":[{"type":"http://cocina.sul.stanford.edu/models/file.jsonld","externalIdentifier":"druid:bw581ng3176/test.txt","label":"test.txt","filename":"test.txt","size":11,"version":1,"hasMimeType":"text/plain","hasMessageDigests":[{"type":"sha1","digest":"5d39343e4bb48abd97f759828282f5ebbac56c5e"},{"type":"md5","digest":"63b8812b0c05722a9d6c51cbd2bfb54b"}],"access":{"access":"world","download":"world"},"administrative":{"sdrPreserve":true,"shelve":true}}]}}]}}
+```

data/exe/sdr

@@ -19,6 +19,9 @@ end
 global.order!
 command = ARGV.shift
 
+retrieve_options = OptionParser.new do |opts|
+end
+
 deposit_options = OptionParser.new do |opts|
   opts.banner = "Usage: sdr #{command} [options]"
   opts.on('--label LABEL', 'The object label') do |label|
@@ -94,6 +97,7 @@ end
 SdrClient::CLI.help unless command
 
 subcommands = {
+  'get' => retrieve_options,
   'deposit' => deposit_options,
   'register' => deposit_options,
   'login' => OptionParser.new
@@ -106,11 +110,10 @@ end
 
 subcommands[command].order!
 
-options[:files] = ARGV unless ARGV.empty?
 options[:url] ||= 'https://sdr-api-prod.stanford.edu'
 
 begin
-  SdrClient::CLI.start(command, options)
+  SdrClient::CLI.start(command, options, ARGV)
 rescue StandardError => e
   warn "There was a problem making your request:\n\n"
   warn e.message

data/lib/sdr_client.rb

@@ -11,6 +11,7 @@ require 'cocina/models'
 require 'sdr_client/version'
 require 'sdr_client/deposit'
 require 'sdr_client/credentials'
+require 'sdr_client/find'
 require 'sdr_client/login'
 require 'sdr_client/login_prompt'
 require 'sdr_client/cli'

data/lib/sdr_client/cli.rb

@@ -23,6 +23,9 @@ module SdrClient
 
 
       COMMANDS:
+        get
+          Retrieve an object from the SDR
+
         deposit
           Accession an object into the SDR
 
@@ -34,12 +37,12 @@ module SdrClient
 
     HELP
 
-    def self.start(command, options)
+    def self.start(command, options, arguments = [])
       case command
+      when 'get'
+        puts SdrClient::Find.run(arguments.first, **options)
       when 'deposit', 'register'
-        display_errors(validate_deposit_options(options))
-        job_id = SdrClient::Deposit.run(accession: command == 'deposit', **options)
-        poll_for_job_complete(job_id: job_id, url: options[:url]) # TODO: add an option that skips this
+        deposit(command, options, arguments)
       when 'login'
         status = SdrClient::Login.run(options)
         puts status.failure if status.failure?
@@ -51,6 +54,13 @@ module SdrClient
       exit(1)
     end
 
+    def self.deposit(command, options, arguments)
+      options[:files] = arguments if arguments.present?
+      display_errors(validate_deposit_options(options))
+      job_id = SdrClient::Deposit.run(accession: command == 'deposit', **options)
+      poll_for_job_complete(job_id: job_id, url: options[:url]) # TODO: add an option that skips this
+    end
+
     def self.display_errors(errors)
       return if errors.empty?
 

data/lib/sdr_client/connection.rb

@@ -32,7 +32,7 @@ module SdrClient
       end
     end
 
-    delegate :put, :post, to: :connection
+    delegate :put, :post, :get, to: :connection
 
     private
 

data/lib/sdr_client/deposit/files/direct_upload_response.rb

@@ -5,7 +5,7 @@ module SdrClient
     module Files
       DirectUploadResponse = Struct.new(:id, :key, :checksum, :byte_size, :content_type,
                                         :filename, :metadata, :created_at, :direct_upload,
-                                        :signed_id, keyword_init: true)
+                                        :signed_id, :service_name, keyword_init: true)
     end
   end
 end

data/lib/sdr_client/find.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'logger'
+
+module SdrClient
+  # The namespace for the "get" command
+  module Find
+    DRO_PATH = '/v1/resources/%<id>s'
+    # @return [String] job id for the background job result
+    def self.run(druid, url:, logger: Logger.new(STDOUT))
+      connection = Connection.new(url: url)
+      path = format(DRO_PATH, id: druid)
+      logger.info("Retrieving metadata from: #{path}")
+      response = connection.get(path)
+      response.body
+    end
+  end
+end

data/lib/sdr_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SdrClient
-  VERSION = '0.38.0'
+  VERSION = '0.42.0'
 end

data/sdr-client.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'cocina-models', '~> 0.43.0'
+  spec.add_dependency 'cocina-models', '~> 0.46.0'
   spec.add_dependency 'dry-monads'
   spec.add_dependency 'faraday', '>= 0.16'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 0.38.0
+  version: 0.42.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.43.0
+        version: 0.46.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.43.0
+        version: 0.46.0
 - !ruby/object:Gem::Dependency
   name: dry-monads
   requirement: !ruby/object:Gem::Requirement
@@ -213,6 +213,7 @@ files:
 - lib/sdr_client/deposit/update_resource.rb
 - lib/sdr_client/deposit/upload_files.rb
 - lib/sdr_client/deposit/upload_files_metadata_builder.rb
+- lib/sdr_client/find.rb
 - lib/sdr_client/login.rb
 - lib/sdr_client/login_prompt.rb
 - lib/sdr_client/version.rb