taskwarrior-web 1.0.7 → 1.0.8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.0.8 (11/18/12)
+
+* Better layout for projects listing page.
+
 ## v1.0.7 (11/17/12)
 
 * Moving `task` version parsing to Verionomy library. Should be much more

data/Rakefile

@@ -4,4 +4,12 @@ require 'rspec/core/rake_task'
 Bundler::GemHelper.install_tasks
 RSpec::Core::RakeTask.new(:spec)
 
+desc 'Uninstalls the current version of taskwarrior-web'
+task :uninstall do
+  `gem uninstall -x taskwarrior-web`
+end
 
+desc 'Reloads the gem (useful for local development)'
+task :refresh => [:uninstall, :install] do
+  `task-web -F`
+end

data/lib/taskwarrior-web.rb

@@ -3,6 +3,15 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 require 'rubygems'
 
-require 'taskwarrior-web/app'
-require 'taskwarrior-web/task'
-require 'taskwarrior-web/config'
+module TaskwarriorWeb
+  autoload :App,            'taskwarrior-web/app'
+  autoload :Helpers,        'taskwarrior-web/helpers'
+  autoload :Task,           'taskwarrior-web/task'
+  autoload :Config,         'taskwarrior-web/config'
+  autoload :CommandBuilder, 'taskwarrior-web/command_builder'
+  autoload :Command,        'taskwarrior-web/command'
+  autoload :Runner,         'taskwarrior-web/runner'
+  autoload :Parser,         'taskwarrior-web/parser'
+
+  class UnrecognizedTaskVersion < Exception; end
+end

data/lib/taskwarrior-web/app.rb

@@ -4,145 +4,141 @@ require 'sinatra'
 require 'erb'
 require 'time'
 require 'rinku'
-require 'taskwarrior-web/config'
-require 'taskwarrior-web/helpers'
 require 'digest'
 
-module TaskwarriorWeb
-  class App < Sinatra::Base
-
-    @@root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
-    set :root,  @@root    
-    set :app_file, __FILE__
-    set :public_folder, File.dirname(__FILE__) + '/public'
-    set :views, File.dirname(__FILE__) + '/views'
-    
-    def protected!
-      response['WWW-Authenticate'] = %(Basic realm="Taskworrior Web") and throw(:halt, [401, "Not authorized\n"]) and return unless authorized?
-    end
+class TaskwarriorWeb::App < Sinatra::Base
+  autoload :Helpers, 'taskwarrior-web/helpers'
+
+  @@root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+  set :root,  @@root    
+  set :app_file, __FILE__
+  set :public_folder, File.dirname(__FILE__) + '/public'
+  set :views, File.dirname(__FILE__) + '/views'
+  
+  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 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
-      protected! if TaskwarriorWeb::Config.property('task-web.user')
-    end
+  # Before filter
+  before do
+    @current_page = request.path_info
+    protected! if TaskwarriorWeb::Config.property('task-web.user')
+  end
 
-    # Helpers
-    helpers TaskwarriorWeb::App::Helpers
+  # Helpers
+  helpers Helpers
 
-    # Redirects
-    get '/' do
-      redirect '/tasks/pending'
-    end
-    get '/tasks/?' do
-      redirect '/tasks/pending'
-    end
+  # Redirects
+  get '/' do
+    redirect '/tasks/pending'
+  end
+  get '/tasks/?' do
+    redirect '/tasks/pending'
+  end
 
-    # Task routes
-    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] }
-      erb :listing
-    end
+  # Task routes
+  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] }
+    erb :listing
+  end
+
+  get '/tasks/new/?' do
+    @title = 'New Task'
+    @date_format = TaskwarriorWeb::Config.dateformat || 'm/d/yy'
+    @date_format.gsub!('Y', 'yy')
+    erb :task_form
+  end
 
-    get '/tasks/new/?' do
+  post '/tasks/?' do
+    results = passes_validation(params[:task], :task)
+    if results.empty?
+      task = TaskwarriorWeb::Task.new(params[:task])
+      task.save!.to_s
+      redirect '/tasks'
+    else
+      @task = params[:task]
       @title = 'New Task'
       @date_format = TaskwarriorWeb::Config.dateformat || 'm/d/yy'
       @date_format.gsub!('Y', 'yy')
-      erb :task_form
-    end
-
-    post '/tasks/?' do
-      results = passes_validation(params[:task], :task)
-      if results.empty?
-        task = TaskwarriorWeb::Task.new(params[:task])
-        task.save!.to_s
-        redirect '/tasks'
-      else
-        @task = params[:task]
-        @title = 'New Task'
-        @date_format = TaskwarriorWeb::Config.dateformat || 'm/d/yy'
-        @date_format.gsub!('Y', 'yy')
-        @messages = []
-        results.each do |result|
-          @messages << { :severity => 'alert-error', :message => result }
-        end
-        erb :task_form
+      @messages = []
+      results.each do |result|
+        @messages << { :severity => 'alert-error', :message => result }
       end
+      erb :task_form
     end
+  end
 
-    # Projects
-    get '/projects' do
-      redirect '/projects/overview'
-    end
-
-    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 }
-      erb :projects
-    end
+  # Projects
+  get '/projects' do
+    redirect '/projects/overview'
+  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] }
-      @title = @tasks.select { |t| t.project.match(/^#{subbed}$/i) }.first.project
-      erb :project
-    end
+  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 }
+    erb :projects
+  end
 
-    # AJAX callbacks
-    get '/ajax/projects/?' do
-      TaskwarriorWeb::Command.new(:projects).run.split("\n").to_json
-    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] }
+    @title = @tasks.select { |t| t.project.match(/^#{subbed}$/i) }.first.project
+    erb :project
+  end
 
-    get '/ajax/tags/?' do
-      tags = TaskwarriorWeb::Command.new(:tags).run.split("\n")
-      tags.keep_if { |tag| tag.include?(params[:query]) }
+  # AJAX callbacks
+  get '/ajax/projects/?' do
+    TaskwarriorWeb::Command.new(:projects).run.split("\n").to_json
+  end
 
-      json = []
-      tags.each do |tag|
-        json << { :name => tag, :id => tag }
-      end
+  get '/ajax/tags/?' do
+    tags = TaskwarriorWeb::Command.new(:tags).run.split("\n")
+    tags.keep_if { |tag| tag.include?(params[:query]) }
 
-      json.to_json
+    json = []
+    tags.each do |tag|
+      json << { :name => tag, :id => tag }
     end
 
-    get '/ajax/count/?' do
-      TaskwarriorWeb::Task.count(:status => :pending).to_s
-    end
+    json.to_json
+  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
+  get '/ajax/count/?' do
+    TaskwarriorWeb::Task.count(:status => :pending).to_s
+  end
 
-    # Error handling
-    not_found do
-      @title = 'Page Not Found'
-      @referrer = request.referrer
-      erb :'404'
-    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
 
-    def passes_validation(item, method)
-      results = [] 
-      case method
-        when :task
-          if item['description'].empty?
-            results << 'You must provide a description'
-          end
-      end
-      results
-    end
+  # Error handling
+  not_found do
+    @title = 'Page Not Found'
+    @referrer = request.referrer
+    erb :'404'
+  end
 
+  def passes_validation(item, method)
+    results = [] 
+    case method
+      when :task
+        if item['description'].empty?
+          results << 'You must provide a description'
+        end
+    end
+    results
   end
 end

data/lib/taskwarrior-web/command.rb

@@ -1,19 +1,12 @@
-require 'taskwarrior-web/command_builder'
-require 'taskwarrior-web/runner'
+class TaskwarriorWeb::Command
+  include TaskwarriorWeb::CommandBuilder
+  include TaskwarriorWeb::Runner
 
-module TaskwarriorWeb
-  class Command
-
-    include TaskwarriorWeb::CommandBuilder
-    include TaskwarriorWeb::Runner
-
-    attr_accessor :command, :id, :params, :built, :command_string
-
-    def initialize(command, id = nil, *args)
-      @command = command if command
-      @id = id if id
-      @params = args.last.is_a?(::Hash) ? args.pop : {}
-    end
+  attr_accessor :command, :id, :params, :built, :command_string
 
+  def initialize(command, id = nil, *args)
+    @command = command if command
+    @id = id if id
+    @params = args.last.is_a?(::Hash) ? args.pop : {}
   end
 end

data/lib/taskwarrior-web/command_builder.rb

@@ -1,22 +1,22 @@
-require 'taskwarrior-web/config'
+module TaskwarriorWeb::CommandBuilder
+  autoload :Base, 'taskwarrior-web/command_builders/base'
+  autoload :V1,   'taskwarrior-web/command_builders/v1'
+  autoload :V2,   'taskwarrior-web/command_builders/v2'
 
-module TaskwarriorWeb
-  module CommandBuilder
-    def self.included(class_name)
-      class_name.class_eval do
-        case TaskwarriorWeb::Config.version.major
-        when 2
-          require 'taskwarrior-web/command_builders/v2'
-          include TaskwarriorWeb::CommandBuilder::V2
-        when 1
-          require 'taskwarrior-web/command_builders/v1'
-          include TaskwarriorWeb::CommandBuilder::V1
-        else
-          raise TaskwarriorWeb::UnrecognizedTaskVersion
-        end
+  class InvalidCommandError < Exception; end
+  class MissingTaskIDError < Exception; end
+
+  def self.included(class_name)
+    class_name.class_eval do
+      case TaskwarriorWeb::Config.version.major
+      when 2
+        include TaskwarriorWeb::CommandBuilder::V2
+      when 1
+        include TaskwarriorWeb::CommandBuilder::V1
+      else
+        raise TaskwarriorWeb::UnrecognizedTaskVersion
       end
     end
   end
 
-  class UnrecognizedTaskVersion < Exception; end
 end

data/lib/taskwarrior-web/command_builders/base.rb

@@ -1,66 +1,60 @@
 require 'shellwords'
 
-module TaskwarriorWeb::CommandBuilder
-  module Base
-
-    TASK_COMMANDS = {
-      :add => 'add',
-      :query => TaskwarriorWeb::Config.version > Versionomy.parse('1.9.2') ? '_query' : 'export',
-      :count => 'count',
-      :complete => ':id done',
-      :projects => '_projects',
-      :tags => '_tags'
-    }    
-
-    def build
-      unless @command_string
-        task_command
-        substitute_parts if @command_string =~ /:id/
-      end
-      parse_params
-      @built = "#{@command_string}#{@params}"
+module TaskwarriorWeb::CommandBuilder::Base
+
+  TASK_COMMANDS = {
+    :add => 'add',
+    :query => TaskwarriorWeb::Config.version > Versionomy.parse('1.9.2') ? '_query' : 'export',
+    :complete => ':id done',
+    :projects => '_projects',
+    :tags => '_tags'
+  }    
+
+  def build
+    unless @command_string
+      task_command
+      substitute_parts if @command_string =~ /:id/
     end
+    parse_params
+    @built = "#{@command_string}#{@params}"
+  end
 
-    def task_command
-      if TASK_COMMANDS.has_key?(@command.to_sym)
-        @command_string = TASK_COMMANDS[@command.to_sym].clone
-      else
-        raise InvalidCommandError
-      end
+  def task_command
+    if TASK_COMMANDS.has_key?(@command.to_sym)
+      @command_string = TASK_COMMANDS[@command.to_sym].clone
+    else
+      raise InvalidCommandError
     end
+  end
 
-    def substitute_parts
-      if @id
-        @command_string.gsub!(':id', "uuid:#{@id.to_s}")
-        return self
-      else
-        raise TaskwarriorWeb::CommandBuilder::MissingTaskIDError
-      end
+  def substitute_parts
+    if @id
+      @command_string.gsub!(':id', "uuid:#{@id.to_s}")
+      return self
+    else
+      raise TaskwarriorWeb::CommandBuilder::MissingTaskIDError
     end
+  end
 
-    def parse_params
-      string = ''
-      string << %Q( #{@params.delete(:description).shellescape}) if @params.has_key?(:description)
+  def parse_params
+    string = ''
+    string << %Q( #{@params.delete(:description).shellescape}) if @params.has_key?(:description)
 
-      if tags = @params.delete(:tags)
-        tag_indicator = TaskwarriorWeb::Config.property('tag.indicator') || '+'
-        tags.each { |tag| string << %Q( #{tag_indicator}#{tag.to_s.shellescape}) } 
-      end
+    if tags = @params.delete(:tags)
+      tag_indicator = TaskwarriorWeb::Config.property('tag.indicator') || '+'
+      tags.each { |tag| string << %Q( #{tag_indicator}#{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}\\") }
-        else
-          string << %Q( #{attr.to_s}:\\"#{value.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}\\") }
+      else
+        string << %Q( #{attr.to_s}:\\"#{value.to_s.shellescape}\\")
       end
-
-      @params = string
-      return self
     end
 
+    @params = string
+    return self
   end
 
-  class InvalidCommandError < Exception; end
-  class MissingTaskIDError < Exception; end
 end