libis-workflow-mongoid 2.0.12 → 2.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd3db3ee795224eb114f5dfd96a37aa9e8c29c77
-  data.tar.gz: 4f7bc7ddd64cb6d1ebd9b4f20a3a0d4549675626
+  metadata.gz: 7ff731d84990f95728323e0a6fdd1c7ddccfacd6
+  data.tar.gz: 3bfdf421a6ad400bef46584cf5d52dbe6c22d330
 SHA512:
-  metadata.gz: 3c4c79cc5ac6a543cf2a293c27911b8e90e1bb6bdb667326a0731f1a7f87bac2a972fb0ac399ff7303bc46d8a0576a12eab250ebfc1a2e30c301e60e25518f51
-  data.tar.gz: c6cc337fa3ae699abfef1bf25d4c7c062ee85d19b810b898e9d0e82fae2c85dd40e5eb22df74629507162b6d226885e95df93e3eabf41eb96adec2c9a064a851
+  metadata.gz: 8eac4a86f2b38c52699d951a1cb3037ad385a89fbab1aaf1280f8667bbcf9bd5dacb9476bcea87e9d56231a7bdade572bec7e140160a1d11c4b949dc04cb0ca9
+  data.tar.gz: a0e1206ac0063fc85ff9cf7f65e7500a01c11cbeefbc45f56be7f1ba0d6b7d4f2458ea16cac9f25c774f6d793738ce44b199c0a288048ac7282181c783b9bfcb

data/lib/libis/workflow/mongoid/base.rb

@@ -18,10 +18,10 @@ module Libis
 
             include ::Mongoid::Document
             include ::Mongoid::Timestamps::Created::Short
-            include ::Libis::Workflow::Mongoid::Sequence
-
-            field :_id, type: Integer, overwrite: true
-            sequence :_id
+            # include ::Libis::Workflow::Mongoid::Sequence
+            #
+            # field :_id, type: Integer, overwrite: true
+            # sequence :_id
             index({c_at: 1}, {name: 'by_created'})
 
           end

data/lib/libis/workflow/mongoid/log_entry.rb

@@ -17,14 +17,11 @@ module Libis
         field :task, type: String, default: ''
         field :code, type: Integer
         field :message, type: String
-        field :status, type: String
         field :run_id
 
         index({c_at: 1}, {name: 'by_created'})
         index({logger_type: 1, logger_id: 1, c_at: 1, }, {background: true, name: 'by_logger'})
         index({logger_type: 1, logger_id: 1, c_at: 1, task: 1}, {background: true, name: 'by_task'})
-        index({logger_type: 1, logger_id: 1, c_at: 1, status: 1}, {background: true, sparse: true, name: 'by_status'})
-        index({logger_type: 1, logger_id: 1, c_at: 1, task:1, status: 1}, {background: true, sparse: true, name: 'by_task_status'})
 
         belongs_to :logger, polymorphic: true
 

data/lib/libis/workflow/mongoid/status_entry.rb

@@ -0,0 +1,27 @@
+require 'libis-workflow'
+require 'libis/workflow/mongoid/base'
+
+require 'mongoid/extensions/time_with_zone'
+
+module Libis
+  module Workflow
+    module Mongoid
+
+      class StatusEntry
+        include ::Mongoid::Document
+        include ::Mongoid::Timestamps::Short
+
+        field :task, type: String
+        field :status, type: String, default: 'STARTED'
+        field :progress, type: Integer
+        field :max, type: Integer
+
+        index({c_at: 1}, {name: 'by_created'})
+        index({u_at: 1}, {name: 'by_updated'})
+
+        embedded_in :item, polymorphic: true
+      end
+
+    end
+  end
+end

data/lib/libis/workflow/mongoid/version.rb

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

data/lib/libis/workflow/mongoid/work_item.rb

@@ -17,28 +17,7 @@ module Libis
 
         index({_id: 1, _type: 1}, {unique: true, name: 'by_id'})
 
-        has_many :logs, as: :logger, class_name: Libis::Workflow::Mongoid::LogEntry.to_s,
-                 dependent: :destroy, autosave: true do
-          def log_history
-            where(:status.exists => false).order(c_at: 1)
-          end
-
-          def status_log(task = nil)
-            if task
-              where(:status.exists => true, task: task)
-            else
-              where(:status.exists => true)
-            end.order(c_at: 1)
-          end
-
-          def get_status(task = nil)
-            if task
-              where(:status.exists => true, task: task)
-            else
-              where(:status.exists => true)
-            end.order(c_at: -1).limit(1).first
-          end
-        end
+        embeds_many :status_log, as: :item, class_name: Libis::Workflow::Mongoid::StatusEntry.to_s
 
         has_many :items, as: :parent, class_name: Libis::Workflow::Mongoid::WorkItem.to_s,
                  dependent: :destroy, autosave: true, order: :c_at.asc
@@ -47,21 +26,6 @@ module Libis
 
         index({parent_id: 1, parent_type: 1, c_at: 1}, {name: 'by_parent'})
 
-        set_callback(:destroy, :before) do |document|
-          # noinspection RubyResolve
-          document.logs.each { |log| log.destroy! }
-        end
-
-        def log_history
-          # noinspection RubyResolve
-          self.logs.log_history.all || []
-        end
-
-        def status_log
-          # noinspection RubyResolve
-          self.logs.status_log.all || []
-        end
-
         def add_item(item)
           if item.parent
             item.parent = nil
@@ -73,6 +37,13 @@ module Libis
           self.items.to_a
         end
 
+        def status_progress(task, progress = 0, max = nil)
+          log_entry = status_entry(task)
+          log_entry ||= self.status_log.build(task: task)
+          log_entry[:progress] = progress
+          log_entry[:max] = max if max
+        end
+
         protected
 
         # Get last known status entry for a given task
@@ -81,17 +52,13 @@ module Libis
         # @param [String] task task name to check item status for
         # @return [Hash] the status entry
         def status_entry(task = nil)
-          self.logs.get_status(task)
-        end
-
-        def add_log_entry(msg)
-          # noinspection RubyResolve
-          self.logs.build(msg)
+          task.nil? ?
+            self.status_log.order_by(u_at: -1).first :
+            self.status_log.order_by(u_at: -1).where(task: task).first
         end
 
         def add_status_log(info)
-          # noinspection RubyResolve
-          self.logs.build(info)
+          self.status_log.build(info)
         end
 
       end

data/lib/libis/workflow/mongoid.rb

@@ -9,6 +9,7 @@ module Libis
       autoload :Base, 'libis/workflow/mongoid/base'
       autoload :Config, 'libis/workflow/mongoid/config'
       autoload :LogEntry, 'libis/workflow/mongoid/log_entry'
+      autoload :StatusEntry, 'libis/workflow/mongoid/status_entry'
       autoload :Job, 'libis/workflow/mongoid/job'
       autoload :WorkItem, 'libis/workflow/mongoid/work_item'
       autoload :Run, 'libis/workflow/mongoid/run'

data/spec/workflow_spec.rb

@@ -160,13 +160,9 @@ STR
 
     # puts output
 
-    expect(run.summary['DEBUG']).to eq 21
-    expect(run.log_history.count).to eq 13
-    expect(run.status_log.count).to eq 10
+    expect(run.status_log.count).to eq 5
     item = run.items.first
-    expect(item.log_history.count).to eq 15
-    expect(item.status_log.count).to eq 6
-    expect(item.summary['DEBUG']).to eq 15
+    expect(item.status_log.count).to eq 3
 
     expect(output.count).to eq sample_out.count
     output.each_with_index do |o, i|
@@ -212,7 +208,6 @@ STR
     expect(item.nil?).to eq false
     expect(item.is_a? TestDirItem).to eq true
     expect(item.properties['name']).to eq 'Items'
-    expect(item.properties['ingest_failed']).to eq false
   end
 
   it 'move item in relation' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow-mongoid
 version: !ruby/object:Gem::Version
-  version: 2.0.12
+  version: 2.0.13
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libis-workflow
@@ -118,6 +118,7 @@ files:
 - lib/libis/workflow/mongoid/log_entry.rb
 - lib/libis/workflow/mongoid/run.rb
 - lib/libis/workflow/mongoid/sequence.rb
+- lib/libis/workflow/mongoid/status_entry.rb
 - lib/libis/workflow/mongoid/version.rb
 - lib/libis/workflow/mongoid/work_item.rb
 - lib/libis/workflow/mongoid/worker.rb