libis-workflow-mongoid 2.0.beta.8 → 2.0.beta.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfa94b307591f08d69fad83f79bf8807c56037fd
-  data.tar.gz: d484aa41a3da41c6d6c282b073231b17faa6948d
+  metadata.gz: 72052cd9486d8810a3435fffb93cec07183a3660
+  data.tar.gz: 3599ae44df1eec26ff057e6c8f41d3e31aba8acb
 SHA512:
-  metadata.gz: 70bf6048529e08dc5cf543788af85d9a8fcea6d36c90ad16d5a6b41c11644abbd38de87557a8d7ae3ae4aa8826de16298d6197811a92a065e7fb302cf2ac506f
-  data.tar.gz: 8cde72beefe397820d0eed41c70218469f93523712ab12c8beff27b89c685105279229ae2f71af635a7023b8589f59a34954314b2c0b707f0dd82f7411633d2e
+  metadata.gz: 4ca524054dd5a6224d420bd4669ccc2d4d6b712bbf067083b2fa4fb5b58463e343a0e13a4f8dba1a17a68f3dce7d1ae9839467b858aaba71000a320032acb598
+  data.tar.gz: 75cf33dad01233954473c2fc2584dbc972f74b0779a62795b6caa1b0f01ce0bb93a6e456cfa91c47c6dc5d469def6937fe00c2afa896bdb2db0ea8348947b213

data/.travis.yml

@@ -1,34 +1,33 @@
 language: ruby
+sudo: false
+bundler_args: --without development
 cache: bundler
-branches:
-  only:
-    - master
 rvm:
-  - 1.9.3
   - 2.1.0
+  - 2.2.0
   - ruby-head
-  - jruby-19mode
+  - jruby-9.0.1.0
 jdk:
   - openjdk7
   - oraclejdk7
   - oraclejdk8
-env:
-  - MONGOID_VERSION=3
-  - MONGOID_VERSION=4
 matrix:
   exclude:
-    - rvm: 1.9.3
-      jdk: oraclejdk7
-    - rvm: 1.9.3
-      jdk: oraclejdk8
     - rvm: 2.1.0
       jdk: oraclejdk7
     - rvm: 2.1.0
       jdk: oraclejdk8
+    - rvm: 2.2.0
+      jdk: oraclejdk7
+    - rvm: 2.2.0
+      jdk: oraclejdk8
     - rvm: ruby-head
       jdk: oraclejdk7
     - rvm: ruby-head
       jdk: oraclejdk8
+branches:
+  only:
+      - master
 services:
   - mongodb
 before_script: ./.travis/db_prepare.sh

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

@@ -13,14 +13,31 @@ module Libis
         def self.included(klass)
           klass.class_eval do
             include ::Mongoid::Document
+            include ::Mongoid::Timestamps::Created::Short
             include ::Mongoid::Extensions::Hash::IndifferentAccess
             include ::Libis::Workflow::Mongoid::Sequence
-            field :_id, type: Integer
+            field :_id, type: Integer, overwrite: true
             sequence :_id
-            index created_at: 1
+            index c_at: 1
           end
         end
 
+        def dup
+          new_obj = self.class.new
+          new_obj.copy_attributes(self)
+        end
+
+        def copy_attributes(other)
+          self.set(
+              other.attributes.reject do |k, _|
+                %W(_id c_at).include? k.to_s
+              end.each_with_object({}) do |(k, v), h|
+                h[k] = v.duplicable? ? v.dup : v
+              end
+          )
+          self
+        end
+
       end
 
     end

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

@@ -19,6 +19,7 @@ module Libis
 
       Config.send(:define_method, :database_connect) do |config_file = './mongoid.yml', environment = nil|
         ::Mongoid.load! config_file, environment
+        ::Mongo::Logger.logger.level = Logger::ERROR
       end
 
     end

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

@@ -0,0 +1,28 @@
+# encoding: utf-8
+require 'libis-workflow'
+require 'libis/workflow/mongoid/base'
+
+require 'mongoid/extensions/time_with_zone'
+
+module Libis
+  module Workflow
+    module Mongoid
+
+      class LogEntry
+        include Libis::Workflow::Mongoid::Base
+
+        store_in collection: 'log'
+
+        field :severity, type: String
+        field :task, type: String, default: '*UNKNOWN*'
+        field :code, type: Integer
+        field :message, type: String
+        field :status, type: String
+
+        belongs_to :logger, polymorphic: true
+
+      end
+
+    end
+  end
+end

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

@@ -18,13 +18,18 @@ module Libis
 
             store_in collection: 'workflow_runs'
 
-            attr_accessor :tasks
-
             field :start_date, type: Time, default: -> { Time.now }
 
+            # def destroy
+            #   self.items.each { |item| item.destroy }
+            #   FileUtils.rmtree(work_dir) if Dir.exist?(work_dir)
+            #   super
+            # end
+
             set_callback(:destroy, :before) do |document|
               wd = document.work_dir
               FileUtils.rmtree wd if Dir.exist? wd
+              document.items.each { |item| item.destroy! }
             end
 
             index start_date: 1
@@ -35,7 +40,7 @@ module Libis
 
             def klass.item_class(item_klass)
               has_many :items, inverse_of: :run, class_name: item_klass.to_s,
-                       dependent: :destroy, autosave: true, order: :created_at.asc
+                       dependent: :destroy, autosave: true, order: :c_at.asc
             end
           end
         end

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

@@ -27,7 +27,8 @@ module Libis
                 default: lambda {
                   self.class.set_from_sequence(_field, prefix)
                 },
-                pre_processed: false
+                pre_processed: false,
+                overwrite: true
             )
             (options.keys - ::Mongoid::Fields::Validators::Macro::OPTIONS).each { |key| options.delete key }
             field(_field, options)
@@ -58,11 +59,15 @@ module Libis
 
           def sequences
             # mongo_session["#{self.collection_name.to_s}__seq"]
-            mongo_session["__sequences__"]
+            mongo_client["__sequences__"]
           end
 
           def seq_upsert(counter_id, change)
-            sequences.where(_id: counter_id).modify(change, upsert: true, new: true)
+            sequences.find_one_and_update({_id: counter_id},
+                                          change,
+                                          upsert: true,
+                                          return_document: :after
+            )
           end
 
         end

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

@@ -3,7 +3,7 @@
 module Libis
   module Workflow
     module Mongoid
-      VERSION = '2.0.beta.8' unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
+      VERSION = '2.0.beta.10' 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,24 +14,30 @@ module Libis
             store_in collection: 'workflow_items'
 
             has_many :items, inverse_of: :parent, class_name: klass.to_s,
-                     dependent: :destroy, autosave: true, order: :created_at.asc
+                     dependent: :destroy, autosave: true, order: :_id.asc
             belongs_to :parent, inverse_of: :items, class_name: klass.to_s
 
+            # def destroy
+            #   self.items.each { |item| item.destroy! }
+            #   super
+            # end
+            set_callback(:destroy, :before) do |document|
+              document.items.each { |item| item.destroy! }
+            end
+
             def klass.run_class(run_klass)
               belongs_to :run, inverse_of: :items, class_name: run_klass.to_s
             end
 
-
           end
         end
 
-        def parent
+        def get_parent
           self[:parent] || self[:run]
         end
 
         def get_run
-          p = self[:parent]
-          p ? p.get_run : self[:run]
+          self[:run] || self[:parent].get_run
         end
 
         def get_root

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

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require 'libis-workflow'
-require 'libis/workflow/mongoid/base'
 
 module Libis
   module Workflow
@@ -10,14 +9,32 @@ module Libis
 
         def self.included(klass)
           klass.class_eval do
-            include Libis::Workflow::WorkItem
+            include ::Libis::Workflow::Base::WorkItem
             include Libis::Workflow::Mongoid::Base
 
             field :options, type: Hash, default: -> { Hash.new }
             field :properties, type: Hash, default: -> { Hash.new }
 
-            field :log_history, type: Array, default: -> { Array.new }
-            field :status_log, type: Array, default: -> { Array.new }
+            has_many :logs, as: :logger, class_name: 'Libis::Workflow::Mongoid::LogEntry',
+                     dependent: :destroy, autosave: true, order: :_id.asc do
+              def log_history
+                where(:status.exists => false)
+              end
+
+              def status_log
+                where(:status.exists => true)
+              end
+            end
+
+            # def destroy
+            #   # noinspection RubyResolve
+            #   self.logs.each { |log| log.destroy }
+            # end
+
+            set_callback(:destroy, :before) do |document|
+              # noinspection RubyResolve
+              document.logs.each { |log| log.destroy! }
+            end
 
             field :summary, type: Hash, default: -> { Hash.new }
           end
@@ -37,6 +54,35 @@ module Libis
 
         alias :<< :add_item
 
+        def log_history
+          # noinspection RubyResolve
+          self.logs.log_history.all || []
+        end
+
+        def status_log
+          # noinspection RubyResolve
+          self.logs.status_log.all || []
+        end
+
+        protected
+
+        def add_log_entry(msg)
+          # noinspection RubyResolve
+          self.logs.build(msg)
+        end
+
+        def add_status_log(message, tasklist = nil)
+          # noinspection RubyResolve
+          self.logs.build(
+              task: (tasklist.join('/') rescue nil),
+              status: message
+          )
+        end
+
+        def status_label(status_entry)
+          "#{status_entry[:task].split('/').last rescue nil}#{status_entry[:status] rescue nil}"
+        end
+
       end
 
     end

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

@@ -2,6 +2,7 @@
 
 require 'libis/workflow/base/workflow'
 require 'libis/workflow/mongoid/base'
+require 'libis/tools/config_file'
 
 module Libis
   module Workflow
@@ -27,6 +28,15 @@ module Libis
                        dependent: :destroy, autosave: true, order: :created_at.asc
             end
 
+            def klass.load(file_or_hash)
+              config = Libis::Tools::ConfigFile.new
+              config << file_or_hash
+              return nil if config.empty?
+              workflow = self.new
+              workflow.configure(config.to_h)
+              workflow
+            end
+
             def create_run_object
               # noinspection RubyResolve
               self.workflow_runs.build

data/lib/libis/workflow/mongoid.rb

@@ -8,12 +8,14 @@ module Libis
   module Workflow
     module Mongoid
 
-      autoload :Config, 'libis/workflow/mongoid/config'
       autoload :Base, 'libis/workflow/mongoid/base'
-      autoload :Workflow, 'libis/workflow/mongoid/workflow'
-      autoload :WorkItem, 'libis/workflow/mongoid/work_item'
+      autoload :Config, 'libis/workflow/mongoid/config'
+      autoload :LogEntry, 'libis/workflow/mongoid/log_entry'
       autoload :Run, 'libis/workflow/mongoid/run'
+      autoload :WorkItem, 'libis/workflow/mongoid/work_item'
+      autoload :WorkItemBase, 'libis/workflow/mongoid/work_item_base'
       autoload :Worker, 'libis/workflow/mongoid/worker'
+      autoload :Workflow, 'libis/workflow/mongoid/workflow'
 
       def self.configure
         yield ::Libis::Workflow::Mongoid::Config.instance

data/libis-workflow-mongoid.gemspec

@@ -5,9 +5,6 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'libis/workflow/mongoid/version'
 
-mv_env = ENV['MONGOID_VERSION'] || '4.0'
-mongoid_version = mv_env == 'master' ? '{github: "mongoid/mongoid"}' : "~> #{mv_env}"
-
 Gem::Specification.new do |gem|
   gem.name = 'libis-workflow-mongoid'
   gem.version = ::Libis::Workflow::Mongoid::VERSION
@@ -28,13 +25,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_runtime_dependency 'libis-workflow', '~> 2.0.beta'
-  gem.add_runtime_dependency 'mongoid', mongoid_version
+  gem.add_runtime_dependency 'mongoid', '~> 5.0'
   gem.add_runtime_dependency 'mongoid-indifferent-access'
-
   gem.add_runtime_dependency 'sidekiq'
-  if mv_env =~ /^3\./
-    gem.add_runtime_dependency 'kiqstand'
-  end
 
   gem.add_development_dependency 'bundler', '~> 1.6'
   gem.add_development_dependency 'rake'

data/mongoid.yml

@@ -1,19 +1,127 @@
 # Mongoid Configuration for Travis CI
 # ===================================
 
-default:
-
 test:
-  options:
-    include_type_for_serialization: true
-    include_root_in_json: false
-    preload_models: false
-    raise_not_found_error: false
-    scope_overwrite_exception: true
-    use_activesupport_time_zone: true
-    use_utc: false
-  sessions:
+  # Configure available database clients. (required)
+  clients:
+    # Defines the default client. (required)
     default:
+      # Defines the name of the default database that Mongoid can connect to.
+      # (required).
       database: workflow_test
+      # Provides the hosts the default client can connect to. Must be an array
+      # of host:port pairs. (required)
       hosts:
         - localhost:27017
+      options:
+        # Change the default write concern. (default = { w: 1 })
+        #write:
+        #  w: 1
+
+        # Change the default read preference. Valid options for mode are: :secondary,
+        # :secondary_preferred, :primary, :primary_preferred, :nearest
+        # (default: primary)
+        #read:
+        #  mode: :secondary_preferred
+
+        # The name of the user for authentication.
+        #user: 'user'
+
+        # The password of the user for authentication.
+        #password: 'password'
+
+        # The user's database roles.
+        #roles:
+        #  - 'dbOwner'
+
+        # Change the default authentication mechanism. Valid options are: :scram,
+        # :mongodb_cr, :mongodb_x509, and :plain. (default on 3.0 is :scram, default
+        # on 2.4 and 2.6 is :plain)
+        #auth_mech: :scram
+
+        # The database or source to authenticate the user against. (default: admin)
+        #auth_source: admin
+
+        # Force a the driver cluster to behave in a certain manner instead of auto-
+        # discovering. Can be one of: :direct, :replica_set, :sharded. Set to :direct
+        # when connecting to hidden members of a replica set.
+        #connect: :direct
+
+        # Changes the default time in seconds the server monitors refresh their status
+        # via ismaster commands. (default: 10)
+        #heartbeat_frequency: 10
+
+        # The time in seconds for selecting servers for a near read preference. (default: 5)
+        #local_threshold: 5
+
+        # The timeout in seconds for selecting a server for an operation. (default: 30)
+        #server_selection_timeout: 30
+
+        # The maximum number of connections in the connection pool. (default: 5)
+        #max_pool_size: 5
+
+        # The minimum number of connections in the connection pool. (default: 1)
+        #min_pool_size: 1
+
+        # The time to wait, in seconds, in the connection pool for a connection
+        # to be checked in before timing out. (default: 5)
+        #wait_queue_timeout: 5
+
+        # The time to wait to establish a connection before timing out, in seconds.
+        # (default: 5)
+        #connect_timeout: 5
+
+        # The timeout to wait to execute operations on a socket before raising an error.
+        # (default: 5)
+        #socket_timeout: 5
+
+        # The name of the replica set to connect to. Servers provided as seeds that do
+        # not belong to this replica set will be ignored.
+        #replica_set: my_replica_set
+
+        # Whether to connect to the servers via ssl. (default: false)
+        #ssl: true
+
+        # The certificate file used to identify the connection against MongoDB.
+        #ssl_cert: /path/to/my.cert
+
+        # The private keyfile used to identify the connection against MongoDB.
+        # Note that even if the key is stored in the same file as the certificate,
+        # both need to be explicitly specified.
+        #ssl_key: /path/to/my.key
+
+        # A passphrase for the private key.
+        #ssl_key_pass_phrase: password
+
+        # Whether or not to do peer certification validation. (default: false)
+        #ssl_verify: true
+
+        # The file containing a set of concatenated certification authority certifications
+        # used to validate certs passed from the other end of the connection.
+        #ssl_ca_cert: /path/to/ca.cert
+
+  # Configure Mongoid specific options. (optional)
+  options:
+    # Includes the root model name in json serialization. (default: false)
+    #include_root_in_json: false
+
+    # Include the _type field in serialization. (default: false)
+    include_type_for_serialization: true
+
+    # Preload all models in development, needed when models use
+    # inheritance. (default: false)
+    #preload_models: false
+
+    # Raise an error when performing a #find and the document is not found.
+    # (default: true)
+    raise_not_found_error: false
+
+    # Raise an error when defining a scope with the same name as an
+    # existing method. (default: false)
+    scope_overwrite_exception: true
+
+    # Use Active Support's time zone in conversions. (default: true)
+    #use_activesupport_time_zone: true
+
+    # Ensure all times are UTC in the app side. (default: false)
+    #use_utc: false

data/spec/items/test_dir_item.rb

@@ -1,8 +1,9 @@
 # encoding: utf-8
+require 'libis/workflow'
 require_relative 'test_item'
 
 class TestDirItem < TestItem
-  include ::Libis::Workflow::DirItem
+  include ::Libis::Workflow::Base::DirItem
 
   def name=(dir)
     raise RuntimeError, "'#{dir}' is not a directory" unless File.directory? dir

data/spec/items/test_file_item.rb

@@ -1,10 +1,11 @@
 # encoding: utf-8
 require 'libis-tools'
+require 'libis-workflow'
 
 require_relative 'test_item'
 
 class TestFileItem < TestItem
-  include ::Libis::Workflow::FileItem
+  include ::Libis::Workflow::Base::FileItem
 
   def filename=(file)
     raise RuntimeError, "'#{file}' is not a file" unless File.file? file

data/spec/tasks/camelize_name.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 require 'backports/rails/string'
-
-require 'libis/workflow/workitems'
+require 'libis-workflow'
 
 class CamelizeName < ::Libis::Workflow::Task
 

data/spec/tasks/checksum_tester.rb

@@ -2,7 +2,7 @@
 require 'libis/tools/checksum'
 
 require 'libis/exceptions'
-require 'libis/workflow/workitems'
+require 'libis-workflow'
 
 class ChecksumTester < ::Libis::Workflow::Task
 

data/spec/workflow_spec.rb

@@ -13,11 +13,10 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 describe 'TestWorkflow' do
 
-  let(:dirname) { File.absolute_path(File.join(File.dirname(__FILE__), 'items')) }
+  before(:context) do
+    @dirname = File.absolute_path(File.join(File.dirname(__FILE__), 'items'))
+    @logoutput = StringIO.new
 
-  let(:logoutput) { StringIO.new }
-
-  let(:workflow) {
     # noinspection RubyResolve
     ::Libis::Workflow::Mongoid.configure do |cfg|
       cfg.itemdir = File.join(File.dirname(__FILE__), 'items')
@@ -34,10 +33,8 @@ describe 'TestWorkflow' do
     TestFileItem.create_indexes
     TestDirItem.create_indexes
 
-    TestWorkflow.each { |wf| wf.destroy }
-
-    workflow = TestWorkflow.new
-    workflow.configure(
+    @workflow = TestWorkflow.find_or_initialize_by(name: 'TestWorkflow')
+    @workflow.configure(
         name: 'TestWorkflow',
         description: 'Workflow for testing',
         tasks: [
@@ -56,14 +53,17 @@ describe 'TestWorkflow' do
             checksum_type: {default: 'SHA1', propagate_to: 'ProcessFiles/ChecksumTester'}
         }
     )
-    workflow.save
-    workflow
-  }
+    # noinspection RubyResolve
+    @workflow.workflow_runs.each { |run| run.destroy! }
+    @workflow.save
+    @run = @workflow.run(dirname: dirname, checksum_type: 'SHA256')
+
+  end
 
-  let(:run) {
-    # noinspection RubyStringKeysInHashInspection
-    workflow.run(dirname: dirname, checksum_type: 'SHA256')
-  }
+  def dirname; @dirname; end
+  def logoutput; @logoutput; end
+  def workflow; @workflow; end
+  def run; @run; end
 
   it 'should contain three tasks' do
 
@@ -88,70 +88,37 @@ describe 'TestWorkflow' do
 
   it 'should return expected debug output' do
 
-    expect(run.summary['DEBUG']).to eq 57
-    expect(run.log_history.count).to eq 8
+    expect(run.summary[:DEBUG]).to eq 21
+    expect(run.log_history.count).to eq 4
     expect(run.status_log.count).to eq 6
-    expect(run.items.first.log_history.count).to eq 25
-    expect(run.items.first.status_log.count).to eq 8
+    item = run.items.first
+    expect(item.log_history.count).to eq 17
+    expect(item.status_log.count).to eq 8
+    expect(item.summary[:DEBUG]).to eq 17
+
 
     sample_out = <<STR
-DEBUG -- CollectFiles - TestRun : Started
 DEBUG -- CollectFiles - TestRun : Processing subitem (1/1): items
-DEBUG -- CollectFiles - items : Started
 DEBUG -- CollectFiles - items : Processing subitem (1/4): test_dir_item.rb
-DEBUG -- CollectFiles - items/test_dir_item.rb : Started
-DEBUG -- CollectFiles - items/test_dir_item.rb : Completed
 DEBUG -- CollectFiles - items : Processing subitem (2/4): test_file_item.rb
-DEBUG -- CollectFiles - items/test_file_item.rb : Started
-DEBUG -- CollectFiles - items/test_file_item.rb : Completed
 DEBUG -- CollectFiles - items : Processing subitem (3/4): test_item.rb
-DEBUG -- CollectFiles - items/test_item.rb : Started
-DEBUG -- CollectFiles - items/test_item.rb : Completed
 DEBUG -- CollectFiles - items : Processing subitem (4/4): test_run.rb
-DEBUG -- CollectFiles - items/test_run.rb : Started
-DEBUG -- CollectFiles - items/test_run.rb : Completed
 DEBUG -- CollectFiles - items : 4 of 4 subitems passed
-DEBUG -- CollectFiles - items : Completed
 DEBUG -- CollectFiles - TestRun : 1 of 1 subitems passed
-DEBUG -- CollectFiles - TestRun : Completed
-DEBUG -- ProcessFiles - TestRun : Started
 DEBUG -- ProcessFiles - TestRun : Processing subitem (1/1): items
-DEBUG -- ProcessFiles - items : Started
 DEBUG -- ProcessFiles - items : Running subtask (1/2): ChecksumTester
-DEBUG -- ProcessFiles/ChecksumTester - items : Started
 DEBUG -- ProcessFiles/ChecksumTester - items : Processing subitem (1/4): test_dir_item.rb
-DEBUG -- ProcessFiles/ChecksumTester - items/test_dir_item.rb : Started
-DEBUG -- ProcessFiles/ChecksumTester - items/test_dir_item.rb : Completed
 DEBUG -- ProcessFiles/ChecksumTester - items : Processing subitem (2/4): test_file_item.rb
-DEBUG -- ProcessFiles/ChecksumTester - items/test_file_item.rb : Started
-DEBUG -- ProcessFiles/ChecksumTester - items/test_file_item.rb : Completed
 DEBUG -- ProcessFiles/ChecksumTester - items : Processing subitem (3/4): test_item.rb
-DEBUG -- ProcessFiles/ChecksumTester - items/test_item.rb : Started
-DEBUG -- ProcessFiles/ChecksumTester - items/test_item.rb : Completed
 DEBUG -- ProcessFiles/ChecksumTester - items : Processing subitem (4/4): test_run.rb
-DEBUG -- ProcessFiles/ChecksumTester - items/test_run.rb : Started
-DEBUG -- ProcessFiles/ChecksumTester - items/test_run.rb : Completed
 DEBUG -- ProcessFiles/ChecksumTester - items : 4 of 4 subitems passed
-DEBUG -- ProcessFiles/ChecksumTester - items : Completed
 DEBUG -- ProcessFiles - items : Running subtask (2/2): CamelizeName
-DEBUG -- ProcessFiles/CamelizeName - items : Started
 DEBUG -- ProcessFiles/CamelizeName - Items : Processing subitem (1/4): test_dir_item.rb
-DEBUG -- ProcessFiles/CamelizeName - Items/test_dir_item.rb : Started
-DEBUG -- ProcessFiles/CamelizeName - Items/TestDirItem.rb : Completed
 DEBUG -- ProcessFiles/CamelizeName - Items : Processing subitem (2/4): test_file_item.rb
-DEBUG -- ProcessFiles/CamelizeName - Items/test_file_item.rb : Started
-DEBUG -- ProcessFiles/CamelizeName - Items/TestFileItem.rb : Completed
 DEBUG -- ProcessFiles/CamelizeName - Items : Processing subitem (3/4): test_item.rb
-DEBUG -- ProcessFiles/CamelizeName - Items/test_item.rb : Started
-DEBUG -- ProcessFiles/CamelizeName - Items/TestItem.rb : Completed
 DEBUG -- ProcessFiles/CamelizeName - Items : Processing subitem (4/4): test_run.rb
-DEBUG -- ProcessFiles/CamelizeName - Items/test_run.rb : Started
-DEBUG -- ProcessFiles/CamelizeName - Items/TestRun.rb : Completed
 DEBUG -- ProcessFiles/CamelizeName - Items : 4 of 4 subitems passed
-DEBUG -- ProcessFiles/CamelizeName - Items : Completed
-DEBUG -- ProcessFiles - Items : Completed
 DEBUG -- ProcessFiles - TestRun : 1 of 1 subitems passed
-DEBUG -- ProcessFiles - TestRun : Completed
 STR
     sample_out = sample_out.lines.to_a
     output = logoutput.string.lines
@@ -186,32 +153,20 @@ STR
 
   # noinspection RubyResolve
   it 'find run' do
-    run
     wf = TestWorkflow.first
-    expect(wf.workflow_runs.count).to be > 0
-    wf_run = wf.workflow_runs.first
-    expect(wf_run.is_a? TestRun).to eq true
-    expect(wf_run.nil?).to eq false
-    expect(wf_run.options[:dirname]).to eq dirname
-    expect(wf_run.properties[:ingest_failed]).to eq false
-    expect(wf_run.log_history.count).to eq 8
-    expect(wf_run.status_log.count).to eq 6
-    expect(wf_run.summary[:DEBUG]).to eq 57
+    expect(wf).to eq workflow
+    expect(workflow.workflow_runs.all.count).to eq 1
+    wf_run = workflow.workflow_runs.all.first
+    expect(wf_run).to eq run
   end
 
   # noinspection RubyResolve
   it 'find first item' do
-    run
-    wf = TestWorkflow.first
-    expect(wf.workflow_runs.first.items.count).to be > 0
-    item = wf.workflow_runs.first.items.first
+    item = run.items.first
     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
-    expect(item.log_history.count).to eq 25
-    expect(item.status_log.count).to eq 8
-    expect(item.summary[:DEBUG]).to eq 49
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow-mongoid
 version: !ruby/object:Gem::Version
-  version: 2.0.beta.8
+  version: 2.0.beta.10
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libis-workflow
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: mongoid-indifferent-access
   requirement: !ruby/object:Gem::Requirement
@@ -141,6 +141,7 @@ files:
 - lib/libis/workflow/mongoid.rb
 - lib/libis/workflow/mongoid/base.rb
 - lib/libis/workflow/mongoid/config.rb
+- lib/libis/workflow/mongoid/log_entry.rb
 - lib/libis/workflow/mongoid/run.rb
 - lib/libis/workflow/mongoid/sequence.rb
 - lib/libis/workflow/mongoid/version.rb
@@ -183,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Mongoid persistence for the LIBIS Workflow framework.