sdr-client 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e763b0d86f9518951eff07ede0ff51629423c8b6855f98eb04225dbdf5b050b
-  data.tar.gz: e1fe1931e7e31cf0d35e647a606a01c7613a1ffcdaf2e4632c0a2291fa03636f
+  metadata.gz: 1ae3d332b62dd4908555f961ffa5f9ebc12e0388836f36f855672731d8b940a1
+  data.tar.gz: 97c3c18fc7e4ed98b5577ea24390eef9f2ecbf8c24970c92fd3d3097a13b5492
 SHA512:
-  metadata.gz: 4ee835ce52cdf35db4b1216ceac46b8bba2cae28f4c6ae4dec0dfeb58d1a258cb9070b3187d96ae367788f6d69084279a401dd5f72e2f57f5fbb26d9e39ee84c
-  data.tar.gz: bfb5da340dd85568daa1c367e374619d12a871900242da31b68f404ff38afc8068a8999fced8f965eafb47d7a4cfbe65e26e10fbea8cdbf8853313176a554f88
+  metadata.gz: f03baa42607cd68d3b814e46df38dda0567ca78082292faaf5ec47dfe518b68e0399f25305a89bed835bf68cde2e680f553646b4c921490ae06c7e426a812c5f
+  data.tar.gz: d392e1bfda994e6266ca4e6e1834036e76a5cfd37008c6ceda87ed6c20d4cbae9becef1fe8f47e3631f824dae7ae883735e0718dec7161488763d891f9d57121

data/lib/sdr_client.rb

@@ -12,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,24 @@
+# frozen_string_literal: true
+
+module SdrClient
+  # The connection to the server
+  class Connection
+    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
+
+    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/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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-13 00:00:00.000000000 Z
+date: 2020-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -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