taskwarrior-web 1.1.10 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81ddd844b563c653dcac866ead7c1481a768d17d
-  data.tar.gz: b30140d7d71ac62c8dd594e389683020377cd94d
+  metadata.gz: 2e9612d9c9cee0c532430c68bf9b66a1cfbaaa6f
+  data.tar.gz: da7c54198ac489b756efcb9d71f9649a5bace0ee
 SHA512:
-  metadata.gz: 5e98706d90542916ca02463a1733b3147f635fdfd3bd664c224e1eb32844be34cacc171e90057536c6fc860080e8524ff6df4c290203e07cbf97ed0f9cfce9ad
-  data.tar.gz: bc577b814732ba215a9618b5658f3246d4b4c6e78f2df4cc7e51bd04edb50759a8d981d07e06c541f24461ae9e1db793150d79aa334cfdb3a201c2294b05c038
+  metadata.gz: aa6f01caf1480aad08d527d0f62b2263a57b19713620ee100dc375ec78e6f144d5ff0016c7d1bddcd713b864812c8903a9f18714415e9e507c57948a7d930de0
+  data.tar.gz: 0e6c15697f13a35d706a3dc8e39942cc1700275a35a6bd7021fe8d687fabed31714f2fd3a31a2e22200cc7227cae247a8e9d4d182361c7776e9464665010b1f7

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.1.11 (7/15/13)
+
+* Rethinking the tasks that are included in project lists. Now, they include
+  completed and waiting tasks as well, with visual distinctions.
+* Misc small fixes
+
 ## v1.1.10 (6/28/13)
 
 * Added ability to specify "wait" property for tasks

data/Guardfile

@@ -1,6 +1,3 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
 guard 'bundler' do
   watch('Gemfile')
   watch('taskwarrior-web.gemspec')

data/config.ru

@@ -1,7 +1,5 @@
 require File.join(File.dirname(__FILE__), 'lib', 'taskwarrior-web')
 
 disable :run
-TaskwarriorWeb::App.set({
-  :environment => :production
-})
+TaskwarriorWeb::App.set({ :environment => :production })
 run TaskwarriorWeb::App

data/lib/taskwarrior-web/app.rb

@@ -132,7 +132,7 @@ class TaskwarriorWeb::App < Sinatra::Base
   get '/projects/overview/?' do
     @title = 'Projects'
     @tasks = TaskwarriorWeb::Task.query('status.not' => :deleted, 'project.not' => '')
-      .sort_by! { |t| [-t.urgency.to_f, t.priority.nil?.to_s, t.priority.to_s, t.due.nil?.to_s, t.due.to_s] }
+      .sort_by! { |t| [t.active? ? 0 : 1, -t.urgency.to_f, t.priority.nil?.to_s, t.priority.to_s, t.due.nil?.to_s, t.due.to_s] }
       .group_by { |t| t.project.to_s }
       .reject { |project, tasks| tasks.select { |task| task.status == 'pending' }.empty? }
     erb :'projects/index'
@@ -141,7 +141,7 @@ class TaskwarriorWeb::App < Sinatra::Base
   get '/projects/:name/?' do
     @title = unlinkify(params[:name])
     @tasks = TaskwarriorWeb::Task.query('status.not' => :deleted, :project => @title)
-      .sort_by! { |t| [-t.urgency.to_f, t.priority.nil?.to_s, t.priority.to_s, t.due.nil?.to_s, t.due.to_s] }
+      .sort_by! { |t| [t.active? ? 0 : 1, -t.urgency.to_f, t.priority.nil?.to_s, t.priority.to_s, t.due.nil?.to_s, t.due.to_s] }
     erb :'projects/show'
   end
 

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

@@ -10,7 +10,7 @@ SimpleNavigation::Configuration.run do |navigation|
       tasks.item :completed, 'Completed', '/tasks/completed'
       tasks.item :deleted, 'Deleted', '/tasks/deleted'
     end
-    primary.item :projects, 'Projects', '/projects' do |projects|
+    primary.item :projects, 'Projects', '/projects', { :highlights_on => %r{/projects/?.+?} } do |projects|
       projects.dom_class = 'nav nav-pills'
       projects.item :overview, 'Overview', '/projects/overview'
     end

data/lib/taskwarrior-web/helpers.rb

@@ -6,6 +6,10 @@ module TaskwarriorWeb::App::Helpers
     Time.parse(timestamp).localtime.strftime(format)
   end
 
+  def format_tags(tags)
+    tags.join(', ')
+  end
+
   def colorize_date(timestamp)
     return if timestamp.nil?
     due_def = (TaskwarriorWeb::Config.due || 7).to_i

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

@@ -58,6 +58,10 @@ module TaskwarriorWeb
       @_errors.empty?
     end
 
+    def active?
+      status.in? ['pending', 'waiting']
+    end
+
     def to_hash
       Hash[instance_variables.select { |var| !var.to_s.start_with?('@_') }.map { |var| [var[1..-1].to_sym, instance_variable_get(var)] }]
     end

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

@@ -64,6 +64,11 @@ html, body { height: 100%; }
 #push, #footer { height: 70px; }
 #footer .container > * { margin: 20px 0; }
 
+tr.completed td { text-decoration: line-through; }
+
+/** Prevents crud links from being broken onto lines **/
+span.crud-links { white-space: nowrap; }
+
 /** Icon spacing **/
 h2.project i { vertical-align: 35%; }
 span.crud-links i { margin-top: 4px; }

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

@@ -6,6 +6,7 @@ $(document).ready(function() {
   initTablesort();
   initAnnotationsModal();
   initUjs();
+  initAutoclose();
   refreshDockBadge();
 
   // Hack to account for navbar when clicking anchor links.
@@ -144,6 +145,10 @@ var initTablesort = function() {
 };
 
 var initAnnotationsModal = function() {
+  $('#annotations-modal').on('shown', function() {
+    $(this).find('[name="annotation[description]"]').focus();
+  });
+
   $(document).on('click', 'a.annotation-add', function(event) {
     event.preventDefault();
     $.get($(this).attr('href') + '.json', function(data) {
@@ -167,6 +172,19 @@ var initUjs = function() {
   });
 };
 
+/**
+ * Anything that has a "data-autoclose" attribute will fade out after the given
+ * number of milliseconds.
+ */
+var initAutoclose = function() {
+  $('[data-autoclose]').each(function(index, element) {
+    $element = $(element);
+    setTimeout(function() {
+      $element.fadeOut(function() { $(this).remove(); });
+    }, $element.data('autoclose'))
+  })
+};
+
 // Count updating.
 
 var refreshDockBadge = function() {

data/lib/taskwarrior-web/version.rb

@@ -1,3 +1,3 @@
 module TaskwarriorWeb
-  VERSION = '1.1.10'
+  VERSION = '1.1.11'
 end

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

@@ -1,6 +1,6 @@
 <div id="flash-messages">
   <% flash_types.select{ |severity| flash.has?(severity) }.each do |severity| %>
-    <div class="alert alert-<%= severity %>">
+    <div class="alert alert-<%= severity %>"<% if severity == :success %> data-autoclose="5000"<% end %>>
       <button type="button" class="close" data-dismiss="alert">&times;</button>
       <%= flash[severity] %>
     </div>

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

@@ -30,15 +30,13 @@
             </thead>
             <tbody>
               <% tasks.each do |task| %>
-                <% if task.status == 'pending' %>
-                  <tr class="<%= colorize_date(task.due) %>">
-                    <td><%= task.description %></td>
-                    <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 %>
+                <tr class="<%= colorize_date(task.due) if task.active? %> <%= task.status %>">
+                  <td><%= task.description %></td>
+                  <td><%= format_date(task.due) unless task.due.nil? %></td>
+                  <td><%= format_tags(task.tags) unless task.tags.nil? %></td>
+                  <td><%= task.priority unless task.priority.nil? %></td>
+                  <% if @can_edit %><td><%= crud_links(task) if task.active? %></td><% end %>
+                </tr>
               <% end %>
             </tbody>
           </table>

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

@@ -13,15 +13,14 @@
     </thead>
     <tbody>
       <% @tasks.each do |task| %>
-        <% if task.status == 'pending' %>
-          <tr class="<%= colorize_date(task.due) %>">
-            <td><%= task.description %></td>
-            <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 %>
+        <tr class="<%= colorize_date(task.due) if task.active? %> <%= task.status %>">
+          <td><%= task.description %></td>
+          <td><%= format_date(task.due) unless task.due.nil? %></td>
+          <td><%= format_tags(task.tags) unless task.tags.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) if task.active? %></td><% end %>
+        </tr>
       <% end %>
     </tbody>
   </table>

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

@@ -23,7 +23,7 @@
   <label for="task-wait" class="control-label">Hide until</label>
   <div class="controls">
     <input class="date-picker" type="text" id="task-wait" name="task[wait]" value="<%= format_date(@task.wait) unless @task.nil? || @task.wait.blank? %>" data-date-format="<%= @date_format %>" />
-    <span class="help-block">If specified, the task will appear in the "Waiting" list until the given date.</span>
+    <span class="help-block">If specified, the task will appear in the <a href="/tasks/waiting">Waiting</a> list until the given date.</span>
   </div>
 </div>
 

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

@@ -24,7 +24,7 @@
       </thead>
       <tbody>
         <% @tasks.each do |task| %>
-          <tr<%= %{ class="#{colorize_date(task.due)}"} if params[:status] == 'pending' %>>
+          <tr<%= %{ class="#{colorize_date(task.due)}"} if task.active? %>>
             <% if params[:status] == 'pending' %>
               <td><input type="checkbox" class="complete" data-task-id="<%= task.uuid %>" /></td>
             <% end %>
@@ -45,7 +45,7 @@
             <td><a href="/projects/<%= linkify(task.project) %>"><%= task.project %></a></td>
             <td><%= format_date(task.due) unless task.due.nil? %></td>
             <% if params[:status] == 'waiting' %><td><%= format_date(task.wait) unless task.wait.nil? %></td><% end %>
-            <td><%= task.tags.join(', ') unless task.tags.nil? %></td>
+            <td><%= format_tags(task.tags) unless task.tags.nil? %></td>
             <td><%= task.priority unless task.priority.nil? %></td>
             <% if can_edit %><td><%= crud_links(task) %></td><% end %>
           </tr>

data/spec/app/app_spec.rb

@@ -11,9 +11,9 @@ describe TaskwarriorWeb::App do
   end
 
   before do
-    TaskwarriorWeb::Config.should_receive(:property).with('task-web.user').any_number_of_times.and_return(nil)
-    TaskwarriorWeb::Config.should_receive(:property).with('task-web.filter').any_number_of_times.and_return(nil)
-    TaskwarriorWeb::Runner.should_receive(:run).any_number_of_times.and_return('{}')
+    allow(TaskwarriorWeb::Config).to receive(:property).with('task-web.user').and_return(nil)
+    allow(TaskwarriorWeb::Config).to receive(:property).with('task-web.filter').and_return(nil)
+    allow(TaskwarriorWeb::Runner).to receive(:run).and_return('{}')
   end
 
   ['/', '/tasks'].each do |path|
@@ -70,7 +70,7 @@ describe TaskwarriorWeb::App do
 
       it 'should render the task form' do
         task = TaskwarriorWeb::Task.new({:tags => 'tag1, tag2'})
-        TaskwarriorWeb::Task.should_receive(:new).any_number_of_times.and_return(task)
+        allow(TaskwarriorWeb::Task).to receive(:new).and_return(task)
         post '/tasks', :task => {}
         last_response.body.should have_tag('form') do
           with_tag('input', :with => { :name => 'task[tags]' , :value => 'tag1, tag2' })
@@ -79,7 +79,7 @@ describe TaskwarriorWeb::App do
 
       it 'should display errors messages' do
         task = TaskwarriorWeb::Task.new
-        TaskwarriorWeb::Task.should_receive(:new).any_number_of_times.and_return(task)
+        allow(TaskwarriorWeb::Task).to receive(:new).and_return(task)
         post '/tasks', :task => {}
         last_response.body.should have_tag('.alert-error')
       end
@@ -160,7 +160,7 @@ describe TaskwarriorWeb::App do
   describe 'DELETE /tasks/:uuid' do
     context 'given a non-existant task' do
       it 'should return a 404' do
-        TaskwarriorWeb::Task.should_receive(:find).any_number_of_times.and_return(nil)
+        allow(TaskwarriorWeb::Task).to receive(:find).and_return(nil)
         delete '/tasks/429897527'
         last_response.should be_not_found
       end
@@ -193,7 +193,7 @@ describe TaskwarriorWeb::App do
 
   describe 'GET /projects/:name' do
     it 'should replace characters in the title' do
-      TaskwarriorWeb::Task.should_receive(:query).any_number_of_times.and_return([])
+      allow(TaskwarriorWeb::Task).to receive(:query).and_return([])
       get '/projects/Test--Project'
       last_response.body.should include('<title>Test.Project')
     end
@@ -277,14 +277,14 @@ describe 'HTTP authentication' do
   end
 
   before do
-    TaskwarriorWeb::Config.should_receive(:property).with('task-web.filter').any_number_of_times.and_return(nil)
-    TaskwarriorWeb::Runner.should_receive(:run).any_number_of_times.and_return('{}')
+    allow(TaskwarriorWeb::Config).to receive(:property).with('task-web.filter').and_return(nil)
+    allow(TaskwarriorWeb::Runner).to receive(:run).and_return('{}')
   end
 
   context 'when credentials are specified in .taskrc' do
     before do
-      TaskwarriorWeb::Config.should_receive(:property).with('task-web.user').any_number_of_times.and_return('test_user')
-      TaskwarriorWeb::Config.should_receive(:property).with('task-web.passwd').and_return('test_pass')
+      allow(TaskwarriorWeb::Config).to receive(:property).with('task-web.user').and_return('test_user')
+      allow(TaskwarriorWeb::Config).to receive(:property).with('task-web.passwd').and_return('test_pass')
     end
 
     it 'should ask for authentication' do
@@ -307,7 +307,7 @@ describe 'HTTP authentication' do
 
   context 'when no credentials are specified in .taskrc' do
     before do
-      TaskwarriorWeb::Config.should_receive(:property).with('task-web.user').any_number_of_times.and_return(nil)
+      allow(TaskwarriorWeb::Config).to receive(:property).with('task-web.user').and_return(nil)
     end
 
     it 'should bypass authentication' do

data/spec/app/helpers_spec.rb

@@ -11,11 +11,8 @@ describe TaskwarriorWeb::App::Helpers do
 
   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
+        allow(TaskwarriorWeb::Config).to receive(:dateformat).and_return(nil)
         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'))
@@ -25,13 +22,13 @@ describe TaskwarriorWeb::App::Helpers do
 
     context 'with a specified date format' do
       it 'should format dates using the specified format' do
-        TaskwarriorWeb::Config.should_receive(:dateformat).any_number_of_times.and_return('%d/%-m/%Y')
+        allow(TaskwarriorWeb::Config).to receive(:dateformat).and_return('%d/%-m/%Y')
         helpers.format_date('2012-12-11 12:23:00').should eq('11/12/2012')
         helpers.format_date('2012-12-11').should eq('11/12/2012')
       end
 
       it 'should convert Taskwarrior formats to Ruby formats correctly' do
-        TaskwarriorWeb::Config.should_receive(:store).any_number_of_times.and_return({'dateformat' => 'd/m/Y'})
+        allow(TaskwarriorWeb::Config).to receive(:store).and_return({ 'dateformat' => 'd/m/Y' })
         helpers.format_date('2012-01-11 12:23:00').should eq('11/1/2012')
         helpers.format_date('2012-12-02 12:23:00').should eq('2/12/2012')
       end
@@ -48,7 +45,7 @@ describe TaskwarriorWeb::App::Helpers do
 
     context 'with a due setting specified' do
       before do
-        TaskwarriorWeb::Config.should_receive(:due).any_number_of_times.and_return(3)
+        allow(TaskwarriorWeb::Config).to receive(:due).and_return(3)
       end
 
       it 'should return "warning" when a given date is today' do
@@ -60,14 +57,14 @@ describe TaskwarriorWeb::App::Helpers do
       end
 
       it 'should return "success" when a date is within the specified range' do
-        TaskwarriorWeb::Config.should_receive(:due).any_number_of_times.and_return(5)
+        allow(TaskwarriorWeb::Config).to receive(:due).and_return(5)
         helpers.colorize_date(Date.tomorrow.to_s).should eq('success')
       end
     end
 
     context 'with no due setting specified' do
       before do
-        TaskwarriorWeb::Config.should_receive(:due).any_number_of_times.and_return(nil)
+        allow(TaskwarriorWeb::Config).to receive(:due).and_return(nil)
       end
 
       it 'should use the default setting of 7 days' do

data/spec/model/task_spec.rb

@@ -3,7 +3,7 @@ require 'taskwarrior-web/model/task'
 
 describe TaskwarriorWeb::Task do
   RSpec::Mocks::setup(TaskwarriorWeb::Runner)
-  TaskwarriorWeb::Runner.stub(:run) { '{}' }
+  TaskwarriorWeb::Runner.double(:run) { '{}' }
 
   describe '#initialize' do
     it 'should assign the passed attributes' do

data/spec/spec_helper.rb

@@ -16,7 +16,6 @@ Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].e
 
 RSpec.configure do |config|
   config.mock_with :rspec
-  config.include(RSpec::Mocks::Methods)
 end
 
 SimpleNavigation.config_file_paths << File.dirname(__FILE__) + '/../lib/taskwarrior-web/config'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taskwarrior-web
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.11
 platform: ruby
 authors:
 - Jake Bell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra