sdr-client 0.58.0 → 0.61.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0aeb8a257ee16931c449f5255f927b242fa1c9893303ae3b76feefa433adb24
-  data.tar.gz: b00a06552dcff58238a57e2f13b500f48960861daf4567490d567d5598b01415
+  metadata.gz: a05e0c0eaec02cd41abd26e460c2be48a5dd45890b2e4e3f42b5c6fcad143936
+  data.tar.gz: 49a61ac42d58a64438d35f3f503cd690e4f3b560fad878929045d7152bde8724
 SHA512:
-  metadata.gz: 045fa4dd33fce4c171c27dea01e0cbb12de8d91408eff404b2121f68690018549d26d6a43cb9792a8cae56f4953353952e0301b8b3a802215bc23d9ad7d2d730
-  data.tar.gz: c15e6aecf2652ce4eb42f1433d3baab4d2cf7605e3e1f60a9b1ed5c5c8a4d7069c8f76ca9aa594741535b6bb3177582375d28280617f7c1096820cb344e3bf9d
+  metadata.gz: 1a02843244adbe817cd84806a445a257cedad1e56e1be71f1c76bb72210bd2a76525dcabc22641fa4dad9da0352274fa46c8cf7957d24fd9422c801ac958c1e9
+  data.tar.gz: d173d54a545ed1846f2418b502240e0141ab9dbe1b1d47663f8736f92317a982aa65b5d9c7b868814d09f0ff1b9d0542f5f740530526fe09fbd3792fc7b92b65

data/lib/sdr_client/connection.rb

@@ -5,14 +5,16 @@ module SdrClient
   class Connection
     include Dry::Monads[:result]
 
-    def initialize(url:, token: Credentials.read)
+    # @param [Integer] read_timeout the value in seconds to set the read timeout
+    def initialize(url:, token: Credentials.read, read_timeout: 180)
       @url = url
       @token = token
+      @request_options = { read_timeout: read_timeout }
     end
 
     def connection
-      @connection ||= Faraday.new(url: url) do |conn|
-        conn.authorization :Bearer, token
+      @connection ||= Faraday.new(url: url, request: request_options) do |conn|
+        conn.request :authorization, :Bearer, token
         conn.adapter :net_http
       end
     end
@@ -36,6 +38,6 @@ module SdrClient
 
     private
 
-    attr_reader :url, :token
+    attr_reader :url, :token, :request_options
   end
 end

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/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.58.0'
+  VERSION = '0.61.1'
 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.61.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.58.0
+  version: 0.61.1
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-06 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.61.0
+        version: 0.62.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.61.0
+        version: 0.62.0
 - !ruby/object:Gem::Dependency
   name: dry-monads
   requirement: !ruby/object:Gem::Requirement