purl_fetcher-client 2.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a8e135cc1e6d731b5a6fbf1706b21764524f422fbe5935306d8c42355ac225a
-  data.tar.gz: 617533e69ecaabe0ea954d3052a74197bbe78c14eb2e58921aa1c0d13dfd18af
+  metadata.gz: 4f527139551834c001a5c25e7ce1c84b07f6dcfd2adb5d58fb9597e89b160324
+  data.tar.gz: 051d4b0e7c6034e719fc936a202aa3146c4727a85084688d65e9fcf4c6c965fe
 SHA512:
-  metadata.gz: ceed9ffc1a6480273b180966c208a02b0e63eff3c1d1725c0b82a968900d1cc98573b734eebdfc4578709e4782d9e90130b79fca718ff9c8e5056913cda6e48d
-  data.tar.gz: 0dc89a720e25f1e0c9f8330665ac3625463053e69717c27fa564876347f949aa9e95d9073c2131cb4eac039ca1d3dc91267edd232c7f3dfcacc02efafb02a042
+  metadata.gz: 804b3f082dea214e88918377130260412c11d3a89697d69013f4eb79ed35d5a0427568f584db8c611d82c442cdd1076939f85d70f54872f2cbd6b4f10e41c626
+  data.tar.gz: cc004f4461fb528491fe868f60e052ed064ff9d7ee40539b4d3df3df9f48fc7725a1e39a90b0e6a5fde3b34841b10b4bc25bc2e57cd961980dd287609a23bad1

data/lib/purl_fetcher/client/publish.rb

@@ -23,7 +23,7 @@ module PurlFetcher
 
       def publish
         logger.debug("Starting a publish request for: #{druid}")
-        client.post(path:, body:)
+        client.put(path:, body:)
         logger.debug("Publish request complete")
       end
 
@@ -54,7 +54,7 @@ module PurlFetcher
       end
 
       def path
-        "/v1/resources"
+        "/v1/purls/#{druid}"
       end
     end
   end

data/lib/purl_fetcher/client/reader.rb

@@ -25,7 +25,7 @@ class PurlFetcher::Client::Reader
   # @raise [PurlFetcher::Client::NotFoundResponseError] if item is not found
   # @raise [PurlFetcher::Client::ResponseError] if the response is not successful
   def files_by_digest(druid)
-    retrieve_json("/purls/druid:#{druid.delete_prefix('druid:')}", {})
+    retrieve_json("/v1/purls/druid:#{druid.delete_prefix('druid:')}", {})
       .fetch("files_by_md5", [])
   end
 

data/lib/purl_fetcher/client/release_tags.rb

@@ -43,7 +43,7 @@ module PurlFetcher
       end
 
       def path
-        "/v1/released/#{druid}"
+        "/v1/purls/#{druid}/release_tags"
       end
     end
   end

data/lib/purl_fetcher/client/unpublish.rb

@@ -38,7 +38,7 @@ module PurlFetcher
       end
 
       def path
-        "/purls/#{druid}"
+        "/v1/purls/#{druid}"
       end
     end
   end

data/lib/purl_fetcher/client/version.rb

@@ -1,5 +1,5 @@
 module PurlFetcher
   class Client
-    VERSION = "2.0.0"
+    VERSION = "2.1.1"
   end
 end

data/lib/purl_fetcher/client/withdraw.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module PurlFetcher
+  class Client
+    # Withdraw / restore a version of an item from the purl-fetcher cache
+    class Withdraw
+      # @param [String] druid the identifier of the item
+      # @param [String] version the version of the item
+      def self.withdraw(druid:, version:)
+        new(druid:, version:).withdraw
+      end
+
+      # @param [String] druid the identifier of the item
+      # @param [String] version the version of the item
+      def self.restore(druid:, version:)
+        new(druid:, version:).restore
+      end
+
+      # @param [String] druid the identifier of the item
+      # @param [String] version the version of the item
+      def initialize(druid:, version:)
+        @druid = druid
+        @version = version
+      end
+
+      def withdraw
+        logger.debug("Starting a withdraw request for: #{druid} (#{version})")
+        response = client.put(path: path(:withdraw))
+        logger.debug("Withdraw request complete")
+        response
+      end
+
+      def restore
+        logger.debug("Starting a restore request for: #{druid} (#{version})")
+        response = client.put(path: path(:restore))
+        logger.debug("Withdraw request complete")
+        response
+      end
+
+      private
+
+      attr_reader :druid, :version
+
+      def logger
+        Client.config.logger
+      end
+
+      def client
+        Client.instance
+      end
+
+      def path(action)
+        "/v1/purls/#{druid}/versions/#{version}/#{action}"
+      end
+    end
+  end
+end

data/lib/purl_fetcher/client.rb

@@ -7,10 +7,10 @@ require "logger"
 require "purl_fetcher/client/version"
 require "purl_fetcher/client/reader"
 require "purl_fetcher/client/mods"
-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/withdraw"
 
 module PurlFetcher
   class Client
@@ -76,9 +76,9 @@ module PurlFetcher
     # @param path [String] the path for the API request
     # @param body [String] the body of the POST request
     # @param headers [Hash] extra headers to add to the SDR API request
-    def put(path:, body:, headers: {})
+    def put(path:, body: nil, headers: {})
       response = connection.put(path) do |request|
-        request.body = body
+        request.body = body if body
         request.headers = default_headers.merge(headers)
       end
 
@@ -112,7 +112,7 @@ module PurlFetcher
     def default_request_options
       # To allow transfer of large files.
       {
-          read_timeout: 900,
+          read_timeout: 1800, # 30 minutes for first response byte to be received
           timeout: 36000
         }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: purl_fetcher-client
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Chris Beer
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-23 00:00:00.000000000 Z
+date: 2024-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -126,13 +126,13 @@ files:
 - bin/console
 - bin/setup
 - lib/purl_fetcher/client.rb
-- lib/purl_fetcher/client/legacy_publish.rb
 - lib/purl_fetcher/client/mods.rb
 - lib/purl_fetcher/client/publish.rb
 - lib/purl_fetcher/client/reader.rb
 - lib/purl_fetcher/client/release_tags.rb
 - lib/purl_fetcher/client/unpublish.rb
 - lib/purl_fetcher/client/version.rb
+- lib/purl_fetcher/client/withdraw.rb
 - purl_fetcher-client.gemspec
 homepage:
 licenses: []
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Traject-compatible reader implementation for streaming data from purl-fetcher

data/lib/purl_fetcher/client/legacy_publish.rb

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-module PurlFetcher
-  class Client
-    # Publish (metadata-only). This will be replaced with a single publish operation
-    class LegacyPublish
-      # @param [Cocina::Models::DRO,Cocina::Models::Collection] cocina the Cocina data object
-      def self.publish(cocina:)
-        new(cocina:).publish
-      end
-
-      # @param [Cocina::Models::DRO,Cocina::Models::Collection] cocina the Cocina data object
-      def initialize(cocina:)
-        @cocina = cocina
-      end
-
-      def publish
-        logger.debug("Starting a legacy publish request for: #{druid}")
-        response = client.post(path:, body:)
-        logger.debug("Legacy publish request complete")
-      end
-
-      private
-
-      attr_reader :cocina
-
-      def druid
-        cocina.externalIdentifier
-      end
-
-      def body
-        cocina.to_json
-      end
-
-      def logger
-        Client.config.logger
-      end
-
-      def client
-        Client.instance
-      end
-
-      def path
-        "/purls/#{druid}"
-      end
-    end
-  end
-end