teambox-things-sync 0.1.1 → 0.1.2

data/Rakefile

@@ -1,5 +1,6 @@
+require 'rubygems'
+
 begin
-  require 'rubygems'
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "teambox-things-sync"
@@ -14,3 +15,11 @@ begin
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"
 end
+
+namespace :command do
+  desc "Run command with using current folder files (not gem)'"
+  task :test do
+    require 'lib/teambox-things-sync.rb'
+    require 'lib/teambox-things-sync/command'
+  end
+end

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/teambox-things-sync.rb

@@ -6,10 +6,45 @@ require 'timeout'
 module TeamboxThingsSync
   autoload :Base, File.dirname(__FILE__) + '/teambox-things-sync/base'
   autoload :ConfigStore, File.dirname(__FILE__) + '/teambox-things-sync/config_store'
-  autoload :TaskListCache, File.dirname(__FILE__) + '/teambox-things-sync/task_list_cache'
+  module Cache
+    autoload :BaseCache, File.dirname(__FILE__) + '/teambox-things-sync/cache/base_cache'
+    autoload :TaskListCache, File.dirname(__FILE__) + '/teambox-things-sync/cache/task_list_cache'
+    autoload :UserNameCache, File.dirname(__FILE__) + '/teambox-things-sync/cache/user_name_cache'
+  end
 end
 
 module Things
-   additional_properties = %{properties :tag_names, :due_date}
-   Todo.module_eval(additional_properties)
+  # adds additional properties that doesn't exist in original gem
+  additional_properties = %{properties :tag_names, :due_date}
+  Todo.module_eval(additional_properties)
+  
+  class Todo
+    
+    attr_accessor :was_in_today
+    
+    # Moves todo to Today list if it's due today or in the past, or user
+    # put it there manually
+    def move_to_today_if_necessary
+      tomorrow_midnight = Time.parse((Date.today+1).to_s)
+      if (self.due_date && self.due_date < tomorrow_midnight) || was_in_today
+        self.move(Things::List.today)
+      end
+    end
+    
+    def remember_today_listing
+      @was_in_today = Things::Todo.today.any? {|t| t.name == self.name}
+    end
+    
+    def self.find(name_or_id)
+      todo = super
+      todo.remember_today_listing if todo
+      return todo
+    end
+    
+    def save
+      todo = super
+      todo.move_to_today_if_necessary if todo
+      return todo
+    end
+  end
 end

data/lib/teambox-things-sync/base.rb

@@ -60,7 +60,10 @@ module TeamboxThingsSync
       def mark_as_done_at_remote(project)
         @client.tasks.each do |task|
           things_todo = Things::Todo.find(task.name)
-          if !things_todo.nil? && things_todo.completed? && is_task_open?(task.status)
+          
+          #TODO: clean it up
+          if !things_todo.nil? && things_todo.completed? && is_task_open?(task.status) &&
+            !Things::App.lists.trash.reference.todos.name.get.include?(things_todo.name)
             # API isn't great right now, so we update task as resolved 
             # and add the new comment to it
             @client.update_project_task(project.permalink, task.id, {:status => 3})
@@ -74,7 +77,9 @@ module TeamboxThingsSync
 
       # fetches current task data from remote
       def fetch_tasks_from_remote(project, person_id)
-        task_list_cache = TaskListCache.new(@client, project.permalink)
+        task_list_cache = Cache::TaskListCache.new(@client, 
+          {:project_permalink => project.permalink})
+        @user_name_cache = Cache::UserNameCache.new(@client)
         @client.tasks.each do |task|
           # grab only tasks assigned to current user
           if task.assigned_id == person_id
@@ -82,9 +87,10 @@ module TeamboxThingsSync
             # update only those that aren't completed in both local and remote
             if is_task_open?(task.status) || !things_todo.completed?
               things_todo.project = Base.find_or_create_project_in_things(project.name)
-              things_todo.notes = "Don't edit this field!\n" +
-                task_url(project.permalink, task.task_list_id, task.id)
-
+              things_todo.notes = build_notes(project.permalink, 
+                task.task_list_id, task.id)
+              things_todo.tag_names = task_list_cache[task.task_list_id]
+              
               unless task.due_on.nil?
                 things_todo.due_date = Time.parse(task.due_on)
               end
@@ -95,9 +101,8 @@ module TeamboxThingsSync
               else
                 things_todo.open
               end
-
-              things_todo.tag_names = task_list_cache[task.task_list_id]
-              things_todo.save
+              
+              things_todo.save              
               log "\"#{task.name}\" has been saved in Things.app"
             end
           end
@@ -113,6 +118,16 @@ module TeamboxThingsSync
         # end
       end
 
+      def build_notes(project_permalink, task_list_id, task_id)
+        notes = task_url(project_permalink, task_list_id, task_id)+"\n\n"
+        @client.project_task_comments(project_permalink, task_id).reverse.each do |c|
+          unless c.body.nil? || c.body.empty?
+            notes << "#{@user_name_cache[c.user_id]} @ #{c.updated_at}:\n #{c.body} \n----------\n\n"
+          end
+        end
+        notes
+      end
+        
       # finds person_id in given project
       def find_person_id(project_permalink)
         project_people = @client.project_people(project_permalink)

data/lib/teambox-things-sync/cache/base_cache.rb

@@ -0,0 +1,19 @@
+module TeamboxThingsSync
+  # saves unnecessary API queries for task list names
+  module Cache
+    class BaseCache
+      def initialize(client, config = {})
+        @data = {}
+        @client = client
+        @config = config
+      end
+
+      def [](id)
+        if @data[id].nil?
+          @data[id] = query_api(id)
+        end
+        @data[id]
+      end
+    end
+  end
+end

data/lib/teambox-things-sync/cache/task_list_cache.rb

@@ -0,0 +1,9 @@
+module TeamboxThingsSync
+  module Cache
+    class TaskListCache < BaseCache
+      def query_api(id)
+        @client.project_task_list(@config[:project_permalink], id).name
+      end
+    end
+  end
+end

data/lib/teambox-things-sync/cache/user_name_cache.rb

@@ -0,0 +1,10 @@
+module TeamboxThingsSync
+  module Cache
+    class UserNameCache < BaseCache
+      def query_api(id)
+        user = @client.user(id)
+        "#{user.first_name} #{user.last_name}"
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -5,4 +5,11 @@ require 'things'
 require 'time'
 require 'timeout'
 require 'rspec'
-Dir["#{File.dirname(__FILE__)}/../lib/*.rb"].each {|f| require f}
+
+Dir["#{File.dirname(__FILE__)}/../lib/*.rb"].each {|f| require f}
+
+module Things
+  def self.names_of_todos_in_today_list
+    Things::App.lists.today.reference.todos.name.get
+  end
+end

data/spec/teambox-things-sync/cache/task_list_cache_spec.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe "TeamboxThingsSync::Cache::TaskListCache" do
+  it "should query teambox api, get and return task name" do
+    @client = double
+    to_return = Hashie::Mash.new(:name => "test")
+    
+    task_list_cache = TeamboxThingsSync::Cache::TaskListCache.new(@client, 
+      {:project_permalink => "testing"})
+    @client.should_receive(:project_task_list).with("testing", 1).
+      and_return(to_return)
+    task_list_cache[1].should == "test"
+  end
+end

data/spec/teambox-things-sync/cache/user_name_cache_spec.rb

@@ -0,0 +1,15 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe "TeamboxThingsSync::Cache::UserNameCache" do
+  it "should query teambox api, get and return user name" do
+    @client = double
+    to_return = Hashie::Mash.new(:first_name => "John", :last_name => "Smith")
+    
+    user_name_cache = TeamboxThingsSync::Cache::UserNameCache.new(@client)
+    @client.should_receive(:user).with(22).
+      and_return(to_return)
+    user_name_cache[22].should == "John Smith"
+    @client.should_not_receive(:user)
+    user_name_cache[22]
+  end
+end

data/spec/teambox-things-sync_spec.rb

@@ -1,5 +1,73 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe TeamboxThingsSync do
-  pending
-end
+describe "Things::Todo" do
+  
+  describe "#move_to_today_if_necessary" do
+  
+    before do
+      Things::App.instance.empty_trash
+      @todo = TeamboxThingsSync::Base.find_or_create_todo_in_things('TEST - Foo')
+    end
+  
+    it "should be moved to Today if due date is today" do
+      @todo.due_date = Time.now
+      @todo.save
+      Things::names_of_todos_in_today_list.should include(@todo.name)
+    end
+  
+    it "should be moved to Today if due date is in the past" do
+      @todo.due_date = Time.now-60*60*24*2
+      @todo.save
+      Things::names_of_todos_in_today_list.should include(@todo.name)
+    end
+  
+    it "should not be moved to Today if due date is in the future" do
+      @todo.due_date = Time.now+60*60*24
+      @todo.save
+      Things::names_of_todos_in_today_list.should_not include(@todo.name)
+    end
+    
+    it "should be moved to Today if user put it manually into Today and then it was resetted by Things::Todo" do
+      @todo.save
+      @todo.move(Things::List.today)
+      @todo = TeamboxThingsSync::Base.find_or_create_todo_in_things('TEST - Foo')
+      @todo.save
+      Things::names_of_todos_in_today_list.should include(@todo.name)
+    end
+  
+    after do
+      @todo.delete
+      Things::App.instance.empty_trash
+    end
+    
+  end
+  
+  describe "#remember_today_listing" do
+    
+    before do
+      Things::App.instance.empty_trash
+      @todo = TeamboxThingsSync::Base.find_or_create_todo_in_things('TEST - Foo')
+      @todo.save
+    end
+    
+    it "should return true if todo existed in Today before updating" do
+      @todo.move(Things::List.today)
+      @todo = TeamboxThingsSync::Base.find_or_create_todo_in_things('TEST - Foo')
+      @todo.save
+      @todo.was_in_today.should be_true
+    end
+    
+    it "should return false if todo didn't exist in Today before updating" do
+      @todo = TeamboxThingsSync::Base.find_or_create_todo_in_things('TEST - Foo')
+      @todo.save
+      @todo.was_in_today.should be_false
+    end
+    
+    after do
+      @todo.delete
+      Things::App.instance.empty_trash
+    end
+  
+  end
+  
+end

data/teambox-things-sync.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{teambox-things-sync}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Arkadiusz Holko"]
-  s.date = %q{2010-09-15}
+  s.date = %q{2010-09-17}
   s.default_executable = %q{teambox-things-sync}
   s.email = %q{fastred@fastred.org}
   s.executables = ["teambox-things-sync"]
@@ -28,12 +28,15 @@ Gem::Specification.new do |s|
      "bin/teambox-things-sync",
      "lib/teambox-things-sync.rb",
      "lib/teambox-things-sync/base.rb",
+     "lib/teambox-things-sync/cache/base_cache.rb",
+     "lib/teambox-things-sync/cache/task_list_cache.rb",
+     "lib/teambox-things-sync/cache/user_name_cache.rb",
      "lib/teambox-things-sync/command.rb",
      "lib/teambox-things-sync/config_store.rb",
-     "lib/teambox-things-sync/task_list_cache.rb",
      "spec/spec_helper.rb",
      "spec/teambox-things-sync/base_spec.rb",
-     "spec/teambox-things-sync/task_list_cache_spec.rb",
+     "spec/teambox-things-sync/cache/task_list_cache_spec.rb",
+     "spec/teambox-things-sync/cache/user_name_cache_spec.rb",
      "spec/teambox-things-sync_spec.rb",
      "teambox-things-sync.gemspec"
   ]
@@ -45,7 +48,8 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/spec_helper.rb",
      "spec/teambox-things-sync/base_spec.rb",
-     "spec/teambox-things-sync/task_list_cache_spec.rb",
+     "spec/teambox-things-sync/cache/task_list_cache_spec.rb",
+     "spec/teambox-things-sync/cache/user_name_cache_spec.rb",
      "spec/teambox-things-sync_spec.rb"
   ]
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Arkadiusz Holko
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 +02:00
+date: 2010-09-17 00:00:00 +02:00
 default_executable: teambox-things-sync
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,12 +81,15 @@ files:
 - bin/teambox-things-sync
 - lib/teambox-things-sync.rb
 - lib/teambox-things-sync/base.rb
+- lib/teambox-things-sync/cache/base_cache.rb
+- lib/teambox-things-sync/cache/task_list_cache.rb
+- lib/teambox-things-sync/cache/user_name_cache.rb
 - lib/teambox-things-sync/command.rb
 - lib/teambox-things-sync/config_store.rb
-- lib/teambox-things-sync/task_list_cache.rb
 - spec/spec_helper.rb
 - spec/teambox-things-sync/base_spec.rb
-- spec/teambox-things-sync/task_list_cache_spec.rb
+- spec/teambox-things-sync/cache/task_list_cache_spec.rb
+- spec/teambox-things-sync/cache/user_name_cache_spec.rb
 - spec/teambox-things-sync_spec.rb
 - teambox-things-sync.gemspec
 has_rdoc: true
@@ -122,5 +125,6 @@ summary: Simple ruby app for Teambox and Things.app syncing
 test_files: 
 - spec/spec_helper.rb
 - spec/teambox-things-sync/base_spec.rb
-- spec/teambox-things-sync/task_list_cache_spec.rb
+- spec/teambox-things-sync/cache/task_list_cache_spec.rb
+- spec/teambox-things-sync/cache/user_name_cache_spec.rb
 - spec/teambox-things-sync_spec.rb

data/lib/teambox-things-sync/task_list_cache.rb

@@ -1,17 +0,0 @@
-module TeamboxThingsSync
-  class TaskListCache
-  
-    def initialize(client, project_name)
-      @data = {}
-      @client = client
-      @project_name = project_name
-    end
-
-    def [](task_list_id)
-      if @data[task_list_id].nil?
-        @data[task_list_id] = @client.project_task_list(@project_name, task_list_id).name
-      end
-      @data[task_list_id]
-    end
-  end
-end

data/spec/teambox-things-sync/task_list_cache_spec.rb

@@ -1,5 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe "TeamboxThingsSync::TaskListCache" do
-  pending
-end