taskwarrior-web 1.0.9 → 1.0.10

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## v1.0.10 (11/20/12)
+
+* Adding ability to specify a filter for the task listing. See [the wiki][1]
+  for more information.
+* Added the SimpleNavigation library for navigation, and moved a bunch of stuff
+  to ActiveSupport.
+
+[1]: http://github.com/theunraveler/taskwarrior-web/wiki/Filters-for-the-task-listing-page
+
 ## v1.0.9 (11/19/12)
 
 * Fixed bug on projects listing page where projects with no pending tasks were

data/lib/taskwarrior-web.rb

@@ -2,13 +2,15 @@ $:.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'
 
 module TaskwarriorWeb
   autoload :App,            'taskwarrior-web/app'
   autoload :Helpers,        'taskwarrior-web/helpers'
-  autoload :Task,           'taskwarrior-web/task'
-  autoload :Config,         'taskwarrior-web/config'
-  autoload :Command,        'taskwarrior-web/command'
+  autoload :Task,           'taskwarrior-web/model/task'
+  autoload :Config,         'taskwarrior-web/model/config'
+  autoload :Command,        'taskwarrior-web/model/command'
   autoload :CommandBuilder, 'taskwarrior-web/services/builder'
   autoload :Runner,         'taskwarrior-web/services/runner'
   autoload :Parser,         'taskwarrior-web/services/parser'

data/lib/taskwarrior-web/app.rb

@@ -5,6 +5,7 @@ require 'erb'
 require 'time'
 require 'rinku'
 require 'digest'
+require 'sinatra/simple-navigation'
 
 class TaskwarriorWeb::App < Sinatra::Base
   autoload :Helpers, 'taskwarrior-web/helpers'
@@ -14,6 +15,10 @@ class TaskwarriorWeb::App < Sinatra::Base
   set :app_file, __FILE__
   set :public_folder, File.dirname(__FILE__) + '/public'
   set :views, File.dirname(__FILE__) + '/views'
+
+  # Helpers
+  helpers Helpers
+  register Sinatra::SimpleNavigation
   
   def protected!
     response['WWW-Authenticate'] = %(Basic realm="Taskworrior Web") and throw(:halt, [401, "Not authorized\n"]) and return unless authorized?
@@ -31,9 +36,6 @@ class TaskwarriorWeb::App < Sinatra::Base
     protected! if TaskwarriorWeb::Config.property('task-web.user')
   end
 
-  # Helpers
-  helpers Helpers
-
   # Redirects
   get '/' do
     redirect '/tasks/pending'
@@ -46,8 +48,12 @@ class TaskwarriorWeb::App < Sinatra::Base
   get '/tasks/:status/?' do
     pass unless ['pending', 'waiting', 'completed', 'deleted'].include?(params[:status])
     @title = "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] }
+    if params[:status] == 'pending' && filter = TaskwarriorWeb::Config.property('task-web.filter')
+      @tasks = TaskwarriorWeb::Task.query(:description => filter)
+    else
+      @tasks = TaskwarriorWeb::Task.find_by_status(params[:status])
+    end
+    @tasks.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] }
     erb :listing
   end
 
@@ -65,7 +71,7 @@ class TaskwarriorWeb::App < Sinatra::Base
       redirect '/tasks'
     end
 
-    @messages = @task.errors.map { |error| { :severity => 'alert-error', :message => error } }
+    @messages = @task._errors.map { |error| { :severity => 'alert-error', :message => error } }
     call! env.merge('REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/tasks/new')
   end
 
@@ -76,7 +82,6 @@ class TaskwarriorWeb::App < Sinatra::Base
 
   get '/projects/overview/?' do
     @title = 'Projects'
-    @subnav = subnav('projects')
     @tasks = TaskwarriorWeb::Task.query('status.not' => :deleted, 'project.not' => '')
       .sort_by! { |x| [x.priority.nil?.to_s, x.priority.to_s, x.due.nil?.to_s, x.due.to_s] }
       .group_by { |x| x.project.to_s }
@@ -85,7 +90,6 @@ class TaskwarriorWeb::App < Sinatra::Base
   end
 
   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] }
@@ -99,7 +103,12 @@ class TaskwarriorWeb::App < Sinatra::Base
   end
 
   get '/ajax/count/?' do
-    TaskwarriorWeb::Task.count(:status => :pending).to_s
+    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
 
   post '/ajax/task-complete/:id/?' do

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

@@ -0,0 +1,18 @@
+SimpleNavigation::Configuration.run do |navigation|  
+  navigation.selected_class = 'active'
+
+  navigation.items do |primary|
+    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 :waiting, 'Waiting', '/tasks/waiting'
+      tasks.item :completed, 'Completed', '/tasks/completed'
+      tasks.item :deleted, 'Deleted', '/tasks/deleted'
+    end
+    primary.item :projects, 'Projects', '/projects' do |projects|
+      projects.dom_class = 'nav nav-pills'
+      projects.item :overview, 'Overview', '/projects/overview'
+    end
+  end
+end

data/lib/taskwarrior-web/helpers.rb

@@ -23,30 +23,7 @@ module TaskwarriorWeb::App::Helpers
     item.gsub('.', '--')
   end
 
-  def idify(item)
-    return if item.nil?
-    linkify(item).gsub(' ', '-').gsub("'", '').downcase
-  end
-
   def auto_link(text)
     Rinku.auto_link(text, :all, 'target="_blank"')
   end
-
-  def subnav(type)
-    case type
-      when 'tasks'
-        { '/tasks/pending' => "Pending <span class=\"badge\">#{TaskwarriorWeb::Task.count(:status => :pending)}</span>",
-          '/tasks/waiting' => "Waiting",
-          '/tasks/completed' => "Completed",
-          '/tasks/deleted' => 'Deleted'
-        }
-      when 'projects'
-        {
-          '/projects/overview' => 'Overview'
-        }
-      else
-        { }
-    end
-  end
-
 end

data/lib/taskwarrior-web/{task.rb → 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
     alias :annotate= :annotations=
 
     ####################################
@@ -17,7 +17,10 @@ module TaskwarriorWeb
     def initialize(attributes = {})
       attributes.each do |attr, value|
         send("#{attr}=", value) if respond_to?(attr.to_sym)
-      end  
+      end
+
+      @_errors = []
+      @tags = [] if @tags.nil?
     end
 
     def save!
@@ -29,21 +32,17 @@ module TaskwarriorWeb
     end
 
     # Make sure that the tags are an array.
-    def tags
-      @tags ? @tags : []
-    end
     def tags=(value)
       @tags = value.is_a?(String) ? value.split(/\W+/).reject(&:empty?) : value
     end
 
     def is_valid?
-      self.errors = []
-      self.errors << 'You must provide a description' if self.description.nil? || self.description.empty?
-      self.errors.empty?
+      @_errors << 'You must provide a description' if self.description.blank?
+      @_errors.empty?
     end
 
     def to_hash
-      Hash[instance_variables.map { |var| [var[1..-1].to_sym, instance_variable_get(var)] }]
+      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/js/application.js

@@ -5,6 +5,7 @@ $(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/lib/taskwarrior-web/views/_subnav.erb

@@ -1,13 +1,7 @@
 <div class="page-header" id="subnav-bar">
   <h1 class="pull-left"><%= @title %></h1>
-  <% if @subnav %>
   <nav class="subnav pull-right">
-    <ul class="nav nav-pills">
-      <% @subnav.each do |path, text| %>
-        <li<%= ' class="active"' if @current_page.index(path) == 0 %>><a href="<%= path %>"><%= text %></a></li>
-      <% end %>
-    </ul>
-  <% end %>
+    <%= render_navigation :level => 2 %>
   </nav>
   <div class="clear"></div>
 </div>

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

@@ -1,12 +1,7 @@
 <div class="navbar navbar-fixed-top">
   <div class="navbar-inner"><div class="container">
     <a href="/" class="brand">Taskwarrior Web</a>
-    <% tabs = { '/tasks' => 'Tasks', '/projects' => 'Projects' } %>
-    <ul class="nav">
-      <% tabs.each do |path, text| %>
-        <li<%= ' class="active"' if @current_page.index(path) == 0 %>><a href="<%= path %>"><%= text %></a></li>
-      <% end %>
-    </ul>
+    <%= render_navigation :level => 1 %>
     <ul class="nav pull-right">
       <li>
         <a href="/tasks/new">

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

@@ -3,7 +3,7 @@
     <ul class="nav nav-list" data-spy="affix" data-offset-top="125">
       <% @tasks.keys.each do |project| %>
         <li>
-          <a href="#project-<%= idify(project) %>"><i class="icon-chevron-right"></i> <%= project %></a>
+          <a href="#project-<%= project.parameterize %>"><i class="icon-chevron-right"></i> <%= project %></a>
         </li>
       <% end %>
     </ul>
@@ -13,7 +13,7 @@
     <div id="listing">
       <% @tasks.each do |proj, tasks| %>
         <% doneness = (tasks.select { |t| t.status == 'completed' }.count.to_f / tasks.count.to_f) * 100 %>
-        <section class="project-container" id="project-<%= idify(proj) %>">
+        <section class="project-container" id="project-<%= proj.parameterize %>">
           <h2 class="project <%= doneness == 100 ? 'done' : 'pending' %>">
             <%= proj %>&nbsp;
             <a href="/projects/<%= linkify(proj) %>"><i class="icon-circle-arrow-right"></i></a>

data/spec/app/app_spec.rb

@@ -12,6 +12,7 @@ describe TaskwarriorWeb::App do
 
   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('{}')
   end
 

data/spec/app/helpers_spec.rb

@@ -61,11 +61,5 @@ describe TaskwarriorWeb::App::Helpers do
       helpers.auto_link('hello')
     end
   end
-
-  describe '#subnav' do
-    it 'should be empty for an unrecognized type' do
-      helpers.subnav('something').should be_empty
-    end
-  end
 end
 

data/spec/{models → model}/command_spec.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../spec_helper'
-require 'taskwarrior-web/command'
+require 'taskwarrior-web/model/command'
 
 describe TaskwarriorWeb::Command do
   describe '#initialize' do

data/spec/{models → model}/config_spec.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../spec_helper'
-require 'taskwarrior-web/config'
+require 'taskwarrior-web/model/config'
 require 'ostruct'
 
 describe TaskwarriorWeb::Config do

data/spec/{models → model}/task_spec.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../spec_helper'
-require 'taskwarrior-web/task'
+require 'taskwarrior-web/model/task'
 
 describe TaskwarriorWeb::Task do
   RSpec::Mocks::setup(TaskwarriorWeb::Runner)

data/spec/services/builder/base_spec.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
-require 'taskwarrior-web/command'
+require 'taskwarrior-web/model/command'
 
 describe TaskwarriorWeb::CommandBuilder::Base do
   describe '#task_command' do

data/spec/services/builder/v1_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 require 'taskwarrior-web/services/builder/v1'
-require 'taskwarrior-web/command'
+require 'taskwarrior-web/model/command'
 require 'ostruct'
 
 describe TaskwarriorWeb::CommandBuilder::V1 do

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'sinatra'
 require 'rack/test'
 require 'rspec'
+require 'simple_navigation'
 
 # Simplecov
 require 'simplecov'
@@ -16,3 +17,5 @@ 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'

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.9'
+  s.version     = '1.0.10'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jake Bell"]
   s.email       = ["jake@theunraveler.com"]
@@ -21,6 +21,8 @@ Gem::Specification.new do |s|
   s.add_dependency('vegas')
   s.add_dependency('rinku')
   s.add_dependency('versionomy')
+  s.add_dependency('activesupport')
+  s.add_dependency('sinatra-simple-navigation')
 
   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.0.9
+  version: 1.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-19 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70214969400280 !ruby/object:Gem::Requirement
+  requirement: &70364966614320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70214969400280
+  version_requirements: *70364966614320
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70214969399720 !ruby/object:Gem::Requirement
+  requirement: &70364966613720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70214969399720
+  version_requirements: *70364966613720
 - !ruby/object:Gem::Dependency
   name: parseconfig
-  requirement: &70214969399240 !ruby/object:Gem::Requirement
+  requirement: &70364966613280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70214969399240
+  version_requirements: *70364966613280
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &70214969398760 !ruby/object:Gem::Requirement
+  requirement: &70364966612800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70214969398760
+  version_requirements: *70364966612800
 - !ruby/object:Gem::Dependency
   name: rinku
-  requirement: &70214969398260 !ruby/object:Gem::Requirement
+  requirement: &70364966612360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70214969398260
+  version_requirements: *70364966612360
 - !ruby/object:Gem::Dependency
   name: versionomy
-  requirement: &70214969397720 !ruby/object:Gem::Requirement
+  requirement: &70364966611800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70214969397720
+  version_requirements: *70364966611800
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70364966611080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70364966611080
+- !ruby/object:Gem::Dependency
+  name: sinatra-simple-navigation
+  requirement: &70364966610460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70364966610460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70214969397240 !ruby/object:Gem::Requirement
+  requirement: &70364966609880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70214969397240
+  version_requirements: *70364966609880
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70214969396600 !ruby/object:Gem::Requirement
+  requirement: &70364966609200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70214969396600
+  version_requirements: *70364966609200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70214969395900 !ruby/object:Gem::Requirement
+  requirement: &70364966608700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70214969395900
+  version_requirements: *70364966608700
 description: This gem provides a graphical frontend for the Taskwarrior task manager.
   It is based on Sinatra.
 email:
@@ -131,9 +153,11 @@ files:
 - config.ru
 - lib/taskwarrior-web.rb
 - lib/taskwarrior-web/app.rb
-- lib/taskwarrior-web/command.rb
-- lib/taskwarrior-web/config.rb
+- lib/taskwarrior-web/config/navigation.rb
 - lib/taskwarrior-web/helpers.rb
+- lib/taskwarrior-web/model/command.rb
+- lib/taskwarrior-web/model/config.rb
+- lib/taskwarrior-web/model/task.rb
 - lib/taskwarrior-web/public/css/bootstrap-responsive.min.css
 - lib/taskwarrior-web/public/css/bootstrap.min.css
 - lib/taskwarrior-web/public/css/datepicker.css
@@ -154,7 +178,6 @@ files:
 - lib/taskwarrior-web/services/parser/csv.rb
 - lib/taskwarrior-web/services/parser/json.rb
 - lib/taskwarrior-web/services/runner.rb
-- lib/taskwarrior-web/task.rb
 - lib/taskwarrior-web/views/404.erb
 - lib/taskwarrior-web/views/_subnav.erb
 - lib/taskwarrior-web/views/_topbar.erb
@@ -166,9 +189,9 @@ files:
 - spec/app/app_spec.rb
 - spec/app/helpers_spec.rb
 - spec/files/taskrc
-- spec/models/command_spec.rb
-- spec/models/config_spec.rb
-- spec/models/task_spec.rb
+- spec/model/command_spec.rb
+- spec/model/config_spec.rb
+- spec/model/task_spec.rb
 - spec/services/builder/base_spec.rb
 - spec/services/builder/v1_spec.rb
 - spec/services/builder_spec.rb
@@ -196,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -561964061204943881
+      hash: 1101487011083302650
 requirements: []
 rubyforge_project: taskwarrior-web
 rubygems_version: 1.8.11
@@ -207,9 +230,9 @@ test_files:
 - spec/app/app_spec.rb
 - spec/app/helpers_spec.rb
 - spec/files/taskrc
-- spec/models/command_spec.rb
-- spec/models/config_spec.rb
-- spec/models/task_spec.rb
+- spec/model/command_spec.rb
+- spec/model/config_spec.rb
+- spec/model/task_spec.rb
 - spec/services/builder/base_spec.rb
 - spec/services/builder/v1_spec.rb
 - spec/services/builder_spec.rb