toodledo 1.3.5 → 1.3.8

data/lib/toodledo/status.rb

@@ -1,44 +1,46 @@
 #
 # The possible values for the status field of a task.
 #
-class Status
+module Toodledo
+  class Status
   
-    NONE = 0
-    NEXT_ACTION = 1
-    ACTIVE = 2
-    PLANNING = 3
-    DELEGATED = 4
-    WAITING = 5
-    HOLD = 6
-    POSTPONED = 7
-    SOMEDAY = 8
-    CANCELLED = 9
-    REFERENCE = 10
+      NONE = 0
+      NEXT_ACTION = 1
+      ACTIVE = 2
+      PLANNING = 3
+      DELEGATED = 4
+      WAITING = 5
+      HOLD = 6
+      POSTPONED = 7
+      SOMEDAY = 8
+      CANCELLED = 9
+      REFERENCE = 10
       
-    STATUS_ARRAY = [
-      NONE,
-      NEXT_ACTION,
-      ACTIVE,
-      PLANNING,
-      DELEGATED,
-      WAITING,
-      HOLD,
-      POSTPONED,
-      SOMEDAY,
-      CANCELLED,
-      REFERENCE
-    ]
+      STATUS_ARRAY = [
+        NONE,
+        NEXT_ACTION,
+        ACTIVE,
+        PLANNING,
+        DELEGATED,
+        WAITING,
+        HOLD,
+        POSTPONED,
+        SOMEDAY,
+        CANCELLED,
+        REFERENCE
+      ]
     
-    def self.each
-      STATUS_ARRAY.each{|value| yield(value)}
-    end
+      def self.each
+        STATUS_ARRAY.each{|value| yield(value)}
+      end
     
-    def self.valid?(input)
-      for status in STATUS_ARRAY
-        if (status == input) 
-          return true
+      def self.valid?(input)
+        for status in STATUS_ARRAY
+          if (status == input) 
+            return true
+          end
         end
+        return false
       end
-      return false
-    end
-end
+  end
+end

data/lib/toodledo/task.rb

@@ -55,6 +55,7 @@ module Toodledo
       return @num_children
     end
 
+    # TODO Repetitious. Refactor
     def initialize(id, params = {})
       @id = id
 
@@ -129,7 +130,7 @@ module Toodledo
       #   <parent>1122</parent>
       #   <children>0</children>
       #   <title>Buy Milk</title>
-      #   <tag>After work</tag>
+      #   <tag>After work</tag> # Actually, this counts as two tags
       #   <folder>123</folder>
       #   <context id="123">Home</context>
       #   <goal id="123">Get a Raise</goal>
@@ -223,7 +224,11 @@ module Toodledo
       title = el.elements['title'].text
       
       tag = el.elements['tag'].text
-      tag = nil if (tag == '0')
+      if tag == '0'
+        tag = nil
+      elsif tag
+        tag = tag.split(/\s+/)
+      end
       
       length = el.elements['length'].text
       length = nil if (length == '0')
@@ -276,7 +281,7 @@ module Toodledo
       #  <parent>#{@parent_id}</parent>
       #  <children>#{@children}</children>
       #  <title>#{@title}</title>
-      #  <tag>#{@tag}</tag>
+      #  <tag>#{@tag.join(' ')}</tag>
       #  <folder>#{@folder.server_id}</folder>
       #  <context id="#{@context.server_id}">#{@context.name}</context>
       #  <goal id="#{@goal.server_id}">#{@goal.name}</goal>

data/lib/toodledo/version.rb

@@ -0,0 +1,11 @@
+
+module Toodledo
+  module Version
+      MAJOR = 1
+      MINOR = 3
+      PATCH = 8
+
+      VERSION = [MAJOR, MINOR, PATCH].compact.join('.')
+    end
+
+end

data/test/client_test.rb

@@ -1,8 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__),'..','lib')
-
-require 'test/unit'
-require 'toodledo/command_line/client'
-require 'flexmock/test_unit'
+require 'helper'
 
 module Toodledo
   module CommandLine
@@ -78,6 +74,39 @@ module Toodledo
 
         @client.add_task(@session, input)
       end
+
+      def test_add_task_with_duedate()
+
+        input = '#2011-03-04 This is a test'
+
+        args = { :duedate => "2011-03-04" }
+
+        @session.should_receive(:add_task).with('This is a test', args).and_return(1)
+        @client.should_receive(:print).with('Task 1 added.')
+        @client.add_task(@session, input)
+      end
+
+      def test_add_task_with_single_tag()
+
+        input = '%tag This is a test'
+
+        args = { :tag => %w{tag} }
+
+        @session.should_receive(:add_task).with('This is a test', args).and_return(1)
+        @client.should_receive(:print).with('Task 1 added.')
+        @client.add_task(@session, input)
+      end
+
+      def test_add_task_with_multiple_tags()
+
+        input = '%[tag1 tag2] This is a test'
+
+        args = { :tag => %w{tag1 tag2} }
+
+        @session.should_receive(:add_task).with('This is a test', args).and_return(1)
+        @client.should_receive(:print).with('Task 1 added.')
+        @client.add_task(@session, input)
+      end
       
       def test_add_folder()
         input = 'name'
@@ -109,7 +138,7 @@ module Toodledo
         
         @client.add_goal(@session, input)
       end
-
+ 
       def test_list_tasks_with_nothing()
 
         params = {
@@ -130,24 +159,43 @@ module Toodledo
         @client.list_tasks(@session, input)
       end
 
-
       def test_list_tasks_with_everything()
 
-        params = {
+        parent_fields = {
+          :priority => Priority::HIGH,
+          :title => 'bar',
+          :folder => Folder::NO_FOLDER,
+          :context => Context::NO_CONTEXT,
+          :goal => Goal::NO_GOAL,
+          :status => Status::NONE,
+          :repeat => Repeat::NONE
+        }
+        parent_task = Task.new(54321, parent_fields)
+        
+        child_fields = {
           :priority => Priority::LOW,
           :title => 'foo',
           :folder => Folder.new(1234, 0, 0, 'test folder'),
           :context => Context.new(345, 'test context'),
           :goal => Goal.new(342341, 0, 0, 'test goal'),
           :repeat => Repeat::BIWEEKLY,
+          :duedatemodifier => 1, # Due On
+          :duedate => Time.local(2011,06,25,13,45,56),
+          :startdate => Date.new(2010,05,23),
           :status => Status::NEXT_ACTION,
+          :star => true,
           :tag => 'some tag',
-          :star => true
+          :parent_id => 54321,
+          :parent => parent_task,
+          :length => 125, # Minutes of duration
+          :timer => 423, # Seconds timer has been running
+          :num_children => 5
         }
-        task = Task.new(1234, params)
-        tasks = [ task ]
+        child_task = Task.new(1234, child_fields)
+        tasks = [ parent_task, child_task ]
         @session.should_receive(:get_tasks).and_return(tasks)
-        @client.should_receive(:print).with('<1234> -- !low *[test folder] @[test context] ^[test goal] repeat[biweekly] status[Next Action] starred tag[some tag] foo')
+        @client.should_receive(:print).with("<54321> -- !high bar").once.ordered
+        @client.should_receive(:print).with("<1234> -- !low *[test folder] @[test context] ^[test goal] repeat[biweekly] #[=06/25/2011 01:45 PM] startdate[05/23/2010] status[Next Action] starred %[some tag] parent[bar] length[125] timer[423] children[5] foo").once.ordered
 
         input = ''
         @client.list_tasks(@session, input)

data/test/helper.rb

@@ -0,0 +1,11 @@
+$: << File.expand_path(File.dirname(__FILE__) + "/../lib")
+
+
+require 'rubygems'
+require 'test/unit'
+require 'toodledo'
+require 'toodledo/command_line/client'
+
+require 'flexmock/test_unit'
+require 'yaml'
+

data/test/parser_helper_test.rb

@@ -1,9 +1,4 @@
-$: << File.expand_path(File.dirname(__FILE__) + "/../lib")
-
-require 'test/unit'
-require 'toodledo'
-require 'toodledo/command_line/parser_helper'
-
+require 'helper'
 
 #
 # Tests the parser helper
@@ -47,6 +42,41 @@ class ParserHelperTest < Test::Unit::TestCase
     
     assert(folder == 'Harder Folder', "Folder not found")
   end
+
+  def test_find_duedate
+    input = "#duedate @Context ^Goal blah blah blah"
+    
+    duedate = parse_date(input)
+    
+    assert(duedate == 'duedate', "duedate not found")
+  end
+
+  # TODO Separate parse_date from parse_duedate?
+  def test_find_harder_duedate
+    
+    input = "Some Text @[Harder Context] #[Harder duedate] ^[Harder Goal]"
+    
+    duedate = parse_date(input)
+    
+    assert(duedate == 'Harder duedate', "duedate not found")
+  end
+
+  def test_find_tag
+    input = "%tag @Context ^Goal blah blah blah"
+    
+    tag = parse_tag(input)
+    
+    assert(tag == ['tag'], "tag not found")
+  end
+
+  def test_find_harder_tag
+    
+    input = "Some Text @[Harder Context] %[Harder tag] ^[Harder Goal]"
+    
+    tag = parse_tag(input)
+    
+    assert(tag == ['Harder','tag'], "tag not found")
+  end
   
   def test_find_goal
     input = "*Folder @Context ^Goal wefawef wefawefawfe"

data/test/session_test.rb

@@ -1,33 +1,33 @@
-$: << File.expand_path(File.dirname(__FILE__) + "/../lib")
-
-
-require 'rubygems'
-require 'test/unit'
-require 'flexmock/test_unit'
-require 'toodledo/session'
+require 'helper'
 
 # 
 # This class tests that various handle methods in the session work as they're
 # supposed to.
 # 
-class SessionTest < Test::Unit::TestCase
 
-  def setup    
+class SessionTest < Test::Unit::TestCase
+  
+  def setup
     @session = Toodledo::Session.new('userid', 'password')    
     
     # mock out the get_token & call methods.
-    flexmock(@session, :get_token => 'token')
+    mock_connection(@session)
     
     @session.connect()
   end
   
+  def mock_connection(session)
+    flexmock(session, :get_token => 'token')
+    flexmock(session, :get_server_info => {:token_expires=>4*60.0})
+  end
+  
   def teardown
     @session.disconnect()
   end
   
   def test_handle_app_id_in_session
     new_sess = Toodledo::Session.new('userid', 'password', nil, 'appid')
-    flexmock(new_sess, :get_token => 'token')
+    mock_connection(new_sess)
     new_sess.connect()
     assert_not_nil new_sess.app_id
   end
@@ -42,7 +42,7 @@ class SessionTest < Test::Unit::TestCase
     flexmock(@session, :get_goal_by_name => goal)
     @session.handle_goal(myhash, params)
     
-    assert myhash[:goal] == goal_id
+    assert_equal goal_id, myhash[:goal]
   end
   
   def test_handle_goal_with_id()
@@ -52,7 +52,7 @@ class SessionTest < Test::Unit::TestCase
 
     @session.handle_goal(myhash, params)
         
-    assert myhash[:goal] == goal_id
+    assert_equal goal_id, myhash[:goal]
   end
   
   def test_handle_goal_with_obj()
@@ -63,7 +63,7 @@ class SessionTest < Test::Unit::TestCase
 
     @session.handle_goal(myhash, params)
     
-    assert myhash[:goal] == goal_id
+    assert_equal goal_id, myhash[:goal]
   end
   
   def test_handle_context_with_obj()
@@ -74,7 +74,7 @@ class SessionTest < Test::Unit::TestCase
     myhash = {}
     @session.handle_context(myhash, params)
     
-    assert myhash[:context] == context_id
+    assert_equal context_id, myhash[:context]
   end
   
   def test_handle_context_with_id()
@@ -84,7 +84,7 @@ class SessionTest < Test::Unit::TestCase
     myhash = {}
     @session.handle_context(myhash, params)
     
-    assert myhash[:context] == context_id
+    assert_equal context_id, myhash[:context]
   end
   
   def test_handle_context_with_name()
@@ -95,7 +95,7 @@ class SessionTest < Test::Unit::TestCase
     flexmock(@session, :get_context_by_name => context)
     @session.handle_context(myhash, params)
     
-    assert myhash[:context] == context_id
+    assert_equal context_id, myhash[:context]
   end
   
   def test_handle_boolean_with_string_true()
@@ -103,7 +103,7 @@ class SessionTest < Test::Unit::TestCase
     params = { :bool => 'true' }
     @session.handle_boolean(myhash, params, :bool)
     
-    assert myhash[:bool] == "1"
+    assert_equal "1", myhash[:bool]
   end
   
   def test_handle_boolean_with_string_false()
@@ -111,7 +111,7 @@ class SessionTest < Test::Unit::TestCase
     params = { :bool => 'false' }
     @session.handle_boolean(myhash, params, :bool)
     
-    assert myhash[:bool] == "0"
+    assert_equal "0", myhash[:bool]
   end
   
   def test_handle_boolean_with_true()
@@ -119,7 +119,7 @@ class SessionTest < Test::Unit::TestCase
     params = { :bool => true }
     @session.handle_boolean(myhash, params, :bool)
     
-    assert myhash[:bool] == "1"
+    assert_equal "1", myhash[:bool]
   end
   
   def test_handle_boolean_with_false()
@@ -127,7 +127,7 @@ class SessionTest < Test::Unit::TestCase
     params = { :bool => false }
     @session.handle_boolean(myhash, params, :bool)
     
-    assert myhash[:bool] == "0"
+    assert_equal "0", myhash[:bool]
   end
   
   def test_handle_folder()
@@ -137,7 +137,7 @@ class SessionTest < Test::Unit::TestCase
     params = { :folder => folder_id }
     @session.handle_folder(myhash, params)
         
-    assert myhash[:folder] == folder_id
+    assert_equal folder_id, myhash[:folder]
   end
   
   def test_handle_folder_with_obj()
@@ -149,7 +149,7 @@ class SessionTest < Test::Unit::TestCase
     params = { :folder => folder }  
     @session.handle_folder(myhash, params)
         
-    assert myhash[:folder] == folder_id
+    assert_equal folder_id, myhash[:folder]
   end
   
   
@@ -164,7 +164,7 @@ class SessionTest < Test::Unit::TestCase
     params = { :folder => folder_name }
     @session.handle_folder(myhash, params)
         
-    assert myhash[:folder] == folder_id
+    assert_equal folder_id, myhash[:folder]
   end
   
   def test_handle_parent_with_task()
@@ -175,7 +175,7 @@ class SessionTest < Test::Unit::TestCase
 
     @session.handle_parent(myhash, params)
         
-    assert myhash[:parent] == task_id
+    assert_equal task_id, myhash[:parent]
   end
   
   def test_handle_parent_with_id()
@@ -185,23 +185,205 @@ class SessionTest < Test::Unit::TestCase
 
     @session.handle_parent(myhash, params)
         
-    assert myhash[:parent] == task_id
+    assert_equal task_id, myhash[:parent]
+  end
+  
+  def test_handle_number_with_nil()
+    myhash = {}
+    params = { :num => nil }
+    @session.handle_number(myhash, params, :num)
+    
+    assert_equal nil, myhash[:num]
+  end
+  
+  def test_handle_number_with_string()
+    myhash = {}
+    params = { :num => '12345' }
+    @session.handle_number(myhash, params, :num)
+    
+    assert_equal nil, myhash[:num]
   end
   
+  def test_handle_number_with_integer()
+    myhash = {}
+    params = { :num => 12345 }
+    @session.handle_number(myhash, params, :num)
+    
+    assert_equal '12345', myhash[:num]
+  end
   
+  def test_handle_string_with_nil()
+    myhash = {}
+    params = { :string => nil }
+    @session.handle_string(myhash, params, :string)
+    
+    assert_equal nil, myhash[:string]
+  end
   
-  #  handle_number
-  #  handle_string
-  #  
-  #  handle_date
-  #  handle_time
-  #  handle_datetime
-  #  
-  #  handle duedate
-  #  handle duetime
-  #  
-  #  handle_repeat
-  #  handle_priority
-
+  def test_handle_string()
+    myhash = {}
+    params = { :string => '12345' }
+    @session.handle_string(myhash, params, :string)
+    
+    assert_equal '12345', myhash[:string]
+  end
+  
+  def test_handle_date_with_nil()
+    myhash = {}
+    params = { :date => nil }
+    @session.handle_date(myhash, params, :date)
+    
+    assert_equal nil, myhash[:date]
+  end
+  
+  def test_handle_date()
+    myhash = {}
+    params = { :date => Time.local(2011,05,23,14,45,56) }
+    @session.handle_date(myhash, params, :date)
+    
+    assert_equal '2011-05-23', myhash[:date]
+  end
+  
+  def test_handle_date_with_string()
+    myhash = {}
+    params = { :date => '2011-05-23' }
+    @session.handle_date(myhash, params, :date)
+    
+    assert_equal '2011-05-23', myhash[:date]
+  end
+  
+  def test_handle_time_with_nil()
+    myhash = {}
+    params = { :time => nil }
+    @session.handle_time(myhash, params, :time)
+    
+    assert_equal nil, myhash[:time]
+  end
+  
+  def test_handle_time()
+    myhash = {}
+    params = { :time => Time.local(2011,05,23,14,45,56) }
+    @session.handle_time(myhash, params, :time)
+    
+    assert_equal '02:45 PM', myhash[:time]
+  end
+  
+  def test_handle_time_with_string()
+    myhash = {}
+    params = { :time => '02:45 PM' }
+    @session.handle_time(myhash, params, :time)
+    
+    assert_equal '02:45 PM', myhash[:time]
+  end
+  
+  def test_handle_datetime_with_nil()
+    myhash = {}
+    params = { :datetime => nil }
+    @session.handle_datetime(myhash, params, :datetime)
+    
+    assert_equal nil, myhash[:datetime]
+  end
+  
+  def test_handle_datetime()
+    myhash = {}
+    params = { :datetime => Time.local(2011,05,23,14,45,56) }
+    @session.handle_datetime(myhash, params, :datetime)
+    
+    assert_equal '2011-05-23 14:45:56', myhash[:datetime]
+  end
+  
+  def test_handle_datetime_with_string()
+    myhash = {}
+    params = { :datetime => '2011-05-23 14:45:56' }
+    @session.handle_datetime(myhash, params, :datetime)
+    
+    assert_equal '2011-05-23 14:45:56', myhash[:datetime]
+  end
+  
+  def test_handle_repeat_with_nil()
+    myhash = {}
+    params = { :repeat => nil }
+    @session.handle_repeat(myhash, params)
+    
+    assert_equal nil, myhash[:repeat]
+  end
+  
+  REPEAT_VALUES = %w{NONE WEEKLY MONTHLY YEARLY DAILY BIWEEKLY BIMONTHLY SEMIANNUALLY QUARTERLY WITH_PARENT}
+  
+  def test_handle_repeat()
+    REPEAT_VALUES.each do |repeat|
+      repeat_value = Toodledo::Repeat.const_get(repeat)
+      myhash = {}
+      params = { :repeat => repeat_value }
+      @session.handle_repeat(myhash, params)
+    
+      assert_equal repeat_value, myhash[:repeat], "does not handle repeat code #{repeat} (value #{repeat_value})"
+    end
+  end
+  
+  def test_handle_priority_with_nil()
+    myhash = {}
+    params = { :priority => nil }
+    @session.handle_priority(myhash, params)
+    
+    assert_equal nil, myhash[:priority]
+  end
+  
+  PRIORITY_VALUES = %w{TOP HIGH MEDIUM LOW NEGATIVE}
+  
+  def test_handle_priority()
+    PRIORITY_VALUES.each do |priority|
+      priority_value = Toodledo::Priority.const_get(priority)
+      myhash = {}
+      params = { :priority => priority_value }
+      @session.handle_priority(myhash, params)
+    
+      assert_equal priority_value, myhash[:priority], "does not handle priority code #{priority} (value #{priority_value})"
+    end
+  end
+  
+  def test_handle_status_with_nil()
+    myhash = {}
+    params = { :status => nil }
+    @session.handle_status(myhash, params)
+    
+    assert_equal nil, myhash[:status]
+  end
+  
+  STATUS_VALUES = %w{NONE NEXT_ACTION ACTIVE PLANNING DELEGATED WAITING HOLD POSTPONED SOMEDAY CANCELLED REFERENCE}
 
+  def test_handle_status()
+    STATUS_VALUES.each do |status|
+      status_value = Toodledo::Status.const_get(status)
+      myhash = {}
+      params = { :status => status_value }
+      @session.handle_status(myhash, params)
+    
+      assert_equal status_value, myhash[:status], "does not handle status code #{status} (value #{status_value})"
+    end
+  end
+  
+  def test_handle_tag_with_nil()
+    myhash = {}
+    params = { :tag => nil }
+    @session.handle_tag(myhash, params)
+    
+    assert_equal nil, myhash[:tag]
+  end
+  
+  def test_handle_tag_with_array()
+    myhash = {}
+    params = { :tag => %w{tag1 tag2 tag3} }
+    @session.handle_tag(myhash, params)
+    
+    assert_equal 'tag1 tag2 tag3', myhash[:tag]
+  end
+  
+  def test_handle_tag_with_string()
+    myhash = {}
+    params = { :tag => 'tags' }
+    @session.handle_tag(myhash, params)
+    
+    assert_equal 'tags', myhash[:tag]
+  end
 end