todoist-ruby 0.1.3 → 0.2.1

data/lib/todoist/misc/query.rb

@@ -5,14 +5,14 @@
 
 module Todoist
   module Misc
-    class Query
+    class Query < Todoist::Service
         include Todoist::Util 
 
         # Given an array of queries, return multiple results with key being the 
         # query results.  Query results have three key elements:  query, type, 
         # and data.  Data is where the items are stored.
         def queries(queries)
-          result = NetworkHelper.getResponse(Config::TODOIST_QUERY_COMMAND, 
+          result = @client.api_helper.get_response(Config::TODOIST_QUERY_COMMAND, 
             queries: queries.to_json)
           return ParseHelper.make_objects_as_hash(result, "query")
         end

data/lib/todoist/misc/quick.rb

@@ -1,12 +1,12 @@
 module Todoist
   module Misc
-    class Quick
+    class Quick < Todoist::Service
         include Todoist::Util 
 
         # Implementation of the Quick Add Task available in the official 
         # clients.
         def add_item(text)
-          result = NetworkHelper.getResponse(Config::TODOIST_QUICK_ADD_COMMAND, {text: text})
+          result = @client.api_helper.get_response(Config::TODOIST_QUICK_ADD_COMMAND, {text: text})
           return ParseHelper.make_object(result)
         end
 

data/lib/todoist/misc/templates.rb

@@ -1,6 +1,6 @@
 module Todoist
   module Misc
-    class Templates
+    class Templates < Todoist::Service
         include Todoist::Util  
         
         # Given a project and a File object (Ruby) imports the content onto the
@@ -8,21 +8,21 @@ module Todoist
         # suffix is CSV.  Otherwise, the file will be parsed as one item per line
         # and ignore the formatting altogether.
         def import_into_project(project, file)
-          multipart_file = NetworkHelper.multipart_file(file)
+          multipart_file = @client.api_helper.multipart_file(file)
           params = {project_id: project.id, file: multipart_file}
-          NetworkHelper.getMultipartResponse(Config::TODOIST_TEMPLATES_IMPORT_INTO_PROJECT_COMMAND, params)
+          @client.api_helper.get_multipart_response(Config::TODOIST_TEMPLATES_IMPORT_INTO_PROJECT_COMMAND, params)
         end
         
         # Export the project as a CSV string
         def export_as_file(project)
           params = {project_id: project.id}
-          NetworkHelper.getResponse(Config::TODOIST_TEMPLATES_EXPORT_AS_FILE_COMMAND, params)
+          @client.api_helper.get_response(Config::TODOIST_TEMPLATES_EXPORT_AS_FILE_COMMAND, params)
         end
         
         # Export the project as a url that can be accessed over HTTP
         def export_as_url(project)
           params = {project_id: project.id}
-          NetworkHelper.getResponse(Config::TODOIST_TEMPLATES_EXPORT_AS_URL_COMMAND, params)
+          @client.api_helper.get_response(Config::TODOIST_TEMPLATES_EXPORT_AS_URL_COMMAND, params)
         end
     end
   end

data/lib/todoist/misc/uploads.rb

@@ -1,13 +1,13 @@
 module Todoist
   module Misc
-    class Uploads
+    class Uploads < Todoist::Service
         include Todoist::Util  
         
         # Uploads a file given a Ruby File.
         def add(file)
-          multipart_file = NetworkHelper.multipart_file(file)
+          multipart_file = @client.api_helper.multipart_file(file)
           params = {file_name: File.basename(file), file: multipart_file}
-          NetworkHelper.getMultipartResponse(Config::TODOIST_UPLOADS_ADD_COMMAND, params)
+          @client.api_helper.get_multipart_response(Config::TODOIST_UPLOADS_ADD_COMMAND, params)
         end
         
         # Get uploads up to limit.  If last_id is entered, then the results list 
@@ -15,13 +15,13 @@ module Todoist
         def get(limit = 30, last_id = 0)
           params = {limit: limit}
           params["last_id"] = last_id if last_id
-          NetworkHelper.getResponse(Config::TODOIST_UPLOADS_GET_COMMAND, params)
+          @client.api_helper.get_response(Config::TODOIST_UPLOADS_GET_COMMAND, params)
         end
         
         # Deletes an upload given a file URL.
         def delete(file_url)
           params = {file_url: file_url}
-          NetworkHelper.getResponse(Config::TODOIST_UPLOADS_DELETE_COMMAND, params)
+          @client.api_helper.get_response(Config::TODOIST_UPLOADS_DELETE_COMMAND, params)
         end
     end
   end

data/lib/todoist/service.rb

@@ -0,0 +1,10 @@
+module Todoist
+  class Service    
+    include Todoist::Util 
+
+    def initialize(client)
+      @client = client
+    end
+    
+  end
+end

data/lib/todoist/sync/filters.rb

@@ -2,30 +2,30 @@
 
 module Todoist
   module Sync
-    class Filters
+    class Filters < Todoist::Service
         include Todoist::Util  
 
         # Return a Hash of filters where key is the id of a filter and value is a filter
         def collection
-          return ApiHelper.collection("filters")
+          return @client.api_helper.collection("filters")
         end
 
         # Add a filter with a given hash of attributes and returns the filter id.  
         # Please note that item_id is required as is a date as specific in the
         # documentation.  This method can be tricky to all.
         def add(args)
-          return ApiHelper.add(args, "filter_add")
+          return @client.api_helper.add(args, "filter_add")
         end
 
         # Update a filter given a hash of attributes
         def update(args)
-          return ApiHelper.command(args, "filter_update")
+          return @client.api_helper.command(args, "filter_update")
         end
 
         # Delete filter given an array of filters
         def delete(filter)
           args = {id: filter.id}
-          return ApiHelper.command(args, "filter_delete")
+          return @client.api_helper.command(args, "filter_delete")
         end
   
         # Update orders for an array of filters
@@ -35,7 +35,7 @@ module Todoist
             args[filter.id] = filter.item_order
           end
           args = {id_order_mapping: args.to_json}
-          return ApiHelper.command(args, "filter_update_orders")
+          return @client.api_helper.command(args, "filter_update_orders")
         end
 
 

data/lib/todoist/sync/items.rb

@@ -1,28 +1,28 @@
 module Todoist
   module Sync
-    class Items
+    class Items < Todoist::Service
         include Todoist::Util  
 
         # Return a Hash of items where key is the id of a item and value is a item
         def collection
-          return ApiHelper.collection("items")
+          return @client.api_helper.collection("items")
         end
 
         # Add a item with a given hash of attributes and returns the item id
         def add(args)
-          return ApiHelper.add(args, "item_add")
+          return @client.api_helper.add(args, "item_add")
         end
 
         # Update item given a hash of attributes
         def update(args)
-          return ApiHelper.command(args, "item_update")
+          return @client.api_helper.command(args, "item_update")
         end
 
         # Delete items given an array of items
         def delete(items)
           item_ids = items.collect { |item| item.id }   
           args = {ids: item_ids.to_json}
-          return ApiHelper.command(args, "item_delete")
+          return @client.api_helper.command(args, "item_delete")
         end
 
         # Move an item from one project to another project given an item and a project.
@@ -31,7 +31,7 @@ module Todoist
         def move(item, project)
           project_items = {item.project_id => [item.id]}
           args = {project_items: project_items, to_project: project.id}
-          return ApiHelper.command(args, "item_move")
+          return @client.api_helper.command(args, "item_move")
         end
         
         # Complete items and optionally move them to history given an array of items.  When force_history = 1,  items should be moved to history (where 1 is true and 0 is false, and the default is 1) This is useful when checking off sub items.
@@ -39,7 +39,7 @@ module Todoist
         def complete(items, force_history=1)
           item_ids = items.collect { |item| item.id }   
           args = {ids: item_ids.to_json, force_history: force_history}
-          return ApiHelper.command(args, "item_complete")
+          return @client.api_helper.command(args, "item_complete")
         end
         
         # Uncomplete items and move them to the active projects given an array 
@@ -48,7 +48,7 @@ module Todoist
         def uncomplete(items)
           item_ids = items.collect { |item| item.id }   
           args = {ids: item_ids.to_json}
-          return ApiHelper.command(args, "item_uncomplete")
+          return @client.api_helper.command(args, "item_uncomplete")
         end
         
         # Complete a recurring item given the id of the recurring item.  
@@ -62,14 +62,14 @@ module Todoist
           args = {id: item.id, is_forward: is_forward}
           if new_date_utc
              # Reformat DateTime to the following string:  YYYY-MM-DDTHH:MM
-            args["new_date_utc"] = ParseHelper.formatTime(new_date_utc)
+            args["new_date_utc"] = ParseHelper.format_time(new_date_utc)
           end
           
           if date_string
             args["date_string"] = date_string
           end
           
-          return ApiHelper.command(args, "item_update_date_complete")
+          return @client.api_helper.command(args, "item_update_date_complete")
         end
         
         # A simplified version of item_complete / item_update_date_complete. 
@@ -78,7 +78,7 @@ module Todoist
         
         def close(item)
           args = {id: item.id}
-          return ApiHelper.command(args, "item_close")
+          return @client.api_helper.command(args, "item_close")
         end
         
         # Update the day orders of multiple items at once given an array of 
@@ -89,7 +89,7 @@ module Todoist
             ids_to_orders[item.id] = item.day_order
           end
           args = {ids_to_orders: ids_to_orders.to_json}
-          return ApiHelper.command(args, "item_update_day_orders")
+          return @client.api_helper.command(args, "item_update_day_orders")
         end
         
         # Update orders and indents for an array of items
@@ -99,7 +99,7 @@ module Todoist
             tuples[item.id] = [item.item_order, item.indent]
           end
           args = {ids_to_orders_indents: tuples.to_json}
-          return ApiHelper.command(args, "item_update_orders_indents")
+          return @client.api_helper.command(args, "item_update_orders_indents")
         end
       
     end

data/lib/todoist/sync/labels.rb

@@ -1,27 +1,27 @@
 module Todoist
   module Sync
-    class Labels
+    class Labels < Todoist::Service
         include Todoist::Util  
 
         # Return a Hash of labels where key is the id of a label and value is a label
         def collection
-          return ApiHelper.collection("labels")
+          return @client.api_helper.collection("labels")
         end
 
         # Add a label with a given hash of attributes and returns the label id
         def add(args)
-          return ApiHelper.add(args, "label_add")
+          return @client.api_helper.add(args, "label_add")
         end
 
         # Update label given a hash of attributes
         def update(args)
-          return ApiHelper.command(args, "label_update")
+          return @client.api_helper.command(args, "label_update")
         end
 
         # Delete a label given a label
         def delete(label)
           args = {id: label.id}
-          return ApiHelper.command(args, "label_delete")
+          return @client.api_helper.command(args, "label_delete")
         end
 
         # Update orders for an array of labels
@@ -31,7 +31,7 @@ module Todoist
             args[label.id] = label.item_order
           end
           args = {id_order_mapping: args.to_json}
-          return ApiHelper.command(args, "label_update_orders")
+          return @client.api_helper.command(args, "label_update_orders")
         end
 
     end

data/lib/todoist/sync/notes.rb

@@ -1,29 +1,29 @@
 module Todoist
   module Sync
-    class Notes
+    class Notes < Todoist::Service
         include Todoist::Util  
 
         # Return a Hash of notes where key is the id of a note and value is a note
         def collection
-          return ApiHelper.collection("notes")
+          return @client.api_helper.collection("notes")
         end
 
         # Add a note with a given hash of attributes and returns the note id.  
         # Please note that item_id or project_id key is required.  In addition, 
         # content is also a required key in the hash.
         def add(args)
-          return ApiHelper.add(args, "note_add")
+          return @client.api_helper.add(args, "note_add")
         end
 
         # Update a note given a hash of attributes
         def update(args)
-          return ApiHelper.command(args, "note_update")
+          return @client.api_helper.command(args, "note_update")
         end
 
         # Delete notes given an a note
         def delete(note)
           args = {id: note.id}
-          return ApiHelper.command(args, "note_delete")
+          return @client.api_helper.command(args, "note_delete")
         end
 
       

data/lib/todoist/sync/projects.rb

@@ -2,43 +2,43 @@ module Todoist
   module Sync
     
 
-    class Projects
+    class Projects < Todoist::Service
       include Todoist::Util  
 
       # Return a Hash of projects where key is the id of a project and value is a project
       def collection
-        return ApiHelper.collection("projects")
+        return @client.api_helper.collection("projects")
       end
 
       # Add a project with a given hash of attributes and returns the project id
       def add(args)
-        return ApiHelper.add(args, "project_add")
+        return @client.api_helper.add(args, "project_add")
       end
 
       # Delete projects given an array of projects
       def delete(projects)
         project_ids = projects.collect { |project| project.id }   
         args = {ids: project_ids.to_json}
-        return ApiHelper.command(args, "project_delete")
+        return @client.api_helper.command(args, "project_delete")
       end
 
       # Archive projects given an array of projects
       def archive(projects)
         project_ids = projects.collect { |project| project.id }   
         args = {ids: project_ids.to_json}
-        return ApiHelper.command(args, "project_archive")
+        return @client.api_helper.command(args, "project_archive")
       end
 
       # Unarchive projects given an array of projects
       def unarchive(projects)
         project_ids = projects.collect { |project| project.id }   
         args = {ids: project_ids.to_json}
-        return ApiHelper.command(args, "project_unarchive")
+        return @client.api_helper.command(args, "project_unarchive")
       end
 
       # Update project given a hash of attributes
       def update(args)
-        return ApiHelper.command(args, "project_update")
+        return @client.api_helper.command(args, "project_update")
       end
 
       # Update orders and indents for an array of projects
@@ -48,7 +48,7 @@ module Todoist
           tuples[project.id] = [project.item_order, project.indent]
         end
         args = {ids_to_orders_indents: tuples.to_json}
-        return ApiHelper.command(args, "project_update_orders_indents")
+        return @client.api_helper.command(args, "project_update_orders_indents")
       end
 
     end

data/lib/todoist/sync/reminders.rb

@@ -1,35 +1,35 @@
 module Todoist
   module Sync
-    class Reminders
+    class Reminders < Todoist::Service
         include Todoist::Util  
 
         # Return a Hash of reminders where key is the id of a reminder and value is a reminder
         def collection
-          return ApiHelper.collection("reminders")
+          return @client.api_helper.collection("reminders")
         end
 
         # Add a reminder with a given hash of attributes and returns the reminder id.  
         # Please note that item_id is required as is a date as specific in the
         # documentation.  This method can be tricky to all.
         def add(args)
-          return ApiHelper.add(args, "reminder_add")
+          return @client.api_helper.add(args, "reminder_add")
         end
 
         # Update a reminder given a hash of attributes
         def update(args)
-          return ApiHelper.command(args, "reminder_update")
+          return @client.api_helper.command(args, "reminder_update")
         end
 
         # Delete reminder given an array of reminders
         def delete(reminder)
           args = {id: reminder.id}
-          return ApiHelper.command(args, "reminder_delete")
+          return @client.api_helper.command(args, "reminder_delete")
         end
 
         # Clear locations which is used for location reminders
         def clear_locations
           args = {}
-          return ApiHelper.command(args, "clear_locations")
+          return @client.api_helper.command(args, "clear_locations")
         end
     end
   end

data/lib/todoist/util/api_helper.rb

@@ -1,10 +1,9 @@
 require "net/http"
 require "json"
-require "todoist/util/config"
+require "todoist/config"
 require "todoist/util/network_helper"
 require "todoist/util/parse_helper"
 require "todoist/util/uuid"
-require "todoist/util/command_synchronizer"
 require "ostruct"
 require 'concurrent'
 
@@ -15,18 +14,21 @@ module Todoist
   module Util
 
     class ApiHelper
-      
-      @@object_cache = {"projects" => Concurrent::Hash.new({}), "labels" => Concurrent::Hash.new({}), 
+      def initialize(client)
+        @client = client
+        @object_cache = {"projects" => Concurrent::Hash.new({}), "labels" => Concurrent::Hash.new({}), 
         "items" => Concurrent::Hash.new({}), "notes" => Concurrent::Hash.new({}),
         "reminders" => Concurrent::Hash.new({}), "filters" => Concurrent::Hash.new({})
-      }
-      @@sync_token_cache = Concurrent::Hash.new({"projects" => "*", "labels" => "*", 
-        "items" => "*", "notes" => "*", "reminders" => "*", "filters" => "*"})
-
-      def self.collection(type)
-        CommandSynchronizer.sync
+        }
+        @sync_token_cache = Concurrent::Hash.new({"projects" => "*", "labels" => "*", 
+          "items" => "*", "notes" => "*", "reminders" => "*", "filters" => "*"})
+        @network_helper = NetworkHelper.new(client)
+      end
+      
+      def collection(type)
+        @network_helper.sync
         
-        response = getSyncResponse({sync_token: sync_token(type), resource_types: "[\"#{type}\"]"})
+        response = @network_helper.get_sync_response({sync_token: sync_token(type), resource_types: "[\"#{type}\"]"})
         response[type].each do |object_data|
            object = OpenStruct.new(object_data)
            objects(type)[object.id] = object
@@ -35,23 +37,24 @@ module Todoist
         return objects(type)
       end
       
-      def self.exec(args, command, temporary_resource_id)
+      def exec(args, command, temporary_resource_id)
         command_uuid = Uuid.command_uuid
         commands = {type: command, temp_id: temporary_resource_id, uuid: command_uuid, args: args}
-        response = getSyncResponse({commands: "[#{commands.to_json}]"})
+        response = @network_helper.get_sync_response({commands: "[#{commands.to_json}]"})
         raise RuntimeError, "Response returned is not ok" unless response["sync_status"][command_uuid] == "ok"
         return response
       end
       
-      def self.command(args, command)
+      def command(args, command)
         temporary_resource_id = Uuid.temporary_resource_id
         command_uuid = Uuid.command_uuid
         command = {type: command, temp_id: temporary_resource_id, uuid: command_uuid, args: args}
-        CommandSynchronizer.queue(command)
+        
+        @network_helper.queue(command)
         return true
       end
 
-      def self.add(args, command)
+      def add(args, command)
         temporary_resource_id = Uuid.temporary_resource_id
         command_uuid = Uuid.command_uuid
         command = {type: command, temp_id: temporary_resource_id, uuid: command_uuid, args: args}
@@ -60,28 +63,38 @@ module Todoist
             object.id = temp_id_mappings[temporary_resource_id] if temp_id_mappings[temporary_resource_id]
         end
         
-        CommandSynchronizer.queue(command, temp_id_callback)
+        @network_helper.queue(command, temp_id_callback)
         return object
       end
 
-      def self.getSyncResponse(params)
-        NetworkHelper.getResponse(Config::TODOIST_SYNC_COMMAND, params)
+      def get_response(command, params = {}, token = true)
+        @network_helper.get_response(command, params, token)
       end
 
-      protected
+      def get_multipart_response(command, params)
+        @network_helper.get_multipart_response(command, params)
+      end
 
+      def multipart_file(file) 
+        @network_helper.multipart_file(file)
+      end
 
+      def sync
+        @network_helper.sync  
+      end
+
+      protected
       
-      def self.objects(type)
-        @@object_cache[type]
+      def objects(type)
+        @object_cache[type]
       end
 
-      def self.sync_token(type)
-        @@sync_token_cache[type]
+      def sync_token(type)
+        @sync_token_cache[type]
       end
 
-      def self.set_sync_token(type, value)
-        @@sync_token_cache[type] = value
+      def set_sync_token(type, value)
+        @sync_token_cache[type] = value
       end
 
     end