taskwarrior-web 0.0.12 → 0.0.13

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.0.13 (2/6/12)
+
+* Adding Fluid app dock icon. The dock icons should now show a number of
+  pending tasks.
+
 ## v0.0.11 (1/10/12)
 
 * Added annotations to task listing, complete with autolinking (turns URLs into

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    taskwarrior-web (0.0.12)
+    taskwarrior-web (0.0.13)
       parseconfig
       rinku
       sinatra
@@ -12,7 +12,7 @@ GEM
   specs:
     diff-lcs (1.1.3)
     parseconfig (0.5.2)
-    rack (1.4.0)
+    rack (1.4.1)
     rack-protection (1.2.0)
       rack
     rake (0.9.2.2)
@@ -30,7 +30,7 @@ GEM
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
     tilt (1.3.3)
-    vegas (0.1.8)
+    vegas (0.1.11)
       rack (>= 1.0.0)
 
 PLATFORMS

data/lib/taskwarrior-web/app.rb

@@ -6,6 +6,7 @@ require 'parseconfig'
 require 'json'
 require 'time'
 require 'rinku'
+require 'digest'
 
 module TaskwarriorWeb
   class App < Sinatra::Base
@@ -14,9 +15,21 @@ module TaskwarriorWeb
     set :root,  @@root    
     set :app_file, __FILE__
     
+    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)
+      @auth.provided? && @auth.basic? && @auth.credentials &&
+        @auth.credentials[0] == TaskwarriorWeb::Config.file.get_value('task-web.user') &&
+        Digest::MD5.hexdigest(@auth.credentials[1]) == TaskwarriorWeb::Config.file.get_value('task-web.passwd')
+    end
+
     # Before filter
     before do
       @current_page = request.path_info
+      protected! if TaskwarriorWeb::Config.file.get_value('task-web.user')
     end
 
     # Helpers
@@ -155,6 +168,10 @@ module TaskwarriorWeb
       tags.compact!.uniq!.to_json
     end
 
+    get '/ajax/count/?' do
+      TaskwarriorWeb::Task.count(:status => :pending).to_s
+    end
+
     # Error handling
     not_found do
       @title = 'Page Not Found'

data/public/js/application.js

@@ -4,6 +4,7 @@ $(document).ready(function() {
 	initCompleteTask();
 	initDatePicker();
 	initAutocomplete();
+	refreshDockBadge();
 });
 
 var initPolling = function() {
@@ -40,6 +41,8 @@ var refreshPageContents = function() {
 		url: window.location,
 		success: function(data) {
 			$('#listing').replaceWith($('#listing', data));
+			refreshSubnavCount();
+			refreshDockBadge();
 		}
 	});
 };
@@ -65,13 +68,8 @@ var initCompleteTask = function() {
 			success: function(data) {
 				row.fadeOut('slow', function() {
 					row.remove();
-					// TODO: Wow. This is nasty.
-					var subnavItem = $('#subnav-bar ul li:first-child a');
-					var oldCount = subnavItem.text().match(/((\d))/);
-					var newCount = parseInt(oldCount[0]) - 1
-					var newVal = subnavItem.text().replace(oldCount[0], newCount);
-					console.log(newVal);
-					subnavItem.text(newVal);
+					refreshSubnavCount();
+					refreshDockBadge();
 				});
 			}
 		});
@@ -124,6 +122,27 @@ var initAutocomplete = function() {
 	});
 };
 
+// Count updating.
+
+var getCount = function(callback) {
+	$.ajax({
+		url: '/ajax/count',
+		success: callback
+	});
+};
+
+var refreshDockBadge = function() {
+	getCount(function(data) {
+		window.fluid.dockBadge = data;
+	});
+};
+
+var refreshSubnavCount = function() {
+	getCount(function(data) {
+		$('#subnav-bar ul li:first-child a').text('Pending ('+data+')');
+	});
+};
+
 function set_message(msg, severity) {
 	severity = severity ? severity : 'info';
 	$('#flash-messages').append('<div class="message ' + severity + '">' + msg + '</div>');

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     = '0.0.12'
+  s.version     = '0.0.13'
   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: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-20 00:00:00.000000000 Z
+date: 2012-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2162204640 !ruby/object:Gem::Requirement
+  requirement: &2162191880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162204640
+  version_requirements: *2162191880
 - !ruby/object:Gem::Dependency
   name: parseconfig
-  requirement: &2162204180 !ruby/object:Gem::Requirement
+  requirement: &2162191420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162204180
+  version_requirements: *2162191420
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &2162203760 !ruby/object:Gem::Requirement
+  requirement: &2162191000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162203760
+  version_requirements: *2162191000
 - !ruby/object:Gem::Dependency
   name: rinku
-  requirement: &2162203300 !ruby/object:Gem::Requirement
+  requirement: &2162190580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162203300
+  version_requirements: *2162190580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2162202880 !ruby/object:Gem::Requirement
+  requirement: &2162190160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162202880
+  version_requirements: *2162190160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2162202460 !ruby/object:Gem::Requirement
+  requirement: &2162189740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162202460
+  version_requirements: *2162189740
 description: This gem provides a graphical frontend for the Taskwarrior task manager.
   It is based on Sinatra.
 email:
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1375552015921977647
+      hash: -705373290022093367
 requirements: []
 rubyforge_project: taskwarrior-web
 rubygems_version: 1.8.11