taskwarrior-web 1.1.2 → 1.1.3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.1.3 (12/11/12)
+
+* Added CRUD links to waiting tab
+* Set rack-protection dependency version (to fix weird static assets 404 issue)
+
 ## v1.1.2 (12/7/12)
 
 * Fixed dumb but annoying timezone issue

data/lib/taskwarrior-web/app.rb

@@ -31,17 +31,12 @@ class TaskwarriorWeb::App < Sinatra::Base
     protected! if TaskwarriorWeb::Config.property('task-web.user')
   end
 
-  # Redirects
-  get('/') { redirect to('/tasks/pending') }
-  get('/tasks/?') { redirect to('/tasks/pending') }
-  get('/projects/?') { redirect to('/projects/overview') }
-
   # Task routes
   get '/tasks/:status/?' do
     pass unless ['pending', 'waiting', 'completed', 'deleted'].include?(params[:status])
     @title = "Tasks"
     if params[:status] == 'pending' && filter = TaskwarriorWeb::Config.property('task-web.filter')
-      @tasks = TaskwarriorWeb::Task.query(:description => filter)
+      @tasks = TaskwarriorWeb::Task.query(filter)
     else
       @tasks = TaskwarriorWeb::Task.find_by_status(params[:status])
     end
@@ -65,11 +60,11 @@ class TaskwarriorWeb::App < Sinatra::Base
     end
 
     flash.now[:error] = @task._errors.join(', ')
-    forward '/tasks/new'
+    erb :new_task
   end
 
   get '/tasks/:uuid/?' do
-    not_found if !TaskwarriorWeb::Config.supports?(:editing)
+    not_found unless TaskwarriorWeb::Config.supports?(:editing)
     tasks = TaskwarriorWeb::Task.find_by_uuid(params[:uuid])
     not_found if tasks.empty?
     @task = tasks.first
@@ -78,7 +73,7 @@ class TaskwarriorWeb::App < Sinatra::Base
   end
 
   patch '/tasks/:uuid/?' do
-    not_found if !TaskwarriorWeb::Config.supports?(:editing)
+    not_found unless TaskwarriorWeb::Config.supports?(:editing)
     not_found if TaskwarriorWeb::Task.find_by_uuid(params[:uuid]).empty?
 
     @task = TaskwarriorWeb::Task.new(params[:task])
@@ -89,11 +84,11 @@ class TaskwarriorWeb::App < Sinatra::Base
     end
 
     flash.now[:error] = @task._errors.join(', ')
-    forward "/tasks/#{@task.uuid}"
+    erb :edit_task
   end
 
   get '/tasks/:uuid/delete/?' do
-    not_found if !TaskwarriorWeb::Config.supports?(:editing)
+    not_found unless TaskwarriorWeb::Config.supports?(:editing)
     tasks = TaskwarriorWeb::Task.find_by_uuid(params[:uuid])
     not_found if tasks.empty?
     @task = tasks.first
@@ -102,7 +97,7 @@ class TaskwarriorWeb::App < Sinatra::Base
   end
 
   delete '/tasks/:uuid' do
-    not_found if !TaskwarriorWeb::Config.supports?(:editing)
+    not_found unless TaskwarriorWeb::Config.supports?(:editing)
     tasks = TaskwarriorWeb::Task.find_by_uuid(params[:uuid])
     not_found if tasks.empty?
     @task = tasks.first
@@ -128,24 +123,20 @@ class TaskwarriorWeb::App < Sinatra::Base
     erb :project
   end
 
+  # Redirects
+  get('/') { redirect to('/tasks/pending') }
+  get('/tasks/?') { redirect to('/tasks/pending') }
+  get('/projects/?') { redirect to('/projects/overview') }
+
   # AJAX callbacks
   get('/ajax/projects/?') { TaskwarriorWeb::Command.new(:projects).run.split("\n").to_json }
   get('/ajax/count/?') { task_count }
   post('/ajax/task-complete/:id/?') { TaskwarriorWeb::Command.new(:complete, params[:id]).run }
-
-  get '/ajax/badge/?' do
-    if filter = TaskwarriorWeb::Config.property('task-web.filter.badge')
-      total = TaskwarriorWeb::Task.query(:description => filter).count
-    else
-      total = task_count
-    end
-    total == 0 ? '' : total.to_s
-  end
+  get('/ajax/badge/?') { badge_count }
 
   # Error handling
   not_found do
     @title = 'Page Not Found'
-    @referrer = request.referrer
     erb :'404'
   end
 end

data/lib/taskwarrior-web/helpers.rb

@@ -36,13 +36,22 @@ module TaskwarriorWeb::App::Helpers
 
   def task_count
     if filter = TaskwarriorWeb::Config.property('task-web.filter')
-      total = TaskwarriorWeb::Task.query(:description => filter).count
+      total = TaskwarriorWeb::Task.query(filter).count
     else
       total = TaskwarriorWeb::Task.count(:status => :pending)
     end
     total.to_s
   end
 
+  def badge_count
+    if filter = TaskwarriorWeb::Config.property('task-web.filter.badge')
+      total = TaskwarriorWeb::Task.query(filter).count
+    else
+      total = task_count
+    end
+    total == 0 ? '' : total.to_s
+  end
+
   def progress_bar(tasks)
     return 0 if tasks.empty?
     doneness = (tasks.select { |t| t.status == 'completed' }.count.to_f / tasks.count.to_f) * 100
@@ -71,8 +80,4 @@ module TaskwarriorWeb::App::Helpers
     values = [TaskwarriorWeb::Config.property('task-web.user'), TaskwarriorWeb::Config.property('task-web.passwd')]
     @auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == values
   end
-
-  def forward(url, method = 'GET')
-    call env.merge('REQUEST_METHOD' => method, 'PATH_INFO' => url)
-  end
 end

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

@@ -57,15 +57,29 @@ module TaskwarriorWeb
     # CLASS METHODS FOR QUERYING TASKS
     ##################################
 
-    # Run queries on tasks.
+    ##
+    # Run queries, returns an array of tasks that meet the criteria.
+    #
+    # Filters can either be a hash of conditions, or an already-constructed
+    # taskwarrior filter string.
+    #
+    # For example:
+    # { :description => 'test', 'project.not' => '' }
+    # 'description:test project.not:'
+
     def self.query(*args)
       tasks = []
-      results = Command.new(:query, nil, *args).run
-      Parser.parse(results).each { |result| tasks << Task.new(result) }
+      if !args.empty? && args.first.is_a?(String)
+        command = Command.new(:query, nil, :description => args.first)
+      else
+        command = Command.new(:query, nil, *args)
+      end
+      Parser.parse(command.run).each { |result| tasks << Task.new(result) }
       tasks
     end
 
-    # Get the number of tasks for some paramters
+    ##
+    # Get the number of tasks for some paramters.
     def self.count(*args)
       self.query(*args).count
     end

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

@@ -1,3 +1,2 @@
-Aww bummer. Taskwarrior doesn't know what to do with <%= @current_page %>.
-<br /><br />
-<a href="<%= @referrer %>">Go back from whence you came</a>
+<p>Aww bummer. Taskwarrior doesn't know what to do with <%= @current_page %>.</p>
+<p>Go <a href="<%= back %>">back</a> or <a href="/tasks">to the main task page</a>.</p>

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

@@ -3,15 +3,14 @@
     <title><%= @title %> | TaskwarriorWeb</title>
 
     <!-- Styles -->
-    <link rel="stylesheet" href="/css/bootstrap.min.css">
-    <link rel="stylesheet" href="/css/datepicker.css">
-    <link rel="stylesheet" href="/css/styles.css">
+    <% ['bootstrap.min', 'datepicker', 'styles'].each do |file| %>
+      <link rel="stylesheet" href="<%= url("/css/#{file}.css") %>">
+    <% end %>
 
     <!-- Scripts -->
-    <script type="text/javascript" src="/js/jquery.min.js"></script>
-    <script type="text/javascript" src="/js/bootstrap.js"></script>
-    <script type="text/javascript" src="/js/bootstrap-datepicker.js"></script>
-    <script type="text/javascript" src="/js/application.js"></script>
+    <% ['jquery.min', 'bootstrap', 'bootstrap-datepicker', 'application'].each do |file| %>
+      <link rel="stylesheet" href="<%= url("/js/#{file}.js") %>">
+    <% end %>
   </head>
 
   <body data-spy="scroll" data-offset="60" data-target="#sidebar">

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

@@ -1,4 +1,4 @@
-<% can_edit = @can_edit && params[:status] == 'pending' %>
+<% can_edit = @can_edit && params[:status].in?(['pending', 'waiting']) %>
 
 <div id="listing">
   <table class="table table-striped table-hover">

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

@@ -1,3 +1,9 @@
+<script>
+  $(document).ready(function() {
+    $('input[name="task[description]"]').focus();
+  });
+</script>
+
 <form id="new-task-form" class="form-horizontal" action="/tasks" method="post">
 
   <%= erb :_task_form %>

data/spec/app/app_spec.rb

@@ -31,7 +31,7 @@ describe TaskwarriorWeb::App do
   describe 'GET /tasks/new' do
     it 'should display a new task form' do
       get '/tasks/new'
-      last_response.body.should include('<form')
+      last_response.body.should have_tag('form', :with => { :action => '/tasks' })
     end
 
     it 'should display a 200 status code' do
@@ -70,17 +70,18 @@ describe TaskwarriorWeb::App do
 
       it 'should render the task form' do
         task = TaskwarriorWeb::Task.new({:tags => 'tag1, tag2'})
-        TaskwarriorWeb::Task.should_receive(:new).once.and_return(task)
+        TaskwarriorWeb::Task.should_receive(:new).any_number_of_times.and_return(task)
         post '/tasks', :task => {}
-        last_response.body.should include('form')
-        last_response.body.should include('tag1, tag2')
+        last_response.body.should have_tag('form') do
+          with_tag('input', :with => { :name => 'task[tags]' , :value => 'tag1, tag2' })
+        end
       end
 
       it 'should display errors messages' do
         task = TaskwarriorWeb::Task.new
-        TaskwarriorWeb::Task.should_receive(:new).once.and_return(task)
+        TaskwarriorWeb::Task.should_receive(:new).any_number_of_times.and_return(task)
         post '/tasks', :task => {}
-        last_response.body.should include('You must provide a description')
+        last_response.body.should have_tag('.alert-error')
       end
     end
   end
@@ -129,6 +130,31 @@ describe TaskwarriorWeb::App do
         last_response.should be_not_found
       end
     end
+
+    context 'given an existing task' do
+      before do
+        TaskwarriorWeb::Task.should_receive(:find_by_uuid).and_return(['hello'])
+      end
+
+      it 'should render an error message if the task is invalid' do
+        patch '/tasks/23455', :task => { :tags => 'test, tags' }
+        last_response.body.should have_tag('form')
+        last_response.body.should have_tag('#flash-messages') do
+          with_tag('.alert-error', :text => /description/)
+        end
+      end
+
+      it 'should save the task and redirect if the task is valid' do
+        task = TaskwarriorWeb::Task.new({ :description => 'Test task' })
+        task.should_receive(:is_valid?).and_return(true)
+        task.should_receive(:save!).once.and_return('A message!')
+        TaskwarriorWeb::Task.should_receive(:new).and_return(task)
+        patch '/tasks/2356', :task => { :description => 'Test task' }
+        last_response.should be_redirect
+        follow_redirect!
+        last_request.url.should =~ /\/tasks\/?$/
+      end
+    end
   end
 
   describe 'GET /tasks/:uuid/delete' do
@@ -230,6 +256,34 @@ describe TaskwarriorWeb::App do
     end
   end
 
+  describe 'GET /ajax/badge' do
+    context 'given a filter specified in .taskrc' do
+      before do
+        TaskwarriorWeb::Config.should_receive(:property).with('task-web.filter.badge').and_return('a filter')
+      end
+
+      it 'should get the count by runnng the filter' do
+        TaskwarriorWeb::Task.should_receive(:query).once.with('a filter').and_return([])
+        get '/ajax/badge'
+      end
+    end
+
+    it 'should return the count as a string' do
+      TaskwarriorWeb::Config.should_receive(:property).with('task-web.filter.badge').and_return('a filter')
+      TaskwarriorWeb::Task.should_receive(:query).with('a filter').and_return(['test'])
+      get '/ajax/badge'
+      last_response.body.should eq('1')
+      last_response.body.should be_a(String)
+    end
+
+    it 'should return an empty string if the count is zero' do
+      TaskwarriorWeb::Config.should_receive(:property).with('task-web.filter.badge').and_return('a filter')
+      TaskwarriorWeb::Task.should_receive(:query).with('a filter').and_return([])
+      get '/ajax/badge'
+      last_response.body.should eq('')
+    end
+  end
+
   describe 'not_found' do
     it 'should set the title to "Not Found"' do
       get '/page-not-found'
@@ -241,4 +295,53 @@ describe TaskwarriorWeb::App do
       last_response.should be_not_found
     end
   end
+
+end
+
+describe 'HTTP authentication' do
+  include Rack::Test::Methods
+
+  def app
+    TaskwarriorWeb::App
+  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('{}')
+  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')
+    end
+
+    it 'should ask for authentication' do
+      get '/tasks/new'
+      last_response.should be_client_error
+    end
+
+    it 'should only accept the configured credentials' do
+      authorize 'bad', 'user'
+      get '/tasks/new'
+      last_response.should be_client_error
+    end
+
+    it 'should pass when the correct credentials are given' do
+      authorize 'test_user', 'test_pass'
+      get '/tasks/new'
+      last_response.should be_ok
+    end
+  end
+
+  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)
+    end
+
+    it 'should bypass authentication' do
+      get '/tasks/new'
+      last_response.should be_ok
+    end
+  end
 end

data/spec/app/helpers_spec.rb

@@ -16,22 +16,30 @@ describe TaskwarriorWeb::App::Helpers do
       end
 
       it 'should format various dates and times to the default format' do
-        helpers.format_date('2012-01-11 12:23:00').should == '1/11/2012'
-        helpers.format_date('2012-01-11').should == '1/11/2012'
+        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
       end
     end
 
     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')
-        helpers.format_date('2012-12-11 12:23:00').should == '11/12/2012'
-        helpers.format_date('2012-12-11').should == '11/12/2012'
+        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(:file).any_number_of_times.and_return({'dateformat' => 'd/m/Y'})
-        helpers.format_date('2012-01-11 12:23:00').should == '11/1/2012'
-        helpers.format_date('2012-12-02 12:23:00').should == '2/12/2012'
+        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
     end
   end

data/spec/services/builder/base_spec.rb

@@ -16,7 +16,7 @@ describe TaskwarriorWeb::CommandBuilder::Base do
 
     it 'should insert the task id into the command' do
       @command.task_command.substitute_parts
-      @command.command_string.should =~ /uuid:34588/
+      @command.command_string.should match(/uuid:34588/)
     end
 
     it 'should return itself' do

data/spec/services/runner_spec.rb

@@ -9,7 +9,7 @@ describe TaskwarriorWeb::Runner do
     @object = TestCommandClass.new
   end
 
-  describe 'include' do
+  describe '.included' do
     it 'should make the class respond to the run command' do
       @object.should respond_to(:run)
     end

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.1.2'
+  s.version     = '1.1.3'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jake Bell"]
   s.email       = ["jake@theunraveler.com"]
@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.0'
 
   s.add_dependency('sinatra')
+  s.add_dependency('rack-protection', '= 1.2.0')
   s.add_dependency('parseconfig')
   s.add_dependency('vegas')
   s.add_dependency('rinku')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taskwarrior-web
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70206370788540 !ruby/object:Gem::Requirement
+  requirement: &70125172704420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206370788540
+  version_requirements: *70125172704420
+- !ruby/object:Gem::Dependency
+  name: rack-protection
+  requirement: &70125172702900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70125172702900
 - !ruby/object:Gem::Dependency
   name: parseconfig
-  requirement: &70206370787820 !ruby/object:Gem::Requirement
+  requirement: &70125172701620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206370787820
+  version_requirements: *70125172701620
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &70206370787120 !ruby/object:Gem::Requirement
+  requirement: &70125172699760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206370787120
+  version_requirements: *70125172699760
 - !ruby/object:Gem::Dependency
   name: rinku
-  requirement: &70206370786420 !ruby/object:Gem::Requirement
+  requirement: &70125172698080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206370786420
+  version_requirements: *70125172698080
 - !ruby/object:Gem::Dependency
   name: versionomy
-  requirement: &70206370785500 !ruby/object:Gem::Requirement
+  requirement: &70125172696940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206370785500
+  version_requirements: *70125172696940
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70206370784480 !ruby/object:Gem::Requirement
+  requirement: &70125172695900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206370784480
+  version_requirements: *70125172695900
 - !ruby/object:Gem::Dependency
   name: sinatra-simple-navigation
-  requirement: &70206370783620 !ruby/object:Gem::Requirement
+  requirement: &70125172694160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206370783620
+  version_requirements: *70125172694160
 - !ruby/object:Gem::Dependency
   name: rack-flash3
-  requirement: &70206370782760 !ruby/object:Gem::Requirement
+  requirement: &70125172692900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206370782760
+  version_requirements: *70125172692900
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70206370781900 !ruby/object:Gem::Requirement
+  requirement: &70125172692020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206370781900
+  version_requirements: *70125172692020
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70206370781160 !ruby/object:Gem::Requirement
+  requirement: &70125172690920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206370781160
+  version_requirements: *70125172690920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70206370780320 !ruby/object:Gem::Requirement
+  requirement: &70125172689960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206370780320
+  version_requirements: *70125172689960
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
-  requirement: &70206370779420 !ruby/object:Gem::Requirement
+  requirement: &70125172689140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206370779420
+  version_requirements: *70125172689140
 description: This gem provides a graphical frontend for the Taskwarrior task manager.
   It is based on Sinatra.
 email:
@@ -234,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3722492291802643643
+      hash: 3014724563927627498
 requirements: []
 rubyforge_project: taskwarrior-web
 rubygems_version: 1.8.11