taskwarrior-web 1.0.14 → 1.1.0

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 1.9.3
 script: "rake spec"
 before_install:
-  - sudo apt-get install task
+  - sudo apt-get update -qq
+  - sudo apt-get install task -qq
   - cp -v /home/vagrant/builds/theunraveler/taskwarrior-web/spec/files/taskrc /home/vagrant/.taskrc
   - mkdir /home/vagrant/.task

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v1.1.0 (12/7/12)
+
+* Editing and deleting tasks! (If you are using task >= 2.0).
+* Fixing status messages. They should now be consistent.
+* Added safeguards for xterm.title and color .taskrc settings. You should now
+  be able to safely set both of those options.
+
 ## v1.0.14 (11/22/12)
 
 * Fixed a bug when colorizing tasks based on "due" setting.

data/README.md

@@ -13,10 +13,6 @@ forthcoming!**
 
 * `ruby` >= 1.9 (support for `ruby` < 1.9 is very unlikely, but pull requests
   are gladly accepted).
-* In your `.taskrc` file, `xterm.title` cannot be enabled. Either remove that
-  line from `.taskrc` or set it to `off`. If you have a very compelling reason
-  for needing this to be enabled, submit a bug report and I'll reconsider
-    adding support for it.
 
 ## Installation
 
@@ -37,8 +33,9 @@ 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.
+* Viewing tasks sorted and grouped in various ways.
 * Creating a new task with a due date, project, and tags.
+* Editing and deleting tasks (only task >= 2.0).
 * `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".

data/lib/taskwarrior-web.rb

@@ -4,6 +4,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 require 'rubygems'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string/inflections'
+require 'active_support/core_ext/string/filters'
 
 module TaskwarriorWeb
   autoload :App,            'taskwarrior-web/app'

data/lib/taskwarrior-web/app.rb

@@ -6,6 +6,7 @@ require 'time'
 require 'rinku'
 require 'digest'
 require 'sinatra/simple-navigation'
+require 'rack-flash'
 
 class TaskwarriorWeb::App < Sinatra::Base
   autoload :Helpers, 'taskwarrior-web/helpers'
@@ -15,34 +16,25 @@ class TaskwarriorWeb::App < Sinatra::Base
   set :app_file, __FILE__
   set :public_folder, File.dirname(__FILE__) + '/public'
   set :views, File.dirname(__FILE__) + '/views'
+  set :method_override, true
+  enable :sessions
 
   # Helpers
   helpers Helpers
   register Sinatra::SimpleNavigation
+  use Rack::Flash
   
-  def protected!
-    response['WWW-Authenticate'] = %(Basic realm="Taskworrior Web") and throw(:halt, [401, "Not authorized\n"]) and return unless authorized?
-  end
-
-  def authorized?
-    @auth ||=  Rack::Auth::Basic::Request.new(request.env)
-    values = [TaskwarriorWeb::Config.property('task-web.user'), TaskwarriorWeb::Config.property('task-web.passwd')]
-    @auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == values
-  end
-
   # Before filter
   before do
     @current_page = request.path_info
+    @can_edit = TaskwarriorWeb::Config.supports? :editing
     protected! if TaskwarriorWeb::Config.property('task-web.user')
   end
 
   # Redirects
-  get '/' do
-    redirect '/tasks/pending'
-  end
-  get '/tasks/?' do
-    redirect '/tasks/pending'
-  end
+  get('/') { redirect to('/tasks/pending') }
+  get('/tasks/?') { redirect to('/tasks/pending') }
+  get('/projects/?') { redirect to('/projects/overview') }
 
   # Task routes
   get '/tasks/:status/?' do
@@ -60,26 +52,63 @@ class TaskwarriorWeb::App < Sinatra::Base
   get '/tasks/new/?' do
     @title = 'New Task'
     @date_format = (TaskwarriorWeb::Config.dateformat || 'm/d/yy').gsub('Y', 'yy')
-    erb :task_form
+    erb :new_task
   end
 
   post '/tasks/?' do
     @task = TaskwarriorWeb::Task.new(params[:task])
 
     if @task.is_valid?
-      @task.save!
-      redirect '/tasks'
+      flash[:success] = @task.save! || %Q{New task "#{@task.description.truncate(20)}" created}
+      redirect to('/tasks')
     end
 
-    @messages = @task._errors.map { |error| { :severity => 'alert-error', :message => error } }
-    call! env.merge('REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/tasks/new')
+    flash.now[:error] = @task._errors.join(', ')
+    forward '/tasks/new'
   end
 
-  # Projects
-  get '/projects' do
-    redirect '/projects/overview'
+  get '/tasks/:uuid/?' do
+    not_found if !TaskwarriorWeb::Config.supports?(:editing)
+    tasks = TaskwarriorWeb::Task.find_by_uuid(params[:uuid])
+    not_found if tasks.empty?
+    @task = tasks.first
+    @title = %Q{Editing "#{@task.description.truncate(20)}"}
+    erb :edit_task
   end
 
+  patch '/tasks/:uuid/?' do
+    not_found if !TaskwarriorWeb::Config.supports?(:editing)
+    not_found if TaskwarriorWeb::Task.find_by_uuid(params[:uuid]).empty?
+
+    @task = TaskwarriorWeb::Task.new(params[:task])
+    if @task.is_valid?
+      flash[:success] = @task.save! || %Q{Task "#{@task.description.truncate(20)}" was successfully updated}
+      redirect to('/tasks')
+    end
+
+    flash.now[:error] = @task._errors.join(', ')
+    forward "/tasks/#{@task.uuid}"
+  end
+
+  get '/tasks/:uuid/delete/?' do
+    not_found if !TaskwarriorWeb::Config.supports?(:editing)
+    tasks = TaskwarriorWeb::Task.find_by_uuid(params[:uuid])
+    not_found if tasks.empty?
+    @task = tasks.first
+    @title = %Q{Are you sure you want to delete the task "#{@task.description.truncate(20)}"?}
+    erb :delete_confirm
+  end
+
+  delete '/tasks/:uuid' do
+    not_found if !TaskwarriorWeb::Config.supports?(:editing)
+    tasks = TaskwarriorWeb::Task.find_by_uuid(params[:uuid])
+    not_found if tasks.empty?
+    @task = tasks.first
+    flash[:success] = @task.delete! || %Q{The task "#{@task.description.truncate(20)}" was successfully deleted}
+    redirect to('/tasks')
+  end
+
+  # Projects
   get '/projects/overview/?' do
     @title = 'Projects'
     @tasks = TaskwarriorWeb::Task.query('status.not' => :deleted, 'project.not' => '')
@@ -90,49 +119,30 @@ class TaskwarriorWeb::App < Sinatra::Base
   end
 
   get '/projects/:name/?' do
-    @title = params[:name].gsub('--', '.') 
+    @title = unlinkify(params[:name])
     @tasks = TaskwarriorWeb::Task.query('status.not' => 'deleted', :project => @title)
       .sort_by! { |x| [x.priority.nil?.to_s, x.priority.to_s, x.due.nil?.to_s, x.due.to_s] }
     erb :project
   end
 
   # AJAX callbacks
-  get '/ajax/projects/?' do
-    TaskwarriorWeb::Command.new(:projects).run.split("\n").to_json
-  end
-
-  get '/ajax/count/?' do
-    self.class.task_count
-  end
+  get('/ajax/projects/?') { TaskwarriorWeb::Command.new(:projects).run.split("\n").to_json }
+  get('/ajax/count/?') { task_count }
+  post('/ajax/task-complete/:id/?') { TaskwarriorWeb::Command.new(:complete, params[:id]).run }
 
-  get '/ajax/badge-count/?' do
+  get '/ajax/badge/?' do
     if filter = TaskwarriorWeb::Config.property('task-web.filter.badge')
       total = TaskwarriorWeb::Task.query(:description => filter).count
     else
-      total = self.class.task_count
+      total = task_count
     end
     total == 0 ? '' : total.to_s
   end
 
-  post '/ajax/task-complete/:id/?' do
-    # Bummer that we have to directly use Command here, but apparently tasks
-    # cannot be filtered by UUID.
-    TaskwarriorWeb::Command.new(:complete, params[:id]).run
-  end
-
   # Error handling
   not_found do
     @title = 'Page Not Found'
     @referrer = request.referrer
     erb :'404'
   end
-
-  def self.task_count
-    if filter = TaskwarriorWeb::Config.property('task-web.filter')
-      total = TaskwarriorWeb::Task.query(:description => filter).count
-    else
-      total = TaskwarriorWeb::Task.count(:status => :pending)
-    end
-    total.to_s
-  end
 end

data/lib/taskwarrior-web/config/navigation.rb

@@ -5,7 +5,7 @@ SimpleNavigation::Configuration.run do |navigation|
     primary.dom_class = 'nav'
     primary.item :tasks, 'Tasks', '/tasks' do |tasks|
       tasks.dom_class = 'nav nav-pills'
-      tasks.item :pending, "Pending <span class=\"badge\">#{TaskwarriorWeb::App.task_count}</span>", '/tasks/pending'
+      tasks.item :pending, "Pending <span class=\"badge\">#{task_count}</span>", '/tasks/pending'
       tasks.item :waiting, 'Waiting', '/tasks/waiting'
       tasks.item :completed, 'Completed', '/tasks/completed'
       tasks.item :deleted, 'Deleted', '/tasks/deleted'

data/lib/taskwarrior-web/helpers.rb

@@ -1,7 +1,6 @@
 require 'active_support/core_ext/date/calculations'
 
 module TaskwarriorWeb::App::Helpers
-
   def format_date(timestamp)
     format = TaskwarriorWeb::Config.dateformat || '%-m/%-d/%Y'
     Time.parse(timestamp).strftime(format)
@@ -20,11 +19,49 @@ module TaskwarriorWeb::App::Helpers
   end
 
   def linkify(item)
-    return if item.nil?
-    item.gsub('.', '--')
+    item.gsub('.', '--') unless item.nil? unless item.nil?
+  end
+
+  def unlinkify(item)
+    item.gsub('--', '.') unless item.nil?
   end
 
   def auto_link(text)
     Rinku.auto_link(text, :all, 'target="_blank"')
   end
+
+  def flash_types
+    [:success, :info, :warning, :error]
+  end
+
+  def task_count
+    if filter = TaskwarriorWeb::Config.property('task-web.filter')
+      total = TaskwarriorWeb::Task.query(:description => filter).count
+    else
+      total = TaskwarriorWeb::Task.count(:status => :pending)
+    end
+    total.to_s
+  end
+
+  def crud_links(task)
+    string = %Q{<a href="/tasks/#{task.uuid}">Edit</a>}
+    string << %Q{&nbsp;|&nbsp;}
+    string << %Q{<a href="/tasks/#{task.uuid}/delete">Delete</a>}
+    string
+  end
+
+  # Authentication
+  def protected!
+    response['WWW-Authenticate'] = %(Basic realm="Taskworrior Web") and throw(:halt, [401, "Not authorized\n"]) and return unless authorized?
+  end
+
+  def authorized?
+    @auth ||=  Rack::Auth::Basic::Request.new(request.env)
+    values = [TaskwarriorWeb::Config.property('task-web.user'), TaskwarriorWeb::Config.property('task-web.passwd')]
+    @auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == values
+  end
+
+  def forward(url, method = 'GET')
+    call env.merge('REQUEST_METHOD' => method, 'PATH_INFO' => url)
+  end
 end

data/lib/taskwarrior-web/model/config.rb

@@ -22,7 +22,7 @@ module TaskwarriorWeb::Config
   }
 
   def self.version
-    @version ||= Versionomy.parse(`task _version`.strip)
+    @version ||= Versionomy.parse(`#{TaskwarriorWeb::Runner::TASK_BIN} _version`.strip)
   end
 
   def self.file
@@ -37,6 +37,13 @@ module TaskwarriorWeb::Config
     self.file['dateformat'].gsub(/(\w)/, DATEFORMATS) unless self.file['dateformat'].nil?
   end
 
+  def self.supports?(feature)
+    case feature.to_sym
+      when :editing then self.version.major > 1
+      else false
+    end
+  end
+
   def self.method_missing(method)
     self.file[method.to_s]
   end

data/lib/taskwarrior-web/model/task.rb

@@ -7,7 +7,7 @@ module TaskwarriorWeb
 
     attr_accessor :entry, :project, :priority, :uuid, :description, :status,
                   :due, :start, :end, :tags, :depends, :wait, :annotations,
-                  :_errors
+                  :_errors, :remove_tags
     alias :annotate= :annotations=
 
     ####################################
@@ -24,16 +24,24 @@ module TaskwarriorWeb
     end
 
     def save!
-      Command.new(:add, nil, self.to_hash).run
+      @uuid ? Command.new(:update, uuid, self.to_hash).run : Command.new(:add, nil, self.to_hash).run
     end
 
     def complete!
       Command.new(:complete, self.uuid).run
     end
 
+    def delete!
+      Command.new(:delete, self.uuid).run
+    end
+
     # Make sure that the tags are an array.
     def tags=(value)
       @tags = value.is_a?(String) ? value.split(/[, ]+/).reject(&:empty?) : value
+
+      if @uuid
+        @remove_tags = Task.find_by_uuid(uuid).first.tags - @tags
+      end
     end
 
     def is_valid?

data/lib/taskwarrior-web/public/js/application.js

@@ -71,7 +71,7 @@ var initTaskCompletion = function() {
 
 var refreshDockBadge = function() {
 	if (window.hasOwnProperty('fluid')) {
-		$.get('/ajax/badge-count', function(data) {
+		$.get('/ajax/badge', function(data) {
 			window.fluid.dockBadge = data;
 		});
 	}
@@ -90,5 +90,7 @@ var refreshSubnavCount = function() {
  * @param string [severity] The severity of the message.
  */
 function set_message(msg, severity) {
-	$('#flash-messages').append('<div class="alert alert-' + (severity || 'success') + '">' + msg + '</div>');
+	$('<div style="display: none;" class="alert alert-' + (severity || 'success') + '">' + msg + '</div>')
+    .appendTo('#flash-messages')
+    .fadeIn();
 }

data/lib/taskwarrior-web/services/builder/base.rb

@@ -4,6 +4,8 @@ module TaskwarriorWeb::CommandBuilder::Base
 
   TASK_COMMANDS = {
     :add => 'add',
+    :update => TaskwarriorWeb::Config.version.major >= 2 ? ':id mod' : nil,
+    :delete => 'rc.confirmation=no :id delete',
     :query => TaskwarriorWeb::Config.version > Versionomy.parse('1.9.2') ? '_query' : 'export',
     :complete => ':id done',
     :projects => '_projects',
@@ -20,7 +22,7 @@ module TaskwarriorWeb::CommandBuilder::Base
   end
 
   def task_command
-    if TASK_COMMANDS.has_key?(@command.to_sym)
+    if TASK_COMMANDS[@command.to_sym]
       @command_string = TASK_COMMANDS[@command.to_sym].clone
       return self
     else
@@ -45,6 +47,10 @@ module TaskwarriorWeb::CommandBuilder::Base
       tags.each { |tag| string << %Q( #{tag_indicator}#{tag.to_s.shellescape}) } 
     end
 
+    if tags = @params.delete(:remove_tags)
+      tags.each { |tag| string << %Q( -#{tag.to_s.shellescape}) } 
+    end
+
     @params.each do |attr, value|
       if value.respond_to? :each
         value.each { |val| string << %Q( #{attr.to_s}:\\"#{val.to_s.shellescape}\\") }

data/lib/taskwarrior-web/services/runner.rb

@@ -1,5 +1,5 @@
 module TaskwarriorWeb::Runner
-  TASK_BIN = 'task'
+  TASK_BIN = 'task rc.xterm.title=no rc.color=off rc.verbose=no'
 
   def run
     @built ||= build

data/lib/taskwarrior-web/views/_flash.erb

@@ -0,0 +1,7 @@
+<div id="flash-messages">
+  <% flash_types.select{ |severity| flash.has?(severity) }.each do |severity| %>
+    <div class="alert alert-<%= severity %>">
+      <%= flash[severity] %>
+    </div>
+  <% end %>
+</div>

data/lib/taskwarrior-web/views/_task_form.erb

@@ -0,0 +1,28 @@
+<div class="control-group">
+  <label for="task-description" class="control-label">Description</label>
+  <div class="controls">
+    <input type="textfield" id="task-description" name="task[description]" value="<%= @task.description unless @task.nil? %>" />
+  </div>
+</div>
+
+<div class="control-group">
+  <label for="task-project" class="control-label">Project</label>
+  <div class="controls">
+    <input type="textfield" id="task-project" name="task[project]" value="<%= @task.project unless @task.nil? %>" autocomplete="off" />
+  </div>
+</div>
+
+<div class="control-group">
+  <label for="task-due" class="control-label">Due Date</label>
+  <div class="controls">
+    <input class="date-picker" type="textfield" id="task-due" name="task[due]" value="<%= format_date(@task.due) unless @task.nil? || @task.due.blank? %>" data-date-format="<%= @date_format %>" />
+  </div>
+</div>
+
+<div class="control-group">
+  <label for="task-tags" class="control-label">Tags</label>
+  <div class="controls">
+    <input type="textfield" id="task-tags" name="task[tags]" value="<%= @task.tags.join(', ') unless @task.nil? %>" autocomplete="off" />
+    <span class="help-block">Enter tags separated by commas or spaces (e.g. <em>each, word will,be a tag</em>)</span>
+  </div>
+</div>

data/lib/taskwarrior-web/views/delete_confirm.erb

@@ -0,0 +1,4 @@
+<form action="/tasks/<%= @task.uuid %>" method="post">
+  <input type="hidden" name="_method" value="delete" />
+  <input type="submit" class="btn btn-danger" value="Delete" /> or <a href="<%= request.referrer %>">cancel</a>
+</form>

data/lib/taskwarrior-web/views/edit_task.erb

@@ -0,0 +1,13 @@
+<form id="new-task-form" class="form-horizontal" action="/tasks/<%= @task.uuid %>" method="post">
+  <input type="hidden" name="task[uuid]" value="<%= @task.uuid %>" />
+
+  <%= erb :_task_form %>
+
+  <div class="control-group">
+    <div class="controls">
+      <button type="submit" class="btn btn-primary">Update Task</button>
+      <input type="hidden" name="_method" value="patch" />
+    </div>
+  </div>
+
+</form>

data/lib/taskwarrior-web/views/layout.erb

@@ -19,13 +19,7 @@
       <%= erb :_topbar %>
       <%= erb :_subnav %>
       <section class="content">
-        <div id="flash-messages">
-          <% if @messages %>
-            <% @messages.each do |message| %>
-              <div class="alert <%= message[:severity] %>"><%= message[:message] %></div>
-            <% end %>
-          <% end %>
-        </div>
+        <%= erb :_flash %>
         <%= yield %>
       </section>
     </div>

data/lib/taskwarrior-web/views/listing.erb

@@ -1,3 +1,5 @@
+<% can_edit = @can_edit && params[:status] == 'pending' %>
+
 <div id="listing">
   <table class="table table-striped table-hover">
     <thead>
@@ -10,6 +12,7 @@
         <th>Due</th>
         <th>Tags</th>
         <th>Priority</th>
+        <% if @can_edit %><th></th><% end %>
       </tr>
     </thead>
     <tbody>
@@ -36,6 +39,7 @@
           <td><%= format_date(task.due) unless task.due.nil? %></td>
           <td><%= task.tags.join(', ') unless task.tags.nil? %></td>
           <td><%= task.priority unless task.priority.nil? %></td>
+          <% if can_edit %><td><%= crud_links(task) %></td><% end %>
         </tr>
       <% end %>
     </tbody>

data/lib/taskwarrior-web/views/new_task.erb

@@ -0,0 +1,11 @@
+<form id="new-task-form" class="form-horizontal" action="/tasks" method="post">
+
+  <%= erb :_task_form %>
+
+  <div class="control-group">
+    <div class="controls">
+      <button type="submit" class="btn btn-primary">Create Task</button>
+    </div>
+  </div>
+
+</form>

data/lib/taskwarrior-web/views/project.erb

@@ -6,6 +6,7 @@
         <th>Due</th>
         <th>Tags</th>
         <th>Priority</th>
+        <% if @can_edit %><th></th><% end %>
       </tr>
     </thead>
     <tbody>
@@ -16,6 +17,7 @@
             <td><%= format_date(task.due) unless task.due.nil? %></td>
             <td><%= task.tags.join(', ') unless task.tags.nil? %></td>
             <td><%= task.priority unless task.priority.nil? %></td>
+            <% if @can_edit %><td><%= crud_links(task) %></td><% end %>
           </tr>
         <% end %>
       <% end %>

data/lib/taskwarrior-web/views/projects.erb

@@ -28,6 +28,7 @@
                 <th>Due</th>
                 <th>Tags</th>
                 <th>Priority</th>
+                <% if @can_edit %><th></th><% end %>
               </tr>
             </thead>
             <tbody>
@@ -38,6 +39,7 @@
                     <td><%= format_date(task.due) unless task.due.nil? %></td>
                     <td><%= task.tags.join(', ') unless task.tags.nil? %></td>
                     <td><%= task.priority unless task.priority.nil? %></td>
+                    <% if @can_edit %><td><%= crud_links(task) %></td><% end %>
                   </tr>
                 <% end %>
               <% end %>

data/spec/app/app_spec.rb

@@ -22,26 +22,16 @@ describe TaskwarriorWeb::App do
         get path
         follow_redirect!
 
-        last_request.url.should =~ /tasks\/pending/
+        last_request.url.should match(/tasks\/pending$/)
         last_response.should be_ok
       end
     end
   end
 
-  describe 'GET /projects' do
-    it 'should redirect to /projects/overview' do
-      get '/projects'
-      follow_redirect!
-
-      last_request.url.should =~ /projects\/overview/
-      last_response.should be_ok
-    end
-  end
-
   describe 'GET /tasks/new' do
     it 'should display a new task form' do
       get '/tasks/new'
-      last_response.body.should =~ /form/
+      last_response.body.should include('<form')
     end
 
     it 'should display a 200 status code' do
@@ -60,13 +50,13 @@ describe TaskwarriorWeb::App do
       end
 
       it 'should redirect to the task listing page' do
-        task = TaskwarriorWeb::Task.new
+        task = TaskwarriorWeb::Task.new({:description => 'Test task'})
         task.should_receive(:is_valid?).and_return(true)
         task.should_receive(:save!)
         TaskwarriorWeb::Task.should_receive(:new).once.and_return(task)
-        post '/tasks', :task => {}
+        post '/tasks', :task => {:description => 'Test task'}
         follow_redirect!
-        last_request.url.should =~ /\/tasks$/
+        last_request.url.should match(/tasks$/)
       end
     end
 
@@ -82,17 +72,134 @@ describe TaskwarriorWeb::App do
         task = TaskwarriorWeb::Task.new({:tags => 'tag1, tag2'})
         TaskwarriorWeb::Task.should_receive(:new).once.and_return(task)
         post '/tasks', :task => {}
-        last_response.body.should =~ /form/
-        last_response.body.should =~ /tag1, tag2/
+        last_response.body.should include('form')
+        last_response.body.should include('tag1, tag2')
       end
 
       it 'should display errors messages' do
         task = TaskwarriorWeb::Task.new
         TaskwarriorWeb::Task.should_receive(:new).once.and_return(task)
         post '/tasks', :task => {}
-        last_response.body.should =~ /You must provide a description/
+        last_response.body.should include('You must provide a description')
+      end
+    end
+  end
+
+  describe 'GET /tasks/:uuid' do
+    context 'given a non-existant task' do
+      it 'should return a 404' do
+        TaskwarriorWeb::Task.should_receive(:find_by_uuid).and_return([])
+        get '/tasks/1'
+        last_response.should be_not_found
       end
     end
+
+    context 'given an existing task' do
+      before do
+        TaskwarriorWeb::Task.should_receive(:find_by_uuid).and_return([
+          TaskwarriorWeb::Task.new({:uuid => 246, :description => 'Test task with a longer description'})
+        ])
+        get '/tasks/246'
+      end
+
+      it 'should render an edit form' do
+        last_response.body.should have_tag('form', :with => { :action => '/tasks/246', :method => 'post' }) do
+          with_tag('input', :with => { :name => '_method', :value => 'patch' })
+        end
+      end
+
+      it 'should set the HTTP method in the form' do
+      end
+
+      it 'should truncate the task description' do
+        last_response.body.should have_tag('title', :text => /Test task with a .../)
+      end
+
+      it 'should fill the form fields with existing data' do
+        last_response.body.should have_tag('input', :with => { :name => 'task[description]', :value => 'Test task with a longer description' })
+      end
+    end
+  end
+
+  describe 'PATCH /tasks/:uuid' do
+    context 'given a non-existant task' do
+      it 'should return a 404' do
+        TaskwarriorWeb::Task.should_receive(:find_by_uuid).and_return([])
+        patch '/tasks/429897527'
+        last_response.should be_not_found
+      end
+    end
+  end
+
+  describe 'GET /tasks/:uuid/delete' do
+    context 'given a non-existant task' do
+      it 'should return a 404' do
+        TaskwarriorWeb::Task.should_receive(:find_by_uuid).and_return([])
+        get '/tasks/429897527/delete'
+        last_response.should be_not_found
+      end
+    end
+
+    context 'given an existing task' do
+      before do
+        TaskwarriorWeb::Task.should_receive(:find_by_uuid).and_return([
+          TaskwarriorWeb::Task.new({:uuid => 246, :description => 'Test task with a longer description'})
+        ])
+        get '/tasks/246/delete'
+      end
+
+      it 'should show a delete form' do
+        last_response.body.should have_tag('form', :with => { :action => '/tasks/246', :method => 'post' }) do
+          with_tag('input', :with => { :name => '_method', :value => 'delete' })
+        end
+      end
+
+      it 'should display a delete button' do
+        last_response.body.should have_tag('input', :with => { :type => 'submit', :value => 'Delete' })
+      end
+    end
+  end
+
+  describe 'DELETE /tasks/:uuid' do
+    context 'given a non-existant task' do
+      it 'should return a 404' do
+        TaskwarriorWeb::Task.should_receive(:find_by_uuid).and_return([])
+        delete '/tasks/429897527'
+        last_response.should be_not_found
+      end
+    end
+
+    context 'given an existing task' do
+      before do
+        @task = TaskwarriorWeb::Task.new
+        @task.should_receive(:delete!).once.and_return('Success')
+        TaskwarriorWeb::Task.should_receive(:find_by_uuid).and_return([@task])
+        delete '/tasks/246'
+      end
+
+      it 'should redirect to the task overview page' do
+        follow_redirect!
+        last_request.url.should match(/tasks$/)
+      end
+    end
+  end
+
+  describe 'GET /projects' do
+    it 'should redirect to /projects/overview' do
+      get '/projects'
+      follow_redirect!
+
+      last_request.url.should match(/projects\/overview$/)
+      last_response.should be_ok
+    end
+  end
+
+  describe 'GET /projects/:name' do
+    it 'should replace characters in the title' do
+      TaskwarriorWeb::Task.should_receive(:query).any_number_of_times.and_return([])
+      get '/projects/Test--Project'
+      last_response.body.should include('<title>Test.Project')
+    end
   end
 
   describe 'GET /ajax/projects' do
@@ -126,12 +233,12 @@ describe TaskwarriorWeb::App do
   describe 'not_found' do
     it 'should set the title to "Not Found"' do
       get '/page-not-found'
-      last_response.body.should =~ /<title>Page Not Found/
+      last_response.body.should include('<title>Page Not Found')
     end
 
     it 'should have a status code of 404' do
       get '/page-not-found'
-      last_response.status.should eq(404)
+      last_response.should be_not_found
     end
   end
 end

data/spec/model/task_spec.rb

@@ -38,6 +38,16 @@ describe TaskwarriorWeb::Task do
     end
   end
 
+  describe '#delete!' do
+    it 'should delete the task' do
+      task = TaskwarriorWeb::Task.new({:uuid => 15})
+      command = TaskwarriorWeb::Command.new(:delete)
+      command.should_receive(:run).once
+      TaskwarriorWeb::Command.should_receive(:new).once.with(:delete, 15).and_return(command)
+      task.delete!
+    end
+  end
+
   describe '.query' do
     before do
       @command = TaskwarriorWeb::Command.new(:query)
@@ -82,6 +92,16 @@ describe TaskwarriorWeb::Task do
       task = TaskwarriorWeb::Task.new(:tags => '@hi, -twice, !again, ~when')
       task.tags.should eq(['@hi', '-twice', '!again', '~when'])
     end
+
+    it 'should properly set tags for removal' do
+      task = TaskwarriorWeb::Task.new({:tags => ['hello', 'goodbye']})
+      TaskwarriorWeb::Task.should_receive(:find_by_uuid).and_return([task])
+      task2 = TaskwarriorWeb::Task.new
+      task2.uuid = 15
+      task2.tags = ['goodbye']
+      task2.tags.should eq(['goodbye'])
+      task2.remove_tags.should eq(['hello'])
+    end
   end
 
   describe '#to_hash' do

data/spec/services/builder/base_spec.rb

@@ -51,6 +51,12 @@ describe TaskwarriorWeb::CommandBuilder::Base do
       command.params.should eq(' +today +tomorrow') 
     end
 
+    it 'should remove tags using a -' do
+      command = TaskwarriorWeb::Command.new(:add, nil, :remove_tags => [:test, :tag])
+      command.parse_params
+      command.params.should eq(' -test -tag') 
+    end
+
     it 'should pull out the description parameter' do
       command = TaskwarriorWeb::Command.new(:add, nil, :description => 'Hello', :status => :pending)
       command.parse_params

data/spec/services/runner_spec.rb

@@ -15,7 +15,7 @@ describe TaskwarriorWeb::Runner do
     end
 
     it 'should add a TASK_VERSION constant' do
-      @object.class.const_get(:TASK_BIN).should eq('task')
+      @object.class.const_defined?(:TASK_BIN).should be_true
     end
   end
 

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'sinatra'
 require 'rack/test'
 require 'rspec'
 require 'simple_navigation'
+require 'rspec-html-matchers'
 
 # Simplecov
 require 'simplecov'

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     = '1.0.14'
+  s.version     = '1.1.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jake Bell"]
   s.email       = ["jake@theunraveler.com"]
@@ -16,17 +16,18 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.0'
 
   s.add_dependency('sinatra')
-  s.add_dependency('thin')
   s.add_dependency('parseconfig')
   s.add_dependency('vegas')
   s.add_dependency('rinku')
   s.add_dependency('versionomy')
   s.add_dependency('activesupport')
   s.add_dependency('sinatra-simple-navigation')
+  s.add_dependency('rack-flash3')
 
   s.add_development_dependency('rake')
   s.add_development_dependency('rack-test')
   s.add_development_dependency('rspec')
+  s.add_development_dependency('rspec-html-matchers')
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taskwarrior-web
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-22 00:00:00.000000000 Z
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70303595592080 !ruby/object:Gem::Requirement
+  requirement: &70274029036160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303595592080
+  version_requirements: *70274029036160
 - !ruby/object:Gem::Dependency
-  name: thin
-  requirement: &70303595590940 !ruby/object:Gem::Requirement
+  name: parseconfig
+  requirement: &70274029035440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303595590940
+  version_requirements: *70274029035440
 - !ruby/object:Gem::Dependency
-  name: parseconfig
-  requirement: &70303595590320 !ruby/object:Gem::Requirement
+  name: vegas
+  requirement: &70274029034480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303595590320
+  version_requirements: *70274029034480
 - !ruby/object:Gem::Dependency
-  name: vegas
-  requirement: &70303595589220 !ruby/object:Gem::Requirement
+  name: rinku
+  requirement: &70274029033940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303595589220
+  version_requirements: *70274029033940
 - !ruby/object:Gem::Dependency
-  name: rinku
-  requirement: &70303595588600 !ruby/object:Gem::Requirement
+  name: versionomy
+  requirement: &70274029032960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303595588600
+  version_requirements: *70274029032960
 - !ruby/object:Gem::Dependency
-  name: versionomy
-  requirement: &70303595587840 !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: &70274029031920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303595587840
+  version_requirements: *70274029031920
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70303595587380 !ruby/object:Gem::Requirement
+  name: sinatra-simple-navigation
+  requirement: &70274029031060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303595587380
+  version_requirements: *70274029031060
 - !ruby/object:Gem::Dependency
-  name: sinatra-simple-navigation
-  requirement: &70303595586840 !ruby/object:Gem::Requirement
+  name: rack-flash3
+  requirement: &70274029030180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303595586840
+  version_requirements: *70274029030180
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70303595580440 !ruby/object:Gem::Requirement
+  requirement: &70274029029420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303595580440
+  version_requirements: *70274029029420
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70303595579780 !ruby/object:Gem::Requirement
+  requirement: &70274029028620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303595579780
+  version_requirements: *70274029028620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70303595579240 !ruby/object:Gem::Requirement
+  requirement: &70274029027800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70274029027800
+- !ruby/object:Gem::Dependency
+  name: rspec-html-matchers
+  requirement: &70274029027120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303595579240
+  version_requirements: *70274029027120
 description: This gem provides a graphical frontend for the Taskwarrior task manager.
   It is based on Sinatra.
 email:
@@ -179,13 +190,17 @@ files:
 - lib/taskwarrior-web/services/parser/json.rb
 - lib/taskwarrior-web/services/runner.rb
 - lib/taskwarrior-web/views/404.erb
+- lib/taskwarrior-web/views/_flash.erb
 - lib/taskwarrior-web/views/_subnav.erb
+- lib/taskwarrior-web/views/_task_form.erb
 - lib/taskwarrior-web/views/_topbar.erb
+- lib/taskwarrior-web/views/delete_confirm.erb
+- lib/taskwarrior-web/views/edit_task.erb
 - lib/taskwarrior-web/views/layout.erb
 - lib/taskwarrior-web/views/listing.erb
+- lib/taskwarrior-web/views/new_task.erb
 - lib/taskwarrior-web/views/project.erb
 - lib/taskwarrior-web/views/projects.erb
-- lib/taskwarrior-web/views/task_form.erb
 - spec/app/app_spec.rb
 - spec/app/helpers_spec.rb
 - spec/files/taskrc
@@ -219,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2980071334250491530
+      hash: 649655695520079499
 requirements: []
 rubyforge_project: taskwarrior-web
 rubygems_version: 1.8.11

data/lib/taskwarrior-web/views/task_form.erb

@@ -1,38 +0,0 @@
-<form id="new-task-form" class="form-horizontal" action="/tasks" method="post">
-
-  <div class="control-group">
-    <label for="task-description" class="control-label">Description</label>
-    <div class="controls">
-      <input type="textfield" id="task-description" name="task[description]" value="<%= @task.description unless @task.nil? %>" />
-    </div>
-  </div>
-
-  <div class="control-group">
-    <label for="task-project" class="control-label">Project</label>
-    <div class="controls">
-      <input type="textfield" id="task-project" name="task[project]" value="<%= @task.project unless @task.nil? %>" autocomplete="off" />
-    </div>
-  </div>
-
-  <div class="control-group">
-    <label for="task-due" class="control-label">Due Date</label>
-    <div class="controls">
-      <input class="date-picker" type="textfield" id="task-due" name="task[due]" value="<%= @task.due unless @task.nil? %>" data-date-format="<%= @date_format %>" />
-    </div>
-  </div>
-
-  <div class="control-group">
-    <label for="task-tags" class="control-label">Tags</label>
-    <div class="controls">
-      <input type="textfield" id="task-tags" name="task[tags]" value="<%= @task.tags.join(', ') unless @task.nil? %>" autocomplete="off" />
-      <span class="help-block">Enter tags separated by commas or spaces (e.g. <em>each, word will,be a tag</em>)</span>
-    </div>
-  </div>
-
-  <div class="control-group">
-    <div class="controls">
-      <button type="submit" class="btn">Create Task</button>
-    </div>
-  </div>
-
-</form>