libis-workflow 2.0.14 → 2.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c25b53a55ca9a0c6aac68722bcb4968fd707df74
-  data.tar.gz: 0388ade78242e081673c20df700e3cb1cf6d4b85
+  metadata.gz: 00b61310a01954b0c05959bec7446bfcddcbb106
+  data.tar.gz: 9dd4d787573e40fb33a348e5a6936569660988cc
 SHA512:
-  metadata.gz: f3c7070a73796efccec423fd13558672af8da60e7242a209c787621624219182d3c1712ac03301950b334b6af9021f6e6a6cbadeefcedeef83522c18a46ac1d8
-  data.tar.gz: 8e163873cb9a8076f90f20476dec1910a72a8655fc14115d39ae18e5025b53462c51b16ee84a272bd921b8db753b55ecaf25f679aee306bbca3cace22861237e
+  metadata.gz: 00376fe9680c270c1b20fd85a96512480e3111a618213365b6f1c8a72785b69722c461b21ceef896f0f8df513377479e32656fdfb4cc969d63bcafe6edd411c9
+  data.tar.gz: 9e46ad09f53c12bc6385e3dc616f5b0a4f6f632d6ce1786b1969f6d01dc54d8f4647bd21b975868ac81fe470c4d30a4e6476d5ec4fdc8fe57ab7e206037c4766

data/lib/libis/workflow/status.rb

@@ -25,13 +25,18 @@ module Libis
       # @param [String] task namepath of the task
       # @param [Symbol] status status to set
       def set_status(task, status)
+        task = task.namepath if task.is_a?(Libis::Workflow::Task)
+        log_entry = self.status_entry(task)
         case status
           when :STARTED
-            self.add_status_log(task: task, status: status)
+            unless status(task) == :ASYNC_WAIT
+              log_entry = self.add_status_log('task' => task, 'status' => status, 'created' => DateTime.now)
+            end
           else
-            log_entry = status_entry(task) || self.add_status_log(task: task, status: status)
-            log_entry[:status] = status
+            log_entry ||= self.add_status_log('task' => task, 'status' => status, 'created' => DateTime.now)
         end
+        log_entry['status'] = status
+        log_entry['updated'] = DateTime.now
         self.save!
       end
 
@@ -40,8 +45,8 @@ module Libis
       # @param [String] task task name to check item status for
       # @return [Symbol] the status code
       def status(task = nil)
-        entry = status_entry(task)
-        status_symbol(entry[:status]) rescue :NOT_STARTED
+        entry = self.status_entry(task)
+        status_symbol(entry['status']) rescue :NOT_STARTED
       end
 
       # Get last known status text for a given task
@@ -49,8 +54,8 @@ module Libis
       # @param [String] task task name to check item status for
       # @return [Symbol] the status code
       def status_text(task = nil)
-        entry = status_entry(task)
-        status_string(entry[:status]) rescue STATUS_TEXT.first
+        entry = self.status_entry(task)
+        status_string(entry['status']) rescue STATUS_TEXT.first
       end
 
       # Gets the last known status label of the object.
@@ -59,7 +64,7 @@ module Libis
       # @return [String] status label ( = task name + status )
       def status_label(task = nil)
         entry = self.status_entry(task)
-        "#{entry[:task] rescue nil}#{entry[:status].capitalize rescue nil}"
+        "#{entry['task'] rescue nil}#{entry['status'].capitalize rescue nil}"
       end
 
       # Check status of the object.
@@ -86,8 +91,9 @@ module Libis
       def status_progress(task, progress = 0, max = nil)
         log_entry = self.status_entry(task)
         return nil unless log_entry
-        log_entry[:progress] = progress
-        log_entry[:max] = max if max
+        log_entry['progress'] = progress
+        log_entry['max'] = max if max
+        log_entry['updated'] = DateTime.now
         self.save!
       end
 
@@ -98,8 +104,9 @@ module Libis
       # @param [String] task task name to check item status for
       # @return [Hash] the status entry
       def status_entry(task = nil)
+        task = task.namepath if task.is_a?(Libis::Workflow::Task)
         return self.status_log.last if task.blank?
-        self.status_log.select { |entry| entry[:task] == task }.last
+        self.status_log.select { |entry| entry['task'] == task }.last
       end
 
       # Convert String, Symbol or Integer to correct symbol for the status.

data/lib/libis/workflow/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Workflow
-    VERSION = '2.0.14' unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
+    VERSION = '2.0.16' unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
   end
 end

data/lib/libis/workflow/work_item.rb

@@ -28,6 +28,7 @@ module Libis
       def add_status_log(info)
         # noinspection RubyResolve
         self.status_log << info
+        self.status_log.last
       end
 
     end

data/spec/workflow_spec.rb

@@ -131,7 +131,7 @@ STR
         {task: 'ProcessFiles/ChecksumTester', status: :DONE, progress: 1, max: 1},
         {task: 'ProcessFiles/CamelizeName', status: :DONE, progress: 1, max: 1},
     ].each_with_index do |h, i|
-      h.keys.each { |key| expect(run.status_log[i][key]).to eq h[key] }
+      h.keys.each { |key| expect(run.status_log[i][key.to_s]).to eq h[key] }
     end
 
     [
@@ -139,7 +139,7 @@ STR
         {task: 'ProcessFiles/ChecksumTester', status: :DONE, progress: 3, max: 3},
         {task: 'ProcessFiles/CamelizeName', status: :DONE, progress: 3, max: 3},
     ].each_with_index do |h, i|
-      h.keys.each { |key| expect(run.items.first.status_log[i][key]).to eq h[key] }
+      h.keys.each { |key| expect(run.items.first.status_log[i][key.to_s]).to eq h[key] }
     end
 
     [
@@ -147,7 +147,7 @@ STR
         {task: 'ProcessFiles/ChecksumTester', status: :DONE, progress: nil, max: nil},
         {task: 'ProcessFiles/CamelizeName', status: :DONE, progress: nil, max: nil},
     ].each_with_index do |h, i|
-      h.keys.each { |key| expect(run.items.first.first.status_log[i][key]).to eq h[key] }
+      h.keys.each { |key| expect(run.items.first.first.status_log[i][key.to_s]).to eq h[key] }
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow
 version: !ruby/object:Gem::Version
-  version: 2.0.14
+  version: 2.0.16
 platform: ruby
 authors:
 - Kris Dekeyser