dor-workflow-client 7.0.2 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6b39aa68d201501560723248e1227a926a054bef2b9d0bd52fb838bfe59b4ab
-  data.tar.gz: d5ec6e469fa8caf1ab3bd89f284000bdf0a1a99ea5e076de92b3a9c6e03d46ee
+  metadata.gz: 29157476de970bf333e7ca643d49b79ef4e03cf0bf9e18aab8277767492aab3f
+  data.tar.gz: c25c23a411be47575be4c3d91e912c4d5b48b698423d302d8263a7ca0f1170f7
 SHA512:
-  metadata.gz: ee3c55767e033f381642b56af7b2b783598b818798d85b6106b3d7defcccb39a6942e2daa3a7abde0133f5e5664bd9927abee6549919d17e35ff52c89b04267e
-  data.tar.gz: c213c42ee4cd545bf81b9104f74449f15af44a947d5e546e4dfd2cde240c0cc0d468bf6b55b3cd94b22517c931922f97ef6f67c1f62445ee32e8df080172e812
+  metadata.gz: 32b74f669d2ec51717389c34e6ab113f1271ba05b84f3a9ac5a2e5e95da562ada8d2e7cb85ed78a8d4c80e14862e7658b15bf18b9933f0be4223933d80dcc0c2
+  data.tar.gz: af1f2bbbb802ebd84ccb239ea62e29b8bfdfb3a0947d0729a9e16caea8594b9bc224750085674b28c7448ff47f4fd8525830b8627ad5dab2f31f0c861d8dafcd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dor-workflow-client (7.0.2)
+    dor-workflow-client (7.2.0)
       activesupport (>= 3.2.1, < 8)
       deprecation (>= 0.99.0)
       faraday (~> 2.0)
@@ -12,7 +12,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.2)
+    activesupport (7.1.3.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -26,18 +26,18 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     base64 (0.2.0)
-    bigdecimal (3.1.5)
+    bigdecimal (3.1.7)
     byebug (11.1.3)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
-    crack (0.4.5)
+    crack (1.0.0)
+      bigdecimal
       rexml
     deprecation (1.1.0)
       activesupport
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     docile (1.4.0)
-    drb (2.2.0)
-      ruby2_keywords
+    drb (2.2.1)
     faraday (2.9.0)
       faraday-net_http (>= 2.0, < 3.2)
     faraday-net_http (3.1.0)
@@ -45,20 +45,20 @@ GEM
     faraday-retry (2.2.0)
       faraday (~> 2.0)
     hashdiff (1.1.0)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     json (2.7.1)
     language_server-protocol (3.17.0.3)
     mini_portile2 (2.8.5)
-    minitest (5.21.1)
+    minitest (5.22.3)
     mutex_m (0.2.0)
     net-http (0.4.1)
       uri
-    nokogiri (1.16.0)
+    nokogiri (1.16.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parallel (1.24.0)
-    parser (3.3.0.4)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
     public_suffix (5.0.4)
@@ -67,22 +67,22 @@ GEM
     rake (13.1.0)
     regexp_parser (2.9.0)
     rexml (3.2.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.60.0)
+    rubocop (1.62.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -90,23 +90,25 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.26.1)
+    rubocop-rspec (2.28.0)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
+      rubocop-rspec_rails (~> 2.28)
+    rubocop-rspec_rails (2.28.2)
+      rubocop (~> 1.40)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -117,12 +119,12 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
     uri (0.13.0)
-    webmock (3.19.1)
+    webmock (3.23.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    yard (0.9.34)
-    zeitwerk (2.6.12)
+    yard (0.9.36)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   ruby

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.0.2'
+      VERSION = '7.2.0'
     end
   end
 end

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

@@ -17,6 +17,7 @@ module Dor
           workflow['id']
         end
 
+        # Check if there are any processes for the provided version.
         # @param [Integer] version the version we are checking for.
         def active_for?(version:)
           result = ng_xml.at_xpath("/workflow/process[@version=#{version}]")
@@ -35,10 +36,16 @@ module Dor
           ng_xml.xpath('/workflow/process').empty?
         end
 
-        def complete?
+        # 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) }
         end
 
+        def complete?
+          complete_for?(version: version)
+        end
+
         attr_reader :xml
 
         private

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

@@ -61,6 +61,31 @@ RSpec.describe Dor::Workflow::Response::Workflow do
     end
   end
 
+  describe '#complete_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 true' do
+        expect(instance.complete_for?(version: 2)).to be true
+      end
+    end
+
+    context 'when some steps are not complete' do
+      it 'returns false' do
+        expect(instance.complete_for?(version: 1)).to be false
+      end
+    end
+  end
+
   describe '#active_for?' do
     subject { instance.active_for?(version: 2) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-workflow-client
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 7.2.0
 platform: ruby
 authors:
 - Willy Mene
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-16 00:00:00.000000000 Z
+date: 2024-04-02 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.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Provides convenience methods to work with the DOR Workflow Service