dor-workflow-client 7.2.0 → 7.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29157476de970bf333e7ca643d49b79ef4e03cf0bf9e18aab8277767492aab3f
-  data.tar.gz: c25c23a411be47575be4c3d91e912c4d5b48b698423d302d8263a7ca0f1170f7
+  metadata.gz: f68410646d6db8f4544022b03aa0c1f4ed062c94482663d6076a2e08deefc0aa
+  data.tar.gz: 2fceb32ccab79dc19cf8449268965f3450d26fb1ab57d23ebff17b316f95c758
 SHA512:
-  metadata.gz: 32b74f669d2ec51717389c34e6ab113f1271ba05b84f3a9ac5a2e5e95da562ada8d2e7cb85ed78a8d4c80e14862e7658b15bf18b9933f0be4223933d80dcc0c2
-  data.tar.gz: af1f2bbbb802ebd84ccb239ea62e29b8bfdfb3a0947d0729a9e16caea8594b9bc224750085674b28c7448ff47f4fd8525830b8627ad5dab2f31f0c861d8dafcd
+  metadata.gz: bec89343f7f847098e221235e4f8f76fe862e57a4af9f05f6da16bc7739e9db28777ae2df11860eba4630c88d5fe179571b6a18bf556477fcae838793e579960
+  data.tar.gz: b1a5e69406924bd48383e18cabd9416d95a77b90c8cbbdfaf2e395de50b2e95926f9a2b30958036f94fa77be2a05f9a0556f5de0c080e3b1881ed7c2351e956a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dor-workflow-client (7.2.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/version.rb

@@ -3,7 +3,7 @@
 module Dor
   module Workflow
     class Client
-      VERSION = '7.2.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/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.2.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
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.7
 signing_key:
 specification_version: 4
 summary: Provides convenience methods to work with the DOR Workflow Service