todo-txt 0.3.1 → 0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: aab28ef27bccaf771aff05bbc5dbff0ac330143f
+  data.tar.gz: 454ff5faf63eaf1fbec2ed0e25fbb87ae6784c41
+SHA512:
+  metadata.gz: 25cddbf92e85d098afa16bda2a3cf33a9ed5d8dc7fe60362194c8993b8073f6595838b982ca6e173b884da5cdd009211925270b3bc0e4063874fc0b2b80713f4
+  data.tar.gz: 2855f72b5b3417517d1126ab35c68c80a96663e8676309f31b5ab853d8a70d1e4406c051159abe317abd051f1fc585097c4ad189f155fceccf167b0921ad74e7

data/.travis.yml

@@ -1,3 +1,4 @@
 language: ruby
 rvm:
   - 1.9.3
+  - 2.0.0

data/Gemfile

@@ -1,6 +1,11 @@
-source :rubygems
+source 'https://rubygems.org'
 
 group :test do
   gem 'rspec'
   gem 'rake'
+  gem 'timecop'
+end
+
+group :development do
+  gem 'bundler'
 end

data/Gemfile.lock

@@ -1,5 +1,5 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     diff-lcs (1.1.3)
     rake (0.9.2.2)
@@ -11,10 +11,13 @@ GEM
     rspec-expectations (2.9.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
+    timecop (0.6.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bundler
   rake
   rspec
+  timecop

data/README.md

@@ -3,13 +3,17 @@
 [![Development Build Status](https://secure.travis-ci.org/samwho/todo-txt-gem.png?branch=develop)](http://travis-ci.org/samwho/todo-txt-gem)
 [![Master Build Status](https://secure.travis-ci.org/samwho/todo-txt-gem.png?branch=master)](http://travis-ci.org/samwho/todo-txt-gem)
 
-This is a Ruby client library for Gina Trapani's [todo.txt](https://github.com/ginatrapani/todo.txt-cli/). It allows for easy parsing of task lists and tasks in the todo.txt format.
+This is a Ruby client library for Gina Trapani's
+[todo.txt](https://github.com/ginatrapani/todo.txt-cli/). It allows for easy
+parsing of task lists and tasks in the todo.txt format.
 
-Find the project on GitHub: [http://github.com/samwho/todo-txt-gem](http://github.com/samwho/todo-txt-gem).
+Find the project on GitHub:
+[http://github.com/samwho/todo-txt-gem](http://github.com/samwho/todo-txt-gem).
 
 # Installation
 
-Installation is very simple. The project is packaged as a Ruby gem and can be installed by running:
+Installation is very simple. The project is packaged as a Ruby gem and can be
+installed by running:
 
     gem install todo-txt
 
@@ -17,76 +21,91 @@ Installation is very simple. The project is packaged as a Ruby gem and can be in
 
 ## Todo::List
 
-A `Todo::List` object encapsulates your todo.txt file. You initialise it by passing the path to your todo.txt to the constructor:
+A `Todo::List` object encapsulates your todo.txt file. You initialise it by
+passing the path to your todo.txt to the constructor:
 
-    require 'todo-txt'
+``` ruby
+require 'todo-txt'
 
-    list = Todo::List.new "path/to/todo.txt"
+list = Todo::List.new "path/to/todo.txt"
+```
 
-`Todo::List` subclasses `Array` so it has all of the standard methods that are available on an array. It is, basically, an array of `Todo::Task` items.
+`Todo::List` subclasses `Array` so it has all of the standard methods that are
+available on an array. It is, basically, an array of `Todo::Task` items.
 
 ### Filtering
 
-You can filter your todo list by priority, project, context or a combination of all three with ease.
+You can filter your todo list by priority, project, context or a combination of
+all three with ease.
 
-    require 'todo-txt'
+``` ruby
+require 'todo-txt'
 
-    list = Todo::List.new "path/to/todo.txt"
+list = Todo::List.new "path/to/todo.txt"
 
-    list.by_priority "A"
-    # => Contains a Todo::List object with only priority A tasks.
+list.by_priority "A"
+# => Contains a Todo::List object with only priority A tasks.
 
-    list.by_context "@code"
-    # => Returns a new Todo::List with only tasks that have a @code context.
+list.by_context "@code"
+# => Returns a new Todo::List with only tasks that have a @code context.
 
-    list.by_project "+manhatten"
-    # => Returns a new Todo::List with only tasks that are part of the
-         +manhatten project (see what I did there?)
+list.by_project "+manhatten"
+# => Returns a new Todo::List with only tasks that are part of the
+#    +manhatten project (see what I did there?)
 
-    # And you can combine these, like so
-    list.by_project("+manhatten").by_priority("B")
+# And you can combine these, like so
+list.by_project("+manhatten").by_priority("B")
+```
 
 ## Todo::Task
 
-A `Todo::Task` object can be created from a standard task string if you don't want to use the `Todo::List` approach (though using `Todo::List` is recommended).
+A `Todo::Task` object can be created from a standard task string if you don't
+want to use the `Todo::List` approach (though using `Todo::List` is
+recommended).
 
-    require 'todo-txt'
+``` ruby
+require 'todo-txt'
 
-    task = Todo::Task.new "(A) This task is top priority! +project @context"
+task = Todo::Task.new "(A) This task is top priority! +project @context"
 
-    task.priority
-    # => "A"
+task.priority
+# => "A"
 
-    task.contexts
-    # => ["@context"]
+task.contexts
+# => ["@context"]
 
-    task.projects
-    # => ["+project"]
+task.projects
+# => ["+project"]
 
-    task.text
-    # => "This task is top priority!"
+task.text
+# => "This task is top priority!"
 
-    task.orig
-    # => "(A) This task is top priority! +project @context"
+task.orig
+# => "(A) This task is top priority! +project @context"
+```
 
 ### Comparable
 
-The `Todo::Task` object includes the `Comparable` mixin. It compares with other tasks and sorts by priority in descending order.
+The `Todo::Task` object includes the `Comparable` mixin. It compares with other
+tasks and sorts by priority in descending order.
 
-    task1 = Todo::Task.new "(A) Priority A."
-    task2 = Todo::Task.new "(B) Priority B."
+``` ruby
+task1 = Todo::Task.new "(A) Priority A."
+task2 = Todo::Task.new "(B) Priority B."
 
-    task1 > task2
-    # => true
+task1 > task2
+# => true
 
-    task1 == task2
-    # => false
+task1 == task2
+# => false
 
-    task2 > task1
-    # => false
+task2 > task1
+# => false
+```
 
 Tasks without a priority will always be less than a task with a priority.
 
 # Requirements
 
-The todo-txt gem requires Ruby 1.9.2 or higher. It doesn't currently run on 1.8.7.
+The todo-txt gem requires Ruby 1.9.2 or higher. It doesn't currently run on
+1.8.7.

data/Rakefile

@@ -1,3 +1,5 @@
+require 'bundler/setup'
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 task :default => [:test]

data/lib/todo-txt.rb

@@ -1,5 +1,7 @@
-# Require all files in the main lib directory
-Dir[File.dirname(__FILE__) + '/todo-txt/*.rb'].each do |file|
-  require file
-end
+lib = File.dirname(__FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
+require 'logger'
+require 'todo-txt/logger'
+require 'todo-txt/list'
+require 'todo-txt/task'

data/lib/todo-txt/list.rb

@@ -5,7 +5,7 @@ module Todo
     #
     #   /home/sam/Dropbox/todo/todo.txt
     #
-    # You would initialize this object like do:
+    # You would initialize this object like:
     #
     #   list = Todo::List.new "/home/sam/Dropbox/todo/todo-txt"
     #

data/lib/todo-txt/logger.rb

@@ -0,0 +1,21 @@
+require 'logger'
+
+module Todo
+  module Logger
+    def self.included base
+      base.extend(self)
+    end
+
+    def self.logger= new_logger
+      @@logger = new_logger
+    end
+
+    def self.logger
+      @@logger ||= ::Logger.new(STDOUT)
+    end
+
+    def logger
+      Todo::Logger.logger
+    end
+  end
+end

data/lib/todo-txt/task.rb

@@ -3,6 +3,7 @@ require 'date'
 module Todo
   class Task
     include Comparable
+    include Todo::Logger
 
     # The regular expression used to match contexts.
     def self.contexts_regex
@@ -15,8 +16,8 @@ module Todo
     end
 
     # The regex used to match priorities.
-    def self.priotity_regex
-      /^\([A-Za-z]\)\s+/
+    def self.priority_regex
+      /(?:^|\s+)\(([A-Za-z])\)\s+/
     end
 
     # The regex used to match dates.
@@ -24,14 +25,34 @@ module Todo
       /(?:\s+|^)([0-9]{4}-[0-9]{2}-[0-9]{2})/
     end
 
+    # The regex used to match creation date.
+    def self.created_on_regex
+      /(?:^|-\d{2}\s|\)\s)(\d{4}-\d{2}-\d{2})\s/
+    end
+
     # The regex used to match completion.
     def self.done_regex
-      /^x\s+/
+      /^x\s+(\d{4}-\d{2}-\d{2})\s+/
+    end
+
+    # The regex used to match due date.
+    def self.due_on_regex
+      /(?:due:)(\d{4}-\d{2}-\d{2})(?:\s+|$)/i
     end
 
-    # Creates a new task. The argument that you pass in must be a string.
+    # Creates a new task. The argument that you pass in must be the string
+    # representation of a task.
+    #
+    # Example:
+    #
+    #   task = Todo::Task.new("(A) A high priority task!")
     def initialize task
       @orig = task
+      @completed_on = get_completed_date #orig.scan(self.class.done_regex)[1] ||= nil
+      @priority, @created_on = orig_priority, orig_created_on
+      @due_on = get_due_on_date
+      @contexts ||= orig.scan(self.class.contexts_regex).map { |item| item.strip }
+      @projects ||= orig.scan(self.class.projects_regex).map { |item| item.strip }
     end
 
     # Returns the original content of the task.
@@ -40,9 +61,46 @@ module Todo
     #
     #   task = Todo::Task.new "(A) @context +project Hello!"
     #   task.orig #=> "(A) @context +project Hello!"
-    def orig
-      @orig
-    end
+    attr_reader :orig
+
+    # Returns the task's creation date, if any.
+    #
+    # Example:
+    #
+    #   task = Todo::Task.new "(A) 2012-03-04 Task."
+    #   task.created_on
+    #   #=> <Date: 2012-03-04 (4911981/2,0,2299161)>
+    #
+    # Dates _must_ be in the YYYY-MM-DD format as specified in the todo.txt
+    # format. Dates in any other format will be classed as malformed and this
+    # attribute will be nil.
+    attr_reader :created_on
+
+    # Returns the task's completion date if task is done.
+    #
+    # Example:
+    #
+    #   task = Todo::Task.new "x 2012-03-04 Task."
+    #   task.completed_on
+    #   #=> <Date: 2012-03-04 (4911981/2,0,2299161)>
+    #
+    # Dates _must_ be in the YYYY-MM-DD format as specified in the todo.txt
+    # format. Dates in any other format will be classed as malformed and this
+    # attribute will be nil.
+    attr_reader :completed_on
+
+    # Returns the task's due date, if any.
+    #
+    # Example:
+    #
+    #   task = Todo::Task.new "(A) This is a task. due:2012-03-04"
+    #   task.due_on
+    #   #=> <Date: 2012-03-04 (4911981/2,0,2299161)>
+    #
+    # Dates _must_ be in the YYYY-MM-DD format as specified in the todo.txt
+    # format. Dates in any other format will be classed as malformed and this
+    # attribute will be nil.
+    attr_reader :due_on
 
     # Returns the priority, if any.
     #
@@ -53,33 +111,23 @@ module Todo
     #
     #   task = Todo::Task.new "Some task."
     #   task.priority #=> nil
-    def priority
-      @priority ||= if orig =~ self.class.priotity_regex
-        orig[1]
-      else
-        nil
-      end
-    end
+    attr_reader :priority
 
-    # Retrieves an array of all the @context annotations.
+    # Returns an array of all the @context annotations.
     #
     # Example:
     #
     #   task = Todo:Task.new "(A) @context Testing!"
     #   task.context #=> ["@context"]
-    def contexts
-      @contexts ||= orig.scan(self.class.contexts_regex).map { |item| item.strip }
-    end
+    attr_reader :contexts
 
-    # Retrieves an array of all the +project annotations.
+    # Returns an array of all the +project annotations.
     #
     # Example:
     #
     #   task = Todo:Task.new "(A) +test Testing!"
     #   task.projects #=> ["+test"]
-    def projects
-      @projects ||= orig.scan(self.class.projects_regex).map { |item| item.strip }
-    end
+    attr_reader :projects
 
     # Gets just the text content of the todo, without the priority, contexts
     # and projects annotations.
@@ -91,14 +139,15 @@ module Todo
     def text
       @text ||= orig.
         gsub(self.class.done_regex, '').
-        gsub(self.class.date_regex, '').
-        gsub(self.class.priotity_regex, '').
+        gsub(self.class.priority_regex, '').
+        gsub(self.class.created_on_regex, '').
         gsub(self.class.contexts_regex, '').
         gsub(self.class.projects_regex, '').
+        gsub(self.class.due_on_regex, '').
         strip
     end
 
-    # Returns the date present in the task.
+    # Returns the task's creation date, if any.
     #
     # Example:
     #
@@ -109,32 +158,24 @@ module Todo
     # Dates _must_ be in the YYYY-MM-DD format as specified in the todo.txt
     # format. Dates in any other format will be classed as malformed and this
     # method will return nil.
+    #
+    # Deprecated
     def date
-      begin
-        @date ||= Date.parse(orig.match(self.class.date_regex)[1])
-      rescue
-        @date = nil
-      end
+      logger.warn("Task#date is deprecated, use created_on instead.")
+
+      @created_on
     end
 
-    # Checks whether or not this task is overdue by comparing the task date to
-    # the current date.
-    #
-    # If there is no date specified for this task, this method returns nil.
+    # Returns whether a task's due date is in the past.
     #
     # Example:
     #
-    #   task = Todo::Task.new "(A) 2012-03-04 Task."
+    #   task = Todo::Task.new("This task is overdue! due:#{Date.today - 1}")
     #   task.overdue?
     #   #=> true
     def overdue?
-      if date.nil?
-        nil
-      elsif date < Date.today
-        true
-      else
-        false
-      end
+      return true if !due_on.nil? && due_on < Date.today
+      false
     end
 
     # Returns if the task is done.
@@ -149,7 +190,79 @@ module Todo
     #   task.done?
     #   #=> false
     def done?
-      @done ||= !(orig =~ self.class.done_regex).nil?
+      !@completed_on.nil?
+    end
+
+    # Completes the task on the current date.
+    #
+    # Example:
+    #
+    #   task = Todo::Task.new "2012-12-08 Task."
+    #   task.done?
+    #   #=> false
+    #
+    #   task.do!
+    #   task.done?
+    #   #=> true
+    #   task.date
+    #   #=> # the current date
+    def do!
+      @completed_on = Date.today
+      @priority = nil
+    end
+
+    # Marks the task as incomplete and resets its original due date.
+    #
+    # Example:
+    #
+    #   task = Todo::Task.new "x 2012-12-08 Task."
+    #   task.done?
+    #   #=> true
+    #
+    #   task.undo!
+    #   task.done?
+    #   #=> false
+    #   task.date
+    #   #=> # <Date: 2012-03-04 (4911981/2,0,2299161)>
+    def undo!
+      @completed_on = nil
+      @priority = orig_priority
+    end
+
+    # Toggles the task from complete to incomplete or vice versa.
+    #
+    # Example:
+    #
+    #   task = Todo::Task.new "x 2012-12-08 Task."
+    #   task.done?
+    #   #=> true
+    #
+    #   task.toggle!
+    #   task.done?
+    #   #=> false
+    #
+    #   task.toggle!
+    #   task.done?
+    #   #=> true
+    def toggle!
+      done? ? undo! : do!
+    end
+
+    # Returns this task as a string.
+    #
+    # Example:
+    #
+    #   task = Todo::Task.new "(A) 2012-12-08 Task"
+    #   task.to_s
+    #   #=> "(A) 2012-12-08 Task"
+    def to_s
+      priority_string = priority ? "(#{priority}) " : ""
+      done_string = done? ? "x #{completed_on} " : ""
+      created_on_string = created_on ? "#{created_on} " : ""
+      contexts_string = contexts.empty? ? "" : " #{contexts.join ' '}"
+      projects_string = projects.empty? ? "" : " #{projects.join ' '}"
+      due_on_string = due_on.nil? ? "" : " due:#{due_on}"
+      "#{done_string}#{priority_string}#{created_on_string}#{text}#{contexts_string}#{projects_string}#{due_on_string}"
     end
 
     # Compares the priorities of two tasks.
@@ -178,5 +291,36 @@ module Todo
         other_task.priority <=> self.priority
       end
     end
+
+    private
+
+    def orig_priority
+      @orig.match(self.class.priority_regex)[1] if @orig =~ self.class.priority_regex
+    end
+
+    def orig_created_on
+      begin
+        if @orig =~ self.class.created_on_regex
+          date = @orig.match self.class.created_on_regex
+          return Date.parse(date[1]) unless date.nil?
+        end
+      rescue; end
+      nil
+    end
+
+    def get_completed_date
+      begin
+        return Date.parse(self.class.done_regex.match(@orig)[1])
+      rescue; end
+      nil
+    end
+
+    def get_due_on_date
+      begin
+        return Date.parse(self.class.due_on_regex.match(@orig)[1])
+      rescue; end
+      nil
+    end
+
   end
 end

data/spec/todo-txt/task_spec.rb

@@ -1,5 +1,6 @@
 require_relative '../spec_helper'
 require 'date'
+require 'timecop'
 
 describe Todo::Task do
   it 'should recognise priorities' do
@@ -12,6 +13,11 @@ describe Todo::Task do
     task.priority.should == nil
   end
 
+  it 'should recognize priorities around dates' do
+    task = Todo::Task.new "x 2012-09-11 (B) 2012-03-04 This is a sweet task. @context +project"
+    task.priority.should == "B"
+  end
+
   it 'should recognise contexts' do
     task = Todo::Task.new "Hello, world! @test"
     task.contexts.should == ["@test"]
@@ -38,7 +44,7 @@ describe Todo::Task do
   end
 
   it 'should be able to get just the text, no contexts etc.' do
-    task = Todo::Task.new "x (B) 2012-03-04 This is a sweet task. @context +project"
+    task = Todo::Task.new "x 2012-09-11 (B) 2012-03-04 This is a sweet task. @context +project"
     task.text.should == "This is a sweet task."
   end
 
@@ -68,37 +74,37 @@ describe Todo::Task do
 
   it 'should be able to recognise dates' do
     task = Todo::Task.new "(C) 2012-03-04 This has a date!"
-    task.date.should == Date.parse("4th March 2012")
+    task.created_on.should == Date.parse("4th March 2012")
   end
 
   it 'should be able to recognise dates without priority' do
     task = Todo::Task.new "2012-03-04 This has a date!"
-    task.date.should == Date.parse("4th March 2012")
+    task.created_on.should == Date.parse("4th March 2012")
   end
 
   it 'should return nil if no date is present' do
     task = Todo::Task.new "No date!"
-    task.date.should be_nil
+    task.created_on.should be_nil
   end
 
   it 'should not recognise malformed dates' do
     task = Todo::Task.new "03-04-2012 This has a malformed date!"
-    task.date.should be_nil
+    task.created_on.should be_nil
   end
 
   it 'should be able to tell if the task is overdue' do
     task = Todo::Task.new((Date.today - 1).to_s + " This task is overdue!")
-    task.overdue?.should be_true
+    task.overdue?.should be_false
   end
 
-  it 'should return nil on overdue? if there is no date' do
+  it 'should return false on overdue? if there is no date' do
     task = Todo::Task.new "No date!"
-    task.overdue?.should be_nil
+    task.overdue?.should be_false
   end
 
   it 'should return nil on ridiculous date data' do
     task = Todo::Task.new "2012-56-99 This has a malformed date!"
-    task.date.should be_nil
+    task.created_on.should be_nil
   end
 
   it 'should be able to recognise completed tasks' do
@@ -107,12 +113,192 @@ describe Todo::Task do
   end
 
   it 'should not recognize incomplete tasks as done' do
-    task = Todo::Task.new "2012-12-08 This is ain't done!"
+    task = Todo::Task.new "2012-12-08 This ain't done!"
+    task.done?.should be_false
+  end
+
+  it 'should be completable' do
+    task = Todo::Task.new "2012-12-08 This ain't done!"
+    task.do!
+    task.done?.should be_true
+  end
+
+  it 'should be marked as incomplete' do
+    task = Todo::Task.new "x 2012-12-08 This is done!"
+    task.undo!
+    task.done?.should be_false
+  end
+
+  it 'should be marked as incomplete without any date' do
+    task = Todo::Task.new "x 2012-12-08 This is done!"
+    task.undo!
+    task.completed_on.should be_nil
+    task.created_on.should be_nil
+  end
+
+  it 'should be toggable' do
+    task = Todo::Task.new "2012-12-08 This ain't done!"
+    task.toggle!
+    task.done?.should be_true
+    task.toggle!
     task.done?.should be_false
   end
 
   it 'should be able to recognise completion dates' do
     task = Todo::Task.new "x 2012-12-08 This is done!"
-    task.date.should == Date.parse("8th December 2012")
+    task.completed_on.should == Date.parse("8th December 2012")
+  end
+
+  it 'should remove the priority when calling Task#do!' do
+    task = Todo::Task.new "(A) Task"
+    task.do!
+    task.priority.should be_nil
+  end
+
+  it 'should reset to the original priority when calling Task#undo!' do
+    task = Todo::Task.new "(A) Task"
+    task.do!
+    task.undo!
+    task.priority.should == "A"
+  end
+
+  it 'should set the current completion dates when calling Task#do!' do
+    task = Todo::Task.new "2012-12-08 Task"
+    Timecop.freeze(2013, 12, 8) do
+      task.do!
+      task.completed_on.should == Date.parse("8th December 2013")
+    end
+  end
+
+  it 'should reset to the original due date when calling Task#undo!' do
+    task = Todo::Task.new "2012-12-08 Task"
+    Timecop.freeze(2013, 12, 8) do
+      task.do!
+      task.undo!
+      task.created_on.should == Date.parse("8th December 2012")
+    end
+  end
+
+  it 'should manage dates when calling Task#toggle!' do
+    task = Todo::Task.new "2012-12-08 This ain't done!"
+    Timecop.freeze(2013, 12, 8) do
+      task.toggle!
+      task.completed_on.should == Date.parse("8th December 2013")
+      task.created_on.should == Date.parse("8th December 2012")
+      task.toggle!
+      task.created_on.should == Date.parse("8th December 2012")
+      task.completed_on.should be_nil
+    end
+  end
+
+  it 'should convert to a string' do
+    task = Todo::Task.new "(A) 2012-12-08 My task @test +test2"
+    task.to_s.should == "(A) 2012-12-08 My task @test +test2"
+  end
+  
+  it 'should keep track of the original string after changing the task' do
+    task = Todo::Task.new "(A) 2012-12-08 My task @test +test2"
+    Timecop.freeze(2013, 12, 8) do
+      task.do!
+      task.orig.should == "(A) 2012-12-08 My task @test +test2"
+    end
+  end
+  
+  it 'should show be modifiable' do
+    task = Todo::Task.new "2012-12-08 My task @test +test2"
+    task.projects.clear
+    task.contexts << ["@test3"]
+    Timecop.freeze(2013, 12, 8) do
+      task.do!
+      task.to_s.should == "x 2013-12-08 2012-12-08 My task @test @test3"
+    end
+  end
+
+  it 'should be not done with missing date' do
+    task = Todo::Task.new "x This is not done"
+    task.done?.should be false
+  end
+
+  it 'should be not done with malformed date' do
+    task = Todo::Task.new "x 01-01-2013 This is not done"
+    task.done?.should be false
+    task.completed_on.should be nil
+  end
+
+  it 'should be not done with an invalid date' do
+    task = Todo::Task.new "x 2013-02-31 This is not done"
+    task.done?.should be false
+    task.completed_on.should be nil
+  end
+
+  it 'should be done on 2013-04-22' do
+    task = Todo::Task.new "x 2013-04-22 This is really done"
+    task.done?.should be true
+    task.completed_on.should == Date.parse('22th April 2013')
+  end
+
+  its 'should have a due date' do
+    task = Todo::Task.new '(A) this task has due date due:2013-12-22'
+    task.due_on.should_not be_nil
+  end
+
+  it 'should due on 2013-12-22' do
+    task = Todo::Task.new '(A) this task has due date due:2013-12-22'
+    task.due_on.should == Date.parse('22th December 2013')
+  end
+
+  it 'should not be overdue on 2013-12-01' do
+    task = Todo::Task.new '(A) this task has due date due:2013-12-22'
+    Timecop.freeze(2013, 12, 01) do
+      task.overdue?.should be_false
+    end
+  end
+
+  it 'should be overdue on 2013-12-23' do
+    task = Todo::Task.new '(A) this task has due date due:2013-12-22'
+    Timecop.freeze(2013, 12, 23) do
+      task.overdue?.should be_true
+    end
+  end
+
+  it 'should be able to get just the text, no due date etc.' do
+    task = Todo::Task.new "x 2012-09-11 (B) 2012-03-04 This is a sweet task. @context due:2012-01-01 +project"
+    task.text.should == "This is a sweet task."
+  end
+
+  it 'should convert to a string with due date' do
+    task = Todo::Task.new "x 2012-09-11 (B) 2012-03-04 This is a sweet task. @context due:2012-01-01 +project"
+    task.to_s.should == "x 2012-09-11 (B) 2012-03-04 This is a sweet task. @context +project due:2012-01-01"
+  end
+
+  it 'should have no due date with malformed date' do
+    task = Todo::Task.new "x 2012-09-11 (B) 2012-03-04 This is a sweet task. @context due:01-01-2012 +project"
+    task.due_on.should be_nil
+  end
+
+  it 'should have no due date with invalid date' do
+    task = Todo::Task.new "x 2012-09-11 (B) 2012-03-04 This is a sweet task. @context due:2012-02-31 +project"
+    task.due_on.should be_nil
+  end
+
+  it 'should recognize DUE:2013-12-22 (case insensitive)' do
+    task = Todo::Task.new '(A) this task has due date DUE:2013-12-22'
+    task.due_on.should == Date.parse('22th December 2013')
+  end
+
+  it 'should have a logger' do
+    task = Todo::Task.new "x 2012-09-11 (B) 2012-03-04 This is a sweet task. @context due:2012-02-31 +project"
+    task.logger.should_not be nil
+  end
+
+  it 'should call @logger.warn if #date called as deprecated method' do
+    logger = double(Logger)
+    Todo::Logger.logger = logger
+
+    task = Todo::Task.new "x 2012-09-11 (B) 2012-03-04 This is a sweet task. @context due:2012-02-31 +project"
+    error_message = 'Task#date is deprecated, use created_on instead.'
+
+    logger.should_receive(:warn).with(error_message)
+    task.date
   end
 end

data/todo-txt.gemspec

@@ -1,7 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{todo-txt}
-  s.version = "0.3.1"
-  s.date = %q{2012-03-31}
+  s.version = "0.4"
   s.authors = ["Sam Rose"]
   s.email = %q{samwho@lbak.co.uk}
   s.summary = %q{A client library for parsing todo.txt files.}
@@ -11,5 +10,5 @@ Gem::Specification.new do |s|
   s.license = 'GPL-2'
 
   # Add all files to the files parameter.
-  s.files = `git ls-files`.split /\n/
+  s.files = `git ls-files`.split(/\n/)
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: todo-txt
 version: !ruby/object:Gem::Version
-  version: 0.3.1
-  prerelease: 
+  version: '0.4'
 platform: ruby
 authors:
 - Sam Rose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-31 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies: []
 description: Allows for simple parsing of todo.txt files, as per Gina Trapani's todo.txt
   project.
@@ -28,6 +27,7 @@ files:
 - Rakefile
 - lib/todo-txt.rb
 - lib/todo-txt/list.rb
+- lib/todo-txt/logger.rb
 - lib/todo-txt/task.rb
 - spec/data/todo.txt
 - spec/spec_helper.rb
@@ -37,26 +37,25 @@ files:
 homepage: http://github.com/samwho/todo-txt-gem
 licenses:
 - GPL-2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A client library for parsing todo.txt files.
 test_files: []