taskwarrior-web 1.1.8 → 1.1.9

data/.travis.yml

@@ -6,5 +6,6 @@ script: "rake spec"
 before_install:
   - 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
+before_script:
+  - cp -v spec/files/taskrc $HOME/.taskrc
+  - mkdir $HOME/.task

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.1.9 (5/21/13)
+
+* Sorting by priority sorts intelligently (http://github.com/theunraveler/taskwarrior-web/issues/39)
+* Fixes updating tasks in taskwarrior 2.2.0+ (http://github.com/theunraveler/taskwarrior-web/issues/36)
+
 ## v1.1.8 (1/15/13)
 
 * Support for adding and removing annotations on tasks.

data/README.md

@@ -3,7 +3,7 @@
 A lightweight, Sinatra-based web interface for the
 wonderful [Taskwarrior](http://taskwarrior.org/) todo application.
 
-![TaskwarriorWeb screenshot](https://dl.dropbox.com/u/107599300/screenshot.png)
+![TaskwarriorWeb screenshot](https://raw.github.com/theunraveler/taskwarrior-web/gh-pages/images/screenshot.png)
 
 [![Gem Version](https://badge.fury.io/rb/taskwarrior-web.png)](http://badge.fury.io/rb/taskwarrior-web)
 [![Build Status](https://secure.travis-ci.org/theunraveler/taskwarrior-web.png)](http://travis-ci.org/theunraveler/taskwarrior-web)

data/lib/taskwarrior-web.rb

@@ -2,9 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 require 'rubygems'
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/string/inflections'
-require 'active_support/core_ext/string/filters'
+require 'active_support/core_ext'
 require 'taskwarrior-web/version'
 
 module TaskwarriorWeb

data/lib/taskwarrior-web/public/css/styles.css

@@ -83,5 +83,3 @@ table.table thead .sorting_desc { background: url('../img/sort_desc.png') no-rep
 
 table.table thead .sorting_asc_disabled { background: url('../img/sort_asc_disabled.png') no-repeat center right; }
 table.table thead .sorting_desc_disabled { background: url('../img/sort_desc_disabled.png') no-repeat center right; }
-
-#annotations-modal textarea { width: 100%; }

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

@@ -54,21 +54,21 @@ var initTaskCompletion = function() {
       e.preventDefault();
 
       // Cache the checkbox in case we need to restore it.
-      var container = $(this).parent(),
-          checkbox = container.html(),
-          row = $(this).closest('tr');
-      container.html('<img src="/img/ajax-loader.gif" />');
+      var $container = $(this).parent(),
+          checkbox = $container.html(),
+          $row = $(this).closest('tr');
+      $container.html('<img src="/img/ajax-loader.gif" />');
       $.ajax({
         url: '/ajax/task-complete/' + $(this).data('task-id'),
         type: 'POST',
         success: function(data) {
           refreshPageContents();
           set_message(data === '' ? 'Task marked as completed.' : data);
-          row.fadeOut();
+          $row.fadeOut();
         },
         error: function(data) {
           set_message('There was an error when marking the task as completed.', 'error');
-          container.html(checkbox);
+          $container.html(checkbox);
         }
       });
     });
@@ -102,16 +102,38 @@ var initTablesort = function() {
     sWrapper: "dataTables_wrapper form-inline"
   });
 
-  $('.table-sortable').each(function(index, el) {
+  $('.table-sortable').each(function(index, table) {
+    var $table = $(table);
+
     // Find out which columns are sortable.
-    var aoColumns = [], element = $(el);
-    element.find('thead th').each(function () {
-      var def = $(this).hasClass('no-sort') ? { "bSortable": false } : null;
-      aoColumns.push(def);
+    var aoColumns = $.map($table.find('thead th'), function (header) {
+      var $header = $(header);
+
+      // Headers with ".no-sort" are not sortable.
+      if ($header.hasClass('no-sort')) {
+        return {'bSortable': false};
+      }
+
+      // Headers with "data-sort-map" should provide a JS object of display to
+      // sort parameter maps.
+      if ($header.data('sort-map')) {
+        var map = $header.data('sort-map');
+        return {'mData': function(source, type, val) {
+          if (type === 'set') {
+            source.raw = val;
+            source.numeric = map[val];
+            return;
+          }
+
+          return type === 'sort' ? source.numeric : source.raw;
+        }};
+      }
+
+      return {};
     });
 
     // Initialze the sorter.
-    element.dataTable({
+    $table.dataTable({
       sDom: "t",
       bInfo: false,
       bPaginate: false,
@@ -135,11 +157,11 @@ var initAnnotationsModal = function() {
 var initUjs = function() {
   $('[data-method]').click(function(e) {
     e.preventDefault();
-    var link = $(this);
-    if (confirm(link.data('confirm') || 'Are you sure?')) {
-      $('<form action="' + link.attr('href') + '" method="POST" style="display: none;">')
-        .append('<input type="hidden" name="_method" value="' + link.data('method') + '" />')
-        .insertAfter(link)
+    var $link = $(this);
+    if (confirm($link.data('confirm') || 'Are you sure?')) {
+      $('<form action="' + $link.attr('href') + '" method="POST" style="display: none;">')
+        .append('<input type="hidden" name="_method" value="' + $link.data('method') + '" />')
+        .insertAfter($link)
         .submit();
     }
   });

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

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

data/lib/taskwarrior-web/version.rb

@@ -1,3 +1,3 @@
 module TaskwarriorWeb
-  VERSION = '1.1.8'
+  VERSION = '1.1.9'
 end

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

@@ -1,3 +1,4 @@
+<!DOCTYPE HTML>
 <html>
   <head>
     <title><%= @title %> | TaskwarriorWeb</title>

data/lib/taskwarrior-web/views/tasks/_annotation_form.erb

@@ -6,7 +6,7 @@
     <h3 id="annotations-modal-label">Add annotation to "<%= @task %>"</h3>
   </div>
   <div class="modal-body">
-    <textarea name="annotation[description]" placeholder="New annotation..." required="required"></textarea>
+    <textarea name="annotation[description]" class="input-block-level" placeholder="New annotation..." required="required"></textarea>
     <input type="hidden" name="annotation[task_id]" value="<%= @task.uuid %>" />
   </div>
   <div class="modal-footer">

data/lib/taskwarrior-web/views/tasks/_form.erb

@@ -1,21 +1,21 @@
 <div class="control-group">
   <label for="task-description" class="control-label">Description</label>
   <div class="controls">
-    <input type="textfield" required="required" id="task-description" name="task[description]" value="<%= @task.description unless @task.nil? %>" />
+    <input type="text" required="required" 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" />
+    <input type="text" 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 %>" />
+    <input class="date-picker" type="text" id="task-due" name="task[due]" value="<%= format_date(@task.due) unless @task.nil? || @task.due.blank? %>" data-date-format="<%= @date_format %>" />
   </div>
 </div>
 
@@ -37,7 +37,7 @@
 <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" />
+    <input type="text" 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/tasks/index.erb

@@ -1,4 +1,5 @@
 <% can_edit = @can_edit && params[:status].in?(['pending', 'waiting']) %>
+<% priority_map = { nil => 0, 'L' => 1, 'M' => -1, 'H' => -2 } %>
 
 <div id="listing">
   <% if @tasks.empty? and params[:status] == 'pending' %>
@@ -16,7 +17,7 @@
           <th>Project</th>
           <th>Due</th>
           <th>Tags</th>
-          <th>Priority</th>
+          <th data-sort-map='{"H": 0, "M": 1, "": 2, "L": 3}'>Priority</th>
           <% if can_edit %><th class="no-sort"></th><% end %>
         </tr>
       </thead>

data/spec/app/helpers_spec.rb

@@ -19,13 +19,7 @@ describe TaskwarriorWeb::App::Helpers do
         helpers.format_date('2012-01-11 12:23:00').should eq('1/11/2012')
         helpers.format_date('2012-01-11').should eq('1/11/2012')
         helpers.format_date('20121231T230000Z').should eq(Time.parse('20121231T230000Z').localtime.strftime('%-m/%-d/%Y'))
-
-        # This test will fail if run in UTC :-)
-        if Time.current.zone == 'UTC'
-          helpers.format_date('20121231T230000Z').should eq(Time.parse('20121231T230000Z').strftime('%-m/%-d/%Y'))
-        else
-          helpers.format_date('20121231T230000Z').should_not eq(Time.parse('20121231T230000Z').strftime('%-m/%-d/%Y'))
-        end
+        helpers.format_date('20121231T230000Z').should eq(Time.parse('20121231T230000Z').strftime('%-m/%-d/%Y'))
       end
     end
 

data/spec/model/task_spec.rb

@@ -114,7 +114,7 @@ describe TaskwarriorWeb::Task do
     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']})
+      @task.to_hash.should eq({:description => 'Testing', :due => '12/2/12', :tags => ['hello', 'twice'], :annotations => []})
     end
   end
 

data/taskwarrior-web.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency('activesupport')
   s.add_dependency('sinatra-simple-navigation')
   s.add_dependency('rack-flash3')
+  s.add_dependency('json', '~> 1.7.7')
 
   s.add_development_dependency('rake')
   s.add_development_dependency('rack-test')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taskwarrior-web
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -139,6 +139,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -307,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4275568887696200084
+      hash: -1134852019242031936
 requirements: []
 rubyforge_project: taskwarrior-web
 rubygems_version: 1.8.23