bumbleworks 0.0.67 → 0.0.68

data/lib/bumbleworks/task/finder.rb

@@ -40,16 +40,20 @@ module Bumbleworks
 
       def where(filters, group_type = nil)
         group_type = :all unless group_type == :any
-        new_finder = self.class.new(@task_class)
-        new_finder.send(:"where_#{group_type}")
-        new_finder = filters.inject(new_finder) { |finder, (key, args)|
+        if group_type != @join
+          finder = self.class.new(@task_class)
+          finder.send(:"where_#{group_type}")
+        else
+          finder = self
+        end
+        finder = filters.inject(finder) { |query_target, (key, args)|
           if method = WhereKeyToMethodMap[key]
-            finder.send(method, args)
+            query_target.send(method, args)
           else
-            finder.with_fields(key => args)
+            query_target.with_fields(key => args)
           end
         }
-        add_subfinder new_finder
+        finder == self ? self : add_subfinder(finder)
       end
 
       def available(check = true)
@@ -164,12 +168,13 @@ module Bumbleworks
       def each
         return to_enum(:each) unless block_given?
         return if @wfids == []
+        only_workitem_queries = @queries.all? { |q| q.is_a? WorkitemQuery }
         workitems = raw_workitems(@wfids)
         @orderers.each do |order_proc|
           workitems.sort! &order_proc
         end
         workitems.each { |wi|
-          if task = filtered_task_from_raw_workitem(wi)
+          if task = filtered_task_from_raw_workitem(wi, only_workitem_queries)
             yield task
           end
         }
@@ -204,9 +209,15 @@ module Bumbleworks
         self
       end
 
-      def filtered_task_from_raw_workitem(workitem)
-        task = from_workitem(::Ruote::Workitem.new(workitem))
-        task if check_queries(workitem, task)
+      def filtered_task_from_raw_workitem(workitem, only_workitem_queries = false)
+        if only_workitem_queries
+          if check_queries(workitem, nil)
+            task = from_workitem(::Ruote::Workitem.new(workitem))
+          end
+        else
+          task = from_workitem(::Ruote::Workitem.new(workitem))
+          task if check_queries(workitem, task)
+        end
       end
 
       def grouped_queries(group_type)

data/lib/bumbleworks/version.rb

@@ -1,3 +1,3 @@
 module Bumbleworks
-  VERSION = "0.0.67"
+  VERSION = "0.0.68"
 end

data/spec/lib/bumbleworks/task/finder_spec.rb

@@ -123,11 +123,11 @@ describe Bumbleworks::Task::Finder do
   end
 
   describe '#where' do
-    it 'creates a new finder and adds it to queries' do
-      parent = described_class.new(:a_class)
+    it 'creates a new finder and adds it to queries, when join type mismatch' do
+      parent = described_class.new(:dummy_task_class).where_all
       child = described_class.new
-      described_class.stub(:new).with(:a_class).and_return(child)
-      child.should_receive(:where_all)
+      described_class.stub(:new).with(:dummy_task_class).and_return(child)
+      child.should_receive(:where_any)
       child.should_receive(:available).and_return(child)
       child.should_receive(:unavailable).and_return(child)
       child.should_receive(:by_nickname).with(:nicholas).and_return(child)
@@ -140,7 +140,7 @@ describe Bumbleworks::Task::Finder do
       child.should_receive(:completable).with(true).and_return(child)
       child.should_receive(:with_fields).with(:horse => :giant_pony).and_return(child)
       child.should_receive(:with_fields).with(:pie => :silly_cake).and_return(child)
-      parent.should_receive(:add_subfinder).with(child)
+      parent.should_receive(:add_subfinder).with(child).and_return(parent)
       parent.where({
         :available => true,
         :unavailable => true,
@@ -154,7 +154,37 @@ describe Bumbleworks::Task::Finder do
         :completable => true,
         :horse => :giant_pony,
         :pie => :silly_cake
-      })
+      }, :any).should == parent
+    end
+
+    it 'adds queries to current finder, when join type matches' do
+      subject.should_receive(:available).and_return(subject)
+      subject.should_receive(:unavailable).and_return(subject)
+      subject.should_receive(:by_nickname).with(:nicholas).and_return(subject)
+      subject.should_receive(:for_roles).with([:dinner, :barca]).and_return(subject)
+      subject.should_receive(:unclaimed).and_return(subject)
+      subject.should_receive(:claimed).and_return(subject)
+      subject.should_receive(:for_claimant).with(:dr_clam).and_return(subject)
+      subject.should_receive(:for_entity).with(:a_luffly_pirate).and_return(subject)
+      subject.should_receive(:for_processes).with([:jasmine, :mulan]).and_return(subject)
+      subject.should_receive(:completable).with(true).and_return(subject)
+      subject.should_receive(:with_fields).with(:horse => :giant_pony).and_return(subject)
+      subject.should_receive(:with_fields).with(:pie => :silly_cake).and_return(subject)
+      subject.should_receive(:add_subfinder).never
+      subject.where({
+        :available => true,
+        :unavailable => true,
+        :nickname => :nicholas,
+        :roles => [:dinner, :barca],
+        :unclaimed => true,
+        :claimed => true,
+        :claimant => :dr_clam,
+        :entity => :a_luffly_pirate,
+        :processes => [:jasmine, :mulan],
+        :completable => true,
+        :horse => :giant_pony,
+        :pie => :silly_cake
+      }).should == subject
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumbleworks
 version: !ruby/object:Gem::Version
-  version: 0.0.67
+  version: 0.0.68
   prerelease: 
 platform: ruby
 authors:
@@ -263,7 +263,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -828437829805338939
+      hash: -2462957176367107392
 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: -828437829805338939
+      hash: -2462957176367107392
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23