taskwarrior-web 1.0.10 → 1.0.11

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.0.11 (11/21/12)
+
+* Nicer badges in the "Pending" menu item
+* Fixed stripping of non-word characters from tags when adding a new task
+
 ## v1.0.10 (11/20/12)
 
 * Adding ability to specify a filter for the task listing. See [the wiki][1]

data/lib/taskwarrior-web/app.rb

@@ -103,12 +103,7 @@ class TaskwarriorWeb::App < Sinatra::Base
   end
 
   get '/ajax/count/?' do
-    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
+    self.class.task_count
   end
 
   post '/ajax/task-complete/:id/?' do
@@ -123,4 +118,13 @@ class TaskwarriorWeb::App < Sinatra::Base
     @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\"></span>", '/tasks/pending'
+      tasks.item :pending, "Pending <span class=\"badge\">#{TaskwarriorWeb::App.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/model/task.rb

@@ -33,7 +33,7 @@ module TaskwarriorWeb
 
     # Make sure that the tags are an array.
     def tags=(value)
-      @tags = value.is_a?(String) ? value.split(/\W+/).reject(&:empty?) : value
+      @tags = value.is_a?(String) ? value.split(/[, ]+/).reject(&:empty?) : value
     end
 
     def is_valid?

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

@@ -4,6 +4,8 @@ body { padding-top: 40px; }
 .section-separator { margin: 40px 0 39px; }
 
 #subnav-bar ul.nav { margin-top: 10px; }
+#subnav-bar .nav .badge { background-color: #08c; }
+#subnav-bar .nav li#pending a { padding-top: 6px; padding-bottom: 6px; }
 
 #sidebar .nav {
   width: 228px;

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

@@ -5,7 +5,6 @@ $(document).ready(function() {
 
 	// Fluid-specific stuff.
 	refreshDockBadge();
-  refreshSubnavCount();
 
   // Hack to account for navbar when clicking anchor links.
   $('#sidebar .nav li a').click(function(event) {

data/spec/app/helpers_spec.rb

@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 require 'taskwarrior-web'
+require 'active_support/core_ext/date/calculations'
 
 class TestHelpers
   include TaskwarriorWeb::App::Helpers
@@ -52,6 +53,12 @@ describe TaskwarriorWeb::App::Helpers do
       it 'should return "overdue" when a date is before today' do
         helpers.colorize_date(Time.at(0).to_s).should eq('error')
       end
+
+      it 'should return "info" when a date is within the specified range' do
+        TaskwarriorWeb::Config.should_receive(:due).any_number_of_times.and_return(5)
+        helpers.colorize_date(Date.tomorrow.to_s).should eq('info')
+      end
+
     end
   end
 

data/spec/model/task_spec.rb

@@ -77,6 +77,11 @@ describe TaskwarriorWeb::Task do
         task.tags.should eq(['hi', 'twice', 'and', 'again'])
       end
     end
+
+    it 'should support most characters' do
+      task = TaskwarriorWeb::Task.new(:tags => '@hi, -twice, !again, ~when')
+      task.tags.should eq(['@hi', '-twice', '!again', '~when'])
+    end
   end
 
   describe '#to_hash' do

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.10'
+  s.version     = '1.0.11'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jake Bell"]
   s.email       = ["jake@theunraveler.com"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taskwarrior-web
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70364966614320 !ruby/object:Gem::Requirement
+  requirement: &70230869736340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364966614320
+  version_requirements: *70230869736340
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70364966613720 !ruby/object:Gem::Requirement
+  requirement: &70230869735580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364966613720
+  version_requirements: *70230869735580
 - !ruby/object:Gem::Dependency
   name: parseconfig
-  requirement: &70364966613280 !ruby/object:Gem::Requirement
+  requirement: &70230869733980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364966613280
+  version_requirements: *70230869733980
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &70364966612800 !ruby/object:Gem::Requirement
+  requirement: &70230869343760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364966612800
+  version_requirements: *70230869343760
 - !ruby/object:Gem::Dependency
   name: rinku
-  requirement: &70364966612360 !ruby/object:Gem::Requirement
+  requirement: &70230869341600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364966612360
+  version_requirements: *70230869341600
 - !ruby/object:Gem::Dependency
   name: versionomy
-  requirement: &70364966611800 !ruby/object:Gem::Requirement
+  requirement: &70230869339760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364966611800
+  version_requirements: *70230869339760
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70364966611080 !ruby/object:Gem::Requirement
+  requirement: &70230869338560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364966611080
+  version_requirements: *70230869338560
 - !ruby/object:Gem::Dependency
   name: sinatra-simple-navigation
-  requirement: &70364966610460 !ruby/object:Gem::Requirement
+  requirement: &70230869337980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364966610460
+  version_requirements: *70230869337980
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70364966609880 !ruby/object:Gem::Requirement
+  requirement: &70230869336800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70364966609880
+  version_requirements: *70230869336800
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70364966609200 !ruby/object:Gem::Requirement
+  requirement: &70230869712360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70364966609200
+  version_requirements: *70230869712360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70364966608700 !ruby/object:Gem::Requirement
+  requirement: &70230869711380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70364966608700
+  version_requirements: *70230869711380
 description: This gem provides a graphical frontend for the Taskwarrior task manager.
   It is based on Sinatra.
 email:
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1101487011083302650
+      hash: 705415222630584467
 requirements: []
 rubyforge_project: taskwarrior-web
 rubygems_version: 1.8.11