sdr-client 0.17.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 065c4f605e60c45bb76c98eac741d67f5b7e848a5b59402396b4c7273ba80334
-  data.tar.gz: f826dad9e9e758242672f92baffde17f65c347f05013d7420a5ff69459344935
+  metadata.gz: e40c3f7aec5b647a05dd4c2e3289a7ed3173c2b18ac57fb74dd218cb7226db0f
+  data.tar.gz: 9c5029ae7bdcde2e2fd2d9261a4a282b46fc6dff09be20c7622f80413bbccb01
 SHA512:
-  metadata.gz: '06295472bb1577491a3ea0f40a89cd904c14bb19c2064c226e129487d74828c0335109b2818bd280eed1d80af266d2352a72bc4b4838fa1fea7ff9830f81f1d8'
-  data.tar.gz: 6830c8249d6ae651fdbf1c6a62e582db254f663fe6d4316de84c7a1d6a2ba17fd516a129991ca8634a98ccd5857fe59ba56b12341412d0f7732232e93e78fa2d
+  metadata.gz: 9d270769997103bac784faaba63e49616c980170696de6aaa6d5c428f3fa97a5e6d14ab53572cb0b61a05efb1398d819b3b5d1caa116c7138555f4f95f6bcf99
+  data.tar.gz: 791d45aa87675605a7facb2ccee548780e9a6863c4c62f8f428d0b182dfdbc4c087b546e71c60a868765ab47736acb048d23fdcc46b572b47ab769946d9c19cb

data/lib/sdr_client.rb

@@ -2,6 +2,8 @@
 
 require 'dry/monads'
 require 'faraday'
+require 'active_support'
+require 'active_support/core_ext/object/json'
 
 require 'sdr_client/version'
 require 'sdr_client/deposit'
@@ -10,6 +12,7 @@ require 'sdr_client/credentials'
 require 'sdr_client/login'
 require 'sdr_client/login_prompt'
 require 'sdr_client/cli'
+require 'sdr_client/connection'
 
 module SdrClient
   class Error < StandardError; end

data/lib/sdr_client/connection.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module SdrClient
+  # The connection to the server
+  class Connection
+    include Dry::Monads[:result]
+
+    def initialize(url:, token: Credentials.read)
+      @url = url
+      @token = token
+    end
+
+    def connection
+      @connection ||= Faraday.new(url: url) do |conn|
+        conn.authorization :Bearer, token
+        conn.adapter :net_http
+      end
+    end
+
+    # This is only available to certain blessed accounts (argo) as it gives the
+    # token that allows you to act as any other user. Thus the caller must authenticate
+    # the user (e.g. using Shibboleth) before calling this method with their email address.
+    # @param [String] the email address of the person to proxy to.
+    # @return [Result] the token for the account
+    def proxy(to)
+      response = connection.post("/v1/auth/proxy?to=#{to}")
+      case response.status
+      when 200
+        Success(response.body)
+      else
+        Failure("Status: #{response.status}\n#{response.body}")
+      end
+    end
+
+    delegate :put, :post, to: :connection
+
+    private
+
+    attr_reader :url, :token
+  end
+end

data/lib/sdr_client/deposit.rb

@@ -25,8 +25,6 @@ module SdrClient
                  files_metadata: {},
                  grouping_strategy: SingleFileGroupingStrategy,
                  logger: Logger.new(STDOUT))
-      token = Credentials.read
-
       augmented_metadata = FileMetadataBuilder.build(files: files, files_metadata: files_metadata)
       metadata = Request.new(label: label,
                              type: type,
@@ -41,7 +39,8 @@ module SdrClient
                              embargo_access: embargo_access,
                              viewing_direction: viewing_direction,
                              files_metadata: augmented_metadata)
-      Process.new(metadata: metadata, url: url, token: token, files: files,
+      connection = Connection.new(url: url)
+      Process.new(metadata: metadata, connection: connection, files: files,
                   grouping_strategy: grouping_strategy, logger: logger).run
     end
     # rubocop:enable Metrics/MethodLength

data/lib/sdr_client/deposit/model_process.rb

@@ -8,31 +8,31 @@ module SdrClient
     class ModelProcess
       DRO_PATH = '/v1/resources'
       # @param [Cocina::Model::RequestDRO] request_dro for depositing
-      # @param [String] url the server to send to
-      # @param [String] token the bearer auth token for the server
+      # @param [Connection] connection the connection to use
       # @param [Array<String>] files a list of file names to upload
       # @param [Logger] logger the logger to use
-      def initialize(request_dro:, url:,
-                     token:, files: [], logger: Logger.new(STDOUT))
+      def initialize(request_dro:, connection:, files: [], logger: Logger.new(STDOUT))
         @files = files
-        @url = url
-        @token = token
+        @connection = connection
         @request_dro = request_dro
         @logger = logger
       end
 
       def run
         check_files_exist
-        UploadFiles.new(files: files,
-                        logger: logger,
-                        connection: connection,
-                        mime_types: mime_types).run
-        upload_request_dro
+        child_files_match
+
+        upload_responses = UploadFiles.new(files: files,
+                                           logger: logger,
+                                           connection: connection,
+                                           mime_types: mime_types).run
+        new_request_dro = with_external_identifiers(upload_responses)
+        upload_request_dro(new_request_dro.to_json)
       end
 
       private
 
-      attr_reader :request_dro, :files, :url, :token, :logger
+      attr_reader :request_dro, :files, :logger, :connection
 
       def check_files_exist
         logger.info('checking to see if files exist')
@@ -41,10 +41,23 @@ module SdrClient
         end
       end
 
+      def child_files_match
+        # Files without request files.
+        files.each do |filepath|
+          filename = ::File.basename(filepath)
+
+          raise "Request file not provided for #{filepath}" if request_files[filename].nil?
+        end
+
+        # Request files without files
+        filenames = files.map { |filepath| ::File.basename(filepath) }
+        request_files.keys.each do |request_filename|
+          raise "File not provided for request file #{request_filename}" unless filenames.include?(request_filename)
+        end
+      end
+
       # @return [Hash<Symbol,String>] the result of the metadata call
-      # rubocop:disable Metrics/AbcSize
-      def upload_request_dro
-        request_json = request_dro.to_json
+      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
@@ -53,7 +66,6 @@ module SdrClient
 
         { druid: JSON.parse(response.body)['druid'], background_job: response.headers['Location'] }
       end
-      # rubocop:enable Metrics/AbcSize
 
       def unexpected_response(response)
         raise "There was an error with your request: #{response.body}" if response.status == 400
@@ -62,23 +74,41 @@ module SdrClient
         raise "unexpected response: #{response.status} #{response.body}"
       end
 
-      def connection
-        @connection ||= Faraday.new(url: url) do |conn|
-          conn.authorization :Bearer, token
-          conn.adapter :net_http
-        end
-      end
-
+      # Map of filenames to mimetypes
       def mime_types
         @mime_types ||=
           Hash[
-            request_dro.structural.contains.map do |file_set|
-              file_set.structural.contains.map do |file|
-                [file.filename, file.hasMimeType || 'application/octet-stream']
-              end
-            end.flatten(1)
+            request_files.map do |filename, file|
+              [filename, file.hasMimeType || 'application/octet-stream']
+            end
           ]
       end
+
+      # Map of filenames to request files
+      def request_files
+        @request_files ||=
+          Hash[
+              request_dro.structural.contains.map do |file_set|
+                file_set.structural.contains.map do |file|
+                  [file.filename, file]
+                end
+              end.flatten(1)
+          ]
+      end
+
+      def with_external_identifiers(upload_responses)
+        signed_id_map = Hash[upload_responses.map { |response| [response.filename, response.signed_id] }]
+
+        # Manipulating request_dro as hash since immutable
+        request_dro_hash = request_dro.to_h
+        request_dro_hash[:structural][:contains].each do |file_set|
+          file_set[:structural][:contains].each do |file|
+            file[:externalIdentifier] = signed_id_map[file[:filename]]
+          end
+        end
+
+        Cocina::Models::RequestDRO.new(request_dro_hash)
+      end
     end
   end
 end

data/lib/sdr_client/deposit/process.rb

@@ -9,21 +9,17 @@ module SdrClient
       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] url the server to send to
-      # @param [String] token the bearer auth token for the server
+      # @param [String] connection the server connection to use
       # @param [Array<String>] files a list of file names to upload
       # @param [Logger] logger the logger to use
-      # rubocop:disable Metrics/ParameterLists
-      def initialize(metadata:, grouping_strategy: SingleFileGroupingStrategy, url:,
-                     token:, files: [], logger: Logger.new(STDOUT))
+      def initialize(metadata:, grouping_strategy: SingleFileGroupingStrategy,
+                     connection:, files: [], logger: Logger.new(STDOUT))
         @files = files
-        @url = url
-        @token = token
+        @connection = connection
         @metadata = metadata
         @logger = logger
         @grouping_strategy = grouping_strategy
       end
-      # rubocop:enable Metrics/ParameterLists
 
       def run
         check_files_exist
@@ -40,7 +36,7 @@ module SdrClient
 
       private
 
-      attr_reader :metadata, :files, :url, :token, :logger, :grouping_strategy
+      attr_reader :metadata, :files, :connection, :logger, :grouping_strategy
 
       def check_files_exist
         logger.info('checking to see if files exist')
@@ -68,13 +64,6 @@ module SdrClient
         raise "unexpected response: #{response.status} #{response.body}"
       end
 
-      def connection
-        @connection ||= Faraday.new(url: url) do |conn|
-          conn.authorization :Bearer, token
-          conn.adapter :net_http
-        end
-      end
-
       def mime_types
         @mime_types ||=
           Hash[

data/lib/sdr_client/deposit/upload_files.rb

@@ -9,7 +9,7 @@ module SdrClient
       BLOB_PATH = '/v1/direct_uploads'
       # @param [Array<String>] files a list of filepaths to upload
       # @param [Logger] logger the logger to use
-      # @param [Faraday::Connection] connection
+      # @param [Connection] connection
       # @param [Hash<String,String] mime_types a map of filenames to mime types
       def initialize(files:, mime_types:, logger:, connection:)
         @files = files

data/lib/sdr_client/login.rb

@@ -7,12 +7,12 @@ module SdrClient
     extend Dry::Monads[:result]
 
     # @return [Result] the status of the call
-    def self.run(url:, login_service: LoginPrompt)
+    def self.run(url:, login_service: LoginPrompt, credential_store: Credentials)
       request_json = JSON.generate(login_service.run)
       response = Faraday.post(url + LOGIN_PATH, request_json, 'Content-Type' => 'application/json')
       case response.status
       when 200
-        Credentials.write(response.body)
+        credential_store.write(response.body)
         Success()
       when 400
         Failure('Email address is not a valid email')

data/lib/sdr_client/model_deposit.rb

@@ -9,9 +9,8 @@ module SdrClient
                        files: [],
                        url:,
                        logger: Logger.new(STDOUT))
-      token = Credentials.read
-
-      ModelProcess.new(request_dro: request_dro, url: url, token: token, files: files, logger: logger).run
+      connection = Connection.new(url: url)
+      ModelProcess.new(request_dro: request_dro, connection: connection, files: files, logger: logger).run
     end
   end
 end

data/lib/sdr_client/version.rb

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

data/sdr-client.gemspec

@@ -27,11 +27,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'activesupport'
+  spec.add_dependency 'cocina-models', '~> 0.31.0'
   spec.add_dependency 'dry-monads'
   spec.add_dependency 'faraday', '>= 0.16'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'cocina-models'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.79.0'

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-03-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cocina-models
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.31.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.31.0
 - !ruby/object:Gem::Dependency
   name: dry-monads
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: cocina-models
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -175,6 +189,7 @@ files:
 - lib/sdr-client.rb
 - lib/sdr_client.rb
 - lib/sdr_client/cli.rb
+- lib/sdr_client/connection.rb
 - lib/sdr_client/credentials.rb
 - lib/sdr_client/deposit.rb
 - lib/sdr_client/deposit/file.rb