dor-workflow-client 7.1.0 → 7.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2691ff10a4a127beadce86389243d3bc13db82ef745a53bf030c50ea85d75f40
-  data.tar.gz: e5872d67e32db69fc53cdf843f394be3f384c8fa5f4f0cd931cc9a04286ae16e
+  metadata.gz: f68410646d6db8f4544022b03aa0c1f4ed062c94482663d6076a2e08deefc0aa
+  data.tar.gz: 2fceb32ccab79dc19cf8449268965f3450d26fb1ab57d23ebff17b316f95c758
 SHA512:
-  metadata.gz: 1ac0df9fb64bc20d641cdc58874fab21b00dee008075d71b5105834495ebc9d191b21196ab6dfe7a72e891ce1761f8679bd41bbce76846820f8ff973f50884a9
-  data.tar.gz: 1209cbb67b48e24bdb48bdffb8976c8048c5465b12e2468ea42eb91b6e475a7dc3616e8805727a94e155e266d9adf48eccbac7441788681e8a84cc112fc476ad
+  metadata.gz: bec89343f7f847098e221235e4f8f76fe862e57a4af9f05f6da16bc7739e9db28777ae2df11860eba4630c88d5fe179571b6a18bf556477fcae838793e579960
+  data.tar.gz: b1a5e69406924bd48383e18cabd9416d95a77b90c8cbbdfaf2e395de50b2e95926f9a2b30958036f94fa77be2a05f9a0556f5de0c080e3b1881ed7c2351e956a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dor-workflow-client (7.1.0)
+    dor-workflow-client (7.3.0)
       activesupport (>= 3.2.1, < 8)
       deprecation (>= 0.99.0)
       faraday (~> 2.0)
@@ -47,7 +47,7 @@ GEM
     hashdiff (1.1.0)
     i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    json (2.7.1)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
     mini_portile2 (2.8.5)
     minitest (5.22.3)
@@ -61,10 +61,10 @@ GEM
     parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
-    public_suffix (5.0.4)
+    public_suffix (5.0.5)
     racc (1.7.3)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
     regexp_parser (2.9.0)
     rexml (3.2.6)
     rspec (3.13.0)
@@ -82,7 +82,7 @@ GEM
     rspec-support (3.13.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.62.1)
+    rubocop (1.63.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -101,7 +101,7 @@ GEM
       rubocop (~> 1.41)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.28.0)
+    rubocop-rspec (2.29.1)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)

data/lib/dor/workflow/client/status.rb

@@ -10,26 +10,24 @@ module Dor
           0 => 'Unknown Status', # if there are no milestones for the current version, someone likely messed up the versioning process.
           1 => 'Registered',
           2 => 'In accessioning',
-          3 => 'In accessioning (described)',
-          4 => 'In accessioning (described, published)',
-          5 => 'In accessioning (described, published, deposited)',
-          6 => 'Accessioned',
-          7 => 'Accessioned (indexed)',
-          8 => 'Accessioned (indexed, ingested)',
-          9 => 'Opened'
+          3 => 'In accessioning (published)',
+          4 => 'In accessioning (published, deposited)',
+          5 => 'Accessioned',
+          6 => 'Accessioned (indexed)',
+          7 => 'Accessioned (indexed, ingested)',
+          8 => 'Opened'
         }.freeze
 
         # milestones from accessioning and the order they happen in
         STEPS = {
           'registered' => 1,
           'submitted' => 2,
-          'described' => 3,
-          'published' => 4,
-          'deposited' => 5,
-          'accessioned' => 6,
-          'indexed' => 7,
-          'shelved' => 8,
-          'opened' => 9
+          'published' => 3,
+          'deposited' => 4,
+          'accessioned' => 5,
+          'indexed' => 6,
+          'shelved' => 7,
+          'opened' => 8
         }.freeze
 
         attr_reader :status_code
@@ -78,7 +76,7 @@ module Dor
         end
 
         # @return [String] text translation of the status code, minus any trailing parenthetical explanation
-        # e.g. 'In accessioning (described)' and 'In accessioning (described, published)' both return 'In accessioning'
+        # e.g. 'Accessioned (indexed)' and 'Accessioned (indexed, ingested)', both return 'Accessioned'
         def simplified_status_code(display)
           display.gsub(/\(.*\)$/, '').strip
         end

data/lib/dor/workflow/client/version.rb

@@ -3,7 +3,7 @@
 module Dor
   module Workflow
     class Client
-      VERSION = '7.1.0'
+      VERSION = '7.3.0'
     end
   end
 end

data/lib/dor/workflow/response/workflow.rb

@@ -28,8 +28,7 @@ module Dor
         def process_for_recent_version(name:)
           nodes = process_nodes_for(name: name)
           node = nodes.max { |a, b| a.attr('version').to_i <=> b.attr('version').to_i }
-          attributes = node ? node.attributes.to_h { |k, v| [k.to_sym, v.value] } : {}
-          Process.new(parent: self, **attributes)
+          to_process(node)
         end
 
         def empty?
@@ -39,13 +38,24 @@ module Dor
         # Check if all processes are skipped or complete for the provided version.
         # @param [Integer] version the version we are checking for.
         def complete_for?(version:)
-          ng_xml.xpath("/workflow/process[@version=#{version}]/@status").map(&:value).all? { |p| %w[skipped completed].include?(p) }
+          # ng_xml.xpath("/workflow/process[@version=#{version}]/@status").map(&:value).all? { |p| %w[skipped completed].include?(p) }
+          incomplete_processes_for(version: version).empty?
         end
 
         def complete?
           complete_for?(version: version)
         end
 
+        def incomplete_processes_for(version:)
+          process_nodes = ng_xml.xpath("/workflow/process[@version=#{version}]")
+          incomplete_process_nodes = process_nodes.reject { |process_node| %w[skipped completed].include?(process_node.attr('status')) }
+          incomplete_process_nodes.map { |process_node| to_process(process_node) }
+        end
+
+        def incomplete_processes
+          incomplete_processes_for(version: version)
+        end
+
         attr_reader :xml
 
         private
@@ -66,6 +76,11 @@ module Dor
         def ng_xml
           @ng_xml ||= Nokogiri::XML(@xml)
         end
+
+        def to_process(node)
+          attributes = node ? node.attributes.to_h { |k, v| [k.to_sym, v.value] } : {}
+          Process.new(parent: self, **attributes)
+        end
       end
     end
   end

data/spec/dor/workflow/client/status_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe Dor::Workflow::Client::Status do
         let(:version) { '4' }
 
         it 'generates a status string' do
-          expect(status).to eq('v4 In accessioning (described, published)')
+          expect(status).to eq('v4 In accessioning (published)')
         end
       end
 
@@ -47,7 +47,7 @@ RSpec.describe Dor::Workflow::Client::Status do
         let(:version) { '3' }
 
         it 'generates a status string' do
-          expect(status).to eq('v3 In accessioning (described, published)')
+          expect(status).to eq('v3 In accessioning (published)')
         end
       end
     end
@@ -177,7 +177,7 @@ RSpec.describe Dor::Workflow::Client::Status do
       end
 
       it 'has the correct status of deposited (v2) object' do
-        expect(status).to eq('v2 In accessioning (described, published, deposited) 2013-10-01 07:10PM')
+        expect(status).to eq('v2 In accessioning (published, deposited) 2013-10-01 07:10PM')
       end
     end
   end

data/spec/dor/workflow/response/workflow_spec.rb

@@ -198,4 +198,62 @@ RSpec.describe Dor::Workflow::Response::Workflow do
       end
     end
   end
+
+  describe '#incomplete_processes' do
+    subject(:processes) { instance.incomplete_processes }
+
+    context 'when all steps are complete' do
+      let(:xml) do
+        <<~XML
+          <workflow repository="dor" objectId="druid:mw971zk1113" id="assemblyWF">
+            <process version="1" laneId="default" elapsed="0.0" attempts="1" datetime="2013-02-18T14:40:25-0800" status="completed" name="start-assembly"/>
+            <process version="1" laneId="default" elapsed="0.509" attempts="1" datetime="2013-02-18T14:42:24-0800" status="completed" name="jp2-create"/>
+          </workflow>
+        XML
+      end
+
+      it { is_expected.to be_empty }
+    end
+
+    context 'when some steps are not complete' do
+      let(:xml) do
+        <<~XML
+          <workflow repository="dor" objectId="druid:mw971zk1113" id="assemblyWF">
+            <process version="1" laneId="default" elapsed="0.0" attempts="1" datetime="2013-02-18T14:40:25-0800" status="completed" name="start-assembly"/>
+            <process version="1" laneId="default" elapsed="0.509" attempts="1" datetime="2013-02-18T14:42:24-0800" status="waiting" name="jp2-create"/>
+          </workflow>
+        XML
+      end
+
+      it 'returns the incomplete processes' do
+        expect(processes.size).to eq 1
+        expect(processes.first.name).to eq 'jp2-create'
+      end
+    end
+  end
+
+  describe '#incomplete_processes_for' do
+    let(:xml) do
+      <<~XML
+        <workflow repository="dor" objectId="druid:mw971zk1113" id="assemblyWF">
+          <process version="1" laneId="default" elapsed="0.0" attempts="1" datetime="2013-02-18T14:40:25-0800" status="completed" name="start-assembly"/>
+          <process version="1" laneId="default" elapsed="0.509" attempts="1" datetime="2013-02-18T14:42:24-0800" status="waiting" name="jp2-create"/>
+          <process version="2" laneId="default" elapsed="0.0" attempts="1" datetime="2013-02-18T14:40:25-0800" status="completed" name="start-assembly"/>
+          <process version="2" laneId="default" elapsed="0.509" attempts="1" datetime="2013-02-18T14:42:24-0800" status="completed" name="jp2-create"/>
+        </workflow>
+      XML
+    end
+
+    context 'when all steps are complete' do
+      it 'returns empty' do
+        expect(instance.incomplete_processes_for(version: 2)).to be_empty
+      end
+    end
+
+    context 'when some steps are not complete' do
+      it 'returns false' do
+        expect(instance.incomplete_processes_for(version: 1).size).to eq 1
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-workflow-client
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.3.0
 platform: ruby
 authors:
 - Willy Mene
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-02 00:00:00.000000000 Z
+date: 2024-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport