todoist-ruby 0.1.3 → 0.2.5

data/lib/todoist/misc/activity.rb

@@ -1,50 +1,40 @@
 module Todoist
   module Misc
-    class Activity
-        include Todoist::Util  
-        
-        # Returns the activity logs for a user.  Full list of supported 
-        # parameters outlined in the API here: https://developer.todoist.com/#activity
-        # The following objects are converted into parameters as appropriate:
-        #
-        # * object
-        # * parent_project
-        # * parent_item
-        # * initiator
-        # * until
-        # * since
-        
+    class Activity < Todoist::Service
+        include Todoist::Util
+
+        # Returns the activity logs for a user.  
+
         def get(params={})
           if params["until"]
-            params["until"] = ParseHelper.formatTime(params["until"])
+            params["until"] = ParseHelper.format_time(params["until"])
           end
-          
+
           if params["since"]
-            params["since"] = ParseHelper.formatTime(params["since"])
+            params["since"] = ParseHelper.format_time(params["since"])
           end
-          
+
           if params["object"]
             params["object_id"] = params["object"].id
             params.delete("object")
           end
-          
+
           if params["parent_object"]
             params["parent_object_id"] = params["parent_object"].id
             params.delete("parent_object")
           end
-          
+
           if params["parent_item"]
             params["parent_item_id"] = params["parent_item"].id
             params.delete("parent_item")
           end
-          
+
           if params["initiator"]
             params["initiator_id"] = params["initiator"].id
             params.delete("initiator")
           end
-            
-          result = NetworkHelper.getResponse(Config::TODOIST_ACTIVITY_GET_COMMAND, params)
-          ParseHelper.make_objects_as_hash(result)
+
+          result = @client.api_helper.get_response(Config::TODOIST_ACTIVITY_GET_COMMAND, params)
         end
     end
   end

data/lib/todoist/misc/backups.rb

@@ -1,11 +1,11 @@
 module Todoist
   module Misc
-    class Backups
+    class Backups < Todoist::Service
         include Todoist::Util  
         
         # Returns the backups for a user.
         def get()
-          result = NetworkHelper.getResponse(Config::TODOIST_BACKUPS_GET_COMMAND, {})
+          result = @client.api_helper.get_response(Config::TODOIST_BACKUPS_GET_COMMAND, {})
           ParseHelper.make_objects_as_hash(result)
         end
     end

data/lib/todoist/misc/completed.rb

@@ -1,12 +1,12 @@
 module Todoist
   module Misc
-    class Completed
+    class Completed < Todoist::Service
         include Todoist::Util  
         
         # Get productivity stats.  Returns a hash of statistics as documented
         # at https://developer.todoist.com/#get-productivity-stats
         def get_productivity_stats()
-          NetworkHelper.getResponse(Config::TODOIST_COMPLETED_GET_STATS_COMMAND)
+          @client.api_helper.get_response(Config::TODOIST_COMPLETED_GET_STATS_COMMAND, {})
         end
         
         # Retrieves all completed items as documented at 
@@ -17,13 +17,13 @@ module Todoist
         
         def get_all_completed_items(params = {})
           if params["until"]
-            params["until"] = ParseHelper.formatTime(params["until"])
+            params["until"] = ParseHelper.format_time(params["until"])
           end
           if params["since"]
-            params["since"] = ParseHelper.formatTime(params["since"])
+            params["since"] = ParseHelper.format_time(params["since"])
           end
           
-          result = NetworkHelper.getResponse(Config::TODOIST_COMPLETED_GET_ALL_COMMAND, params)
+          result = @client.api_helper.get_response(Config::TODOIST_COMPLETED_GET_ALL_COMMAND, params)
           items = ParseHelper.make_objects_as_array(result["items"])
           projects = ParseHelper.make_objects_as_array(result["projects"])
           return {"items" => items, "projects" => projects}

data/lib/todoist/misc/items.rb

@@ -1,6 +1,6 @@
 module Todoist
   module Misc
-    class Items
+    class Items < Todoist::Service
         include Todoist::Util  
         
         # Add a new task to a project. Note, that this is provided as a
@@ -29,8 +29,8 @@ module Todoist
             optional_params.delete("labels")
           end
 
-          params.merge(optional_params)
-          result = NetworkHelper.getResponse(Config::TODOIST_ITEMS_ADD_COMMAND, params)
+          params.merge!(optional_params)
+          result = @client.api_helper.get_response(Config::TODOIST_ITEMS_ADD_COMMAND, params)
           item = ParseHelper.make_object(result)
           return item
         end
@@ -43,7 +43,7 @@ module Todoist
         def get_item(item, all_data = true)
           params = {item_id: item.id, all_data: all_data}
           
-          result = NetworkHelper.getResponse(Config::TODOIST_ITEMS_GET_COMMAND, params)
+          result = @client.api_helper.get_response(Config::TODOIST_ITEMS_GET_COMMAND, params)
           item = ParseHelper.make_object(result["item"])
           project = ParseHelper.make_object(result["project"])
           notes = result["notes"] ? ParseHelper.make_objects_as_hash(result["notes"]) : nil

data/lib/todoist/misc/projects.rb

@@ -1,18 +1,18 @@
 module Todoist
   module Misc
-    class Projects
+    class Projects < Todoist::Service
         include Todoist::Util  
         
         # Get archived projects.  Returns projects as documented here.
         def get_archived_projects()
-          result = NetworkHelper.getResponse(Config::TODOIST_PROJECTS_GET_ARCHIVED_COMMAND)
+          result = @client.api_helper.get_response(Config::TODOIST_PROJECTS_GET_ARCHIVED_COMMAND)
           return ParseHelper.make_objects_as_hash(result)
         end
         
         # Gets project information including all notes.
         
         def get_project_info(project, all_data = true)
-          result = NetworkHelper.getResponse(Config::TODOIST_PROJECTS_GET_COMMAND, {project_id: project.id, all_data: true})
+          result = @client.api_helper.get_response(Config::TODOIST_PROJECTS_GET_COMMAND, {project_id: project.id, all_data: true})
           
           project = result["project"] ? ParseHelper.make_object(result["project"]) : nil
           notes = result["notes"] ? ParseHelper.make_objects_as_hash(result["notes"]) : nil
@@ -21,7 +21,7 @@ module Todoist
         
         # Gets a project's uncompleted items
         def get_project_data(project)
-          result = NetworkHelper.getResponse(Config::TODOIST_PROJECTS_GET_DATA_COMMAND, {project_id: project.id})
+          result = @client.api_helper.get_response(Config::TODOIST_PROJECTS_GET_DATA_COMMAND, {project_id: project.id})
           project = result["project"] ? ParseHelper.make_object(result["project"]) : nil
           items = result["items"] ? ParseHelper.make_objects_as_hash(result["items"]) : nil
           return {"project" => project, "items" => items}

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,87 +1,83 @@
 module Todoist
   module Sync
-    class Items
-        include Todoist::Util  
+    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 }   
+          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.
         # Note that move requires a fully inflated item object because it uses
         # the project id in the item object.
         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")
+          args = {id: item.id, project_id: project.id}
+          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.
-        
-        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")
+
+        # Complete an item and optionally move them to history.  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.
+
+        def complete(item, force_history=1)
+          args = {id: item.id, force_history: force_history}
+          return @client.api_helper.command(args, "item_complete")
         end
-        
-        # Uncomplete items and move them to the active projects given an array 
-        # of items.
-        
-        def uncomplete(items)
-          item_ids = items.collect { |item| item.id }   
-          args = {ids: item_ids.to_json}
-          return ApiHelper.command(args, "item_uncomplete")
+
+        # Uncomplete item and move them to the active projects
+
+        def uncomplete(item)
+          args = {id: item.id}
+          return @client.api_helper.command(args, "item_uncomplete")
         end
-        
-        # Complete a recurring item given the id of the recurring item.  
-        # This method also accepts as optional a new DateTime in UTC, a date 
-        # string to reset the object to, and whether or not the item is to 
-        # be completed or not using the is_forward flag. 
 
-        def complete_recurring(item, new_date_utc = nil, date_string = nil, 
+        # Complete a recurring item given the id of the recurring item.
+        # This method also accepts as optional a new DateTime in UTC, a date
+        # string to reset the object to, and whether or not the item is to
+        # be completed or not using the is_forward flag.
+
+        def complete_recurring(item, new_date_utc = nil, date_string = nil,
           is_forward = 1)
-  
+
           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["due"] = {date: ParseHelper.format_time(new_date_utc)}
           end
-          
+
           if date_string
-            args["date_string"] = date_string
+            args["due"] = {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. 
-        # The command does exactly what official clients do when you close a item 
+
+        # A simplified version of item_complete / item_update_date_complete.
+        # The command does exactly what official clients do when you close a item
         # given an item.
-        
+
         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 
+
+        # Update the day orders of multiple items at once given an array of
         # items
         def update_day_orders(items)
           ids_to_orders = {}
@@ -89,9 +85,9 @@ 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
         def update_multiple_orders_and_indents(items)
           tuples = {}
@@ -99,9 +95,9 @@ 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
   end
 end