bumbleworks 0.0.63 → 0.0.64

data/lib/bumbleworks/task.rb

@@ -32,9 +32,9 @@ module Bumbleworks
         end
       end
 
-      def method_missing(method, *args)
+      def method_missing(method, *args, &block)
         if Finder.new.respond_to?(method)
-          return Finder.new([], self).send(method, *args)
+          return Finder.new([], self).send(method, *args, &block)
         end
         super
       end

data/lib/bumbleworks/task/finder.rb

@@ -76,11 +76,10 @@ module Bumbleworks
       end
 
       def for_entity(entity)
-        @queries << proc { |wi|
-          (wi['fields'][:entity_type] || wi['fields']['entity_type']) == entity.class.name &&
-            (wi['fields'][:entity_id] || wi['fields']['entity_id']) == entity.identifier
-        }
-        self
+        with_fields({
+          :entity_type => entity.class.name,
+          :entity_id => entity.identifier
+        })
       end
 
       def for_processes(processes)
@@ -95,57 +94,57 @@ module Bumbleworks
         for_processes([process])
       end
 
-      def all
-        return [] if @wfids == []
-        workitems = Bumbleworks.dashboard.context.storage.get_many('workitems', @wfids).select { |wi|
-          @queries.all? { |q| q.call(wi) }
-        }.collect { |wi|
-          ::Ruote::Workitem.new(wi)
-        }
-        from_workitems(workitems)
-      end
-
       def completable(true_or_false = true)
         @task_filters << proc { |task| task.completable? == true_or_false }
         self
       end
 
-      def each(&block)
-        all.each(&block)
-      end
-
-      def empty?
-        all.empty?
-      end
-
       def next_available(options = {})
         options[:timeout] ||= Bumbleworks.timeout
 
         start_time = Time.now
-        while first.nil?
+        while (first_task = first).nil?
           if (Time.now - start_time) > options[:timeout]
             raise @task_class::AvailabilityTimeout, "No tasks found matching criteria in time"
           end
           sleep 0.1
         end
-        first
+        first_task
+      end
+
+      def each
+        return to_enum(:each) unless block_given?
+        return if @wfids == []
+        workitems = Bumbleworks.dashboard.context.storage.get_many('workitems', @wfids).each { |wi|
+          if task = filtered_task_from_raw_workitem(wi)
+            yield task
+          end
+        }
+      end
+
+      def all
+        to_a
+      end
+
+      def empty?
+        !any?
       end
 
     private
 
-      def filter_tasks(tasks)
-        @task_filters.empty? ? tasks :
-          tasks.select { |task|
-            @task_filters.all? { |f| f.call(task) }
-          }
+      def filtered_task_from_raw_workitem(workitem)
+        if @queries.all? { |q| q.call(workitem) }
+          task = from_workitem(::Ruote::Workitem.new(workitem))
+          task if check_filters(task)
+        end
       end
 
-      def from_workitems(workitems)
-        tasks = workitems.map { |wi|
-          @task_class.new(wi)
-        }.compact
+      def check_filters(task)
+        @task_filters.all? { |f| f.call(task) }
+      end
 
-        filter_tasks(tasks)
+      def from_workitem(workitem)
+        task = @task_class.new(workitem)
       end
     end
   end

data/lib/bumbleworks/version.rb

@@ -1,3 +1,3 @@
 module Bumbleworks
-  VERSION = "0.0.63"
+  VERSION = "0.0.64"
 end

data/spec/lib/bumbleworks/task_spec.rb

@@ -408,6 +408,43 @@ describe Bumbleworks::Task do
     end
   end
 
+  context 'iterators' do
+    before :each do
+      Bumbleworks.define_process 'life_on_tha_street' do
+        concurrence do
+          oscar :task => 'grouch_it_up'
+          elmo :task => 'sing_a_tune'
+          elmo :task => 'steal_booze'
+          snuffy :task => 'eat_cabbage'
+        end
+      end
+      Bumbleworks.launch!('life_on_tha_street')
+      Bumbleworks.dashboard.wait_for(:snuffy)
+    end
+
+    describe '.each' do
+      it 'executes for each found task' do
+        list = []
+        described_class.each { |t| list << t.nickname }
+        list.should =~ ['grouch_it_up', 'sing_a_tune', 'steal_booze', 'eat_cabbage']
+      end
+    end
+
+    describe '.map' do
+      it 'maps result of yielding block with each task' do
+        list = described_class.map { |t| t.nickname }
+        list.should =~ ['grouch_it_up', 'sing_a_tune', 'steal_booze', 'eat_cabbage']
+      end
+    end
+
+    context 'with queries' do
+      it 'checks filters' do
+        list = described_class.for_role('elmo').map { |t| t.nickname }
+        list.should =~ ['sing_a_tune', 'steal_booze']
+      end
+    end
+  end
+
   describe '.all' do
     before :each do
       Bumbleworks.define_process 'dog-lifecycle' do
@@ -506,7 +543,7 @@ describe Bumbleworks::Task do
   end
 
   describe '.with_fields' do
-    it 'returns all tasks with given fields' do
+    before(:each) do
       Bumbleworks.define_process 'divergination' do
         concurrence do
           sequence do
@@ -524,12 +561,24 @@ describe Bumbleworks::Task do
       end
       Bumbleworks.launch!('divergination', :grumbles => true)
       Bumbleworks.dashboard.wait_for(:loofer)
+    end
+
+    it 'returns all tasks with given field' do
       described_class.with_fields(:grumbles => true).count.should == 3
       described_class.with_fields(:bumby => 'fancy').count.should == 1
       described_class.with_fields(:bumby => 'not_fancy').count.should == 2
-      described_class.with_fields(:grumbles => false, :bumby => 'not_fancy').should be_empty
       described_class.with_fields(:what => 'ever').should be_empty
     end
+
+    it 'looks up multiple fields at once' do
+      described_class.with_fields(:grumbles => true, :bumby => 'not_fancy').count.should == 2
+      described_class.with_fields(:grumbles => false, :bumby => 'not_fancy').should be_empty
+    end
+
+    it 'can be chained' do
+      described_class.with_fields(:grumbles => true).with_fields(:bumby => 'fancy').count.should == 1
+      described_class.with_fields(:grumbles => false).with_fields(:bumby => 'not_fancy').should be_empty      
+    end
   end
 
   describe '.for_entity' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumbleworks
 version: !ruby/object:Gem::Version
-  version: 0.0.63
+  version: 0.0.64
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruote
@@ -263,7 +263,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4057710288026265450
+      hash: 2850289231226753878
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -272,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4057710288026265450
+      hash: 2850289231226753878
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23