sdr-client 0.21.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dab3e033cd3f0fd0eae7045c3565f7c24300d99ebcd7141777eb0d005847497
-  data.tar.gz: 25a76561f9aafdcc4a575030ca9bb750e8cdf036b60c14cc92f413bbde4668d2
+  metadata.gz: 4ba412736744579cc3c7730354944d6357027106ca021c60e7363071a441ac21
+  data.tar.gz: 808952a65481516130017e8215656062e06ed9386fbab4486eb2b00bf1e977a1
 SHA512:
-  metadata.gz: fa6080f541ce480fc8ca31f5f063404090235e8edce6849aa10c4f50f1a00ef83a166ea1c97ad579e094fbf9b5d8f24df73debc68ce567e1a7886dc7a491b643
-  data.tar.gz: a915029ed2f58221fe4c2418e8fef194f11eb6bde24af289dc9f52da438841a4bab90fec7a95a94eeaa22334e2e72897a6047f01c5909ed995d371473b1c0295
+  metadata.gz: dbc1f0cb2fd1edf1b3af487cb585aab7304600cae177791d0861eeacfed8ba15caf8e59fd222def840e2e102656868e73869ec739fcc499fc40c0807b17ddaf8
+  data.tar.gz: 22a5983f2c7b3d77b70efbaab7a6e0280e9057cec80697c80759c4b6efd25fddfcd52c1b8b51c5bc4b819a42b9cabd09ecbb8abcb2522ba6ae2a25dfce2f97a7

data/.rubocop_todo.yml

@@ -1,16 +1,17 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-03-02 15:54:47 -0600 using RuboCop version 0.79.0.
+# on 2020-04-27 08:24:29 -0400 using RuboCop version 0.82.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
+# Offense count: 2
+# Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
   Max: 16
 
-# Offense count: 4
+# Offense count: 7
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
-  Max: 14
+  Max: 15

data/README.md

@@ -21,8 +21,15 @@ Log in:
 sdr --service-url http://sdr-api-server:3000 login
 ```
 
+Register a new object:
+```
+sdr --service-url https://sdr-api-server:3000 register --label 'hey there' \
+  --admin-policy 'druid:bk123gh4567' \
+  --collection 'druid:gh456kw9876' \
+  --source-id 'googlebooks:stanford_12345' file1.png file2.png
+```
 
-Deposit a new object:
+Deposit (register + accession) a new object:
 ```
 sdr --service-url https://sdr-api-server:3000 deposit --label 'hey there' \
   --admin-policy 'druid:bk123gh4567' \

data/exe/sdr

@@ -27,7 +27,10 @@ global = OptionParser.new do |opts|
 
       COMMANDS
         deposit
-        deposit files to the SDR
+        accession object into the SDR
+
+        register
+        create a draft object in SDR
 
         login
         Will prompt for email & password and exchange it for an login token, which it saves in ~/.sdr/token
@@ -40,77 +43,80 @@ end
 global.order!
 command = ARGV.shift
 
-subcommands = {
-  'deposit' => OptionParser.new do |opts|
-    opts.on('--label LABEL', 'The object label') do |label|
-      options[:label] = label
-    end
+deposit_options = OptionParser.new do |opts|
+  opts.on('--label LABEL', 'The object label') do |label|
+    options[:label] = label
+  end
 
-    opts.on('--admin-policy ADMIN_POLICY', 'The druid identifier of the admin policy object') do |apo|
-      options[:apo] = apo
-    end
+  opts.on('--admin-policy ADMIN_POLICY', 'The druid identifier of the admin policy object') do |apo|
+    options[:apo] = apo
+  end
 
-    opts.on('--type TYPE', 'The object type to create. ' \
-            'One of: "image", "book", "document", "map", "manuscript", "media", ' \
-            '"three_dimensional", "collection", or "admin_policy"') do |type|
-      if %w[image book document map manuscript media three_dimensional collection admin_policy].include?(type)
-        options[:type] = "http://cocina.sul.stanford.edu/models/#{type}.jsonld"
-      end
+  opts.on('--type TYPE', 'The object type to create. ' \
+          'One of: "image", "book", "document", "map", "manuscript", "media", ' \
+          '"three_dimensional", "collection", or "admin_policy"') do |type|
+    if %w[image book document map manuscript media three_dimensional collection admin_policy].include?(type)
+      options[:type] = "http://cocina.sul.stanford.edu/models/#{type}.jsonld"
     end
+  end
 
-    opts.on('--collection COLLECTION', 'The druid identifier of the collection object') do |collection|
-      options[:collection] = collection
-    end
+  opts.on('--collection COLLECTION', 'The druid identifier of the collection object') do |collection|
+    options[:collection] = collection
+  end
 
-    opts.on('--catkey CATKEY', 'The catkey for this item') do |catkey|
-      options[:catkey] = catkey
-    end
+  opts.on('--catkey CATKEY', 'The catkey for this item') do |catkey|
+    options[:catkey] = catkey
+  end
 
-    opts.on('--source-id SOURCE_ID', 'The source id for this object') do |source_id|
-      options[:source_id] = source_id
-    end
+  opts.on('--source-id SOURCE_ID', 'The source id for this object') do |source_id|
+    options[:source_id] = source_id
+  end
 
-    opts.on('--copyright COPYRIGHT', 'The copyright statement') do |copyright|
-      options[:copyright] = copyright
-    end
+  opts.on('--copyright COPYRIGHT', 'The copyright statement') do |copyright|
+    options[:copyright] = copyright
+  end
 
-    opts.on('--use-statement STATEMENT', 'The use and reproduction statement') do |use_statement|
-      options[:use_statement] = use_statement
-    end
+  opts.on('--use-statement STATEMENT', 'The use and reproduction statement') do |use_statement|
+    options[:use_statement] = use_statement
+  end
 
-    opts.on('--viewing-direction DIRECTION', 'The viewing direction (if a book). ' \
-            'Either "left-to-right" or "right-to-left"') do |viewing_direction|
-      options[:viewing_direction] = viewing_direction if %w[left-to-right right-to-left].include?(viewing_direction)
-    end
+  opts.on('--viewing-direction DIRECTION', 'The viewing direction (if a book). ' \
+          'Either "left-to-right" or "right-to-left"') do |viewing_direction|
+    options[:viewing_direction] = viewing_direction if %w[left-to-right right-to-left].include?(viewing_direction)
+  end
 
-    opts.on('--access LEVEL', 'The access level for this object. ' \
-            'Either "world", "stanford", "location-based", "citation-only" or "dark"') do |level|
-      options[:access] = level if %w[world stanford location-based citation-only dark].include?(level)
-    end
+  opts.on('--access LEVEL', 'The access level for this object. ' \
+          'Either "world", "stanford", "location-based", "citation-only" or "dark"') do |level|
+    options[:access] = level if %w[world stanford location-based citation-only dark].include?(level)
+  end
 
-    opts.on('--files-metadata FILES_METADATA', 'A JSON object representing per-file metadata') do |files_metadata|
-      options[:files_metadata] = JSON.parse(files_metadata)
-    end
+  opts.on('--files-metadata FILES_METADATA', 'A JSON object representing per-file metadata') do |files_metadata|
+    options[:files_metadata] = JSON.parse(files_metadata)
+  end
 
-    opts.on('--strategy STRATEGY',
-            'The strategy to use for distributing files into filesets. Either "default" or "filename"') do |strategy|
-      strategy_class = case strategy
-                       when 'filename'
-                         SdrClient::Deposit::MatchingFileGroupingStrategy
-                       when 'default'
-                         SdrClient::Deposit::SingleFileGroupingStrategy
-                       else
-                         warn "Unknown strategy #{strategy}"
-                         exit(1)
-                       end
-      options[:grouping_strategy] = strategy_class
-    end
+  opts.on('--strategy STRATEGY',
+          'The strategy to use for distributing files into filesets. Either "default" or "filename"') do |strategy|
+    strategy_class = case strategy
+                     when 'filename'
+                       SdrClient::Deposit::MatchingFileGroupingStrategy
+                     when 'default'
+                       SdrClient::Deposit::SingleFileGroupingStrategy
+                     else
+                       warn "Unknown strategy #{strategy}"
+                       exit(1)
+                     end
+    options[:grouping_strategy] = strategy_class
+  end
 
-    opts.on('-h', '--help', 'Display this screen') do
-      puts opts
-      exit
-    end
-  end,
+  opts.on('-h', '--help', 'Display this screen') do
+    puts opts
+    exit
+  end
+end
+
+subcommands = {
+  'deposit' => deposit_options,
+  'register' => deposit_options,
   'login' => OptionParser.new
 }
 

data/lib/sdr_client/cli.rb

@@ -6,7 +6,9 @@ module SdrClient
     def self.start(command, options)
       case command
       when 'deposit'
-        SdrClient::Deposit.run(options)
+        SdrClient::Deposit.run(accession: true, **options)
+      when 'register'
+        SdrClient::Deposit.run(accession: false, **options)
       when 'login'
         status = SdrClient::Login.run(options)
         puts status.value if status.failure?

data/lib/sdr_client/deposit.rb

@@ -12,6 +12,7 @@ module SdrClient
                  type: BOOK_TYPE,
                  viewing_direction: nil,
                  access: 'dark',
+                 download: 'none',
                  use_statement: nil,
                  copyright: nil,
                  apo:,
@@ -23,12 +24,14 @@ module SdrClient
                  url:,
                  files: [],
                  files_metadata: {},
+                 accession: false,
                  grouping_strategy: SingleFileGroupingStrategy,
                  logger: Logger.new(STDOUT))
       augmented_metadata = FileMetadataBuilder.build(files: files, files_metadata: files_metadata)
       metadata = Request.new(label: label,
                              type: type,
                              access: access,
+                             download: download,
                              apo: apo,
                              use_statement: use_statement,
                              copyright: copyright,
@@ -41,7 +44,9 @@ module SdrClient
                              files_metadata: augmented_metadata)
       connection = Connection.new(url: url)
       Process.new(metadata: metadata, connection: connection, files: files,
-                  grouping_strategy: grouping_strategy, logger: logger).run
+                  grouping_strategy: grouping_strategy,
+                  accession: accession,
+                  logger: logger).run
     end
     # rubocop:enable Metrics/MethodLength
     # rubocop:enable Metrics/ParameterLists
@@ -56,6 +61,7 @@ require 'sdr_client/deposit/file'
 require 'sdr_client/deposit/file_metadata_builder'
 require 'sdr_client/deposit/file_set'
 require 'sdr_client/deposit/request'
-require 'sdr_client/deposit/upload_files'
 require 'sdr_client/deposit/metadata_builder'
 require 'sdr_client/deposit/process'
+require 'sdr_client/deposit/upload_files'
+require 'sdr_client/deposit/upload_resource'

data/lib/sdr_client/deposit/file.rb

@@ -6,7 +6,7 @@ module SdrClient
     class File
       # rubocop:disable Metrics/ParameterLists
       def initialize(external_identifier:, label:, filename:,
-                     access: 'dark', preserve: false, shelve: false,
+                     access: 'world', preserve: true, shelve: true,
                      mime_type: nil, md5: nil, sha1: nil, use: nil)
         @external_identifier = external_identifier
         @label = label

data/lib/sdr_client/deposit/model_process.rb

@@ -6,16 +6,18 @@ module SdrClient
   module Deposit
     # The process for doing a deposit from a Cocina Model
     class ModelProcess
-      DRO_PATH = '/v1/resources'
       # @param [Cocina::Model::RequestDRO] request_dro for depositing
       # @param [Connection] connection the connection to use
       # @param [Array<String>] files a list of file names to upload
+      # @param [Boolean] accession should the accessionWF be started
       # @param [Logger] logger the logger to use
-      def initialize(request_dro:, connection:, files: [], logger: Logger.new(STDOUT))
+      def initialize(request_dro:, connection:,
+                     files: [], accession:, logger: Logger.new(STDOUT))
         @files = files
         @connection = connection
         @request_dro = request_dro
         @logger = logger
+        @accession = accession
       end
 
       def run
@@ -27,7 +29,10 @@ module SdrClient
                                            connection: connection,
                                            mime_types: mime_types).run
         new_request_dro = with_external_identifiers(upload_responses)
-        upload_request_dro(new_request_dro.to_json)
+        UploadResource.run(accession: @accession,
+                           metadata: new_request_dro.to_json,
+                           logger: logger,
+                           connection: connection)
       end
 
       private
@@ -56,24 +61,6 @@ module SdrClient
         end
       end
 
-      # @return [Hash<Symbol,String>] the result of the metadata call
-      def upload_request_dro(request_json)
-        logger.info("Starting upload metadata: #{request_json}")
-        response = connection.post(DRO_PATH, request_json, 'Content-Type' => 'application/json')
-        unexpected_response(response) unless response.status == 201
-
-        logger.info("Response from server: #{response.body}")
-
-        { druid: JSON.parse(response.body)['druid'], background_job: response.headers['Location'] }
-      end
-
-      def unexpected_response(response)
-        raise "There was an error with your request: #{response.body}" if response.status == 400
-        raise 'There was an error with your credentials. Perhaps they have expired?' if response.status == 401
-
-        raise "unexpected response: #{response.status} #{response.body}"
-      end
-
       # Map of filenames to mimetypes
       def mime_types
         @mime_types ||=

data/lib/sdr_client/deposit/process.rb

@@ -6,20 +6,24 @@ module SdrClient
   module Deposit
     # The process for doing a deposit
     class Process
-      DRO_PATH = '/v1/resources'
       # @param [Request] metadata information about the object
       # @param [Class] grouping_strategy class whose run method groups an array of uploads
       # @param [String] connection the server connection to use
       # @param [Array<String>] files a list of file names to upload
+      # @param [Boolean] accession should the accessionWF be started
       # @param [Logger] logger the logger to use
+      #
+      # rubocop:disable Metrics/ParameterLists
       def initialize(metadata:, grouping_strategy: SingleFileGroupingStrategy,
-                     connection:, files: [], logger: Logger.new(STDOUT))
+                     connection:, files: [], accession:, logger: Logger.new(STDOUT))
         @files = files
         @connection = connection
         @metadata = metadata
         @logger = logger
         @grouping_strategy = grouping_strategy
+        @accession = accession
       end
+      # rubocop:enable Metrics/ParameterLists
 
       # rubocop:disable Metrics/AbcSize
       def run
@@ -33,7 +37,10 @@ module SdrClient
                                                logger: logger)
         request = metadata_builder.with_uploads(upload_responses)
         model = Cocina::Models.build_request(request.as_json.with_indifferent_access)
-        upload_metadata(model.to_h)
+        UploadResource.run(accession: @accession,
+                           metadata: JSON.generate(model.to_h),
+                           logger: logger,
+                           connection: connection)
       end
       # rubocop:enable Metrics/AbcSize
 
@@ -48,25 +55,6 @@ module SdrClient
         end
       end
 
-      # @return [Hash<Symbol,String>] the result of the metadata call
-      def upload_metadata(metadata)
-        logger.info("Starting upload metadata: #{metadata}")
-        request_json = JSON.generate(metadata)
-        response = connection.post(DRO_PATH, request_json, 'Content-Type' => 'application/json')
-        unexpected_response(response) unless response.status == 201
-
-        logger.info("Response from server: #{response.body}")
-
-        { druid: JSON.parse(response.body)['druid'], background_job: response.headers['Location'] }
-      end
-
-      def unexpected_response(response)
-        raise "There was an error with your request: #{response.body}" if response.status == 400
-        raise 'There was an error with your credentials. Perhaps they have expired?' if response.status == 401
-
-        raise "unexpected response: #{response.status} #{response.body}"
-      end
-
       def mime_types
         @mime_types ||=
           Hash[

data/lib/sdr_client/deposit/request.rb

@@ -14,6 +14,7 @@ module SdrClient
       # rubocop:disable Metrics/ParameterLists
       def initialize(label: nil,
                      access: 'dark',
+                     download: 'none',
                      use_statement: nil,
                      copyright: nil,
                      apo:,
@@ -34,6 +35,7 @@ module SdrClient
         @embargo_release_date = embargo_release_date
         @embargo_access = embargo_access
         @access = access
+        @download = download
         @use_statement = use_statement
         @copyright = copyright
         @apo = apo
@@ -59,6 +61,7 @@ module SdrClient
       def with_file_sets(file_sets)
         Request.new(label: label,
                     access: access,
+                    download: download,
                     apo: apo,
                     collection: collection,
                     copyright: copyright,
@@ -85,7 +88,7 @@ module SdrClient
 
       attr_reader :access, :label, :file_sets, :source_id, :catkey, :apo, :collection,
                   :files_metadata, :embargo_release_date, :embargo_access,
-                  :viewing_direction, :use_statement, :copyright
+                  :viewing_direction, :use_statement, :copyright, :download
 
       def administrative
         {
@@ -108,7 +111,10 @@ module SdrClient
       end
 
       def access_struct
-        { access: access }.tap do |json|
+        {
+          access: access,
+          download: download
+        }.tap do |json|
           json[:useAndReproductionStatement] = use_statement if use_statement
           json[:copyright] = copyright if copyright
 

data/lib/sdr_client/deposit/upload_resource.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module SdrClient
+  module Deposit
+    # Uploads a resource (metadata) to the server
+    class UploadResource
+      DRO_PATH = '/v1/resources'
+
+      def self.run(accession:, metadata:, logger:, connection:)
+        new(accession: accession, metadata: metadata, logger: logger, connection: connection).run
+      end
+
+      # @param [Boolean] accession should the accessionWF be started
+      # @param [String] metadata
+      # @param [Hash<Symbol,String>] the result of the metadata call
+      def initialize(accession:, metadata:, logger:, connection:)
+        @accession = accession
+        @metadata = metadata
+        @logger = logger
+        @connection = connection
+      end
+
+      # @param [Hash<Symbol,String>] the result of the metadata call
+      # @return [Hash<Symbol,String>] the result of the metadata call
+      def run
+        response = metadata_request
+        unexpected_response(response) unless response.status == 201
+
+        logger.info("Response from server: #{response.body}")
+
+        { druid: JSON.parse(response.body)['druid'], background_job: response.headers['Location'] }
+      end
+
+      private
+
+      attr_reader :metadata, :logger, :connection
+
+      def metadata_request
+        logger.debug("Starting upload metadata: #{metadata}")
+
+        connection.post(path, metadata, 'Content-Type' => 'application/json')
+      end
+
+      def unexpected_response(response)
+        raise "There was an error with your request: #{response.body}" if response.status == 400
+        raise 'There was an error with your credentials. Perhaps they have expired?' if response.status == 401
+
+        raise "unexpected response: #{response.status} #{response.body}"
+      end
+
+      def accession?
+        @accession
+      end
+
+      def path
+        path = DRO_PATH
+        path += '?accession=true' if accession?
+        path
+      end
+    end
+  end
+end

data/lib/sdr_client/model_deposit.rb

@@ -8,9 +8,14 @@ module SdrClient
     def self.model_run(request_dro:,
                        files: [],
                        url:,
+                       accession:,
                        logger: Logger.new(STDOUT))
       connection = Connection.new(url: url)
-      ModelProcess.new(request_dro: request_dro, connection: connection, files: files, logger: logger).run
+      ModelProcess.new(request_dro: request_dro,
+                       connection: connection,
+                       files: files,
+                       logger: logger,
+                       accession: accession).run
     end
   end
 end

data/lib/sdr_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SdrClient
-  VERSION = '0.21.0'
+  VERSION = '0.25.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.31.0'
+  spec.add_dependency 'cocina-models', '~> 0.32.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.21.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.31.0
+        version: 0.32.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.31.0
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: dry-monads
   requirement: !ruby/object:Gem::Requirement
@@ -207,6 +207,7 @@ files:
 - lib/sdr_client/deposit/request.rb
 - lib/sdr_client/deposit/single_file_grouping_strategy.rb
 - lib/sdr_client/deposit/upload_files.rb
+- lib/sdr_client/deposit/upload_resource.rb
 - lib/sdr_client/login.rb
 - lib/sdr_client/login_prompt.rb
 - lib/sdr_client/model_deposit.rb