gsquire 0.0.3 → 0.0.4

data/bin/gsquire

@@ -60,22 +60,10 @@ class App < Thor
 
       output = options.output.gsub /{account}/, account
       output << ".#{options.format}"
-      
+
       case fmt = options.format.to_sym
       when :json
         File.open(output, 'w') {|f| f.write JSON.pretty_generate result }
-=begin Yeah, I'm committing commented code, I feel bad.
-      when :dot, :png
-        graph = GraphViz.new 'Tasks', :type => :digraph
-        result.each do |tasklist|
-          list_node = graph.add_nodes tasklist['id'], :label => "#{tasklist['name']} (#{tasklist['id']})"
-          tasklist['tasks'].each do |task|
-            task_node = graph.add_nodes task['id'], :label => "#{task['name']} (#{task['id']})"
-            graph.add_edges task_node, list_node
-          end
-        end
-        graph.output(fmt => output)
-=end
       end
 
       task_count = result.inject(0) {|sum, h| sum += h[:tasks].size }
@@ -88,32 +76,18 @@ class App < Thor
   method_option :format, :aliases => '-f', :type => :string, :default => 'json', :desc => "Input file format (valid: #{INPUT_FORMATS.join(', ')})"
   method_option :pretend, :aliases => '-p', :type => :boolean, :default => false, :desc => "Run but do not make any changes"
   method_option :debug, :aliases => '-d', :type => :boolean, :default => false, :desc => "Turn on debugging"
-  #method_option :graph, :aliases => '-g', :type => :boolean, :default => false, :desc => "Generates a graph image of both the import and result sets"
   def import(account, input)
     if not INPUT_FORMATS.include? options.format
       say_status "export", "invalid format #{options.format}", :red
       exit 1
     end
 
-=begin I'm doing it again, fuck me.
-    if options.graph?
-      begin
-        require 'graphviz'
-      rescue LoadError
-        raise Thor::Error, "'ruby-graphviz' gem is required to generate a graph visualization"
-      end
-
-      graph_src = GraphViz.new 'Import', :type => :digraph
-      graph_dest = GraphViz.new 'Result', :type => :digraph
-    end
-=end
-
     tasklists = case options.format.to_sym
       when :json
         JSON.parse(File.read input)
       end
 
-    parents, orphans = prepare_tasklists!(tasklists)
+    tasklists, parents = prepare_import(tasklists)
 
     if options.pretend?
       client = nil
@@ -127,6 +101,8 @@ class App < Thor
       end
     end
 
+    id_mapping = {}
+
     total_tasks = 0
     tasklists.each do |tasklist|
       task_count = 0
@@ -138,34 +114,10 @@ class App < Thor
         new_tasklist = client.create_tasklist(tasklist)
       end
 
-=begin When you do it twice, you stop caring.
-      if options.graph?
-        graph_src.add_node(tasklist['id'])
-        graph_dest.add_node(new_tasklist['id'])
-      end
-=end
-
       debug "tasklist:create '#{new_tasklist['title']}' (#{new_tasklist['id']})"
 
       tasklist['tasks'].each do |task|
-        if orphans.include? task['id']
-          debug "skip: orphaned task #{task['title']} (#{task['id']})"
-          next
-        end
-
-        if task.has_key? 'parent'
-          if parents.fetch(task['parent'], :placeholder) == :placeholder
-            parent = tasklist['tasks'].find {|t| t['id'] == task['parent']}
-            tasks = [task, parent].map {|t| "#{t['id'].rjust(35)} #{t['position'].to_s.rjust(20)}" }.join("\n")
-            debug "skip: child called not yet initialized parent:\n#{tasks}"
-            next
-          end
-
-          debug "parent:rename #{task['parent']} #{parents[task['parent']]}"
-          task['parent'] = parents[task['parent']]
-        end
-
-        task['title'].strip!
+        task_id = task.delete 'id'
 
         if options.pretend?
           new_task = task.dup.update 'id' => "task-#{task_id_seq.next}"
@@ -173,14 +125,11 @@ class App < Thor
           new_task = client.create_task(task, new_tasklist['id'])
         end
 
-        debug "task:create '#{new_task['title']}' (#{new_task['id']}, #{task['id']})#{new_task['parent'] ? " [child of #{new_task['parent']}]" : ""}"
+        id_mapping[task_id] = { 'id' => new_task['id'], 'tasklist' => new_tasklist['id'] }
 
-        task_count += 1
+        debug "task:create '#{new_task['title']}' (#{new_task['id']}, #{task_id})#{new_task['parent'] ? " [child of #{new_task['parent']}]" : ""}"
 
-        if parents.include? task['id']
-          debug "trying to set parent id #{task['id']} twice" if parents[task['id']] != :placeholder
-          parents[task['id']] = new_task['id']
-        end
+        task_count += 1
       end
 
       total_tasks += task_count
@@ -192,6 +141,21 @@ class App < Thor
                pluralize(task_count, "task"))
     end
 
+    parents.each do |parent, children|
+      new_parent = id_mapping[parent]['id']
+
+      children.each do |id|
+        new_id = id_mapping[id]['id']
+        list_id = id_mapping[id]['tasklist']
+
+        unless options.pretend?
+          client.move_task new_id, list_id, :parent => new_parent
+        end
+
+        debug "task:move (#{id}, #{new_id}) tasklist (#{list_id}) children of (#{parent}, #{new_parent})"
+      end
+    end
+
     say_status "import:#{options.format}",
       format("%s [%s %s, %s %s]",
              cyan(account, :bold),
@@ -300,30 +264,30 @@ to get one and bring it here to him!
     say_status "debug", msg, :white if options.debug?
   end
 
-  # Handle parent-child relationships
-  def prepare_tasklists!(tasklists)
+  # Handle parent-child relationships and ordering
+  def prepare_import(tasklists)
     parents = {}
-    orphans = []
-    tasklist_ids = tasklists.map {|list| list['id'] }
-    tasklists.each do |tasklist|
-      task_ids = tasklist['tasks'].map {|task| task['id'] }
-      tasklist['tasks'].each do |task|
-        next unless task.has_key? 'parent'
-        if not task_ids.include?(task['parent'])
-          if tasklist_ids.include?(task['parent'])
-            task.delete 'parent'
-          else
-            orphans << task['id']
-          end
-        else
-          parents[task['parent']] ||= :placeholder
+    tasklists = tasklists.map do |list|
+      list_data = GSquire.resource(list).data
+      list_data.delete 'id'
+      # can't order by task['position'] since it doesn't reflect the actual order
+      # and inserts without the 'previous' parameter puts tasks on top like a stack
+      # so we need to revert the original task array
+      tasks = list['tasks'].reverse
+      list_data['tasks'] = tasks.map do |task|
+        task_data = GSquire.resource(task).data
+        if task_data.include? 'parent'
+          parents[task_data['parent']] ||= []
+          parents[task_data['parent']] << task_data['id']
+          task_data.delete 'parent'
         end
+        # we don't clear the 'id' attribute to be able to use it with parents hash later
+        task_data
       end
-
-      tasklist['tasks'].sort_by! {|t| t.include?('parent') ? 1 : 0 }
+      list_data
     end
 
-    [parents, orphans]
+    [tasklists, parents]
   end
 
   def id_seq

data/lib/gsquire/accounts/tasks_api_middleware.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'hashie'
+require 'gsquire/models'
 
 module GSquire
   class Accounts
@@ -23,7 +23,7 @@ module GSquire
       end
 
       def mash(hash)
-        Hashie::Mash.new hash
+        GSquire.resource hash
       end
 
       def content_type(env)

data/lib/gsquire/application.rb

@@ -6,7 +6,6 @@ require 'gsquire/accounts'
 require 'gsquire/logging'
 
 module GSquire
-  
   #
   # This is the entry-point class for GSquire. Clients should use it to implement applications that use GSquire.
   #

data/lib/gsquire/client.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 
+require 'cgi'
 require 'json'
 require 'uri'
 
@@ -12,66 +13,97 @@ module GSquire
 
     attr_accessor :oauth_token
 
+    # @param [OAuth2::AccessToken] Authorized oauth token
     def initialize(token)
       @oauth_token = token
     end
 
-    # Pulls all task lists for authorized user
-    # @return [Array] Array of task list hashes
+    # Pulls all tasklists for authorized user
+    # @return [Array] Array of tasklist hashes
     def tasklists
       get gtasks_tasklists_url
     end
 
-    # Pulls a task list
-    # @param [String] tasklist_id ('@default') Task list ID
-    # @return [Hash] task list
-    def tasklist(tasklist_id = '@default')
-      get gtasks_tasklist_url(tasklist_id)
+    # Pulls a tasklist
+    # @param [String] tasklist_id ('@default') Tasklist id
+    # @option opts [true|false] :pull_tasks (false) Pulls tasklist with all tasks preloaded in the `'tasks'` key
+    # @return [Hash] tasklist
+    def tasklist(tasklist_id = '@default', opts={})
+      tasklist = get gtasks_tasklist_url(tasklist_id)
+      tasklist['tasks'] = tasks tasklist_id if opts[:pull_tasks]
+      tasklist
     end
 
+    # Creates a tasklist
+    # @param [Hash] tasklist Tasklist data
     def create_tasklist(tasklist)
       post gtasks_tasklists_url, strip(:tasklist, :create, tasklist)
     end
 
+    # Updates a tasklist
+    # @param [Hash] tasklist Tasklist data
     def update_tasklist(tasklist)
       put gtasks_tasklist_url(tasklist[:id]), strip(:tasklist, :update, tasklist)
     end
 
+    # Deletes a tasklist
+    # @param [String] tasklist_id ('@default') Tasklist id
     def delete_tasklist(tasklist_id)
       delete gtasks_tasklist_url(tasklist_id)
     end
 
-    # Pulls all tasks of a task list
-    # @param [String] tasklist_id ('@default') Task list ID
+    # Pulls all tasks of a tasklist
+    # @param [String] tasklist_id ('@default') Tasklist id
     # @return [Array] Array of task hashes
     def tasks(tasklist_id = '@default')
       get gtasks_tasks_url(tasklist_id)
     end
 
-    # Pulls a task of a task list
-    # @param [String] task_id Task ID
-    # @param [String] tasklist_id ('@default') Task list ID
+    # Pulls a task of a tasklist
+    # @param [String] task_id Task id
+    # @param [String] tasklist_id ('@default') Tasklist id
     # @return [Hash] Task hash
     def task(task_id, tasklist_id = '@default')
       get gtasks_task_url(task_id, tasklist_id)
     end
 
+    # Creates a task in the given tasklist
+    # @param [Hash] task Task data
+    # @param [String] tasklist_id ('@default') Tasklist id
     def create_task(task, tasklist_id = '@default')
       post gtasks_tasks_url(tasklist_id), strip(:task, :create, task)
     end
 
+    # Moves a task inside the given tasklist
+    # @param [String] task_id Task id
+    # @param [String] tasklist_id ('@default') Tasklist id
+    # @option params [String] :parent Parent task id. Will move the task under the parent id
+    # @option params [String] :previous Previous task id. Will move the task to after the task with this id
+    def move_task(task_id, tasklist_id = '@default', params={})
+      return if params.empty?
+      post gtasks_task_move_url(task_id, tasklist_id, params)
+    end
+
     protected
 
     def get(url)
       _ oauth_token.get(url)
     end
 
-    def post(url, content)
-      _ oauth_token.post(url, body: content.to_json, headers: {'Content-Type' => 'application/json'})
+    def post(url, content={})
+      opts = {}
+      if not content.empty?
+        opts.merge!(body: content.to_json, headers: {'Content-Type' => 'application/json'})
+      end
+      _ oauth_token.post(url, opts)
     end
 
-    def put(url, content)
-      _ oauth_token.put(url, body: content.to_json, headers: {'Content-Type' => 'application/json'})
+    def put(url, content={})
+      opts = {}
+      if not content.empty?
+        opts.merge!(body: content.to_json, headers: {'Content-Type' => 'application/json'})
+      end
+      _ oauth_token.put(url, opts)
     end
 
     def delete(url)
@@ -94,6 +126,16 @@ module GSquire
       gtasks_urls(:task, tasklist_id, task_id)
     end
 
+    def gtasks_task_move_url(task_id, tasklist_id = '@default', params)
+      uri = gtasks_urls(:task_move, tasklist_id, task_id)
+      uri.query = params.collect { |k, v| "#{k.to_s}=#{CGI::escape(v.to_s)}" }.join('&')
+      uri
+    end
+
+    def gtasks_tasks_clear_url(tasklist_id = '@default')
+      gtasks_urls(:tasks_clear, tasklist_id)
+    end
+
     def gtasks_urls(resource, *params)
       segments = case resource
         when :tasklists
@@ -104,6 +146,10 @@ module GSquire
           "/lists/$/tasks"
         when :task
           "/lists/$/tasks/$"
+        when :task_move
+          "/lists/$/tasks/$/move"
+        when :tasks_clear
+          "/lists/$/clear"
       end.split('/')
       subpath = segments.map {|seg| seg == '$' ? params.shift : seg }.join('/')
       GOOGLE_TASKS_API.merge(GOOGLE_TASKS_API.path + subpath)

data/lib/gsquire/models.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+require 'gsquire/models/task'
+require 'gsquire/models/tasklist'
+
+module GSquire
+  RESOURCE_KINDS = {
+    "tasks#taskList" => Tasklist,
+    "tasks#task" => Task
+  }.freeze
+
+  class << self
+    def resource(hash)
+      return nil unless hash.include? 'kind'
+
+      unless RESOURCE_KINDS.include? hash['kind']
+        raise ArgumentError, "Unknown resource kind #{hash['kind'].inspect}"
+      end
+
+      RESOURCE_KINDS[hash['kind']].new(hash)
+    end
+  end
+end

data/lib/gsquire/models/task.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+require 'hashie'
+
+module GSquire
+  class Task < Hashie::Mash
+    DATA_ATTRIBUTES = %w[
+      id
+      title
+      parent
+      notes
+      status
+      due
+      completed
+      deleted
+      hidden
+    ].freeze
+
+    def data
+      select {|k,v| DATA_ATTRIBUTES.include? k }
+    end
+  end
+end

data/lib/gsquire/models/tasklist.rb

@@ -0,0 +1,16 @@
+# encoding: utf-8
+
+require 'hashie'
+
+module GSquire
+  class Tasklist < Hashie::Mash
+    DATA_ATTRIBUTES = %w[
+      id
+      title
+    ].freeze
+
+    def data
+      select {|k,v| DATA_ATTRIBUTES.include? k }
+    end
+  end
+end

data/lib/gsquire/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module GSquire
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gsquire
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-03 00:00:00.000000000Z
+date: 2012-01-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
-  requirement: &16757400 !ruby/object:Gem::Requirement
+  requirement: &13973740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *16757400
+  version_requirements: *13973740
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &16756920 !ruby/object:Gem::Requirement
+  requirement: &13973000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *16756920
+  version_requirements: *13973000
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &16756460 !ruby/object:Gem::Requirement
+  requirement: &13972540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *16756460
+  version_requirements: *13972540
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &16756080 !ruby/object:Gem::Requirement
+  requirement: &13972160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16756080
+  version_requirements: *13972160
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &16755620 !ruby/object:Gem::Requirement
+  requirement: &13971680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16755620
+  version_requirements: *13971680
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &16755200 !ruby/object:Gem::Requirement
+  requirement: &13971240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16755200
+  version_requirements: *13971240
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &16754780 !ruby/object:Gem::Requirement
+  requirement: &13970820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16754780
+  version_requirements: *13970820
 description: ! "Back in the Age of Heroes, GSquire would carry thy armor\n    and
   sword, would get thy lordship dressed and accompany in battle. He would\n    fight
   side by side with those who stood brave against the toughest of the\n    foes. These
@@ -119,6 +119,9 @@ files:
 - lib/gsquire/application.rb
 - lib/gsquire/client.rb
 - lib/gsquire/logging.rb
+- lib/gsquire/models.rb
+- lib/gsquire/models/task.rb
+- lib/gsquire/models/tasklist.rb
 - lib/gsquire/version.rb
 homepage: http://commita.com/community
 licenses: []