dor-workflow-client 3.19.0 → 3.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fdb8fc01a2ed982c1fd0e0d2e0aaaf58e9ac4dd89171c879c491fccaf02a83d
-  data.tar.gz: 50503e224f5c8c0e23cd9111de9c889b0f2773697a9acc1eb5985d8bca916111
+  metadata.gz: 5eef64675c5a37fb89ea5f7a522c85dfa8a6e426418f4af515f73719a6812a28
+  data.tar.gz: 32162d0b34a328cc2d42414bac647db71f5e14425c223cf0c22b9dc37b2a71a4
 SHA512:
-  metadata.gz: ed1e22bad5aebd865bff1c03ab340b37a73eb7b4d6671436ad4fa2b5375c68667deb26fdd630800dad6d1392a4f27877c9c32611e54495947488f0d7ad0ab0de
-  data.tar.gz: 604a0981194c0d857b93ddc7925a3c4036eb560141e1ba61226367e8324ee26206cd92f2abe61ce6710ac89493c1ce563d001e64bc206605aad6af25544ad652
+  metadata.gz: 804ed21db035008f7ce28ec81491fcc3d2f8d72c7c06f4874ffe74431d8b5b59ffc3f860a31847456644b428a57c1b0352681c7046b622ff9e72bfab8d02125e
+  data.tar.gz: d76a0c12b6570130d4adf11980fd1cbd80df8336c9d00b960b03d4ff0c75b46812a8a18e1527cd8df82b55a63ab12bbb6564e5b2156332b50dbc7daa4f1bcb64

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

@@ -42,32 +42,38 @@ module Dor
         end
 
         # @return [Hash{Symbol => Object}] including :status_code and :status_time
+        # rubocop:disable Metrics/MethodLength
         def info
-          # if we have an accessioned milestone, this is the last possible step and should be the status regardless of time stamp
-          accessioned_milestones = current_milestones.select { |m| m[:milestone] == 'accessioned' }
-          return { status_code: STEPS['accessioned'], status_time: accessioned_milestones.last[:at].utc.xmlschema } unless accessioned_milestones.empty?
-
-          status_code = 0
-          status_time = nil
-          # for each milestone in the current version, see if it comes at the same time or after the current 'last' step, if so, make it the last and record the date/time
-          current_milestones.each do |m|
-            m_name = m[:milestone]
-            m_time = m[:at].utc.xmlschema
-            next unless STEPS.key?(m_name) && (!status_time || m_time >= status_time)
-
-            status_code = STEPS[m_name]
-            status_time = m_time
+          @info ||= begin
+            # if we have an accessioned milestone, this is the last possible step and should be the status regardless of time stamp
+            accessioned_milestones = current_milestones.select { |m| m[:milestone] == 'accessioned' }
+            return { status_code: STEPS['accessioned'], status_time: accessioned_milestones.last[:at].utc.xmlschema } unless accessioned_milestones.empty?
+
+            status_code = 0
+            status_time = nil
+            # for each milestone in the current version, see if it comes at the same time or after the current 'last' step, if so, make it the last and record the date/time
+            current_milestones.each do |m|
+              m_name = m[:milestone]
+              m_time = m[:at].utc.xmlschema
+              next unless STEPS.key?(m_name) && (!status_time || m_time >= status_time)
+
+              status_code = STEPS[m_name]
+              status_time = m_time
+            end
+
+            { status_code: status_code, status_time: status_time }
           end
+        end
+        # rubocop:enable Metrics/MethodLength
 
-          { status_code: status_code, status_time: status_time }
+        def status_code
+          info.fetch(:status_code)
         end
 
         # @param [Boolean] include_time
         # @return [String] single composed status from status_info
         def display(include_time: false)
-          status_info_hash = info
-          status_code = status_info_hash[:status_code]
-          status_time = status_info_hash[:status_time]
+          status_time = info[:status_time]
 
           # use the translation table to get the appropriate verbage for the latest step
           result = "v#{version} #{STATUS_CODE_DISP_TXT[status_code]}"
@@ -75,6 +81,10 @@ module Dor
           result
         end
 
+        def display_simplified
+          simplified_status_code(STATUS_CODE_DISP_TXT[status_code])
+        end
+
         def milestones
           @milestones ||= lifecycle_routes.milestones('dor', druid)
         end
@@ -83,6 +93,12 @@ module Dor
 
         attr_reader :druid, :version, :lifecycle_routes
 
+        # @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'
+        def simplified_status_code(display)
+          display.gsub(/\(.*\)$/, '').strip
+        end
+
         def current_milestones
           current = []
           # only get steps that are part of accessioning and part of the current version. That can mean they were archived with the current version

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

@@ -3,7 +3,7 @@
 module Dor
   module Workflow
     class Client
-      VERSION = '3.19.0'
+      VERSION = '3.20.0'
     end
   end
 end

data/spec/workflow/client/status_spec.rb

@@ -14,12 +14,6 @@ RSpec.describe Dor::Workflow::Client::Status do
   describe '#display' do
     subject(:status) { instance.display }
 
-    before do
-      # TODO: this stub is too knowledgable about the inner workings of the LifecycleRoutest
-      # instead it should just stub :milestones which returns an array of hashes
-      # expect(lifecycle_routes).to receive(:query_lifecycle).and_return(xml)
-    end
-
     context 'for gv054hp4128' do
       context 'when current version is published, but does not have a version attribute' do
         let(:xml) do
@@ -178,4 +172,23 @@ RSpec.describe Dor::Workflow::Client::Status do
       end
     end
   end
+
+  describe '#display_simplified' do
+    subject(:status) { instance.display_simplified }
+    let(:xml) do
+      '<?xml version="1.0" encoding="UTF-8"?>
+      <lifecycle objectId="druid:gv054hp4128">
+      <milestone date="2012-11-06T16:19:15-0800" version="2">described</milestone>
+      <milestone date="2012-11-06T16:21:02-0800">opened</milestone>
+      <milestone date="2012-11-06T16:30:03-0800">submitted</milestone>
+      <milestone date="2012-11-06T16:35:00-0800">described</milestone>
+      <milestone date="2012-11-06T16:59:39-0800" version="3">published</milestone>
+      <milestone date="2012-11-06T16:59:39-0800">published</milestone>
+      </lifecycle>'
+    end
+
+    it 'generates a status string' do
+      expect(status).to eq('In accessioning')
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-workflow-client
 version: !ruby/object:Gem::Version
-  version: 3.19.0
+  version: 3.20.0
 platform: ruby
 authors:
 - Willy Mene
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport