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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72052cd9486d8810a3435fffb93cec07183a3660
-  data.tar.gz: 3599ae44df1eec26ff057e6c8f41d3e31aba8acb
+  metadata.gz: cb77b9360af577f7b0b7f8067b0b43339a562512
+  data.tar.gz: 40868911a55787816c6cbd9e8e2730da9e26b1f4
 SHA512:
-  metadata.gz: 4ca524054dd5a6224d420bd4669ccc2d4d6b712bbf067083b2fa4fb5b58463e343a0e13a4f8dba1a17a68f3dce7d1ae9839467b858aaba71000a320032acb598
-  data.tar.gz: 75cf33dad01233954473c2fc2584dbc972f74b0779a62795b6caa1b0f01ce0bb93a6e456cfa91c47c6dc5d469def6937fe00c2afa896bdb2db0ea8348947b213
+  metadata.gz: 64a7f3c741675179200da3beaa66d02265611afabe19dc18e3f6f293e71b8bac1c9b077b021a26e4cb76c68f403fad2c45c8d4036ab4898654783d7553e9d7ef
+  data.tar.gz: ef4c92bc1aba840e0b7b609624203759557cea6fcbf65681a60ffae6c8131410d37d9d5ced04e988360715ead97cfb5aa3dff6517aa4813445e3f57734eb1d39

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

@@ -0,0 +1,47 @@
+# encoding: utf-8
+
+require 'libis/workflow/base/job'
+require 'libis/workflow/mongoid/base'
+
+module Libis
+  module Workflow
+    module Mongoid
+
+      module Job
+
+        def self.included(klass)
+          klass.class_eval do
+            include ::Libis::Workflow::Base::Job
+            include ::Libis::Workflow::Mongoid::Base
+
+            store_in collection: 'workflow_jobs'
+
+            field :name, type: String
+            field :description, type: String
+            field :input, type: Hash, default: -> { Hash.new }
+            field :run_object, type: String
+
+            index({name: 1}, {unique: 1})
+
+            def klass.run_class(run_klass)
+              has_many :runs, inverse_of: :job, class_name: run_klass.to_s,
+                       dependent: :destroy, autosave: true, order: :c_at.asc
+            end
+
+            def klass.workflow_class(workflow_klass)
+              belongs_to :workflow, inverse_of: :jobs, class_name: workflow_klass.to_s
+            end
+
+            # def create_run_object
+            #   # noinspection RubyResolve
+            #   self.runs.build
+            # end
+
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -20,22 +20,18 @@ module Libis
 
             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! }
+              wd = document.work_dir
+              FileUtils.rmtree wd if wd && !wd.blank? && Dir.exist?(wd)
+              id = document.properties[:ingest_dir]
+              FileUtils.rmtree id if id && !id.blank? && Dir.exist?(id)
             end
 
             index start_date: 1
 
-            def klass.workflow_class(wf_klass)
-              belongs_to :workflow, inverse_of: :workflow_runs, class_name: wf_klass.to_s
+            def klass.job_class(job_klass)
+              belongs_to :job, inverse_of: :runs, class_name: job_klass.to_s
             end
 
             def klass.item_class(item_klass)
@@ -45,11 +41,10 @@ module Libis
           end
         end
 
-        def run(opts = {})
+        def run
           self.tasks = []
           self.items = []
-          # noinspection RubySuperCallWithoutSuperclassInspection
-          super opts
+          super
         end
 
         def restart(taskname)

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

@@ -3,7 +3,7 @@
 module Libis
   module Workflow
     module Mongoid
-      VERSION = '2.0.beta.10' unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
+      VERSION = '2.0.beta.11' 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,10 +17,6 @@ module Libis
                      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
@@ -33,15 +29,15 @@ module Libis
         end
 
         def get_parent
-          self[:parent] || self[:run]
+          self.parent || self.run
         end
 
         def get_run
-          self[:run] || self[:parent].get_run
+          self.run || self.parent && self.parent.get_run || nil
         end
 
         def get_root
-          self[:parent].get_root rescue self
+          self.parent && self.parent.get_root || self
         end
 
       end

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

@@ -23,9 +23,9 @@ module Libis
 
             index({name: 1}, {unique: 1})
 
-            def klass.run_class(run_klass)
-              has_many :workflow_runs, inverse_of: :workflow, class_name: run_klass.to_s,
-                       dependent: :destroy, autosave: true, order: :created_at.asc
+            def klass.job_class(job_klass)
+              has_many :jobs, inverse_of: :workflow, class_name: job_klass.to_s,
+                       dependent: :destroy, autosave: true, order: :c_at.asc
             end
 
             def klass.load(file_or_hash)
@@ -37,19 +37,6 @@ module Libis
               workflow
             end
 
-            def create_run_object
-              # noinspection RubyResolve
-              self.workflow_runs.build
-            end
-
-            def restart(id, task = nil)
-              # noinspection RubyResolve
-              run_object = self.workflow_runs.select { |run| run.id == id }
-              raise WorkflowError, "Run #{id} not found" unless run_object
-              run_object.restart task
-              run_object
-            end
-
           end
 
         end

data/lib/libis/workflow/mongoid.rb

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

data/spec/items/test_run.rb

@@ -5,7 +5,7 @@ class TestRun
   include ::Libis::Workflow::Mongoid::Run
 
   item_class 'TestItem'
-  workflow_class 'TestWorkflow'
+  job_class 'TestJob'
 
   def name; 'TestRun'; end
 

data/spec/test_job.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+require 'libis/workflow/mongoid/job'
+
+class TestJob
+  include ::Libis::Workflow::Mongoid::Job
+  run_class 'TestRun'
+  workflow_class 'TestWorkflow'
+end

data/spec/test_workflow.rb

@@ -4,5 +4,5 @@ require 'libis/workflow/mongoid/workflow'
 
 class TestWorkflow
   include ::Libis::Workflow::Mongoid::Workflow
-  run_class 'TestRun'
+  job_class 'TestJob'
 end

data/spec/workflow_spec.rb

@@ -6,6 +6,7 @@ require 'stringio'
 require 'libis-workflow-mongoid'
 
 require_relative 'spec_helper'
+require_relative 'test_job'
 require_relative 'test_workflow'
 require_relative 'items'
 
@@ -53,16 +54,28 @@ describe 'TestWorkflow' do
             checksum_type: {default: 'SHA1', propagate_to: 'ProcessFiles/ChecksumTester'}
         }
     )
-    # noinspection RubyResolve
-    @workflow.workflow_runs.each { |run| run.destroy! }
     @workflow.save
-    @run = @workflow.run(dirname: dirname, checksum_type: 'SHA256')
+
+    @job = TestJob.find_or_initialize_by(name: 'TestJob')
+    @job.configure(
+            name: 'TestJob',
+            description: 'Job for testing',
+            workflow: @workflow,
+            run_object: 'TestRun',
+            input: {dirname: dirname, checksum_type: 'SHA256'},
+    )
+
+    # noinspection RubyResolve
+    @job.runs.each { |run| run.destroy! }
+    @job.save
+    @run = @job.execute
 
   end
 
   def dirname; @dirname; end
   def logoutput; @logoutput; end
   def workflow; @workflow; end
+  def job; @job; end
   def run; @run; end
 
   it 'should contain three tasks' do
@@ -153,11 +166,11 @@ STR
 
   # noinspection RubyResolve
   it 'find run' do
-    wf = TestWorkflow.first
-    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
+    my_job = TestJob.first
+    expect(my_job).to eq job
+    expect(my_job.runs.all.count).to eq 1
+    my_run = my_job.runs.all.first
+    expect(my_run).to eq run
   end
 
   # noinspection RubyResolve

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow-mongoid
 version: !ruby/object:Gem::Version
-  version: 2.0.beta.10
+  version: 2.0.beta.11
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libis-workflow
@@ -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/job.rb
 - lib/libis/workflow/mongoid/log_entry.rb
 - lib/libis/workflow/mongoid/run.rb
 - lib/libis/workflow/mongoid/sequence.rb
@@ -162,6 +163,7 @@ files:
 - spec/tasks/camelize_name.rb
 - spec/tasks/checksum_tester.rb
 - spec/tasks/collect_files.rb
+- spec/test_job.rb
 - spec/test_workflow.rb
 - spec/workflow_spec.rb
 homepage: https://github.com/libis/workflow-mongoid
@@ -200,5 +202,6 @@ test_files:
 - spec/tasks/camelize_name.rb
 - spec/tasks/checksum_tester.rb
 - spec/tasks/collect_files.rb
+- spec/test_job.rb
 - spec/test_workflow.rb
 - spec/workflow_spec.rb