lyber-core 8.0.1 → 8.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc18c830beb558a54a5c5186428bd29b46a7c7f2472caf2b4e901d9d7df30a4d
-  data.tar.gz: 1043076f43c92c4e3a17e06aebde5bfd08570fab7e5d1007ad897fc29dff8ea6
+  metadata.gz: 36bd350f4d9c4ce74e6da529f8fe9dddd89a8f2c71daa79ccad91fdc9efa00f3
+  data.tar.gz: '0122852b4e4e24cef6844b8aef7026c75bcd9573947b6c0c002208bd61838315'
 SHA512:
-  metadata.gz: e6e609d9f243f13b3ca1a420a175bbd2d65cbf7f4e40dcfb04689dad0cbfefcaba2e5923ddb0c62cc82e60f56399ab289a833d3f24cb9ff0e5de31c1d4655dad
-  data.tar.gz: cbf5ec1fb917e2de0886b2d456d829fc63c11fc2b7a23ea65ac5080f1bbcef859967a29f3f193d01b1524a8fabc7d64e02217e06f8ea894925afaf95f7fb1dde
+  metadata.gz: 84d64ade10a163e0092643301e0ead58e695f5506c38651e95965ebae44e128dd619990055c2b0a23cba201e4c816428d57d65f1b9db2c5955337ece3bcee148
+  data.tar.gz: 8b55154f52c0df55d7fa029ae22e1bd54747e10cb56763e0a71ffd44b1e3608e7d084f8d0c1feda15fc8a981c0d53a986b3b3ff36e5d8156fc9b391523db5c8b

data/lib/lyber_core/robot.rb

@@ -12,14 +12,15 @@ module LyberCore
     sidekiq_retries_exhausted do |job, ex|
       # When all the retries are exhausted, update the workflow to error.
       robot = job['class'].constantize.new
-      druid = job['args'].first
+      druid, version = job['args']
       workflow = Workflow.new(object_client: Dor::Services::Client.object(druid),
                               workflow_name: robot.workflow_name,
-                              process: robot.process)
+                              process: robot.process,
+                              version:)
       workflow.error!(ex.message, Socket.gethostname)
     end
 
-    attr_reader :workflow_name, :process, :druid, :retriable_exceptions
+    attr_reader :workflow_name, :process, :druid, :version, :retriable_exceptions
     attr_accessor :check_queued_status
 
     # These methods are delegated to the workflow ivar as a convenient way for child classes to interact
@@ -51,11 +52,13 @@ module LyberCore
     # Calls the #perform_work method, then sets workflow to 'completed' or 'error' depending on success
     # rubocop:disable Metrics/AbcSize
     # rubocop:disable Metrics/MethodLength
-    def perform(druid)
+    def perform(druid, version = nil)
       @druid = druid
+      @version = version
       Honeybadger.context(druid:, process:, workflow_name:)
 
       logger.info "#{druid} processing #{process} (#{workflow_name})"
+      return skip_for_superseded_version! if superseded_version?
       return unless check_item_queued_or_retry?
 
       # this is the default note to pass back to workflow service,
@@ -115,7 +118,22 @@ module LyberCore
     end
 
     def workflow
-      @workflow ||= Workflow.new(object_client:, workflow_name:, process:)
+      @workflow ||= Workflow.new(object_client:, workflow_name:, process:, version:)
+    end
+
+    # @return [Boolean] true if a version was provided and it no longer matches the object's current version,
+    #   meaning a newer version has superseded the one this job was queued for
+    def superseded_version?
+      return false if version.nil?
+
+      cocina_object.version.to_i != version.to_i
+    end
+
+    def skip_for_superseded_version!
+      msg = "Item #{druid} is queued for version #{version} but the current object version is " \
+            "#{cocina_object.version}. Skipping #{process} (#{workflow_name})."
+      logger.warn(msg)
+      workflow.skip!(msg)
     end
 
     def check_item_queued_or_retry? # rubocop:disable Metrics/AbcSize

data/lib/lyber_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LyberCore
-  VERSION = '8.0.1'
+  VERSION = '8.2.0'
 end

data/lib/lyber_core/workflow.rb

@@ -3,10 +3,11 @@
 module LyberCore
   # This encapsulates the workflow operations that lyber-core does
   class Workflow
-    def initialize(object_client:, workflow_name:, process:)
+    def initialize(object_client:, workflow_name:, process:, version:)
       @object_client = object_client
       @workflow_name = workflow_name
       @process = process
+      @version = version
     end
 
     # @return [Dor::Services::Client::ObjectWorkflow] for druid/workflow/step on which this instance was initialized
@@ -30,23 +31,27 @@ module LyberCore
     end
 
     def start!(note)
-      workflow_process.update(status: 'started', elapsed: 1.0, note:)
+      workflow_process.update(status: 'started', elapsed: 1.0, note:, version:)
     end
 
     def complete!(status, elapsed, note)
-      workflow_process.update(status:, elapsed:, note:)
+      workflow_process.update(status:, elapsed:, note:, version:)
     end
 
     def retrying!
-      workflow_process.update(status: 'retrying', elapsed: 1.0, note: nil)
+      workflow_process.update(status: 'retrying', elapsed: 1.0, note: nil, version:)
+    end
+
+    def skip!(note)
+      workflow_process.update(status: 'skipped', elapsed: 0, note:, version:)
     end
 
     def error!(error_msg, error_text)
-      workflow_process.update_error(error_msg:, error_text:)
+      workflow_process.update_error(error_msg:, error_text:, version:)
     end
 
     delegate :context, :status, :lane_id, to: :process_response
 
-    attr_reader :object_client, :workflow_name, :process
+    attr_reader :object_client, :workflow_name, :process, :version
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lyber-core
 version: !ruby/object:Gem::Version
-  version: 8.0.1
+  version: 8.2.0
 platform: ruby
 authors:
 - Alpana Pande
@@ -13,10 +13,9 @@ authors:
 - Michael Klein
 - Darren Weber
 - Peter Mangiafico
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-21 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -92,16 +91,16 @@ dependencies:
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -252,7 +251,6 @@ licenses:
 - Apache-2.0
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -267,8 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Core services used by the SUL Digital Library
 test_files: []