bumbleworks 0.0.68 → 0.0.69

data/lib/bumbleworks/task/finder.rb

@@ -200,7 +200,11 @@ module Bumbleworks
           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]
+            wi_x_field, wi_y_field = sets[0][field.to_s], sets[1][field.to_s]
+            result = wi_x_field <=> wi_y_field
+            if result.nil?
+              result = wi_x_field.nil? ? 1 : -1
+            end
             relevant_direction = direction
             break if !result.zero?
           end

data/lib/bumbleworks/version.rb

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

data/spec/lib/bumbleworks/task_spec.rb

@@ -226,6 +226,7 @@ describe Bumbleworks::Task do
           patient :task => 'panic', :priority => 2, :importance => 5
           nurse :task => 'roll_eyes', :priority => 4, :importance => 1000
           officer :task => 'appear_authoritative', :priority => 1, :importance => 1000
+          rhubarb :task => 'sit_quietly', :importance => 80
         end
       end
     end
@@ -243,13 +244,15 @@ describe Bumbleworks::Task do
             'appear_authoritative',
             'panic',
             'evince_concern',
-            'roll_eyes'
+            'roll_eyes',
+            'sit_quietly'
           ]
         end
 
         it 'can order in reverse' do
           tasks = described_class.order_by_param(:priority, :desc)
           tasks.map(&:nickname).should == [
+            'sit_quietly',
             'roll_eyes',
             'evince_concern',
             'panic',
@@ -265,6 +268,7 @@ describe Bumbleworks::Task do
             'appear_authoritative',
             'evince_concern',
             'roll_eyes',
+            'sit_quietly',
             'panic'
           ]
         end
@@ -281,6 +285,8 @@ describe Bumbleworks::Task do
         Bumbleworks.dashboard.wait_for(:officer)
         @wf4 = Bumbleworks.launch!('emergency_hamster_bullet', :group => 1, :strength => 4)
         Bumbleworks.dashboard.wait_for(:officer)
+        @wf5 = Bumbleworks.launch!('emergency_hamster_bullet', :group => 1)
+        Bumbleworks.dashboard.wait_for(:officer)
       end
 
       describe '.order_by_field' do
@@ -290,13 +296,15 @@ describe Bumbleworks::Task do
             ['evince_concern', @wf1.wfid],
             ['evince_concern', @wf2.wfid],
             ['evince_concern', @wf3.wfid],
-            ['evince_concern', @wf4.wfid]
+            ['evince_concern', @wf4.wfid],
+            ['evince_concern', @wf5.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', @wf5.wfid],
             ['evince_concern', @wf4.wfid],
             ['evince_concern', @wf3.wfid],
             ['evince_concern', @wf2.wfid],
@@ -309,6 +317,7 @@ describe Bumbleworks::Task 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', @wf5.wfid],
             ['evince_concern', @wf4.wfid],
             ['evince_concern', @wf2.wfid],
             ['evince_concern', @wf3.wfid],

metadata

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