sdr-client 0.56.0 → 0.60.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 335b17d92fb6fc1987038e7837b751ca4c918b4bfb3510e6738e763191416aa4
-  data.tar.gz: db5ef06226d88fdab05db520a5402ce3606e119147386d7fcc1e52027bb0f1b0
+  metadata.gz: 827537801986b42218654f8edb47fe460c1bb9cf802ed11b1f9bd22fe6c419f0
+  data.tar.gz: c60c836e2822365cead36f7dfec7984bbe903b331b7eccf1483810a1598e8188
 SHA512:
-  metadata.gz: da2726c5a061d58185d32ba50d7a17073a8ad35cb4db9469875895a60374fbab96d07df007c684078589ba3efb85d2b6590a60de6cd3164fd41d26746e71392c
-  data.tar.gz: e1a60e9dec9cb2d6b32788f87da85f9667b00cb4b2a6ec592c83acff1508eb6f6842ed8befc2915714e822e8d8190320a85e397c50f751a114db546cfb640eff
+  metadata.gz: 818ea7f4c057215f2160375043cf58569256448159eda5d71863558cd9d55fdbe3cab21ac729769940251a582e31878ce1d5f3a2f3d2a130902f57718178c453
+  data.tar.gz: 17aafa6c32f3f95792f0cfa08c31ffb5acddd0158b1fa36c7c1bfbefd97b097e144d8faab4e899ee0cd6bdeaf07d03a85d84442c48f6a4ca4e6a6d65b29caf80

data/lib/sdr_client/deposit/create_resource.rb

@@ -6,15 +6,21 @@ module SdrClient
     class CreateResource
       DRO_PATH = '/v1/resources'
 
-      def self.run(accession:, metadata:, logger:, connection:)
-        new(accession: accession, metadata: metadata, logger: logger, connection: connection).run
+      def self.run(accession:, assign_doi: false, metadata:, logger:, connection:)
+        new(accession: accession,
+            assign_doi: assign_doi,
+            metadata: metadata,
+            logger: logger,
+            connection: connection).run
       end
 
       # @param [Boolean] accession should the accessionWF be started
+      # @param [Boolean] assign_doi should a DOI be assigned to this item
       # @param [Cocina::Models::RequestDRO, Cocina::Models::RequestCollection] metadata
       # @param [Hash<Symbol,String>] the result of the metadata call
-      def initialize(accession:, metadata:, logger:, connection:)
+      def initialize(accession:, assign_doi:, metadata:, logger:, connection:)
         @accession = accession
+        @assign_doi = assign_doi
         @metadata = metadata
         @logger = logger
         @connection = connection
@@ -48,8 +54,14 @@ module SdrClient
         @accession
       end
 
+      def assign_doi?
+        @assign_doi
+      end
+
       def path
-        "#{DRO_PATH}?accession=#{accession?}"
+        params = { accession: accession? }
+        params[:assign_doi] = true if assign_doi? # false is default
+        DRO_PATH + '?' + params.map { |k, v| "#{k}=#{v}" }.join('&')
       end
     end
   end

data/lib/sdr_client/deposit/file.rb

@@ -15,7 +15,7 @@ module SdrClient
         @access = access
         @download = download
         @preserve = preserve
-        @shelve = shelve
+        @shelve = access == 'dark' ? false : shelve
         @publish = publish
         @mime_type = mime_type
         @md5 = md5

data/lib/sdr_client/deposit/file_set.rb

@@ -5,7 +5,7 @@ module SdrClient
     # This represents the FileSet metadata that we send to the server for doing a deposit
     class FileSet
       # @param [Array] uploads
-      # @param [Hash<String,Hash<String,String>>] the file level metadata
+      # @param [Hash<String,Hash<String,String>>] uploads_metadata the file level metadata
       # @param [Array] files
       # @param [String] label
       def initialize(uploads: [], uploads_metadata: {}, files: [], label:)

data/lib/sdr_client/deposit/model_process.rb

@@ -10,14 +10,19 @@ module SdrClient
       # @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 [Boolean] assign_doi should a DOI be assigned to this item
       # @param [Logger] logger the logger to use
-      def initialize(request_dro:, connection:,
-                     files: [], accession:, logger: Logger.new(STDOUT))
+      def initialize(request_dro:, # rubocop:disable Metrics/ParameterLists
+                     connection:,
+                     files: [], accession:,
+                     assign_doi: false,
+                     logger: Logger.new(STDOUT))
         @files = files
         @connection = connection
         @request_dro = request_dro
         @logger = logger
         @accession = accession
+        @assign_doi = assign_doi
       end
 
       def run
@@ -30,6 +35,7 @@ module SdrClient
                                               connection: connection)
         new_request_dro = UpdateDroWithFileIdentifiers.update(request_dro: request_dro, upload_responses: upload_responses)
         CreateResource.run(accession: @accession,
+                           assign_doi: @assign_doi,
                            metadata: new_request_dro,
                            logger: logger,
                            connection: connection)

data/lib/sdr_client/deposit/process.rb

@@ -10,18 +10,21 @@ module SdrClient
       # @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] assign_doi should a DOI be assigned to this item
       # @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: [], accession:, logger: Logger.new(STDOUT))
+                     connection:, files: [], accession:, assign_doi: false,
+                     logger: Logger.new(STDOUT))
         @files = files
         @connection = connection
         @metadata = metadata
         @logger = logger
         @grouping_strategy = grouping_strategy
         @accession = accession
+        @assign_doi = assign_doi
       end
       # rubocop:enable Metrics/ParameterLists
 
@@ -40,6 +43,7 @@ module SdrClient
         request = metadata_builder.with_uploads(upload_responses)
         model = Cocina::Models.build_request(request.as_json.with_indifferent_access)
         CreateResource.run(accession: @accession,
+                           assign_doi: @assign_doi,
                            metadata: model,
                            logger: logger,
                            connection: connection)

data/lib/sdr_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SdrClient
-  VERSION = '0.56.0'
+  VERSION = '0.60.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.59.0'
+  spec.add_dependency 'cocina-models', '~> 0.62.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.56.0
+  version: 0.60.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.59.0
+        version: 0.62.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.59.0
+        version: 0.62.0
 - !ruby/object:Gem::Dependency
   name: dry-monads
   requirement: !ruby/object:Gem::Requirement
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: The CLI for https://github.com/sul-dlss/sdr-api