taskwarrior-web 1.0.13 → 1.0.14

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.0.14 (11/22/12)
+
+* Fixed a bug when colorizing tasks based on "due" setting.
+* Fixed bugs that may result from differences between Taskwarrior's date format
+  strings and those of Ruby.
+
 ## v1.0.13 (11/22/12)
 
 * Added support for `task-web.filter.badge` option to control the Fluid badge

data/lib/taskwarrior-web/helpers.rb

@@ -1,20 +1,21 @@
+require 'active_support/core_ext/date/calculations'
+
 module TaskwarriorWeb::App::Helpers
 
   def format_date(timestamp)
-    format = TaskwarriorWeb::Config.dateformat || 'm/d/Y'
-    subbed = format.gsub(/([a-zA-Z])/, '%\1')
-    Time.parse(timestamp).strftime(subbed)
+    format = TaskwarriorWeb::Config.dateformat || '%-m/%-d/%Y'
+    Time.parse(timestamp).strftime(format)
   end
 
   def colorize_date(timestamp)
     return if timestamp.nil?
-    due_def = TaskwarriorWeb::Config.due.to_i || 5
-    time = Time.parse(timestamp)
+    due_def = (TaskwarriorWeb::Config.due || 7).to_i
+    date = Date.parse(timestamp)
     case true
-      when Time.now.strftime('%D') == time.strftime('%D') then 'success'
-      when Time.now.to_i > time.to_i then 'error'
-      when (time.to_i - Time.now.to_i) < (due_def * 86400) then 'info'
-      else 'regular'
+      when Date.today == date then 'warning'                            # today
+      when Date.today > date then 'error'                               # overdue
+      when Date.today.advance(:days => due_def) >= date then 'success'  # within the "due" range
+      else 'regular'                                                    # just a regular task
     end
   end
 

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

@@ -2,6 +2,25 @@ require 'parseconfig'
 require 'versionomy'
 
 module TaskwarriorWeb::Config
+  # A list of date formats, with Taskwarrior's on the left and the Ruby
+  # equivalent on the right.
+  DATEFORMATS = {
+    'm' => '%-m',  # minimal-digit month, for example 1 or 12
+    'd' => '%-d',   # minimal-digit day, for example 1 or 30
+    'y' => '%y',   # two-digit year, for example 09
+    'D' => '%d',   # two-digit day, for example 01 or 30
+    'M' => '%m',   # two-digit month, for example 01 or 12
+    'Y' => '%Y',   # four-digit year, for example 2009
+    'a' => '%a',   # short name of weekday, for example Mon or Wed
+    'A' => '%A',   # long name of weekday, for example Monday or Wednesday
+    'b' => '%b',   # short name of month, for example Jan or Aug
+    'B' => '%B',   # long name of month, for example January or August
+    'V' => '%U',   # weeknumber, for example 03 or 37
+    'H' => '%H',   # two-digit hour, for example 03 or 11
+    'N' => '%M',   # two-digit minutes, for example 05 or 42
+    'S' => '%S',   # two-digit seconds, for example 07 or 47
+  }
+
   def self.version
     @version ||= Versionomy.parse(`task _version`.strip)
   end
@@ -14,7 +33,11 @@ module TaskwarriorWeb::Config
     self.file[prop]
   end
 
+  def self.dateformat
+    self.file['dateformat'].gsub(/(\w)/, DATEFORMATS) unless self.file['dateformat'].nil?
+  end
+
   def self.method_missing(method)
-    self.file[method]
+    self.file[method.to_s]
   end
 end

data/spec/app/helpers_spec.rb

@@ -16,19 +16,22 @@ 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 == '01/11/2012'
-        helpers.format_date('2012-01-11').should == '01/11/2012'
+        helpers.format_date('2012-01-11 12:23:00').should == '1/11/2012'
+        helpers.format_date('2012-01-11').should == '1/11/2012'
       end
     end
 
     context 'with a specified date format' do
-      before do
-        TaskwarriorWeb::Config.should_receive(:dateformat).any_number_of_times.and_return('d/m/Y')
+      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'
       end
 
-      it 'should format dates using the specified format' do
-        helpers.format_date('2012-01-11 12:23:00').should == '11/01/2012'
-        helpers.format_date('2012-01-11').should == '11/01/2012'
+      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'
       end
     end
   end
@@ -46,19 +49,28 @@ describe TaskwarriorWeb::App::Helpers do
         TaskwarriorWeb::Config.should_receive(:due).any_number_of_times.and_return(3)
       end
 
-      it 'should return "today" when a given date is today' do
-        helpers.colorize_date(Time.now.to_s).should eq('success') 
+      it 'should return "warning" when a given date is today' do
+        helpers.colorize_date(Time.now.to_s).should eq('warning')
       end
 
-      it 'should return "overdue" when a date is before today' do
+      it 'should return "error" when a date is before today' do
         helpers.colorize_date(Time.at(0).to_s).should eq('error')
       end
 
-      it 'should return "info" when a date is within the specified range' do
+      it 'should return "success" when a date is within the specified range' do
         TaskwarriorWeb::Config.should_receive(:due).any_number_of_times.and_return(5)
-        helpers.colorize_date(Date.tomorrow.to_s).should eq('info')
+        helpers.colorize_date(Date.tomorrow.to_s).should eq('success')
+      end
+    end
+
+    context 'with no due setting specified' do
+      before do
+        TaskwarriorWeb::Config.should_receive(:due).any_number_of_times.and_return(nil)
       end
 
+      it 'should use the default setting of 7 days' do
+        helpers.colorize_date(Date.tomorrow.to_s).should eq('success')
+      end
     end
   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.0.13'
+  s.version     = '1.0.14'
   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.13
+  version: 1.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70281201384300 !ruby/object:Gem::Requirement
+  requirement: &70303595592080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70281201384300
+  version_requirements: *70303595592080
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70281201383540 !ruby/object:Gem::Requirement
+  requirement: &70303595590940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70281201383540
+  version_requirements: *70303595590940
 - !ruby/object:Gem::Dependency
   name: parseconfig
-  requirement: &70281201381840 !ruby/object:Gem::Requirement
+  requirement: &70303595590320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70281201381840
+  version_requirements: *70303595590320
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &70281200991580 !ruby/object:Gem::Requirement
+  requirement: &70303595589220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70281200991580
+  version_requirements: *70303595589220
 - !ruby/object:Gem::Dependency
   name: rinku
-  requirement: &70281200989300 !ruby/object:Gem::Requirement
+  requirement: &70303595588600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70281200989300
+  version_requirements: *70303595588600
 - !ruby/object:Gem::Dependency
   name: versionomy
-  requirement: &70281200987560 !ruby/object:Gem::Requirement
+  requirement: &70303595587840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70281200987560
+  version_requirements: *70303595587840
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70281200986500 !ruby/object:Gem::Requirement
+  requirement: &70303595587380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70281200986500
+  version_requirements: *70303595587380
 - !ruby/object:Gem::Dependency
   name: sinatra-simple-navigation
-  requirement: &70281200985920 !ruby/object:Gem::Requirement
+  requirement: &70303595586840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70281200985920
+  version_requirements: *70303595586840
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70281200984440 !ruby/object:Gem::Requirement
+  requirement: &70303595580440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70281200984440
+  version_requirements: *70303595580440
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70281201360300 !ruby/object:Gem::Requirement
+  requirement: &70303595579780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70281201360300
+  version_requirements: *70303595579780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70281201359320 !ruby/object:Gem::Requirement
+  requirement: &70303595579240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70281201359320
+  version_requirements: *70303595579240
 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: 3651661756966679752
+      hash: -2980071334250491530
 requirements: []
 rubyforge_project: taskwarrior-web
 rubygems_version: 1.8.11