libis-workflow-mongoid 2.0.13 → 2.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ff731d84990f95728323e0a6fdd1c7ddccfacd6
-  data.tar.gz: 3bfdf421a6ad400bef46584cf5d52dbe6c22d330
+  metadata.gz: b3ff5f51a5e475651b8d8ad4c994ba59a6cd2e92
+  data.tar.gz: 5ec123c0adb36feeef0772b0a577565b81093c3a
 SHA512:
-  metadata.gz: 8eac4a86f2b38c52699d951a1cb3037ad385a89fbab1aaf1280f8667bbcf9bd5dacb9476bcea87e9d56231a7bdade572bec7e140160a1d11c4b949dc04cb0ca9
-  data.tar.gz: a0e1206ac0063fc85ff9cf7f65e7500a01c11cbeefbc45f56be7f1ba0d6b7d4f2458ea16cac9f25c774f6d793738ce44b199c0a288048ac7282181c783b9bfcb
+  metadata.gz: 77b1a1f1d3c860ccf8682f369e528b404a5a6faef9309cafe92ad8ddd0f95e28780a3dfce6bdbca9c257426230d111e396c950fe0ac5750e2b1d7bc4eb931f71
+  data.tar.gz: 4b8ed290d124e27db2676c62bda5a324e4a1ccd744275a05720ec3492ad40755f6afa0a5fb0e17e815662d42cd42e1cf3b0d4739b6f3111f5de9a21f8151a1ff

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

@@ -9,15 +9,16 @@ module Libis
 
       class StatusEntry
         include ::Mongoid::Document
-        include ::Mongoid::Timestamps::Short
 
         field :task, type: String
+        field :created, type: DateTime, default: -> { DateTime.now }
+        field :updated, type: DateTime
         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'})
+        index({created: 1}, {name: 'by_created'})
+        index({updated: 1}, {name: 'by_updated'})
 
         embedded_in :item, polymorphic: true
       end

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

@@ -1,7 +1,7 @@
 module Libis
   module Workflow
     module Mongoid
-      VERSION = '2.0.13' unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
+      VERSION = '2.0.15' 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

@@ -14,11 +14,10 @@ module Libis
         field :options, type: Hash, default: -> { Hash.new }
         field :properties, type: Hash, default: -> { Hash.new }
         field :summary, type: Hash, default: -> { Hash.new }
+        field :status_log, type: Array, default: -> { Array.new }
 
         index({_id: 1, _type: 1}, {unique: true, name: 'by_id'})
 
-        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
 
@@ -37,28 +36,12 @@ 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
-        #
-        # In the Mongid storage, we retrieve the status log in date descending order, so we retrieve the first item.
-        # @param [String] task task name to check item status for
-        # @return [Hash] the status entry
-        def status_entry(task = nil)
-          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)
-          self.status_log.build(info)
+          # noinspection RubyResolve
+          self.status_log << info
+          self.status_log.last
         end
 
       end

data/lib/libis/workflow/mongoid.rb

@@ -8,7 +8,6 @@ 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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow-mongoid
 version: !ruby/object:Gem::Version
-  version: 2.0.13
+  version: 2.0.15
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libis-workflow
@@ -115,7 +115,6 @@ files:
 - lib/libis/workflow/mongoid/config.rb
 - lib/libis/workflow/mongoid/dynamic.rb
 - lib/libis/workflow/mongoid/job.rb
-- 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

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

@@ -1,32 +0,0 @@
-require 'libis-workflow'
-require 'libis/workflow/mongoid/base'
-
-require 'mongoid/extensions/time_with_zone'
-
-module Libis
-  module Workflow
-    module Mongoid
-
-      class LogEntry
-        include ::Mongoid::Document
-        include ::Mongoid::Timestamps::Created::Short
-
-        store_in collection: 'log'
-
-        field :severity, type: String
-        field :task, type: String, default: ''
-        field :code, type: Integer
-        field :message, 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'})
-
-        belongs_to :logger, polymorphic: true
-
-      end
-
-    end
-  end
-end