taskwarrior-web 1.0.6 → 1.0.7

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v1.0.7 (11/17/12)
+
+* Moving `task` version parsing to Verionomy library. Should be much more
+  flexible and stable.
+* Removing tag input widget from new task form, and changed parsing to split
+  tags on spaces, commas, or any combination thereof. So something like
+  "these,will all,  be  , tags now" should result in tags of "these", "will",
+  "all", "be", "tags", and "now". Hopefully this is easier to use and less
+  confusing.
+* Adding basic support for `task` < 1.9.2
+* Moved to thin gem as a server for speed and stability.
+
 ## v1.0.6 (11/15/12)
 
 * Fixed escaping issue when viewing or adding projects with spaces.

data/README.md

@@ -3,12 +3,17 @@
 A lightweight, Sinatra-based web interface for the
 wonderful [Taskwarrior](http://taskwarrior.org/) todo application.
 
-**Now compatible with ALL versions of Taskwarrior, including the new 2.0.0**
+**Now compatible with all versions of Taskwarrior, including 2.x**
 **Also, now including a NEW theme based on Twitter Bootstrap. Mobile version
 forthcoming!**
 
 [![Build Status](https://secure.travis-ci.org/theunraveler/taskwarrior-web.png)](http://travis-ci.org/theunraveler/taskwarrior-web)
 
+## Requirements
+
+* `ruby` >= 1.9 (support for `ruby` < 1.9 is very unlikely, but pull requests
+  are gladly accepted).
+
 ## Installation
 
 `gem install taskwarrior-web`
@@ -38,10 +43,17 @@ The current featureset includes:
 * Optional Basic HTTP Auth protection. To enable, set `task-web.user` and
   `task-web.passwd` in your `.taskrc` file.
 
-## Known Issues
+## Reporting Bugs
+
+To report a bug, use the [Github issue tracker][1]. Since `taskwarrior-web`
+works with several different versions of `task`, using many different
+configurations, please include the output from `task _version` and either the
+output of `task show` or a copy of your `.taskrc` file when filing a bug. This helps me reproduce bugs easier.
+
+Here is an example of a [good bug report][2].
 
-* taskwarrior-web requires Ruby >= 1.9. It will not work with 1.8 and lower.
-  Support for 1.8 will happen at some point.
+[1]: http://github.com/theunraveler/taskwarrior-web/issues
+[2]: http://github.com/theunraveler/taskwarrior-web/issues/26
 
 ## Marginalia
 

data/lib/taskwarrior-web/command_builder.rb

@@ -4,7 +4,7 @@ module TaskwarriorWeb
   module CommandBuilder
     def self.included(class_name)
       class_name.class_eval do
-        case TaskwarriorWeb::Config.task_major_version
+        case TaskwarriorWeb::Config.version.major
         when 2
           require 'taskwarrior-web/command_builders/v2'
           include TaskwarriorWeb::CommandBuilder::V2

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

@@ -5,7 +5,7 @@ module TaskwarriorWeb::CommandBuilder
 
     TASK_COMMANDS = {
       :add => 'add',
-      :query => '_query',
+      :query => TaskwarriorWeb::Config.version > Versionomy.parse('1.9.2') ? '_query' : 'export',
       :count => 'count',
       :complete => ':id done',
       :projects => '_projects',
@@ -42,8 +42,7 @@ module TaskwarriorWeb::CommandBuilder
       string = ''
       string << %Q( #{@params.delete(:description).shellescape}) if @params.has_key?(:description)
 
-      if @params.has_key?(:tags)
-        tags = @params.delete(:tags)
+      if tags = @params.delete(:tags)
         tag_indicator = TaskwarriorWeb::Config.property('tag.indicator') || '+'
         tags.each { |tag| string << %Q( #{tag_indicator}#{tag.to_s.shellescape}) } 
       end

data/lib/taskwarrior-web/config.rb

@@ -1,14 +1,11 @@
 require 'parseconfig'
+require 'versionomy'
 
 module TaskwarriorWeb
   class Config
 
-    def self.task_version
-      @task_version ||= `task _version`
-    end
-
-    def self.task_major_version
-      self.task_version[0,1].to_i
+    def self.version
+      @version ||= Versionomy.parse(`task _version`.strip)
     end
 
     def self.file

data/lib/taskwarrior-web/parser.rb

@@ -0,0 +1,16 @@
+require 'taskwarrior-web/config'
+require 'versionomy'
+
+module TaskwarriorWeb
+  module Parser
+    def self.parse(results)
+      if TaskwarriorWeb::Config.version > Versionomy.parse('1.9.2')
+        require 'taskwarrior-web/parser/json'
+        TaskwarriorWeb::Parser::Json.parse(results)
+      else
+        require 'taskwarrior-web/parser/csv'
+        TaskwarriorWeb::Parser::Csv.parse(results)
+      end
+    end
+  end
+end

data/lib/taskwarrior-web/parser/csv.rb

@@ -0,0 +1,11 @@
+require 'csv'
+
+module TaskwarriorWeb::Parser::Csv
+  def self.parse(csv)
+    rows = []
+    CSV.parse(csv, :headers => true, :quote_char => "'", :header_converters => :symbol, :converters => :all) do |row|
+      rows << Hash[row.headers.zip(row.fields)]
+    end
+    rows
+  end
+end

data/lib/taskwarrior-web/parser/json.rb

@@ -0,0 +1,9 @@
+require 'json'
+
+module TaskwarriorWeb::Parser::Json
+  def self.parse(json)
+    json.strip!
+    json = '[' + json + ']'
+    json == '[No matches.]' ? [] : ::JSON.parse(json)
+  end
+end

data/lib/taskwarrior-web/public/js/application.js

@@ -28,34 +28,25 @@ var initAutocomplete = function() {
 	$('#task-project').typeahead({
 		source: function (query, process) {
 			return $.get('/ajax/projects/', {query: query}, function (data) {
-				data = $.parseJSON(data);
-				process(data);
+				process($.parseJSON(data));
 			});
 		}
 	});
-
-	$('#task-tags').tokenInput('/ajax/tags', {
-		theme: 'facebook',
-		queryParam: 'query',
-		noResultsText: 'No matching tags',
-		allowFreeTagging: true
-	});
 };
 
 var initTaskCompletion = function() {
 	$('input.complete').click(function() {
 		// Cache the checkbox in case we need to restore it.
-		var container = $(this).parent();
-		var checkbox = container.html();
-		var row = $(this).closest('tr');
+		var container = $(this).parent(),
+		    checkbox = container.html(),
+		    row = $(this).closest('tr');
 		container.html('<img src="/img/ajax-loader.gif" />');
 		$.ajax({
 			url: '/ajax/task-complete/' + $(this).data('task-id'),
 			type: 'POST',
 			success: function(data) {
 				refreshPageContents();
-				var message = (data === '') ? 'Task marked as completed.' : data;
-				set_message(message, 'alert-success');
+				set_message(data === '' ? 'Task marked as completed.' : data, 'alert-success');
 				row.fadeOut();
 			},
 			error: function(data) {

data/lib/taskwarrior-web/task.rb

@@ -1,5 +1,6 @@
-require 'json'
 require 'taskwarrior-web/command'
+require 'taskwarrior-web/parser'
+require 'versionomy'
 
 module TaskwarriorWeb
   
@@ -32,7 +33,7 @@ module TaskwarriorWeb
 
     # Make sure that the tags are an array.
     def tags=(value)
-      @tags = value.is_a?(String) ? value.gsub(', ', ',').split(',') : value
+      @tags = value.is_a?(String) ? value.split(/\W+/).reject(&:empty?) : value
     end
 
     def to_hash
@@ -46,20 +47,18 @@ module TaskwarriorWeb
     # Run queries on tasks.
     def self.query(*args)
       tasks = []
-
-      # Process the JSON data.
-      json = Command.new(:query, nil, *args).run
-      json.strip!
-      json = '[' + json + ']'
-      results = json == '[No matches.]' ? [] : ::JSON.parse(json)
-
-      results.each { |result| tasks << Task.new(result) }
+      results = Command.new(:query, nil, *args).run
+      Parser.parse(results).each { |result| tasks << Task.new(result) }
       tasks
     end
 
     # Get the number of tasks for some paramters
     def self.count(*args)
-      Command.new(:count, nil, *args).run.to_s.strip!
+      if TaskwarriorWeb::Config.version > Versionomy.parse('1.9.2')
+        Command.new(:count, nil, *args).run.to_s.strip!
+      else
+        self.query(*args).count
+      end
     end
 
     # Define method_missing to implement dynamic finder methods

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

@@ -1,19 +1,16 @@
 <html>
   <head>
-    <title><%= @title %> | Taskwarrior</title>
+    <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/token-input.css">
-    <link rel="stylesheet" href="/css/token-input-facebook.css">
     <link rel="stylesheet" href="/css/styles.css">
 
     <!-- Scripts -->
     <script type="text/javascript" src="/js/jquery.min.js"></script>
     <script type="text/javascript" src="/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="/js/bootstrap-datepicker.js"></script>
-    <script type="text/javascript" src="/js/jquery.tokeninput.js"></script>
     <script type="text/javascript" src="/js/application.js"></script>
   </head>
 

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

@@ -10,7 +10,7 @@
   <div class="control-group">
     <label for="task-project" class="control-label">Project</label>
     <div class="controls">
-      <input type="textfield" id="task-project" name="task[project]" value="<%= @task[:project] unless @task.nil? %>" />
+      <input type="textfield" id="task-project" name="task[project]" value="<%= @task[:project] unless @task.nil? %>" autocomplete="off" />
     </div>
   </div>
 
@@ -24,8 +24,8 @@
   <div class="control-group">
     <label for="task-tags" class="control-label">Tags</label>
     <div class="controls">
-      <input type="textfield" id="task-tags" name="task[tags]" value="<%= @task[:tags] unless @task.nil? %>" />
-      <div class="description">Enter tags separated by commas</div>
+      <input type="textfield" id="task-tags" name="task[tags]" value="<%= @task[:tags] unless @task.nil? %>" autocomplete="off" />
+      <div class="description">Enter tags separated by commas or spaces (e.g. <em>each, word will,be a tag</em>)</div>
     </div>
   </div>
 

data/spec/app/app_spec.rb

@@ -44,4 +44,16 @@ describe "My App" do
       last_response.body.should eq('15')
     end
   end
+
+  describe 'not_found' do
+    it 'should set the title to "Not Found"' do
+      get '/page-not-found'
+      last_response.body.should =~ /<title>Page Not Found/
+    end
+
+    it 'should have a status code of 404' do
+      get '/page-not-found'
+      last_response.status.should eq(404)
+    end
+  end
 end

data/spec/models/command_builder_spec.rb

@@ -7,7 +7,7 @@ describe TaskwarriorWeb::CommandBuilder do
   describe '.included' do
     context 'when v2 is reported' do
       it 'should include CommandBuilder V2 module' do
-        TaskwarriorWeb::Config.should_receive(:task_version).and_return('2.0.1')
+        TaskwarriorWeb::Config.should_receive(:version).and_return(Versionomy.parse('2.0.0'))
         TestCommandClass.class_eval { include TaskwarriorWeb::CommandBuilder }
         TestCommandClass.should include(TaskwarriorWeb::CommandBuilder::V2)
       end
@@ -15,7 +15,7 @@ describe TaskwarriorWeb::CommandBuilder do
 
     context 'when v1 is reported' do
       it 'should include CommandBuilder V1 module' do
-        TaskwarriorWeb::Config.should_receive(:task_version).and_return('1.9.4')
+        TaskwarriorWeb::Config.should_receive(:version).and_return(Versionomy.parse('1.0.0'))
         TestCommandClass.class_eval { include TaskwarriorWeb::CommandBuilder }
         TestCommandClass.should include(TaskwarriorWeb::CommandBuilder::V1)
       end
@@ -23,7 +23,7 @@ describe TaskwarriorWeb::CommandBuilder do
 
     context 'when an invalid version number is reported' do
       it 'should throw an UnrecognizedTaskVersion exception' do
-        TaskwarriorWeb::Config.should_receive(:task_version).and_return('95.583.3')
+        TaskwarriorWeb::Config.should_receive(:version).and_return(Versionomy.parse('9.0.0'))
         expect { 
           TestCommandClass.class_eval { include TaskwarriorWeb::CommandBuilder }
         }.to raise_exception(TaskwarriorWeb::UnrecognizedTaskVersion)

data/spec/models/command_builders/base_spec.rb

@@ -17,7 +17,7 @@ describe TaskwarriorWeb::CommandBuilder::Base do
     it 'should create a string from the passed paramters' do
       command = TaskwarriorWeb::Command.new(:query, nil, :test => 14, :none => :none, :hello => :hi)
       command.parse_params
-      command.params.should eq(' test:14 none:none hello:hi')
+      command.params.should eq(' test:\"14\" none:\"none\" hello:\"hi\"')
     end
 
     it 'should prefix tags with the tag.indicator if specified' do
@@ -37,7 +37,7 @@ describe TaskwarriorWeb::CommandBuilder::Base do
     it 'should pull out the description parameter' do
       command = TaskwarriorWeb::Command.new(:add, nil, :description => 'Hello', :status => :pending)
       command.parse_params
-      command.params.should eq(" Hello status:pending")
+      command.params.should eq(' Hello status:\"pending\"')
     end
   end  
 end

data/spec/models/task_spec.rb

@@ -53,8 +53,8 @@ describe TaskwarriorWeb::Task do
 
   describe '#tags=' do
     it 'should convert a string to an array when initializing' do
-      task = TaskwarriorWeb::Task.new(:tags => 'hi there, twice')
-      task.tags.should eq(['hi there', 'twice'])
+      task = TaskwarriorWeb::Task.new(:tags => 'hi, twice')
+      task.tags.should eq(['hi', 'twice'])
     end
 
     it 'should convert a string to an array when setting explicitly' do
@@ -62,6 +62,15 @@ describe TaskwarriorWeb::Task do
       task.tags = 'hello, twice,thrice'
       task.tags.should eq(['hello', 'twice', 'thrice'])
     end
+
+    it 'should break on any combination of spaces and commas' do
+      try = ['hi twice and again', 'hi,twice,and,again', 'hi twice,and again', 'hi,  twice and  ,   again']
+
+      try.each do |tags|
+        task = TaskwarriorWeb::Task.new(:tags => tags)
+        task.tags.should eq(['hi', 'twice', 'and', 'again'])
+      end
+    end
   end
 
   describe '#to_hash' do

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.6'
+  s.version     = '1.0.7'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jake Bell"]
   s.email       = ["jake@theunraveler.com"]
@@ -16,9 +16,11 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.0'
 
   s.add_dependency('sinatra')
+  s.add_dependency('thin')
   s.add_dependency('parseconfig')
   s.add_dependency('vegas')
   s.add_dependency('rinku')
+  s.add_dependency('versionomy')
 
   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.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2012-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70175087714260 !ruby/object:Gem::Requirement
+  requirement: &70252814870220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70175087714260
+  version_requirements: *70252814870220
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: &70252814869540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70252814869540
 - !ruby/object:Gem::Dependency
   name: parseconfig
-  requirement: &70175087713800 !ruby/object:Gem::Requirement
+  requirement: &70252814868880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70175087713800
+  version_requirements: *70252814868880
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &70175087713200 !ruby/object:Gem::Requirement
+  requirement: &70252814868200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70175087713200
+  version_requirements: *70252814868200
 - !ruby/object:Gem::Dependency
   name: rinku
-  requirement: &70175087712780 !ruby/object:Gem::Requirement
+  requirement: &70252814867560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70252814867560
+- !ruby/object:Gem::Dependency
+  name: versionomy
+  requirement: &70252814866800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70175087712780
+  version_requirements: *70252814866800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70175087712300 !ruby/object:Gem::Requirement
+  requirement: &70252814866040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70175087712300
+  version_requirements: *70252814866040
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70175087711700 !ruby/object:Gem::Requirement
+  requirement: &70252814865320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70175087711700
+  version_requirements: *70252814865320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70175087711220 !ruby/object:Gem::Requirement
+  requirement: &70252814864780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70175087711220
+  version_requirements: *70252814864780
 description: This gem provides a graphical frontend for the Taskwarrior task manager.
   It is based on Sinatra.
 email:
@@ -116,13 +138,13 @@ files:
 - lib/taskwarrior-web/command_builders/v2.rb
 - lib/taskwarrior-web/config.rb
 - lib/taskwarrior-web/helpers.rb
+- lib/taskwarrior-web/parser.rb
+- lib/taskwarrior-web/parser/csv.rb
+- lib/taskwarrior-web/parser/json.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
-- lib/taskwarrior-web/public/css/jquery.tagsinput.css
 - lib/taskwarrior-web/public/css/styles.css
-- lib/taskwarrior-web/public/css/token-input-facebook.css
-- lib/taskwarrior-web/public/css/token-input.css
 - lib/taskwarrior-web/public/favicon.ico
 - lib/taskwarrior-web/public/img/ajax-loader.gif
 - lib/taskwarrior-web/public/img/glyphicons-halflings-white.png
@@ -131,7 +153,6 @@ files:
 - lib/taskwarrior-web/public/js/bootstrap-datepicker.js
 - lib/taskwarrior-web/public/js/bootstrap.min.js
 - lib/taskwarrior-web/public/js/jquery.min.js
-- lib/taskwarrior-web/public/js/jquery.tokeninput.js
 - lib/taskwarrior-web/runner.rb
 - lib/taskwarrior-web/task.rb
 - lib/taskwarrior-web/views/404.erb
@@ -175,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3999339187514199251
+      hash: -2453576857035471181
 requirements: []
 rubyforge_project: taskwarrior-web
 rubygems_version: 1.8.11