libis-workflow-mongoid 2.0.18 → 2.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 032144e349fab139b8d8b790a2efe60182d2c6ac
-  data.tar.gz: d2d9b8a18f3c870bb0bb57d1019747c31daf36c4
+  metadata.gz: 0dbf52eb295a357488cc482b75e3b3cf2ab4c2a8
+  data.tar.gz: aafeac6cd8e4a50a9864d422c2de51a7894ee8c4
 SHA512:
-  metadata.gz: 67fb90f5e6fbf5eab1575db46ecb49cb37d8d90569411ba5adc203cca36866e4b78e22df87c94e34f44f92885046275149fcb6c5cb4a93a88e1ae6fca29b7d89
-  data.tar.gz: 1b69d6fe573724a7849644cd623204e39beea57bec8d3bb83483b11944217ca68efde4aebf53e9971039c3bdd151b2518cfdb87657ba4f028c264e6b66433308
+  metadata.gz: 092ae4d3b766b028096ad93c2b3ee85865dd433675d943338aa979e524fbb7b4da3cca8b535c782915524b747067eea995c6b39ede4dd069a28ac0668dd2289f
+  data.tar.gz: 28b502a5aaa9cb58f4781ccecfc174b33020ff2393b58c7ec69701aa9883ee4bf336b4f2da9d8d638946208666598bd33b63fd6716bf7ac3bcd38db1c2a61baf

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

@@ -52,11 +52,6 @@ module Libis
 
         end
 
-        def dup
-          new_obj = self.class.new
-          new_obj.copy_attributes(self)
-        end
-
         def to_hash
           result = self.attributes.reject { |k, v| v.blank? || volatile_attributes.include?(k) }
           result = result.to_yaml.gsub(/!ruby\/hash:BSON::Document/, '')

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

@@ -46,6 +46,8 @@ module Libis
         def run(action = :run)
           self.tasks = []
           super action
+          self.reload
+          self.reload_relations
           close_logger
         end
 

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

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

@@ -13,7 +13,6 @@ 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'})
@@ -26,11 +25,20 @@ module Libis
         index({parent_id: 1, parent_type: 1, c_at: 1}, {name: 'by_parent'})
 
         def add_item(item)
+          raise Libis::WorkflowError, 'Trying to add item already linked to another item' unless item.parent.nil?
+          super(item)
+        end
+
+        def move_item(item)
+          new_item = item.dup
+          yield new_item, item if block_given?
+          new_item.parent = nil
+          item.items.each { |i| new_item.move_item(i) }
+          self.add_item(new_item)
           if item.parent
-            item.parent.delete(item)
-            item.parent.save!
+            item.parent.items.delete(item)
           end
-          super
+          new_item
         end
 
         def get_items

data/spec/workflow_spec.rb

@@ -213,7 +213,7 @@ STR
   it 'move item in relation' do
     item = run.items.first
     sub_item = item.items.first
-    run.add_item(sub_item)
+    run.move_item(sub_item)
     expect(run.size).to eq 2
     expect(item.size).to eq 3
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow-mongoid
 version: !ruby/object:Gem::Version
-  version: 2.0.18
+  version: 2.0.19
 platform: ruby
 authors:
 - Kris Dekeyser