bumbleworks 0.0.65 → 0.0.66

data/lib/bumbleworks/task.rb

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

data/lib/bumbleworks/task/finder.rb

@@ -3,13 +3,13 @@ module Bumbleworks
     class Finder
       include Enumerable
 
-      def initialize(queries = [], task_class = Bumbleworks::Task)
-        @queries = queries
-        @queries << proc { |wi| wi['fields']['params']['task'] }
+      def initialize(task_class = Bumbleworks::Task)
         @task_class = task_class
+        @queries = []
         @task_filters = []
         @orderers = []
         @wfids = nil
+        add_query { |wi| wi['fields']['params']['task'] }
       end
 
       def where(filters)
@@ -43,14 +43,12 @@ module Bumbleworks
       end
 
       def by_nickname(nickname)
-        @queries << proc { |wi| wi['fields']['params']['task'] == nickname }
-        self
+        add_query { |wi| wi['fields']['params']['task'] == nickname }
       end
 
       def for_roles(identifiers)
         identifiers ||= []
-        @queries << proc { |wi| identifiers.include?(wi['participant_name']) }
-        self
+        add_query { |wi| identifiers.include?(wi['participant_name']) }
       end
 
       def for_role(identifier)
@@ -58,8 +56,7 @@ module Bumbleworks
       end
 
       def unclaimed(check = true)
-        @queries << proc { |wi| wi['fields']['params']['claimant'].nil? == check }
-        self
+        add_query { |wi| wi['fields']['params']['claimant'].nil? == check }
       end
 
       def claimed(check = true)
@@ -67,13 +64,11 @@ module Bumbleworks
       end
 
       def with_fields(field_hash)
-        @queries << proc { |wi| field_hash.all? { |k, v| wi['fields'][k.to_s] == v } }
-        self
+        add_query { |wi| field_hash.all? { |k, v| wi['fields'][k.to_s] == v } }
       end
 
       def for_claimant(token)
-        @queries << proc { |wi| wi['fields']['params']['claimant'] == token }
-        self
+        add_query { |wi| wi['fields']['params']['claimant'] == token }
       end
 
       def for_entity(entity)
@@ -112,7 +107,16 @@ module Bumbleworks
       end
 
       def completable(true_or_false = true)
-        @task_filters << proc { |task| task.completable? == true_or_false }
+        add_filter { |task| task.completable? == true_or_false }
+      end
+
+      def add_query(&block)
+        @queries << block
+        self
+      end
+
+      def add_filter(&block)
+        @task_filters << block
         self
       end
 

data/lib/bumbleworks/version.rb

@@ -1,3 +1,3 @@
 module Bumbleworks
-  VERSION = "0.0.65"
+  VERSION = "0.0.66"
 end

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

@@ -14,11 +14,41 @@ describe Bumbleworks::Task::Finder do
     end
   end
 
+  describe '#add_query' do
+    it 'adds given block as new raw workitem query' do
+      Bumbleworks.launch!('dog-lifecycle')
+      Bumbleworks.dashboard.wait_for(:cat)
+      finder = subject.add_query { |wi|
+        wi['fields']['params']['task'] != 'pet_dog'
+      }
+      finder.map(&:nickname).should =~ [
+        'eat',
+        'bark',
+        'skip_and_jump'
+      ]
+    end
+  end
+
+  describe '#add_filter' do
+    it 'adds given block as new task filter' do
+      Bumbleworks.launch!('dog-lifecycle')
+      Bumbleworks.dashboard.wait_for(:cat)
+      finder = subject.add_filter { |task|
+        task.nickname != 'pet_dog'
+      }
+      finder.map(&:nickname).should =~ [
+        'eat',
+        'bark',
+        'skip_and_jump'
+      ]
+    end
+  end
+
   describe '#all' do
     it 'uses Bumbleworks::Task class by default for task generation' do
       Bumbleworks.launch!('dog-lifecycle')
       Bumbleworks.dashboard.wait_for(:cat)
-      tasks = Bumbleworks::Task::Finder.new.all
+      tasks = subject.all
       tasks.should be_all { |t| t.class == Bumbleworks::Task }
     end
 
@@ -26,7 +56,7 @@ describe Bumbleworks::Task::Finder do
       class MyOwnTask < Bumbleworks::Task; end
       Bumbleworks.launch!('dog-lifecycle')
       Bumbleworks.dashboard.wait_for(:cat)
-      tasks = Bumbleworks::Task::Finder.new([], MyOwnTask).all
+      tasks = described_class.new(MyOwnTask).all
       tasks.should be_all { |t| t.class == MyOwnTask }
       Object.send(:remove_const, :MyOwnTask)
     end
@@ -34,27 +64,25 @@ describe Bumbleworks::Task::Finder do
 
   describe '#available' do
     it 'adds both unclaimed and completable filters' do
-      query = Bumbleworks::Task::Finder.new
-      query.should_receive(:unclaimed).and_return(query)
-      query.should_receive(:completable).and_return(query)
-      query.available
+      subject.should_receive(:unclaimed).and_return(subject)
+      subject.should_receive(:completable).and_return(subject)
+      subject.available
     end
   end
 
   describe '#where' do
     it 'compiles a finder' do
-      query = Bumbleworks::Task::Finder.new
-      query.should_receive(:available).and_return(query)
-      query.should_receive(:by_nickname).with(:nicholas).and_return(query)
-      query.should_receive(:for_roles).with([:dinner, :barca]).and_return(query)
-      query.should_receive(:unclaimed).and_return(query)
-      query.should_receive(:claimed).and_return(query)
-      query.should_receive(:for_claimant).with(:dr_clam).and_return(query)
-      query.should_receive(:for_entity).with(:a_luffly_pirate).and_return(query)
-      query.should_receive(:for_processes).with([:jasmine, :mulan]).and_return(query)
-      query.should_receive(:completable).with(true).and_return(query)
-      query.should_receive(:with_fields).with({ :horse => :giant_pony, :pie => :silly_cake }).and_return(query)
-      query.where({
+      subject.should_receive(:available).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, :pie => :silly_cake }).and_return(subject)
+      subject.where({
         :available => true,
         :nickname => :nicholas,
         :roles => [:dinner, :barca],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumbleworks
 version: !ruby/object:Gem::Version
-  version: 0.0.65
+  version: 0.0.66
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-02-12 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: 3834352798561343652
+      hash: 2932416293581742499
 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: 3834352798561343652
+      hash: 2932416293581742499
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23