purl_fetcher-client 1.2.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5acaaa62d71bc3971cf608280ed164c905c643a883a03abd51c1ddc6f4efb943
-  data.tar.gz: a067e49e7eb1d75b66ba27cdb21bbbcb2dfc83bf9fa6885a8afaf01167d5823e
+  metadata.gz: 8acef0951b0c30808be01de74a0be92e5926d8aa749844517cb559df253b9809
+  data.tar.gz: 7bc3b857be71f2ef660956e1b5db1bd9411fc391fefa8b7d52f128a8743a2b34
 SHA512:
-  metadata.gz: ebc5cd6e69bf54c81fc74aa0fca8ffc06b4f32007fcdaab58a9c04ef7030e2dfeeb4820b3e0fd60d61b54abc8e9af2f9ea3fd5c19219355e62aee4f23d907fc1
-  data.tar.gz: c6d4931fd315dc5c4c30ee407a009d2698950f09b05c286efd81413579a9d02a5a0682b97332ed42471da2e9b2bf5c43925b70f2ce575031610a2ec153e497d8
+  metadata.gz: c87d8d90b38301ca7879cae8d95acf44ea0b4b54a1cf954040cc06f3dc8cc36420757a19f95d7a05b7e4acd77bd46f91e3469ec4aef04ba804833ede2006c2d7
+  data.tar.gz: bd9cadb99c2db016b91627d35b4928bc5e1fc1fecbb204ab82f217ee58a652baa0b593499f0358eaf46bb975fac093bcf745fddbb27b739a01bf522c00d281bb

data/Gemfile

@@ -7,3 +7,4 @@ gemspec
 
 gem "rubocop-rails-omakase", require: false, group: [ :development ]
 gem "debug"
+gem "cocina-models"

data/lib/purl_fetcher/client/mods.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module PurlFetcher
+  class Client
+    # Create a MODS represenation of Cocina JSON
+    class Mods
+      # @param [Cocina::Models::Dro] cocina the Cocina JSON representation of the object
+      def self.create(cocina:)
+        new(cocina:).create
+      end
+
+      # @param [Cocina::Models::Dro] cocina the Cocina JSON representation of the object
+      def initialize(cocina:)
+        @cocina = cocina
+      end
+
+      def create
+        response = client.post(path:, body:)
+      end
+
+      private
+
+      attr_reader :cocina
+
+      def body
+        cocina.to_json
+      end
+
+      def client
+        Client.instance
+      end
+
+      def path
+        "/v1/mods"
+      end
+    end
+  end
+end

data/lib/purl_fetcher/client/publish.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module PurlFetcher
+  class Client
+    # Publish (metadata-only) to the purl cache
+    class Publish
+      def self.publish(...)
+        new(...).publish
+      end
+
+      # @param [Cocina::Models::DRO,Cocina::Models::Collection] cocina the Cocina data object
+      # @param [Hash<String,String>] file_uploads map of filenames to signed_ids
+      def initialize(cocina:, file_uploads:)
+        @cocina = cocina
+        @file_uploads = file_uploads
+      end
+
+      def publish
+        logger.debug("Starting a publish request for: #{druid}")
+        client.post(path:, body:)
+        logger.debug("Publish request complete")
+      end
+
+      private
+
+      attr_reader :cocina, :file_uploads
+
+      def druid
+        cocina.externalIdentifier
+      end
+
+      def body
+        {
+          object: cocina.to_h,
+          file_uploads: file_uploads
+      }.to_json
+      end
+
+      def logger
+        Client.config.logger
+      end
+
+      def client
+        Client.instance
+      end
+
+      def path
+        "/v1/resources"
+      end
+    end
+  end
+end

data/lib/purl_fetcher/client/publish_shelve.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module PurlFetcher
+  class Client
+    # High-level client for publishing and shelving.
+    class PublishShelve
+      def self.publish_and_shelve(...)
+        new(...).publish_and_shelve
+      end
+
+      # @param [Cocina::Models::DRO,Cocina::Models::Collection] cocina the Cocina data object
+      # @param [Hash<String,String>] filepath_map map of relative filepaths to absolute filepaths
+      def initialize(cocina:, filepath_map:)
+        @cocina = cocina
+        @filepath_map = filepath_map
+      end
+
+      def publish_and_shelve
+        logger.debug("Starting publish and shelve for: #{cocina.externalIdentifier}")
+
+        direct_upload_responses = PurlFetcher::Client::UploadFiles.upload(file_metadata: file_metadata, filepath_map: filepath_map)
+        file_uploads = direct_upload_responses.map { |response| [ response.filename, response.signed_id ] }.to_h
+
+        PurlFetcher::Client::Publish.publish(cocina: cocina, file_uploads: file_uploads)
+        logger.debug("Publish and shelve complete")
+      end
+
+      private
+
+      attr_reader :cocina, :filepath_map
+
+      def file_metadata
+        cocina.structural.contains.flat_map do |fileset|
+          fileset.structural.contains.select { |file| filepath_map.include?(file.filename) }.map do |file|
+            direct_upload_request_for(file)
+          end
+        end
+      end
+
+      def direct_upload_request_for(cocina_file)
+        PurlFetcher::Client::DirectUploadRequest.from_file(
+          hexdigest: md5_for(cocina_file),
+          byte_size: size_for(cocina_file),
+          content_type: "application/octet-stream",
+          file_name: cocina_file.filename
+        )
+      end
+
+      def md5_for(cocina_file)
+        cocina_file.hasMessageDigests.find { |digest| digest.type == "md5" }.digest
+      end
+
+      def size_for(cocina_file)
+        return cocina_file.size if cocina_file.size.present? && cocina_file.size.positive?
+
+        File.size(filepath_map[cocina_file.filename])
+      end
+
+      def logger
+        Client.config.logger
+      end
+    end
+  end
+end

data/lib/purl_fetcher/client/upload_files.rb

@@ -10,7 +10,7 @@ module PurlFetcher
         new(file_metadata: file_metadata, filepath_map: filepath_map).upload
       end
 
-      # @param [Hash<String,DirectUploadRequest>] file_metadata map of relative filepaths to file metadata
+      # @param [Array<DirectUploadRequest>] file_metadata array of DirectUploadRequests for the files to be uploaded
       # @param [Hash<String,String>] filepath_map map of relative filepaths to absolute filepaths
       def initialize(file_metadata:, filepath_map:)
         @file_metadata = file_metadata
@@ -19,10 +19,10 @@ module PurlFetcher
 
       # @return [Array<DirectUploadResponse>] the responses from the server for the uploads
       def upload
-        file_metadata.map do |filepath, metadata|
-          direct_upload(metadata.to_json).tap do |response|
-            # ActiveStorage modifies the filename provided in response, so setting here with the relative filename
-            response = response.with_filename(filepath)
+        file_metadata.map do |metadata|
+          filepath = metadata.filename
+          # ActiveStorage modifies the filename provided in response, so setting here with the relative filename
+          direct_upload(metadata.to_json).with_filename(filepath).tap do |response|
             upload_file(response)
             logger.info("Upload of #{filepath} complete")
           end

data/lib/purl_fetcher/client/version.rb

@@ -1,5 +1,5 @@
 module PurlFetcher
   class Client
-    VERSION = "1.2.2"
+    VERSION = "1.4.0"
   end
 end

data/lib/purl_fetcher/client.rb

@@ -6,12 +6,15 @@ require "logger"
 
 require "purl_fetcher/client/version"
 require "purl_fetcher/client/reader"
+require "purl_fetcher/client/mods"
 require "purl_fetcher/client/upload_files"
 require "purl_fetcher/client/direct_upload_request"
 require "purl_fetcher/client/direct_upload_response"
 require "purl_fetcher/client/legacy_publish"
+require "purl_fetcher/client/publish"
 require "purl_fetcher/client/release_tags"
 require "purl_fetcher/client/unpublish"
+require "purl_fetcher/client/publish_shelve"
 
 module PurlFetcher
   class Client
@@ -87,7 +90,8 @@ module PurlFetcher
     def connection
       Faraday.new(
         url: config.url,
-        headers: default_headers
+        headers: default_headers,
+        request: default_request_options
       ) do |conn|
         conn.response :json
       end
@@ -101,6 +105,14 @@ module PurlFetcher
       }.compact
     end
 
+    def default_request_options
+      # To allow transfer of large files.
+      {
+          read_timeout: 900,
+          timeout: 900
+        }
+    end
+
     def auth_header
       "Bearer #{config.token}" if config.token
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: purl_fetcher-client
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-07 00:00:00.000000000 Z
+date: 2024-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -129,6 +129,9 @@ files:
 - lib/purl_fetcher/client/direct_upload_request.rb
 - lib/purl_fetcher/client/direct_upload_response.rb
 - lib/purl_fetcher/client/legacy_publish.rb
+- lib/purl_fetcher/client/mods.rb
+- lib/purl_fetcher/client/publish.rb
+- lib/purl_fetcher/client/publish_shelve.rb
 - lib/purl_fetcher/client/reader.rb
 - lib/purl_fetcher/client/release_tags.rb
 - lib/purl_fetcher/client/unpublish.rb
@@ -153,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Traject-compatible reader implementation for streaming data from purl-fetcher