dor-services 8.2.0 → 8.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55aca082954da26152f1a29b2212755d957a1d7fdf1d2dd87ff373555ab4d66e
-  data.tar.gz: ca157bb92f8dabe93a9d49e9d862f8cdfcaee9b7d59fe6510cfd8180b67cd19c
+  metadata.gz: 122c50609b2053d3b4083b985fcc128fd89726687a5bdf1230a4bbfafb55355f
+  data.tar.gz: 5c375fe22a648e6a697902a056b6752962cd78d7ecaa6c58d3b7c7049b1181fc
 SHA512:
-  metadata.gz: a4ca1272b55af9e0c828fa678d6a51a669f3614c72b367a51c2bf22ba29dc69ccc1ad44482756c704bca319b3b7decc47a7a44a24ef62457062b38975c472a3c
-  data.tar.gz: 609b3cb8a631c40979aea5e37086ed50550fd42d3ea1e3bede01b10942c01942b0fc2db86fcaaf893d7fb8ad9389c93c6be25abbe34acca042527c79ab19e96e
+  metadata.gz: 073f7a22dfe87e282a156ea6f1b14ad1971bafa79e29334d95da14a89c094b0c0e68f7b706519b0ea5d928de665383846c33563e8f4c98a6d9e7b291192c07aa
+  data.tar.gz: 8c5424ada3a28d7acee8061d398a436f8cc9b214a299d40e4ad15a8337967ff176f5a376b59eed55239a0e412c0f99ef0870b3865e515627fd2a12f655bfe338

data/lib/dor/datastreams/geo_metadata_ds.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'scanf'
 require 'uri'
 
 module Dor

data/lib/dor/indexers/workflow_indexer.rb

@@ -20,17 +20,18 @@ module Dor
       WorkflowSolrDocument.new do |solr_doc|
         definition = Dor::Config.workflow.client.workflow_template(workflow_name)
         solr_doc.name = workflow_name
-        processes_names = definition['processes'].map { |p| p['name'] }
+        definition_process_names = definition['processes'].map { |p| p['name'] }
 
         errors = 0 # The error count is used by the Report class in Argo
-        processes = processes_names.map do |process_name|
+        processes = definition_process_names.map do |process_name|
           workflow.process_for_recent_version(name: process_name)
         end
+
         processes.each do |process|
           index_process(solr_doc, process)
           errors += 1 if process.status == 'error'
         end
-        solr_doc.status = [workflow_name, workflow_status(processes), errors, repository].join('|')
+        solr_doc.status = [workflow_name, workflow_status(workflow), errors, repository].join('|')
       end
     end
 
@@ -62,14 +63,8 @@ module Dor
       process.datetime && process.status && (process.status == 'completed' || process.status == 'error')
     end
 
-    def workflow_status(processes)
-      return 'empty' if processes.empty?
-
-      workflow_should_show_completed?(processes) ? 'completed' : 'active'
-    end
-
-    def workflow_should_show_completed?(processes)
-      processes.all? { |p| %w[skipped completed].include?(p.status) }
+    def workflow_status(workflow)
+      workflow.complete? ? 'completed' : 'active'
     end
 
     # index the error message without the druid so we hopefully get some overlap

data/lib/dor/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 8.2.0
+  version: 8.3.0
 platform: ruby
 authors:
 - Michael Klein
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-20 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -240,14 +240,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: druid-tools
   requirement: !ruby/object:Gem::Requirement