taskwarrior-web 1.0.11 → 1.0.12

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.0.12 (11/22/12)
+
+* Miscellaneous styling fixes and improvements
+
 ## v1.0.11 (11/21/12)
 
 * Nicer badges in the "Pending" menu item

data/lib/taskwarrior-web/app.rb

@@ -90,10 +90,9 @@ class TaskwarriorWeb::App < Sinatra::Base
   end
 
   get '/projects/:name/?' do
-    subbed = params[:name].gsub('--', '.') 
-    @tasks = TaskwarriorWeb::Task.query('status.not' => 'deleted', :project => subbed)
+    @title = params[:name].gsub('--', '.') 
+    @tasks = TaskwarriorWeb::Task.query('status.not' => 'deleted', :project => @title)
       .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
 

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

@@ -1,10 +1,10 @@
-.clear { clear: both; }
 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.active .badge { color: #08c; background-color: #fff; }
 #subnav-bar .nav li#pending a { padding-top: 6px; padding-bottom: 6px; }
 
 #sidebar .nav {

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

@@ -1,7 +1,6 @@
-<div class="page-header" id="subnav-bar">
+<div class="page-header clearfix" id="subnav-bar">
   <h1 class="pull-left"><%= @title %></h1>
   <nav class="subnav pull-right">
     <%= render_navigation :level => 2 %>
   </nav>
-  <div class="clear"></div>
 </div>

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

@@ -1,9 +1,9 @@
 <div class="navbar navbar-fixed-top">
   <div class="navbar-inner"><div class="container">
-    <a href="/" class="brand">Taskwarrior Web</a>
+    <a href="/" class="brand">TaskwarriorWeb</a>
     <%= render_navigation :level => 1 %>
     <ul class="nav pull-right">
-      <li>
+      <li<% if @current_page =~ %r{^/tasks/new/?} %> class="active"<% end %>>
         <a href="/tasks/new">
           <i class="icon-plus"></i>
           Add a Task

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

@@ -19,7 +19,6 @@
       <%= erb :_topbar %>
       <%= erb :_subnav %>
       <section class="content">
-        <div class="clearer"></div>
         <div id="flash-messages">
           <% if @messages %>
             <% @messages.each do |message| %>

data/spec/app/app_spec.rb

@@ -113,6 +113,16 @@ describe TaskwarriorWeb::App do
     end
   end
 
+  describe 'POST /ajax/task-complete/:id' do
+    it 'should mark the given task as complete' do
+      command = TaskwarriorWeb::Command.new(:complete, 15)
+      command.should_receive(:run).once
+      TaskwarriorWeb::Command.should_receive(:new).once.with(:complete, '15').and_return(command)
+      post '/ajax/task-complete/15'
+      last_response.should be_ok
+    end
+  end
+
   describe 'not_found' do
     it 'should set the title to "Not Found"' do
       get '/page-not-found'

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.11'
+  s.version     = '1.0.12'
   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.11
+  version: 1.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70230869736340 !ruby/object:Gem::Requirement
+  requirement: &70123076122640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70230869736340
+  version_requirements: *70123076122640
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70230869735580 !ruby/object:Gem::Requirement
+  requirement: &70123076120340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70230869735580
+  version_requirements: *70123076120340
 - !ruby/object:Gem::Dependency
   name: parseconfig
-  requirement: &70230869733980 !ruby/object:Gem::Requirement
+  requirement: &70123075730540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70230869733980
+  version_requirements: *70123075730540
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &70230869343760 !ruby/object:Gem::Requirement
+  requirement: &70123075727940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70230869343760
+  version_requirements: *70123075727940
 - !ruby/object:Gem::Dependency
   name: rinku
-  requirement: &70230869341600 !ruby/object:Gem::Requirement
+  requirement: &70123075726560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70230869341600
+  version_requirements: *70123075726560
 - !ruby/object:Gem::Dependency
   name: versionomy
-  requirement: &70230869339760 !ruby/object:Gem::Requirement
+  requirement: &70123075725580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70230869339760
+  version_requirements: *70123075725580
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70230869338560 !ruby/object:Gem::Requirement
+  requirement: &70123075724880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70230869338560
+  version_requirements: *70123075724880
 - !ruby/object:Gem::Dependency
   name: sinatra-simple-navigation
-  requirement: &70230869337980 !ruby/object:Gem::Requirement
+  requirement: &70123076100220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70230869337980
+  version_requirements: *70123076100220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70230869336800 !ruby/object:Gem::Requirement
+  requirement: &70123076099160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70230869336800
+  version_requirements: *70123076099160
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70230869712360 !ruby/object:Gem::Requirement
+  requirement: &70123076098320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70230869712360
+  version_requirements: *70123076098320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70230869711380 !ruby/object:Gem::Requirement
+  requirement: &70123076097080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70230869711380
+  version_requirements: *70123076097080
 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: 705415222630584467
+      hash: -3441978643579448486
 requirements: []
 rubyforge_project: taskwarrior-web
 rubygems_version: 1.8.11