libis-workflow-mongoid 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3640448e952c1db33b7a9fb19e25d4b3969a20c5
-  data.tar.gz: 1129400163285ea1d4343bc0900bf67d5e0f8a44
+  metadata.gz: 017f82dc01ac32a1e83b84d9fc5df11ffaf0615c
+  data.tar.gz: d92861630b1adebd7230af71e6d51b0285107308
 SHA512:
-  metadata.gz: 409cb938c747fcafd98c598a77a1c6e1b0d466138d2d32bb6d6d2f57c66695c0305e6d70f0bc55f557cfb4cec787799f9e47a30a786051beb666844223b3c208
-  data.tar.gz: 12a4cec01e0db131e0a0a3e38e81aaa77905ea37b46db8d3abfe06c4d404d28164cd535d1529d97124849d4a96db07f1177165e543a017f6152999b2ac1b621e
+  metadata.gz: 82f885ebe58ec52be066d8aefd8859612569e5ba6556d905852c80062fe0c9b51265563763b845caa2a4bded2924c9ce708c5dca71bcfcd94b60b0ef3478e107
+  data.tar.gz: 97bf3b6bc08f98149cbe887e855c2fcc9d776aa1b951fc85910cdaabff6b2dc2294368735a540e761069f23d4bfd2663813f8a1a4f96afa53aab2c857acf9483

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

@@ -1,14 +1,11 @@
-# encoding: utf-8
 require 'mongoid'
 require 'mongoid/document'
 require 'yaml'
 require 'libis/tools/extend/hash'
 require 'map_with_indifferent_access'
 
-# require 'mongoid_indifferent_access'
 require_relative 'sequence'
 
-
 module Libis
   module Workflow
     module Mongoid
@@ -17,14 +14,17 @@ module Libis
 
         def self.included(klass)
           klass.extend(ClassMethods)
+
           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, overwrite: true
             sequence :_id
             index c_at: 1
+
           end
         end
 

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'singleton'
 require 'mongoid'
 

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

@@ -6,27 +6,33 @@ module Libis
   module Workflow
     module Mongoid
       module Dynamic
+
+        module ClassMethods
+          def has_key?(key)
+            self.attributes.has_key?(key.to_s) || self.attributes.has_key?(key.to_sym)
+          end
+
+          def each(&block)
+            self.attributes.reject { |k,_| k == '_id' }.each(&block)
+          end
+        end
+
         def self.included(klass)
+          klass.extend(ClassMethods)
+
           klass.class_eval do
+
             include ::Mongoid::Document
             include ::Mongoid::Attributes::Dynamic
             include ::Libis::Workflow::Mongoid::Sequence
+
             field :_id, type: Integer, overwrite: true
             sequence :_id
             index _id: 1
 
-            def has_key?(key)
-              self.attributes.has_key?(key.to_s) || self.attributes.has_key?(key.to_sym)
-            end
-
-            def each(&block)
-              self.attributes.reject { |k,_| k == '_id' }.each(&block)
-            end
-
           end
         end
 
-
       end
     end
   end

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'libis-workflow'
 require 'libis/workflow/mongoid/base'
 

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

@@ -1,20 +1,14 @@
-# encoding: utf-8
 require 'fileutils'
 
 require 'libis/workflow/base/run'
-require 'libis/workflow/mongoid/work_item_base'
 
 module Libis
   module Workflow
     module Mongoid
 
-      class Run
+      class Run < Libis::Workflow::Mongoid::WorkItem
 
         include ::Libis::Workflow::Base::Run
-        include ::Libis::Workflow::Mongoid::WorkItemBase
-        # extend ActiveSupport::Concern
-
-        store_in collection: 'workflow_runs'
 
         field :start_date, type: Time, default: -> { Time.now }
         field :log_to_file, type: Boolean, default: false
@@ -36,8 +30,6 @@ module Libis
 
         def run(action = :run)
           self.tasks = []
-          self.items = []
-          # noinspection RubySuperCallWithoutSuperclassInspection
           super action
         end
 

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

@@ -1,9 +1,7 @@
-# encoding: utf-8
-
 module Libis
   module Workflow
     module Mongoid
-      VERSION = '2.0.4' unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
+      VERSION = '2.0.5' 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,4 +1,3 @@
-# encoding: utf-8
 require 'libis-workflow'
 
 module Libis
@@ -8,7 +7,79 @@ module Libis
       class WorkItem
 
         include Libis::Workflow::Base::WorkItem
-        include Libis::Workflow::Mongoid::WorkItemBase
+        include Libis::Workflow::Mongoid::Base
+
+        store_in collection: 'workflow_items'
+
+        field :_options, type: Hash, default: -> { Hash.new }
+        field :_properties, type: Hash, default: -> { Hash.new }
+        field :_summary, type: Hash, default: -> { Hash.new }
+
+        has_many :logs, as: :logger, class_name: Libis::Workflow::Mongoid::LogEntry.to_s,
+                 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
+
+        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
+          document.logs.each { |log| log.destroy! }
+        end
+
+        indifferent_hash :_options, :options
+        indifferent_hash :_properties, :properties
+        indifferent_hash :_summary, :summary
+
+        def to_hash
+          result = super
+          result[:options] = result.delete(:_options)
+          result[:properties] = result.delete(:_properties)
+          result[:summary] = result.delete(:_summary)
+          result
+        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
+          end
+          super
+        end
+
+        def get_items
+          self.items.to_a
+        end
+
+        protected
+
+        def add_log_entry(msg)
+          # noinspection RubyResolve
+          self.logs.build(msg)
+        end
+
+        def add_status_log(info)
+          # noinspection RubyResolve
+          self.logs.build(info)
+        end
 
       end
 

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'libis/workflow/worker'
 require 'sidekiq'
 

data/lib/libis/workflow/mongoid.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'libis-workflow'
 
 require_relative 'mongoid/version'
@@ -12,7 +10,6 @@ module Libis
       autoload :Config, 'libis/workflow/mongoid/config'
       autoload :LogEntry, 'libis/workflow/mongoid/log_entry'
       autoload :Job, 'libis/workflow/mongoid/job'
-      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'

data/lib/libis-workflow-mongoid.rb

@@ -1,2 +1 @@
-# encoding: utf-8
 require 'libis/workflow/mongoid'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow-mongoid
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Kris Dekeyser
@@ -120,7 +120,6 @@ files:
 - lib/libis/workflow/mongoid/sequence.rb
 - lib/libis/workflow/mongoid/version.rb
 - lib/libis/workflow/mongoid/work_item.rb
-- lib/libis/workflow/mongoid/work_item_base.rb
 - lib/libis/workflow/mongoid/worker.rb
 - lib/libis/workflow/mongoid/workflow.rb
 - lib/map_with_indifferent_access.rb

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

@@ -1,94 +0,0 @@
-require 'map_with_indifferent_access'
-require 'libis-workflow'
-
-module Libis
-  module Workflow
-    module Mongoid
-
-      module WorkItemBase
-
-        def self.included(klass)
-          klass.class_eval do
-            include Libis::Workflow::Base::WorkItem
-            include Libis::Workflow::Mongoid::Base
-
-            store_in collection: 'workflow_items'
-
-            field :_options, type: Hash, default: -> { Hash.new }
-            field :_properties, type: Hash, default: -> { Hash.new }
-            field :_summary, type: Hash, default: -> { Hash.new }
-
-            has_many :logs, as: :logger, class_name: Libis::Workflow::Mongoid::LogEntry.to_s,
-                     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
-
-            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
-              document.logs.each { |log| log.destroy! }
-            end
-
-            indifferent_hash :_options, :options
-            indifferent_hash :_properties, :properties
-            indifferent_hash :_summary, :summary
-
-          end
-        end
-
-        def to_hash
-          result = super
-          result[:options] = result.delete(:_options)
-          result[:properties] = result.delete(:_properties)
-          result[:summary] = result.delete(:_summary)
-          result
-        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
-          end
-          super
-        end
-
-        def get_items
-          self.items.to_a
-        end
-
-        protected
-
-        def add_log_entry(msg)
-          # noinspection RubyResolve
-          self.logs.build(msg)
-        end
-
-        def add_status_log(info)
-          # noinspection RubyResolve
-          self.logs.build(info)
-        end
-
-      end
-
-    end
-  end
-end