@@ -39,11 +39,11 @@ class Dst tasks = if options.empty? Task.unfinished elsif context - Task.unfinished(:include => [:context, :project]).find_all { |task| + Task.unfinished.select { |task| task.context.name == context if task.context } elsif project - Task.unfinished(:include => [:context, :project]).find_all { |task| + Task.unfinished.select { |task| task.project.name == project if task.project } end || [] lib/dst.rb @@ -23,7 +23,7 @@ class Dst belongs_to :project def self.unfinished(options={}) - find(:all, {:conditions => 'status = "f"'}.merge(options)) + find(:all, :conditions => 'status = "f"', :include => [:context, :project], :order => 't1_r1') end def self.toggle!(task_id) lib/dst/models.rb @@ -1,4 +1,6 @@ $:.unshift 'lib/', File.dirname(__FILE__) + '/../lib' +require 'rubygems' +require 'spec' require 'dst' describe Dst do @@ -140,25 +142,25 @@ describe Dst do describe "when listing tasks: `[<@context> <@project>] [-a]]'" do before(:each) do - @tasks = mock('tasks', :find_all => [@task], :empty? => false, :map => [@task]) + @tasks = mock('tasks', :select => [@task], :empty? => false, :map => [@task]) @task_model.stub!(:unfinished).and_return(@tasks) end it 'finds all unfinished tasks if no filter provided' do @task_model.should_receive(:unfinished).and_return(@tasks) - @tasks.should_not_receive(:find_all) + @tasks.should_not_receive(:select) @dst.process_command('') end it 'finds unfinished tasks filtered by context' do @task_model.should_receive(:unfinished).and_return(@tasks) - @tasks.should_receive(:find_all) + @tasks.should_receive(:select) @dst.process_command('@context') end it 'finds unfinished tasks filtered by project' do @task_model.should_receive(:unfinished).and_return(@tasks) - @tasks.should_receive(:find_all) + @tasks.should_receive(:select) @dst.process_command(':project') end spec/dst_spec.rb 2acb0615a89bbcfb7a0a876ce867470dd994c9e5 Simon Rozet simon@rozet.name http://github.com/sr/dst/commit/8af7c137e9e68645cba27619dd4f3d0c65ea3ceb 8af7c137e9e68645cba27619dd4f3d0c65ea3ceb 2008-02-10T04:59:46-08:00 2008-02-10T04:59:46-08:00 - Sort tasks by context - Use #select instead #find_all - Always pass include :context and :project when selecting tasks 95a36a4b35f0683d8cb3d1379cdcbce23674883a Simon Rozet simon@rozet.name