taskflow-mongoid 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d7fcb6e49960147821299b3fadcfa8cb29c4ea6
-  data.tar.gz: 3aab13db0e1dc980bc0c2d7ca759d78025f27bdf
+  metadata.gz: eeeffb90deeb6366c7eb33ed0af49391f1f89353
+  data.tar.gz: 9ccc0648722b456c3820c351edd278817e971150
 SHA512:
-  metadata.gz: e3265a9cd061760cb56d2e43ce5417b86043834ccb8f7850387eb483aa77d8e6d97f689eef9e616937c853db7d5109819c09885c79ebb1443db4da6fd41fc529
-  data.tar.gz: 9184401ef5b052ecd3761fcb2c50ce7379a1bbdcda05f3d65f141a1938c049bda11dfab4693b07bd4f589f652b174368b4fdd1b4471a362cc04678561cba4bd2
+  metadata.gz: 07f79dc97c64af40fbfc204d10f4a760768080b5f007edb3f89950a66e3c8ab73e9c66226e8d915ae65e5cc658702e501c27d04f560f0f089c3ad343f422e67c
+  data.tar.gz: 83f96943374f2bef0c92591627bd09862f2613bd196c276cccc7bbef99dd021f1ba8f6e36622ab0f60b9025c92386c77eb55e33994d9b93f7d9a74610152f74f

data/lib/taskflow/flow.rb

@@ -46,28 +46,6 @@ class Taskflow::Flow
         self.tasks.in(state: ['running','paused'])
     end
 
-    # opts support :name,:params
-    def run(klass,opts={})
-        obj = {
-            klass: klass.to_s,
-            name: opts[:name] || klass.to_s,
-            input: opts[:params],
-            index: self.tasks.size + 1
-        }
-        task = klass.create obj.select{|k,v| v }
-        if opts[:before]
-            task.downstream << opts[:before]
-        end
-        if opts[:after]
-            task.upstream << opts[:after]
-        end
-        if opts[:before].nil? && opts[:after].nil? && self.tasks.last
-            self.tasks.last.downstream << task
-        end
-        self.tasks << task
-        task
-    end
-
     def stop!(user_id=nil)
         percent = self.tasks.map(&:progress).sum / self.tasks.size
         self.update_attributes! progress: percent,halt_by: user_id,ended_at: Time.now, state: 'stopped',result: 'warning'
@@ -94,10 +72,14 @@ class Taskflow::Flow
     end
 
     private
+
     def configure_tasks
         begin
+            @task_list = []
             configure
             sort_index  1,[]
+            TaskFlow::Task.collection.insert @task_list
+            @task_list = nil
         rescue=>exception
             self.destroy
             raise exception
@@ -105,12 +87,61 @@ class Taskflow::Flow
         reload
     end
 
+    # opts support :name,:params
+    def run(klass,opts={})
+        task_data = {
+            klass: klass.to_s,
+            name: opts[:name] || klass.to_s,
+            input: opts[:params] || {},
+            index: @task_list.size + 1,
+            _type: klass.to_s,
+            state: 'pending',
+            output: {},
+            progress: 0,
+            data: {},
+            flow_id: self.id,
+            _id: BSON::ObjectId.new,
+            downstream_ids: [],
+            upstream_ids: []
+        }.select{|k,v| v }
+        if opts[:before]
+            if opts[:before].is_a? Array
+                opts[:before].flatten!
+                opts[:before].each do |b|
+                    b[:upstream_ids] << task_data[:_id]
+                    task_data[:downstream_ids]  << b[:_id]
+                end
+            else
+                task_data[:downstream_ids]  << opts[:before][:_id]
+                opts[:before][:upstream_ids] << task_data[:_id]
+            end
+        end
+        if opts[:after]
+            if opts[:after].is_a? Array
+                opts[:after].flatten!
+                opts[:after].each do |a|
+                    task_data[:upstream_ids]  << a[:_id]
+                    a[:downstream_ids] << task_data[:_id]
+                end
+            else
+                task_data[:upstream_ids]  << opts[:after][:_id]
+                opts[:after][:downstream_ids] << task_data[:_id]
+            end
+        end
+        if opts[:before].nil? && opts[:after].nil? && @task_list.last
+            @task_list.last[:downstream_ids]  << task_data
+            task_data[:upstream_ids] << @task_list.last[:_id]
+        end
+        @task_list << task_data
+        task_data
+    end
+
     def sort_index(i,scanned)
-        queue = self.tasks.nin(id: scanned).select{|t| t.upstream.empty? || t.upstream.all?{|upt| scanned.include?(upt.id.to_s)}}
+        queue = @task_list.select{|t| !scanned.include?(t[:_id]) && (t[:upstream_ids].nil? || t[:upstream_ids].empty? || t[:upstream_ids].all?{|uid| scanned.include?(uid)}) }
         return if queue.empty?
         queue.each do |task|
-            task.update_attributes index: i
-            scanned << task.id.to_s
+            task[:index] = i
+            scanned << task[:_id]
         end
         sort_index i + 1,scanned
     end

data/lib/taskflow/version.rb

@@ -1,3 +1,3 @@
 module Taskflow
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/taskflow/worker.rb

@@ -69,9 +69,9 @@ class Taskflow::Worker
             flow.state = 'stopped'
         elsif flow.tasks.all?{|t| %w(stopped skipped).include? t.state }
             flow.state = 'stopped'
-        elsif flow.tasks.any?{|t| t.state == 'paused' }
+        elsif  paused_task = flow.tasks.find_by(state: 'paused')
             flow.state = 'paused'
-            flow.result = flow.tasks.find_by(state: 'paused').result
+            flow.result = paused_task.result
         else
             flow.state = 'running'
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taskflow-mongoid
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - qujianping
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,3 +116,4 @@ signing_key:
 specification_version: 4
 summary: Easy task flow based on sidekiq.
 test_files: []
+has_rdoc: