bumbleworks 0.0.64 → 0.0.65

data/lib/bumbleworks/task/finder.rb

@@ -8,6 +8,7 @@ module Bumbleworks
         @queries << proc { |wi| wi['fields']['params']['task'] }
         @task_class = task_class
         @task_filters = []
+        @orderers = []
         @wfids = nil
       end
 
@@ -94,6 +95,22 @@ module Bumbleworks
         for_processes([process])
       end
 
+      def order_by_field(field, direction = :asc)
+        order_by_fields(field => direction)
+      end
+
+      def order_by_param(param, direction = :asc)
+        order_by_params(param => direction)
+      end
+
+      def order_by_fields(fields)
+        add_orderer(fields)
+      end
+
+      def order_by_params(params)
+        add_orderer(params, 'params')
+      end
+
       def completable(true_or_false = true)
         @task_filters << proc { |task| task.completable? == true_or_false }
         self
@@ -115,7 +132,11 @@ module Bumbleworks
       def each
         return to_enum(:each) unless block_given?
         return if @wfids == []
-        workitems = Bumbleworks.dashboard.context.storage.get_many('workitems', @wfids).each { |wi|
+        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)
             yield task
           end
@@ -132,6 +153,21 @@ module Bumbleworks
 
     private
 
+      def add_orderer(fields, field_type = 'fields')
+        @orderers << proc { |wi_x, wi_y|
+          relevant_direction, result = :asc, 0
+          fields.each do |field, direction|
+            sets = [wi_x['fields'], wi_y['fields']]
+            sets.map! { |s| s['params'] } if field_type.to_s == 'params'
+            result = sets[0][field.to_s] <=> sets[1][field.to_s]
+            relevant_direction = direction
+            break if !result.zero?
+          end
+          relevant_direction == :desc ? -result : result
+        }
+        self
+      end
+
       def filtered_task_from_raw_workitem(workitem)
         if @queries.all? { |q| q.call(workitem) }
           task = from_workitem(::Ruote::Workitem.new(workitem))
@@ -146,6 +182,10 @@ module Bumbleworks
       def from_workitem(workitem)
         task = @task_class.new(workitem)
       end
+
+      def raw_workitems(wfids)
+        Bumbleworks.dashboard.context.storage.get_many('workitems', wfids)
+      end
     end
   end
 end

data/lib/bumbleworks/version.rb

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

data/spec/lib/bumbleworks/task_spec.rb

@@ -218,6 +218,107 @@ describe Bumbleworks::Task do
     end
   end
 
+  context 'ordering' do
+    before :each do
+      Bumbleworks.define_process 'emergency_hamster_bullet' do
+        concurrence do
+          doctor :task => 'evince_concern', :priority => 3, :importance => 1000
+          patient :task => 'panic', :priority => 2, :importance => 5
+          nurse :task => 'roll_eyes', :priority => 4, :importance => 1000
+          officer :task => 'appear_authoritative', :priority => 1, :importance => 1000
+        end
+      end
+    end
+
+    context 'by params' do
+      before(:each) do
+        Bumbleworks.launch!('emergency_hamster_bullet')
+        Bumbleworks.dashboard.wait_for(:officer)
+      end
+
+      describe '.order_by_param' do
+        it 'orders returned tasks by given param ascending by default' do
+          tasks = described_class.order_by_param(:priority)
+          tasks.map(&:nickname).should == [
+            'appear_authoritative',
+            'panic',
+            'evince_concern',
+            'roll_eyes'
+          ]
+        end
+
+        it 'can order in reverse' do
+          tasks = described_class.order_by_param(:priority, :desc)
+          tasks.map(&:nickname).should == [
+            'roll_eyes',
+            'evince_concern',
+            'panic',
+            'appear_authoritative'
+          ]
+        end
+      end
+
+      describe '.order_by_params' do
+        it 'orders by multiple parameters' do
+          tasks = described_class.order_by_params(:importance => :desc, :priority => :asc)
+          tasks.map(&:nickname).should == [
+            'appear_authoritative',
+            'evince_concern',
+            'roll_eyes',
+            'panic'
+          ]
+        end
+      end
+    end
+
+    context 'by fields' do
+      before(:each) do
+        @wf3 = Bumbleworks.launch!('emergency_hamster_bullet', :group => 2, :strength => 3)
+        Bumbleworks.dashboard.wait_for(:officer)
+        @wf1 = Bumbleworks.launch!('emergency_hamster_bullet', :group => 2, :strength => 1)
+        Bumbleworks.dashboard.wait_for(:officer)
+        @wf2 = Bumbleworks.launch!('emergency_hamster_bullet', :group => 1, :strength => 2)
+        Bumbleworks.dashboard.wait_for(:officer)
+        @wf4 = Bumbleworks.launch!('emergency_hamster_bullet', :group => 1, :strength => 4)
+        Bumbleworks.dashboard.wait_for(:officer)
+      end
+
+      describe '.order_by_field' do
+        it 'orders returned tasks by given param ascending by default' do
+          tasks = described_class.for_role('doctor').order_by_field(:strength)
+          tasks.map { |t| [t.nickname, t.wfid] }.should == [
+            ['evince_concern', @wf1.wfid],
+            ['evince_concern', @wf2.wfid],
+            ['evince_concern', @wf3.wfid],
+            ['evince_concern', @wf4.wfid]
+          ]
+        end
+
+        it 'can order in reverse' do
+          tasks = described_class.for_role('doctor').order_by_field(:strength, :desc)
+          tasks.map { |t| [t.nickname, t.wfid] }.should == [
+            ['evince_concern', @wf4.wfid],
+            ['evince_concern', @wf3.wfid],
+            ['evince_concern', @wf2.wfid],
+            ['evince_concern', @wf1.wfid]
+          ]
+        end
+      end
+
+      describe '.order_by_fields' do
+        it 'orders by multiple parameters' do
+          tasks = described_class.for_role('doctor').order_by_fields(:group => :asc, :strength => :desc)
+          tasks.map { |t| [t.nickname, t.wfid] }.should == [
+            ['evince_concern', @wf4.wfid],
+            ['evince_concern', @wf2.wfid],
+            ['evince_concern', @wf3.wfid],
+            ['evince_concern', @wf1.wfid]
+          ]
+        end
+      end
+    end
+  end
+
   describe '.for_roles' do
     before :each do
       Bumbleworks.define_process 'lowering_penguin_self_esteem' do

metadata

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