libis-workflow-mongoid 2.0.beta.14 → 2.0.beta.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab26385c0cb9336c38cbfdb6e3443eac39ed0e81
-  data.tar.gz: 78fafdcac7388b0d26cc4c52a0891a31fe564fdc
+  metadata.gz: 257d09f473547c6a373ff1040d3ab93bd2a3c7f0
+  data.tar.gz: 57a636a4ecb6dd41c817b95ecc8b9d41df58d437
 SHA512:
-  metadata.gz: 45571956f037710ef97cba6c63526ff1363083f4d6bed937c3f668809c255fe09a3e18f6f5f05c6b452a1d907d924892d5b188f404acdebff498dd588bddc04a
-  data.tar.gz: 7ba8ca07a056b4997637091cba2fbb3d5bd0aaad8cec9ad3f15eeafd48d55380d8ebe193ea43ea34be408b943dade48c67b66b7b4b2230b3ebb6329bf7812fb8
+  metadata.gz: 68011bc0fe042fff0434fabbae544e3a0b0f8177e0f67c6230458fc46847d9d2c8b99acaaeecdafa279d2981c87a83a000eadbcdf04f1b0db3a3126ca3ee74ea
+  data.tar.gz: fb282a3b8f7cc371b6e338664541acc19353b575b753479ef3df05b019081841660fb6c7971612a7d55c92543cce180f16e5a51f872eb8145799e56d43db14d9

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

@@ -7,41 +7,31 @@ module Libis
   module Workflow
     module Mongoid
 
-      module Job
+      class Job
 
-        def self.included(klass)
-          klass.class_eval do
-            include ::Libis::Workflow::Base::Job
-            include ::Libis::Workflow::Mongoid::Base
+        include ::Libis::Workflow::Base::Job
+        include ::Libis::Workflow::Mongoid::Base
 
-            store_in collection: 'workflow_jobs'
+        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
+        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})
+        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
+        has_many :runs, as: :job, dependent: :destroy, autosave: true, order: :c_at.asc
 
-            def klass.workflow_class(workflow_klass)
-              belongs_to :workflow, inverse_of: :jobs, class_name: workflow_klass.to_s
-            end
+        belongs_to :workflow, polymorphic: true
 
-            # def create_run_object
-            #   # noinspection RubyResolve
-            #   self.runs.build
-            # end
-
-          end
-
-        end
+        # def create_run_object
+        #   # noinspection RubyResolve
+        #   self.runs.build
+        # end
 
       end
+
     end
   end
 end

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

@@ -8,36 +8,24 @@ module Libis
   module Workflow
     module Mongoid
 
-      module Run
-        # extend ActiveSupport::Concern
+      class Run
 
-        def self.included(klass)
-          klass.class_eval do
-            include ::Libis::Workflow::Base::Run
-            include ::Libis::Workflow::Mongoid::WorkItemBase
+        include ::Libis::Workflow::Base::Run
+        include ::Libis::Workflow::Mongoid::WorkItemBase
+        # extend ActiveSupport::Concern
 
-            store_in collection: 'workflow_runs'
+        store_in collection: 'workflow_runs'
 
-            field :start_date, type: Time, default: -> { Time.now }
+        field :start_date, type: Time, default: -> { Time.now }
 
-            set_callback(:destroy, :before) do |document|
-              document.items.each { |item| item.destroy }
-              wd = document.work_dir
-              FileUtils.rmtree wd if wd && !wd.blank? && Dir.exist?(wd)
-            end
+        set_callback(:destroy, :before) do |document|
+          wd = document.work_dir
+          FileUtils.rmtree wd if wd && !wd.blank? && Dir.exist?(wd)
+        end
 
-            index start_date: 1
+        index start_date: 1
 
-            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)
-              has_many :items, inverse_of: :run, class_name: item_klass.to_s,
-                       dependent: :destroy, autosave: true, order: :c_at.asc
-            end
-          end
-        end
+        belongs_to :job, polymorphic: true
 
         def run
           self.tasks = []
@@ -46,25 +34,6 @@ module Libis
           super
         end
 
-        # Add a child work item
-        #
-        # @param [Libis::Workflow::Mongoid::WorkItem] item to be added to the child list :items
-        def add_item(item)
-          # noinspection RubyResolve
-          item.run = self
-          super
-        end
-
-        alias_method :<<, :add_item
-
-        def parent
-          nil
-        end
-
-        def parent=(_)
-          nil
-        end
-
       end
 
     end

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

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

@@ -1,36 +1,15 @@
 # encoding: utf-8
-require 'libis/workflow/mongoid/work_item_base'
+require 'libis-workflow'
+require_relative 'dynamic'
 
 module Libis
   module Workflow
     module Mongoid
 
-      module WorkItem
+      class WorkItem
 
-        def self.included(klass)
-          klass.class_eval do
-            include Libis::Workflow::Mongoid::WorkItemBase
-
-            store_in collection: 'workflow_items'
-
-            has_many :items, inverse_of: :parent, class_name: klass.to_s,
-                     dependent: :destroy, autosave: true, order: :_id.asc
-            belongs_to :parent, inverse_of: :items, class_name: klass.to_s
-
-            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 get_parent
-          self.parent || self.run
-        end
+        include Libis::Workflow::Base::WorkItem
+        include Libis::Workflow::Mongoid::WorkItemBase
 
       end
 

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

@@ -10,17 +10,17 @@ module Libis
 
         class Options
           include Libis::Workflow::Mongoid::Dynamic
-          embedded_in :work_item, class_name: Libis::Workflow::Mongoid::WorkItemBase.to_s
+          embedded_in :work_item, class_name: 'Libis::Workflow::Mongoid::WorkItem'
         end
 
         class Properties
           include Libis::Workflow::Mongoid::Dynamic
-          embedded_in :work_item, class_name: Libis::Workflow::Mongoid::WorkItemBase.to_s
+          embedded_in :work_item, class_name: 'Libis::Workflow::Mongoid::WorkItem'
         end
 
         class Summary
           include Libis::Workflow::Mongoid::Dynamic
-          embedded_in :work_item, class_name: Libis::Workflow::Mongoid::WorkItemBase.to_s
+          embedded_in :work_item, class_name: 'Libis::Workflow::Mongoid::WorkItem'
         end
 
         def self.included(klass)
@@ -28,6 +28,8 @@ module Libis
             include Libis::Workflow::Base::WorkItem
             include Libis::Workflow::Mongoid::Base
 
+            store_in collection: 'workflow_items'
+
             embeds_one :options, class_name: Libis::Workflow::Mongoid::WorkItemBase::Options.to_s
             embeds_one :properties, class_name: Libis::Workflow::Mongoid::WorkItemBase::Properties.to_s
             embeds_one :summary, class_name: Libis::Workflow::Mongoid::WorkItemBase::Summary.to_s
@@ -43,10 +45,10 @@ module Libis
               end
             end
 
-            # def destroy
-            #   # noinspection RubyResolve
-            #   self.logs.each { |log| log.destroy }
-            # end
+            has_many :items, as: :parent, class_name: Libis::Workflow::Mongoid::WorkItem.to_s,
+                     dependent: :destroy, autosave: true, order: :c_at.asc
+
+            belongs_to :parent, polymorphic: true
 
             set_callback(:destroy, :before) do |document|
               # noinspection RubyResolve
@@ -60,24 +62,8 @@ module Libis
             end
 
           end
-
-        end
-
-        def each
-          self.items.each { |item| yield item }
         end
 
-        def get_items
-          self.items.to_a
-        end
-
-        def item_count
-          self.items.count
-        end
-
-        alias_method :count, :item_count
-        alias_method :size, :item_count
-
         def log_history
           # noinspection RubyResolve
           self.logs.log_history.all || []

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

@@ -9,37 +9,28 @@ module Libis
   module Workflow
     module Mongoid
 
-      module Workflow
+      class Workflow
 
-        def self.included(klass)
-          klass.class_eval do
-            include ::Libis::Workflow::Base::Workflow
-            include ::Libis::Workflow::Mongoid::Base
+        include ::Libis::Workflow::Base::Workflow
+        include ::Libis::Workflow::Mongoid::Base
 
-            store_in collection: 'workflow_definitions'
+        store_in collection: 'workflow_definitions'
 
-            field :name, type: String
-            field :description, type: String
-            field :config, type: Hash, default: -> { Hash.new }
+        field :name, type: String
+        field :description, type: String
+        field :config, type: Hash, default: -> { Hash.new }
 
-            index({name: 1}, {unique: 1})
+        index({name: 1}, {unique: 1})
 
-            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)
-              config = Libis::Tools::ConfigFile.new
-              config << file_or_hash
-              return nil if config.empty?
-              workflow = self.new
-              workflow.configure(config.to_hash.key_strings_to_symbols(recursive: true))
-              workflow
-            end
-
-          end
+        has_many :jobs, as: :workflow, dependent: :destroy, autosave: true, order: :c_at.asc
 
+        def self.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_hash.key_strings_to_symbols(recursive: true))
+          workflow
         end
 
       end

data/lib/libis/workflow/mongoid.rb

@@ -12,9 +12,9 @@ module Libis
       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'
+      autoload :WorkItem, 'libis/workflow/mongoid/work_item'
+      autoload :Run, 'libis/workflow/mongoid/run'
       autoload :Worker, 'libis/workflow/mongoid/worker'
       autoload :Workflow, 'libis/workflow/mongoid/workflow'
 

data/mongoid.yml

@@ -110,7 +110,7 @@ test:
 
     # Preload all models in development, needed when models use
     # inheritance. (default: false)
-    #preload_models: false
+    preload_models: true
 
     # Raise an error when performing a #find and the document is not found.
     # (default: true)

data/spec/items/test_dir_item.rb

@@ -3,6 +3,7 @@ require 'libis/workflow'
 require_relative 'test_item'
 
 class TestDirItem < TestItem
+
   include ::Libis::Workflow::Base::DirItem
 
   def name=(dir)

data/spec/items/test_file_item.rb

@@ -5,6 +5,7 @@ require 'libis-workflow'
 require_relative 'test_item'
 
 class TestFileItem < TestItem
+
   include ::Libis::Workflow::Base::FileItem
 
   def filename=(file)

data/spec/items/test_item.rb

@@ -2,7 +2,5 @@
 
 require 'libis/workflow/mongoid/work_item'
 
-class TestItem
-  include Libis::Workflow::Mongoid::WorkItem
-  run_class 'TestRun'
+class TestItem < Libis::Workflow::Mongoid::WorkItem
 end

data/spec/items/test_run.rb

@@ -1,11 +1,7 @@
 # encoding: utf-8
 require 'libis-workflow-mongoid'
 
-class TestRun
-  include ::Libis::Workflow::Mongoid::Run
-
-  item_class 'TestItem'
-  job_class 'TestJob'
+class TestRun <::Libis::Workflow::Mongoid::Run
 
   def name; 'TestRun'; end
 

data/spec/test_job.rb

@@ -2,8 +2,5 @@
 
 require 'libis/workflow/mongoid/job'
 
-class TestJob
-  include ::Libis::Workflow::Mongoid::Job
-  run_class 'TestRun'
-  workflow_class 'TestWorkflow'
+class TestJob < ::Libis::Workflow::Mongoid::Job
 end

data/spec/test_workflow.rb

@@ -2,7 +2,5 @@
 
 require 'libis/workflow/mongoid/workflow'
 
-class TestWorkflow
-  include ::Libis::Workflow::Mongoid::Workflow
-  job_class 'TestJob'
+class TestWorkflow < ::Libis::Workflow::Mongoid::Workflow
 end

data/spec/workflow_spec.rb

@@ -90,25 +90,19 @@ describe 'TestWorkflow' do
 
     expect(run.options['CollectFiles'][:location]).to eq dirname
 
-    def print_item(item, indent = 0)
-      puts "#{' ' * indent * 2} - #{item.name}"
-      item.get_items.each do |i|
-        print_item(i, indent + 1)
-      end
-    end
-    print_item(run)
-
+    expect(run.items.size).to eq 1
+    expect(run.items.count).to eq 1
+    expect(run.size).to eq 1
     expect(run.count).to eq 1
+    expect(run.items.first.class).to eq TestDirItem
     expect(run.first.class).to eq TestDirItem
+    expect(run.first.items.size).to eq 4
+    expect(run.first.items.count).to eq 4
+    expect(run.first.size).to eq 4
     expect(run.first.count).to eq 4
+    expect(run.first.items.first.class).to eq TestFileItem
     expect(run.first.first.class).to eq TestFileItem
 
-    # the following tests do not work on Travis. Tried for days to find out why, but I give up.
-    # expect(run.get_items.count).to eq 1
-    # expect(run.get_items.first.class).to eq TestDirItem
-    # expect(run.get_items.first.count).to eq 4
-    # expect(run.get_items.first.get_items.first.class).to eq TestFileItem
-
     run.items.first.each_with_index do |x, i|
       expect(x.name).to eq %w'TestDirItem.rb TestFileItem.rb TestItem.rb TestRun.rb'[i]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow-mongoid
 version: !ruby/object:Gem::Version
-  version: 2.0.beta.14
+  version: 2.0.beta.15
 platform: ruby
 authors:
 - Kris Dekeyser