taskwarrior-web 0.0.13 → 0.0.14

data/.gitignore

@@ -1,3 +1,5 @@
 .rvmrc
+coverage
 pkg
 coverage
+Gemfile.lock

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v0.0.14 (2/9/12)
+
+* Merged in major refactoring to allow for easier support of task 2 and
+  1 simultaneously. Note that taskwarrior-web still only supports task 1, but
+  adding support for task 2 should now be easier.
+* Removed the ability to mark a task as complete. This was really buggy to
+  begin with, and will need to wait until task 2.
+* Fixed project autocomplete. Now it should actually work.
+* Added a new tab for "Waiting" tasks (where status:waiting)
+
 ## v0.0.13 (2/6/12)
 
 * Adding Fluid app dock icon. The dock icons should now show a number of

data/Gemfile

@@ -2,3 +2,6 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in taskwarrior-web.gemspec
 gemspec
+
+gem 'rb-fsevent', :require => false
+gem 'growl', :require => false

data/Guardfile

@@ -0,0 +1,12 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'bundler' do
+  watch('Gemfile')
+  watch('taskwarrior-web.gemspec')
+end
+
+guard 'rspec', :version => 2 do
+  watch(/^lib\/(.+)\.rb$/) { "spec" }
+  watch(/^spec\/(.+)\.rb$/) { "spec" }
+end

data/README.md

@@ -1,4 +1,4 @@
-# Web Interface for Taskwarrior
+# A Web Interface for Taskwarrior
 
 A lightweight, Sinatra-based web interface for the
 wonderful [Taskwarrior](http://taskwarrior.org/) todo application.
@@ -25,14 +25,18 @@ an executable, so all options for Vegas are valid for `task-web`. Type
 The current featureset includes:
 
 * Viewing tasks (duh) sorted and grouped in various ways.
-* Marking a pending task as done.
 * Creating a new task with a due date, project, and tags.
 * `task-web` will pull your `task` config (from `.taskrc`) and use it to
   determine date formatting and when an upcoming task should be marked as
   "due".
+* If you are on a Mac and use Fluid.app, you get a dock badge showing the
+  number of pending tasks.
 
 I'm looking to include more features once `task` supports issuing commands via
-UUID.
+UUID, like:
+
+* Marking a pending task as done.
+* Deleting tasks
 
 ## Known Issues
 
@@ -42,9 +46,6 @@ UUID.
   Support for 1.8 will happen at some point.
 * The "View as list"/"View as Grid" links do nothing right now. (They will
   soon).
-* There are occasionally pretty severe race conditions due to the way that
-  `task` assigns IDs to tasks. This will no longer be the case when UUIDs are
-  implemented in `task`.
 
 ## Marginalia
 

data/lib/taskwarrior-web/app.rb

@@ -2,10 +2,10 @@
 
 require 'sinatra'
 require 'erb'
-require 'parseconfig'
-require 'json'
 require 'time'
 require 'rinku'
+require 'taskwarrior-web/config'
+require 'taskwarrior-web/helpers'
 require 'digest'
 
 module TaskwarriorWeb
@@ -22,66 +22,18 @@ module TaskwarriorWeb
     def authorized?
       @auth ||=  Rack::Auth::Basic::Request.new(request.env)
       @auth.provided? && @auth.basic? && @auth.credentials &&
-        @auth.credentials[0] == TaskwarriorWeb::Config.file.get_value('task-web.user') &&
-        Digest::MD5.hexdigest(@auth.credentials[1]) == TaskwarriorWeb::Config.file.get_value('task-web.passwd')
+        @auth.credentials[0] == TaskwarriorWeb::Config.property('task-web.user') &&
+        Digest::MD5.hexdigest(@auth.credentials[1]) == TaskwarriorWeb::Config.property('task-web.passwd')
     end
 
     # Before filter
     before do
       @current_page = request.path_info
-      protected! if TaskwarriorWeb::Config.file.get_value('task-web.user')
+      protected! if TaskwarriorWeb::Config.property('task-web.user')
     end
 
     # Helpers
-    helpers do
-
-      def format_date(timestamp)
-        format = TaskwarriorWeb::Config.file.get_value('dateformat') || 'm/d/Y'
-        subbed = format.gsub(/([a-zA-Z])/, '%\1')
-        Time.parse(timestamp).strftime(subbed)
-      end
-
-      def colorize_date(timestamp)
-        return if timestamp.nil?
-        due_def = TaskwarriorWeb::Config.file.get_value('due').to_i || 5
-        time = Time.parse(timestamp)
-        case true
-          when Time.now.strftime('%D') == time.strftime('%D') then 'today'
-          when Time.now.to_i > time.to_i then 'overdue'
-          when (time.to_i - Time.now.to_i) < (due_def * 86400) then 'due'
-          else 'regular'
-        end
-      end
-
-      def linkify(item, method)
-        return if item.nil?
-        case method.to_s
-          when 'project'
-            item.downcase.gsub('.', '--')
-        end
-      end
-
-      def auto_link(text)
-        Rinku.auto_link(text, :all, 'target="_blank"')
-      end
-
-      def subnav(type)
-        case type
-          when 'tasks' then
-            { '/tasks/pending' => "Pending (#{TaskwarriorWeb::Task.count(:status => 'pending')})", 
-              '/tasks/completed' => "Completed",
-              '/tasks/deleted' => 'Deleted'
-            }
-          when 'projects'
-            {
-              '/projects/overview' => 'Overview'
-            }
-          else
-            { }
-        end
-      end
-
-    end
+    helpers TaskwarriorWeb::App::Helpers
 
     # Redirects
     get '/' do
@@ -93,7 +45,7 @@ module TaskwarriorWeb
 
     # Task routes
     get '/tasks/:status/?' do
-      pass unless ['pending', 'completed', 'deleted'].include?(params[:status])
+      pass unless ['pending', 'waiting', 'completed', 'deleted'].include?(params[:status])
       @title = "#{params[:status].capitalize} Tasks"
       @subnav = subnav('tasks')
       @tasks = TaskwarriorWeb::Task.find_by_status(params[:status]).sort_by! { |x| [x.priority.nil?.to_s, x.priority.to_s, x.due.nil?.to_s, x.due.to_s, x.project.to_s] }
@@ -103,7 +55,7 @@ module TaskwarriorWeb
     get '/tasks/new/?' do
       @title = 'New Task'
       @subnav = subnav('tasks')
-      @date_format = TaskwarriorWeb::Config.file.get_value('dateformat') || 'm/d/yy'
+      @date_format = TaskwarriorWeb::Config.dateformat || 'm/d/yy'
       @date_format.gsub!('Y', 'yy')
       erb :task_form
     end
@@ -124,11 +76,6 @@ module TaskwarriorWeb
       end
     end
 
-    post '/tasks/:id/complete' do
-      TaskwarriorWeb::Task.complete!(params[:id])
-      redirect '/tasks/pending'
-    end
-
     # Projects
     get '/projects' do
       redirect '/projects/overview'
@@ -144,9 +91,8 @@ module TaskwarriorWeb
     get '/projects/:name/?' do
       @subnav = subnav('projects')
       subbed = params[:name].gsub('--', '.') 
-      @tasks = TaskwarriorWeb::Task.query('status.not' => 'deleted', 'project' => subbed).sort_by! { |x| [x.priority.nil?.to_s, x.priority.to_s, x.due.nil?.to_s, x.due.to_s] }
-      regex = Regexp.new("^#{subbed}$", Regexp::IGNORECASE)
-      @title = @tasks.select { |t| t.project.match(regex) }.first.project
+      @tasks = TaskwarriorWeb::Task.query('status.not' => 'deleted', :project => subbed).sort_by! { |x| [x.priority.nil?.to_s, x.priority.to_s, x.due.nil?.to_s, x.due.to_s] }
+      @title = @tasks.select { |t| t.project.match(/^#{subbed}$/i) }.first.project
       erb :project
     end
 
@@ -157,7 +103,7 @@ module TaskwarriorWeb
     # AJAX callbacks
     get '/ajax/projects/?' do
       projects = TaskwarriorWeb::Task.query('status.not' => 'deleted').collect { |t| t.project }
-      projects.compact!.uniq!.to_json
+      projects.compact.uniq.select {|proj| proj.start_with?(params[:term]) }.to_json
     end
 
     get '/ajax/tags/?' do
@@ -181,8 +127,8 @@ module TaskwarriorWeb
 
     def passes_validation(item, method)
       results = [] 
-      case method.to_s
-        when 'task'
+      case method
+        when :task
           if item['description'].empty?
             results << 'You must provide a description'
           end

data/lib/taskwarrior-web/command.rb

@@ -0,0 +1,25 @@
+require 'taskwarrior-web/runner'
+
+module TaskwarriorWeb
+  class Command
+
+    attr_accessor :command, :id, :params
+
+    def initialize(command, id = nil, *args)
+      @command = command if command
+      @id = id if id
+      @params = args.last.is_a?(::Hash) ? args.pop : {}
+    end
+
+    def run
+      if @command
+        TaskwarriorWeb::Runner.run(self)
+      else
+        raise MissingCommandError
+      end
+    end
+
+  end
+
+  class MissingCommandError < Exception; end
+end

data/lib/taskwarrior-web/config.rb

@@ -1,11 +1,24 @@
+require 'parseconfig'
+
 module TaskwarriorWeb
-  module Config
+  class Config
 
-    extend self
+    def self.task_version
+      # TODO: Parse the actual task version
+      1
+    end
 
-    def file
+    def self.file
       @file ||= ParseConfig.new("#{Dir.home}/.taskrc")
     end
 
+    def self.property(prop)
+      self.file.get_value(prop)
+    end
+
+    def self.method_missing(method)
+      self.file.get_value(method)
+    end
+
   end
 end

data/lib/taskwarrior-web/helpers.rb

@@ -0,0 +1,56 @@
+require 'taskwarrior-web/config'
+
+module TaskwarriorWeb
+  class App < Sinatra::Base
+    module Helpers
+
+      def format_date(timestamp)
+        format = TaskwarriorWeb::Config.dateformat || 'm/d/Y'
+        subbed = format.gsub(/([a-zA-Z])/, '%\1')
+        Time.parse(timestamp).strftime(subbed)
+      end
+
+      def colorize_date(timestamp)
+        return if timestamp.nil?
+        due_def = TaskwarriorWeb::Config.due.to_i || 5
+        time = Time.parse(timestamp)
+        case true
+          when Time.now.strftime('%D') == time.strftime('%D') then 'today'
+          when Time.now.to_i > time.to_i then 'overdue'
+          when (time.to_i - Time.now.to_i) < (due_def * 86400) then 'due'
+          else 'regular'
+        end
+      end
+
+      def linkify(item, method)
+        return if item.nil?
+        case method.to_s
+          when 'project'
+            item.downcase.gsub('.', '--')
+        end
+      end
+
+      def auto_link(text)
+        Rinku.auto_link(text, :all, 'target="_blank"')
+      end
+
+      def subnav(type)
+        case type
+          when 'tasks' then
+            { '/tasks/pending' => "Pending (#{TaskwarriorWeb::Task.count(:status => :pending)})",
+              '/tasks/waiting' => "Waiting",
+              '/tasks/completed' => "Completed",
+              '/tasks/deleted' => 'Deleted'
+            }
+          when 'projects'
+            {
+              '/projects/overview' => 'Overview'
+            }
+          else
+            { }
+        end
+      end
+
+    end
+  end
+end

data/lib/taskwarrior-web/runner.rb

@@ -1,12 +1,61 @@
+require 'taskwarrior-web/config'
+
 module TaskwarriorWeb
   class Runner
 
     TASK_BIN = 'task'
 
-    def self.run(command)
-      command = TASK_BIN + " #{command}"
-      `#{command}`
+    TASK_COMMANDS = {
+      :add => 'add',
+      :query => '_query',
+      :count => 'count'
+    }
+
+    def self.run(command_obj)
+      command = build(command_obj)
+      # Add some logging
+      `#{TASK_BIN} #{command}`
+    end
+
+    def self.build(command_obj)
+      command = task_command(command_obj)
+      command = substitute_parts(command, command_obj) if command =~ /:id/
+      params = parsed_params(command_obj.params)
+      "#{command}#{params}"
+    end
+
+    def self.task_command(command_obj)
+      if TASK_COMMANDS.has_key?(command_obj.command.to_sym)
+        TASK_COMMANDS[command_obj.command.to_sym]
+      else
+        raise InvalidCommandError
+      end
+    end
+
+    def self.substitute_parts(task_command, command_obj)
+      if command_obj.id
+        task_command.gsub(':id', command_obj.id.to_s)
+      else
+        raise MissingTaskIDError
+      end
+    end
+
+    def self.parsed_params(params)
+      String.new.tap do |string|
+        string << " '#{params.delete(:description)}'" if params.has_key?(:description)
+
+        if params.has_key?(:tags)
+          tags = params.delete(:tags)
+          tag_indicator = TaskwarriorWeb::Config.property('tag.indicator') || '+'
+          tags.each { |tag| string << " #{tag_indicator}#{tag.to_s}" } 
+        end
+
+        params.each { |attr, value| string << " #{attr.to_s}:#{value.to_s}" }
+      end
     end
 
   end
+
+  class InvalidCommandError < Exception; end
+  class MissingTaskIDError < Exception; end
 end

data/lib/taskwarrior-web/runners/v1.rb

@@ -0,0 +1,11 @@
+module TaskwarriorWeb
+  module Runner
+    module Version1
+
+      def self.run
+        puts 'Called versioned run method.'
+      end
+
+    end
+  end
+end

data/lib/taskwarrior-web/runners/v2.rb

@@ -0,0 +1,7 @@
+module TaskwarriorWeb
+  module Runner
+    module Version2
+
+    end
+  end
+end

data/lib/taskwarrior-web/task.rb

@@ -1,4 +1,5 @@
-require 'taskwarrior-web/runner'
+require 'json'
+require 'taskwarrior-web/command'
 
 module TaskwarriorWeb
   
@@ -7,7 +8,7 @@ module TaskwarriorWeb
   #################
   class Task
 
-    attr_accessor :id, :entry, :project, :priority, :uuid, :description, :status,
+    attr_accessor :entry, :project, :priority, :uuid, :description, :status,
                   :due, :start, :end, :tags, :depends, :wait, :annotations
     alias :annotate= :annotations=
 
@@ -22,19 +23,16 @@ module TaskwarriorWeb
     end
 
     def save!
-      exclude = ['@description', '@tags']
-      command = 'add'
-      command << " '#{description}'"
-      instance_variables.each do |ivar|
-        subbed = ivar.to_s.gsub('@', '')
-        command << " #{subbed}:#{send(subbed.to_sym)}" unless exclude.include?(ivar.to_s)
-      end
-      unless tags.nil?
-        tags.gsub(', ', ',').split(',').each do |tag|
-          command << " +#{tag}"
-        end
-      end
-      TaskwarriorWeb::Runner.run(command)
+      Command.new(:add, nil, self.to_hash).run
+    end
+
+    # Make sure that the tags are an array.
+    def tags=(value)
+      @tags = value.is_a?(String) ? value.gsub(', ', ',').split(',') : value
+    end
+
+    def to_hash
+      Hash[instance_variables.map { |var| [var[1..-1].to_sym, instance_variable_get(var)] }]
     end
     
     ##################################
@@ -44,34 +42,27 @@ module TaskwarriorWeb
     # Run queries on tasks.
     def self.query(*args)
       tasks = []
-      count = 1
-  
-      command =  '_query'
-      args.each do |param|
-        param.each do |attr, value|
-          command << " #{attr.to_s}:#{value}"
-        end
-      end
 
       # Process the JSON data.
-      json = TaskwarriorWeb::Runner.run(command)
+      json = Command.new(:query, nil, *args).run
       json.strip!
       json = '[' + json + ']'
-      results = json == '[No matches.]' ? [] : JSON.parse(json)
+      results = json == '[No matches.]' ? [] : ::JSON.parse(json)
 
-      results.each do |result|
-        result[:id] = count
-        tasks << Task.new(result)
-        count = count + 1
-      end
-      return tasks
+      results.each { |result| tasks << Task.new(result) }
+      tasks
+    end
+
+    # Get the number of tasks for some paramters
+    def self.count(*args)
+      Command.new(:count, nil, *args).run.to_s.strip!
     end
 
     # Define method_missing to implement dynamic finder methods
     def self.method_missing(method_sym, *arguments, &block)
       match = TaskDynamicFinderMatch.new(method_sym)
       if match.match? 
-        self.query(match.attribute => arguments.first)
+        self.query(match.attribute.to_s => arguments.first.to_s)
       else
         super
       end
@@ -86,28 +77,6 @@ module TaskwarriorWeb
       end
     end
 
-    # Get the number of tasks for some paramters
-    def self.count(*args)
-      command = 'count'
-      args.each do |param|
-        param.each do |attr, value|
-          command << " #{attr.to_s}:#{value}"
-        end
-      end
-      return TaskwarriorWeb::Runner.run(command).strip!
-    end
-
-    ###############################################
-    # CLASS METHODS FOR INTERACTING WITH TASKS
-    # (THESE WILL PROBABLY BECOME INSTANCE METHODS)
-    ###############################################
-
-    # Mark a task as complete
-    # TODO: Make into instance method when `task` supports finding by UUID.
-    def self.complete!(task_id)
-      TaskwarriorWeb::Runner.run("#{task_id} done")
-    end
-
   end
 
   ###########################################

data/public/js/application.js

@@ -1,15 +1,18 @@
 $(document).ready(function() {
 	initPolling();
 	initTooltips();
-	initCompleteTask();
 	initDatePicker();
 	initAutocomplete();
-	refreshDockBadge();
+
+	// Fluid-specific stuff.
+	if (window.fluid) {
+		refreshDockBadge();
+	}
 });
 
 var initPolling = function() {
-	var polling;
-	if (polling = $.cookie('taskwarrior-web-polling')) {
+	var polling = $.cookie('taskwarrior-web-polling');
+	if (polling) {
 		var pollingInterval = startPolling();
 	} else {
 		$('#polling-info a').text('Start polling');
@@ -54,56 +57,6 @@ var initTooltips = function() {
 	});
 };
 
-var initCompleteTask = function() {
-	$('input.pending').live('change', function() {
-		var checkbox = $(this);
-		var row = checkbox.closest('tr');
-		var task_id = $(this).data('task');
-		$.ajax({
-			url: '/tasks/' + task_id + '/complete',
-			type: 'post',
-			beforeSend: function() {
-				checkbox.replaceWith('<img src="/images/ajax-loader.gif" />');
-			},
-			success: function(data) {
-				row.fadeOut('slow', function() {
-					row.remove();
-					refreshSubnavCount();
-					refreshDockBadge();
-				});
-			}
-		});
-	});
-};
-
-var initInPlaceEditing = function() {
-	// Hide it initially.
-	$('.inplace-edit').hide();
-	$('#listing table td').live('mouseover mouseout', function(e) {
-		if (e.type == 'mouseover')  {
-			$('.inplace-edit', this).show();
-		} else {
-			$('.inplace-edit', this).hide();
-		}
-	});
-
-	$('.inplace-edit').live('click', function() {
-		var field = $($(this).siblings('span')[0]);
-		var formElement = '<input type="text" class="inplace-text" value="'+field.text()+'" />';
-		formElement += '<button type="submit" class="inplace-submit">Update</button>';
-		formElement += '<a href="javascript:void(0);" class="inplace-cancel">Cancel</a>';
-		field.replaceWith(formElement);
-		$(this).remove();
-	});
-
-	$('.inplace-cancel').live('click', function() {
-		var td = $(this).closest('td');
-		var oldField = '<span class="description">'+$($(this).siblings('.inplace-text')[0]).val()+'</span>';
-		oldField += '<a class="inplace-edit" href="javascript:void(0);">Edit</a>';
-		td.html(oldField);
-	});
-};
-
 var initDatePicker = function() {
 	$('.datefield input').datepicker({
 		dateFormat: $('.datefield input').data('format'),

data/spec/app/app_spec.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'taskwarrior-web/app'
+
+set :environment, :test
+
+describe "My App" do
+  include Rack::Test::Methods
+
+  def app
+    TaskwarriorWeb::App
+  end
+
+  before do
+    TaskwarriorWeb::Config.should_receive(:property).with('task-web.user').any_number_of_times.and_return(nil)
+    TaskwarriorWeb::Runner.should_receive(:run).any_number_of_times.and_return('{}')
+  end
+
+  describe 'GET /' do
+    it 'should redirect to /tasks/pending' do
+      get "/"
+      follow_redirect!
+
+      last_request.url.should =~ /tasks\/pending/
+      last_response.should be_ok
+    end
+  end
+end

data/spec/app/helpers_spec.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'taskwarrior-web/helpers'
+
+class TestHelpers
+  include TaskwarriorWeb::App::Helpers
+end
+
+describe TaskwarriorWeb::App::Helpers do
+  let(:helpers) { TestHelpers.new }
+
+  describe '#format_date' do
+    context 'with no format specified' do
+      before do
+        TaskwarriorWeb::Config.should_receive(:dateformat).any_number_of_times.and_return(nil)
+      end
+
+      it 'should format various dates and times to the default format' do
+        helpers.format_date('2012-01-11 12:23:00').should == '01/11/2012'
+        helpers.format_date('2012-01-11').should == '01/11/2012'
+      end
+    end
+
+    context 'with a specified date format' do
+      before do
+        TaskwarriorWeb::Config.should_receive(:dateformat).any_number_of_times.and_return('d/m/Y')
+      end
+
+      it 'should format dates using the specified format' do
+        helpers.format_date('2012-01-11 12:23:00').should == '11/01/2012'
+        helpers.format_date('2012-01-11').should == '11/01/2012'
+      end
+    end
+
+  end
+end
+

data/spec/models/command_spec.rb

@@ -0,0 +1,39 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'taskwarrior-web/command'
+
+describe TaskwarriorWeb::Command do
+  describe '.initialize' do
+    context 'when the command, id, and params are specified' do
+      it 'should set the passed variables' do
+        command = TaskwarriorWeb::Command.new('test', 3, :hello => :hi, :none => :none)
+        command.command.should eq('test')
+        command.id.should eq(3)
+        command.params.should eq({ :hello => :hi, :none => :none })
+      end
+    end
+
+    it 'should not set an @id if none is passed' do
+      command = TaskwarriorWeb::Command.new('test', nil, :hello => :hi, :none => :none)
+      command.command.should eq('test')
+      command.id.should be_nil
+      command.params.should eq({ :hello => :hi, :none => :none })
+    end
+  end
+
+  describe '#run' do
+    before do
+      @command = TaskwarriorWeb::Command.new('test', 4)
+    end
+
+    it 'should pass the object to the Runner' do
+      TaskwarriorWeb::Runner.should_receive(:run).with(@command).and_return('{}')
+      @command.run
+    end
+
+    it 'should raise an exception if no command is specified' do
+      command = TaskwarriorWeb::Command.new(nil, 5)
+      expect { command.run }.to raise_error(TaskwarriorWeb::MissingCommandError)
+    end
+
+  end
+end

data/spec/models/runner_spec.rb

@@ -0,0 +1,74 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'taskwarrior-web/runner'
+
+describe TaskwarriorWeb::Runner do
+  before do
+    @command = TaskwarriorWeb::Command.new(:add)
+  end
+
+  describe '.run' do
+    context 'valid, without a command' do
+      before do
+        TaskwarriorWeb::Runner.should_receive(:`).and_return('{}')
+      end
+
+      it 'should return the stdout' do
+        TaskwarriorWeb::Runner.run(@command).should eq('{}')
+      end
+
+      it 'should not call .substitute_parts if not necessary' do
+        TaskwarriorWeb::Runner.should_not_receive(:substitute_parts)
+        TaskwarriorWeb::Runner.run(@command)
+      end
+    end
+
+    context 'invalid' do
+      it 'should throw an exception if the command is not valid' do
+        @command.command = :test
+        expect { TaskwarriorWeb::Runner.run(@command) }.to raise_error(TaskwarriorWeb::InvalidCommandError)
+      end
+    end
+
+    context 'with a given command' do
+      it 'should execute the given command' do
+        TaskwarriorWeb::Runner.should_receive(:`).with('task add').and_return('{}')
+        TaskwarriorWeb::Runner.run(@command)
+      end
+    end
+  end
+
+  describe '.substitute_parts' do
+    it 'should replace the :id string with the given task ID' do
+      command = TaskwarriorWeb::Command.new(:complete, 4)
+      TaskwarriorWeb::Runner.substitute_parts(':id done', command).should eq('4 done')
+    end
+
+    it 'should throw an error if the command has no task ID' do
+      expect { TaskwarriorWeb::Runner.substitute_parts(':id done', @command) }.to raise_error(TaskwarriorWeb::MissingTaskIDError)
+    end
+  end
+
+  describe '.parsed_params' do
+    it 'should create a string from the passed paramters' do
+      command = TaskwarriorWeb::Command.new(:query, nil, :test => 14, :none => :none, :hello => :hi)
+      TaskwarriorWeb::Runner.parsed_params(command.params).should eq(' test:14 none:none hello:hi')
+    end
+
+    it 'should prefix tags with the tag.indicator if specified' do
+      TaskwarriorWeb::Config.should_receive(:property).with('tag.indicator').and_return(';')
+      command = TaskwarriorWeb::Command.new(:add, nil, :tags => [:today, :tomorrow])
+      TaskwarriorWeb::Runner.parsed_params(command.params).should eq(' ;today ;tomorrow') 
+    end
+
+    it 'should prefix tags with a + if no tag.indicator is specified' do
+      TaskwarriorWeb::Config.should_receive(:property).with('tag.indicator').and_return(nil)
+      command = TaskwarriorWeb::Command.new(:add, nil, :tags => [:today, :tomorrow])
+      TaskwarriorWeb::Runner.parsed_params(command.params).should eq(' +today +tomorrow') 
+    end
+
+    it 'should pull out the description parameter' do
+      command = TaskwarriorWeb::Command.new(:add, nil, :description => 'Hello', :status => :pending)
+      TaskwarriorWeb::Runner.parsed_params(command.params).should eq(" 'Hello' status:pending")
+    end
+  end
+end

data/spec/models/task_spec.rb

@@ -1,6 +1,9 @@
+require File.dirname(__FILE__) + '/../spec_helper'
 require 'taskwarrior-web/task'
 
 describe TaskwarriorWeb::Task do
+  RSpec::Mocks::setup(TaskwarriorWeb::Runner)
+  TaskwarriorWeb::Runner.stub(:run) { '{}' }
 
   describe '#initialize' do
     it 'should assign the passed attributes' do
@@ -14,4 +17,82 @@ describe TaskwarriorWeb::Task do
       task.respond_to?(:bogus).should be_false
     end
   end
+
+  describe '.query' do
+    it 'should create and run a new Command object' do
+      command = TaskwarriorWeb::Command.new(:query)
+      TaskwarriorWeb::Command.should_receive(:new).with(:query, nil).and_return(command)
+      command.should_receive(:run).and_return('{}')
+      TaskwarriorWeb::Task.query
+    end
+
+    it 'should parse the JSON received from the `task` command' do
+      TaskwarriorWeb::Runner.should_receive(:run).and_return('{}')
+      ::JSON.should_receive(:parse).with('[{}]').and_return([])
+      TaskwarriorWeb::Task.query
+    end
+
+    it 'should not parse the results when there are no matching tasks' do
+      TaskwarriorWeb::Runner.should_receive(:run).and_return('No matches.')
+      ::JSON.should_not_receive(:parse)
+      TaskwarriorWeb::Task.query
+    end
+  end
+
+  describe '.count' do
+    it 'create and run an new command object' do
+      command = TaskwarriorWeb::Command.new(:count)
+      TaskwarriorWeb::Command.should_receive(:new).with(:count, nil).and_return(command)
+      command.should_receive(:run).and_return('{}')
+      TaskwarriorWeb::Task.count
+    end
+  end
+
+  describe '#tags=' do
+    it 'should convert a string to an array when initializing' do
+      task = TaskwarriorWeb::Task.new(:tags => 'hi there, twice')
+      task.tags.should eq(['hi there', 'twice'])
+    end
+
+    it 'should convert a string to an array when setting explicitly' do
+      task = TaskwarriorWeb::Task.new
+      task.tags = 'hello, twice,thrice'
+      task.tags.should eq(['hello', 'twice', 'thrice'])
+    end
+  end
+
+  describe '#to_hash' do
+    before do
+      @task = TaskwarriorWeb::Task.new(:description => 'Testing', :due => '12/2/12', :tags => 'hello, twice')
+    end
+
+    it 'should return a hash' do
+      @task.to_hash.should be_a(Hash)
+    end
+
+    it 'should have keys for each of the object\'s instance variables' do
+      @task.to_hash.should eq({:description => 'Testing', :due => '12/2/12', :tags => ['hello', 'twice']})
+    end
+  end
+
+  describe '.method_missing' do
+    it 'should call the query method for find_by queries' do
+      TaskwarriorWeb::Task.should_receive(:query).with('status' => 'pending')
+      TaskwarriorWeb::Task.find_by_status(:pending)
+    end
+
+    it 'should call pass other methods to super if not find_by_*' do
+      TaskwarriorWeb::Task.should_not_receive(:query)
+      Object.should_receive(:method_missing).with(:do_a_thing, anything)
+      TaskwarriorWeb::Task.do_a_thing(:pending)
+    end
+
+    it 'should make the class respond to find_by queries' do
+      TaskwarriorWeb::Task.should respond_to(:find_by_test)
+    end
+
+    it 'should not add support for obviously bogus methods' do
+      TaskwarriorWeb::Task.should_not respond_to(:wefiohhohiihihih)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -0,0 +1,18 @@
+require 'sinatra'
+require 'rack/test'
+require 'rspec'
+
+# Simplecov
+require 'simplecov'
+SimpleCov.start do
+  add_filter "spec"
+end
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+  config.include(RSpec::Mocks::Methods)
+end

data/taskwarrior-web.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "taskwarrior-web"
-  s.version     = '0.0.13'
+  s.version     = '0.0.14'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jake Bell"]
   s.email       = ["jake@theunraveler.com"]
@@ -21,7 +21,11 @@ Gem::Specification.new do |s|
   s.add_dependency('rinku')
 
   s.add_development_dependency('rake')
+  s.add_development_dependency('rack-test')
   s.add_development_dependency('rspec')
+  s.add_development_dependency('simplecov')
+  s.add_development_dependency('guard-rspec')
+  s.add_development_dependency('guard-bundler')
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/views/listing.erb

@@ -2,7 +2,6 @@
   <table>
     <thead>
       <tr>
-        <th></th>
         <th>Description</th>
         <th>Project</th>
         <th>Due</th>
@@ -14,11 +13,9 @@
       <% @tasks.each do |task| %>
         <% if task.status == 'pending' %>
           <tr class="<%= colorize_date(task.due) %>">
-            <td><input type="checkbox" <%= 'checked="checked" ' if task.status == 'completed' %> class="<%= task.status %>" data-task="<%= task.id %>" /></td>
-          <% else %>
-            <tr class="<%= task.status %>">
-              <td></td>
-          <% end %>
+        <% else %>
+          <tr class="<%= task.status %>">
+        <% end %>
           <td>
             <%= task.description %>
             <% unless task.annotations.nil? || task.annotations.empty? %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taskwarrior-web
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000 Z
+date: 2012-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2162191880 !ruby/object:Gem::Requirement
+  requirement: &2152168480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162191880
+  version_requirements: *2152168480
 - !ruby/object:Gem::Dependency
   name: parseconfig
-  requirement: &2162191420 !ruby/object:Gem::Requirement
+  requirement: &2152167760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162191420
+  version_requirements: *2152167760
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &2162191000 !ruby/object:Gem::Requirement
+  requirement: &2152167020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162191000
+  version_requirements: *2152167020
 - !ruby/object:Gem::Dependency
   name: rinku
-  requirement: &2162190580 !ruby/object:Gem::Requirement
+  requirement: &2152166160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162190580
+  version_requirements: *2152166160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2162190160 !ruby/object:Gem::Requirement
+  requirement: &2152165600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,54 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162190160
+  version_requirements: *2152165600
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &2152165000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152165000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2162189740 !ruby/object:Gem::Requirement
+  requirement: &2152164380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152164380
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &2152023060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152023060
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &2152021400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152021400
+- !ruby/object:Gem::Dependency
+  name: guard-bundler
+  requirement: &2152020560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162189740
+  version_requirements: *2152020560
 description: This gem provides a graphical frontend for the Taskwarrior task manager.
   It is based on Sinatra.
 email:
@@ -87,18 +131,23 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
+- Guardfile
 - README.md
 - Rakefile
 - bin/task-web
 - config.ru
 - lib/taskwarrior-web.rb
 - lib/taskwarrior-web/app.rb
+- lib/taskwarrior-web/command.rb
 - lib/taskwarrior-web/config.rb
+- lib/taskwarrior-web/helpers.rb
 - lib/taskwarrior-web/runner.rb
+- lib/taskwarrior-web/runners/v1.rb
+- lib/taskwarrior-web/runners/v2.rb
 - lib/taskwarrior-web/task.rb
 - public/css/gh-buttons.css
 - public/css/jquery-ui.css
@@ -128,7 +177,12 @@ files:
 - public/js/jquery.min.js
 - public/js/jquery.tagsinput.js
 - public/js/jquery.tipsy.js
+- spec/app/app_spec.rb
+- spec/app/helpers_spec.rb
+- spec/models/command_spec.rb
+- spec/models/runner_spec.rb
 - spec/models/task_spec.rb
+- spec/spec_helper.rb
 - taskwarrior-web.gemspec
 - views/404.erb
 - views/_navigation.erb
@@ -157,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -705373290022093367
+      hash: -1565305535582289311
 requirements: []
 rubyforge_project: taskwarrior-web
 rubygems_version: 1.8.11
@@ -165,4 +219,9 @@ signing_key:
 specification_version: 3
 summary: Web frontend for taskwarrior command line task manager.
 test_files:
+- spec/app/app_spec.rb
+- spec/app/helpers_spec.rb
+- spec/models/command_spec.rb
+- spec/models/runner_spec.rb
 - spec/models/task_spec.rb
+- spec/spec_helper.rb

data/Gemfile.lock

@@ -1,42 +0,0 @@
-PATH
-  remote: .
-  specs:
-    taskwarrior-web (0.0.13)
-      parseconfig
-      rinku
-      sinatra
-      vegas
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.1.3)
-    parseconfig (0.5.2)
-    rack (1.4.1)
-    rack-protection (1.2.0)
-      rack
-    rake (0.9.2.2)
-    rinku (1.5.0)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    sinatra (1.3.2)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    tilt (1.3.3)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rake
-  rspec
-  taskwarrior-web!