lib/todoist/sync/items.rb in todoist-ruby-0.2.3 vs lib/todoist/sync/items.rb in todoist-ruby-0.2.4

@@ -1,9 +1,9 @@
 module Todoist
   module Sync
     class Items < Todoist::Service
-        include Todoist::Util  
+        include Todoist::Util
 
         # Return a Hash of items where key is the id of a item and value is a item
         def collection
           return @client.api_helper.collection("items")
         end
@@ -18,90 +18,86 @@
           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 @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}
+          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}
+
+        # 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}
+
+        # 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.format_time(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 @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 @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 = {}
           items.each do |item|
             ids_to_orders[item.id] = item.day_order
           end
           args = {ids_to_orders: ids_to_orders.to_json}
           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 = {}
           items.each do |item|
             tuples[item.id] = [item.item_order, item.indent]
           end
           args = {ids_to_orders_indents: tuples.to_json}
           return @client.api_helper.command(args, "item_update_orders_indents")
         end
-      
+
     end
   end
 end