sdr-client 0.17.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67db5756bbb0378efa0f8fc14cf690b790ce8165142487e79b1449d497c30001
-  data.tar.gz: 4c6d3c6a5108eece153ebb3880129210423568025db785cbbd12b4c0988d4a3d
+  metadata.gz: 8dab3e033cd3f0fd0eae7045c3565f7c24300d99ebcd7141777eb0d005847497
+  data.tar.gz: 25a76561f9aafdcc4a575030ca9bb750e8cdf036b60c14cc92f413bbde4668d2
 SHA512:
-  metadata.gz: 54da060f2498da93b90292f07ecb3e3076418acfbf19a2a233867a11a251075c1bb56a7b497f11ebe7194eb035285525f9948f90939acfc753bfd2f746b3ad63
-  data.tar.gz: bb9a4281ea61338b4acccbca9c2af67801982202378172682e2d17f57d8027018644e1b54d2d3c19a1969328b818f1ce055c04d7040d14c50c7cdab026d572e1
+  metadata.gz: fa6080f541ce480fc8ca31f5f063404090235e8edce6849aa10c4f50f1a00ef83a166ea1c97ad579e094fbf9b5d8f24df73debc68ce567e1a7886dc7a491b643
+  data.tar.gz: a915029ed2f58221fe4c2418e8fef194f11eb6bde24af289dc9f52da438841a4bab90fec7a95a94eeaa22334e2e72897a6047f01c5909ed995d371473b1c0295

data/.rubocop.yml

@@ -9,6 +9,8 @@ AllCops:
 
 Layout/LineLength:
   Max: 120
+  Exclude:
+    - 'spec/sdr_client/deposit/process_spec.rb'
 
 Metrics/BlockLength:
   Exclude:

data/lib/sdr_client.rb

@@ -4,6 +4,8 @@ require 'dry/monads'
 require 'faraday'
 require 'active_support'
 require 'active_support/core_ext/object/json'
+require 'active_support/core_ext/hash/indifferent_access'
+require 'cocina/models'
 
 require 'sdr_client/version'
 require 'sdr_client/deposit'
@@ -12,6 +14,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/file.rb

@@ -34,9 +34,10 @@ module SdrClient
           administrative: {
             sdrPreserve: @preserve,
             shelve: @shelve
-          }
+          },
+          version: 1,
+          hasMessageDigests: message_digests
         }.tap do |json|
-          json['hasMessageDigests'] = message_digests unless message_digests.empty?
           json['hasMimeType'] = @mime_type if @mime_type
           json['use'] = @use if @use
         end

data/lib/sdr_client/deposit/file_set.rb

@@ -25,7 +25,8 @@ module SdrClient
           "label": label,
           structural: {
             contains: files.map(&:as_json)
-          }
+          },
+          version: 1
         }
       end
 

data/lib/sdr_client/deposit/model_process.rb

@@ -8,15 +8,12 @@ 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
@@ -35,7 +32,7 @@ module SdrClient
 
       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')
@@ -77,13 +74,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
-
       # Map of filenames to mimetypes
       def mime_types
         @mime_types ||=

data/lib/sdr_client/deposit/process.rb

@@ -9,22 +9,19 @@ 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
 
+      # rubocop:disable Metrics/AbcSize
       def run
         check_files_exist
         upload_responses = UploadFiles.new(files: files,
@@ -35,12 +32,14 @@ module SdrClient
                                                grouping_strategy: grouping_strategy,
                                                logger: logger)
         request = metadata_builder.with_uploads(upload_responses)
-        upload_metadata(request.as_json)
+        model = Cocina::Models.build_request(request.as_json.with_indifferent_access)
+        upload_metadata(model.to_h)
       end
+      # rubocop:enable Metrics/AbcSize
 
       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 +67,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/request.rb

@@ -49,10 +49,10 @@ module SdrClient
           type: type,
           administrative: administrative,
           identification: identification,
-          structural: structural
-        }.tap do |json|
-          json[:label] = label if label
-        end
+          structural: structural,
+          version: 1,
+          label: label.nil? ? ':auto' : label
+        }
       end
 
       # @return [Request] a clone of this request with the file_sets added

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.1'
+  VERSION = '0.21.0'
 end

data/sdr-client.gemspec

@@ -28,11 +28,11 @@ Gem::Specification.new do |spec|
   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', '~> 0.28.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.79.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.21.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-11 00:00:00.000000000 Z
+date: 2020-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !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
@@ -66,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.28.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.28.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -189,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