teamlab 0.1.4 → 0.2.1

data/lib/teamlab/Config.rb

@@ -8,8 +8,7 @@ module Teamlab
   def self.configure(&block)
     @config ||= Config.new
     yield @config if block_given?
-    @config.api_additive = 'authentication'
-    @config.token = Teamlab::Request.post('', {:userName => @config.username, :password => @config.password}).body['response']['token']
+    @config.token = Teamlab::Request.new('authentication').post('', {:userName => @config.username, :password => @config.password}).body['response']['token']
     @config.headers = { 'authorization' => @config.token}
   end
 

data/lib/teamlab/Modules/Calendar.rb

@@ -2,7 +2,7 @@ module Teamlab
   class Calendar
 
     def initialize
-      @request = Teamlab::Request
+      @request = Teamlab::Request.new('calendar')
     end
 
     def get_default_access

data/lib/teamlab/Modules/Community.rb

@@ -1,7 +1,7 @@
 module Teamlab
   class Community
     def initialize
-      @request = Teamlab::Request
+      @request = Teamlab::Request.new('community')
     end
 
     def get_all_posts

data/lib/teamlab/Modules/Crm.rb

@@ -2,7 +2,7 @@ module Teamlab
   class Crm
 
     def initialize
-      @request = Teamlab::Request
+      @request = Teamlab::Request.new('crm')
     end
 
     def get_all_opportunity_stages

data/lib/teamlab/Modules/Files.rb

@@ -2,7 +2,7 @@ module Teamlab
   class Files
 
     def initialize
-      @request = Teamlab::Request
+      @request = Teamlab::Request.new('files')
     end
 
     def get_my_files
@@ -41,8 +41,8 @@ module Teamlab
       @request.get([folder_id.to_s, 'feeds'])
     end
 
-    def get_share_link(file_id, share)
-      @request.put([file_id, 'sharedlink'], share: share)
+    def generate_shared_link(file_id, share)
+      @request.put([file_id.to_s, 'sharedlink'], share: share)
     end
 
 #================================== TODO: UPLOAD FILES ================================
@@ -117,6 +117,10 @@ module Teamlab
       @request.put(%w(settings import terminate))
     end
 
+    def import_from_third_party(source, folder_id, ignore_coincidence_files, data_to_import, options = {})
+      @request.put(['settings', 'import', source.to_s, 'data'], {folderId: folder_id.to_s, ignoreCoincidenceFiles: ignore_coincidence_files, dataToImport: data_to_import}.merge(options))
+    end
+
     def delete_file(file_id)
       @request.delete(['file', file_id.to_s])
     end
@@ -129,11 +133,11 @@ module Teamlab
       @request.get(%w(fileops))
     end
 
-    def move_files(dest_folder_id, options)
+    def move_files(dest_folder_id, options = {})
       @request.put(%w(fileops move), { destFolderId: dest_folder_id }.merge(options))
     end
 
-    def copy_to_folder(dest_folder_id, options)
+    def copy_to_folder(dest_folder_id, options = {})
       @request.put(%w(fileops copy), { destFolderId: dest_folder_id }.merge(options))
     end
 

data/lib/teamlab/Modules/Group.rb

@@ -3,7 +3,7 @@ module Teamlab
   class Group
 
     def initialize
-      @request = Teamlab::Request
+      @request = Teamlab::Request.new('group')
     end
 
     def get_groups

data/lib/teamlab/Modules/Mail.rb

@@ -2,7 +2,7 @@ module Teamlab
   class Mail
 
     def initialize
-      @request = Teamlab::Request
+      @request = Teamlab::Request.new('mail')
     end
 
     def get_message(id, options = {})
@@ -21,6 +21,8 @@ module Teamlab
       @request.delete(['accounts', email.to_s])
     end
 
+    #region Tags
+
     def get_tag_list
       @request.get(%w(tags))
     end
@@ -29,6 +31,23 @@ module Teamlab
       @request.post(%w(tags), {name: name}.merge(options))
     end
 
+    def update_tag(id, name, options = {})
+      @request.put(['tags', id.to_s], {name: name}.merge(options))
+    end
+
+    def set_tag_to_messages(id, *message_ids)
+      @request.put(['tags', id.to_s, 'set'], messages: message_ids.flatten)
+    end
+
+    def remove_tag_from_messages(id, *message_ids)
+      @request.put(['tags', id.to_s, 'remove'], messages: message_ids.flatten)
+    end
+
+    def delete_tag(id)
+      @request.delete(['tags', id.to_s])
+    end
+
+    #endregion
   end
 end
 

data/lib/teamlab/Modules/People.rb

@@ -3,7 +3,7 @@ module Teamlab
   class People
 
     def initialize
-      @request = Teamlab::Request
+      @request = Teamlab::Request.new('people')
     end
 
     def get_people
@@ -39,7 +39,7 @@ module Teamlab
     end
 
     def search_with_status(status, query)
-      @request.get(['status', status.to_s, '@search', query.to_s])
+      @request.get(['status', status.to_s, 'search'], {query: query.to_s})
     end
 
     def add_user(is_visitor, email, firstname, lastname, options = {})

data/lib/teamlab/Modules/Project.rb

@@ -1,9 +1,11 @@
 module Teamlab
   class Project
     def initialize
-      @request = Teamlab::Request
+      @request = Teamlab::Request.new('project')
     end
 
+    #region Import
+
     def get_import_status
       @request.get(['import'])
     end
@@ -17,66 +19,78 @@ module Teamlab
       @request.post(%w(import projects), url: url, userName: username, password: password)
     end
 
-    def get_latest_discussion_messages
+    #endregion
+
+    #region Discussions
+
+    def get_latest_discussion_messages #есть тест
       @request.get(['message'])
     end
 
-    def get_message_by_filter(options = {})
+    def get_message_by_filter(options = {}) #есть тест
       @request.get(%w(message filter), options)
     end
 
-    def get_messages(project_id)
+    def get_messages(project_id) #есть тест
       @request.get([project_id.to_s, 'message'])
     end
 
-    def check_subscription_to_discussion(message_id)
+    def check_subscription_to_discussion(message_id) #есть тест
       @request.get(['message', message_id.to_s, 'subscribe'])
     end
 
-    def add_message(project_id, title, content, participants, options = [])
-      @request.get([project_id.to_s, 'message'], { title: title, content: content, participants: participants }.merge(options))
+    def add_message(project_id, title, content, participants, options = {}) #есть тест
+      @request.post([project_id.to_s, 'message'], { title: title, content: content, participants: participants }.merge(options))
     end
 
-    def update_message(message_id, project_id, title, content, options = {})
+    def update_message(message_id, project_id, title, content, options = {}) #есть тест
       @request.put(['message', message_id.to_s], { projectid: project_id, title: title, content: content }.merge(options))
     end
 
-    def subscribe_to_message(message_id)
+    def subscribe_to_message_action(message_id) #есть тест
       @request.put(['message', message_id.to_s, 'subscribe'])
     end
 
-    def delete_message(message_id)
+    def delete_message(message_id) #есть тест
       @request.delete(['message', message_id.to_s])
     end
 
-    def get_task_files(task_id)
+    #endregion
+
+    #region Files
+
+    def get_task_files(task_id) #есть тест
       @request.get(['task', task_id.to_s, 'files'])
     end
 
-    def get_entity_files(entity_id, entity_type)
+    def get_entity_files(entity_id, entity_type) #есть тест
       @request.get([entity_id.to_s, 'entityfiles'], entityType: entity_type)
     end
 
-    def get_message_files(message_id)
+    def get_message_files(message_id) #есть тест
       @request.get(['message', message_id.to_s, 'files'])
     end
 
-    def upload_file_to_task(task_id, *files)
+    def upload_file_to_task(task_id, *files) #есть тест
       @request.post(['task', task_id.to_s, 'files'], files: files.flatten)
     end
 
-    def upload_file_to_message(message_id, *files)
+    def upload_file_to_message(message_id, *files) #есть тест
       @request.post(['message', message_id.to_s, 'files'], files: files.flatten)
     end
 
-    def detach_file_from_task(task_id, file_id)
+    def detach_file_from_task(task_id, file_id) #есть тест
       @request.delete(['task', task_id.to_s, 'files'], fileid: file_id)
     end
 
-    def detach_file_from_message(message_id, file_id)
+    def detach_file_from_message(message_id, file_id) #есть тест
       @request.delete(['task', message_id.to_s, 'files'], fileid: file_id)
     end
 
+    #endregion
+
+    #region Comment
+
     def get_comment(comment_id)
       @request.get(['comment', comment_id.to_s])
     end
@@ -89,27 +103,31 @@ module Teamlab
       @request.get(['message', message_id.to_s, 'comment'])
     end
 
-    def add_task_comment(task_id, content, options = {})
+    def add_task_comment(task_id, content, options = {}) #есть тест
       @request.post(['task', task_id.to_s, 'comment'], { content: content }.merge(options))
     end
 
-    def add_message_comment(message_id, content, options = {})
+    def add_message_comment(message_id, content, options = {}) #есть тест
       @request.post(['task', message_id.to_s, 'comment'], { content: content }.merge(options))
     end
 
-    def update_comment(comment_id, content)
+    def update_comment(comment_id, content) #есть тест
       @request.put(['comment', comment_id.to_s], content: content)
     end
 
-    def delete_comment(comment_id)
+    def delete_comment(comment_id) #есть тест
       @request.delete(['comment', comment_id.to_s])
     end
 
-    def create_report_template(name, options)
+    #endregion
+
+    #region Report Template
+
+    def create_report_template(name, options = {})
       @request.post(['report'], { name: name }.merge(options))
     end
 
-    def update_report_template(report_id, name, options)
+    def update_report_template(report_id, name, options = {})
       @request.put(['report', report_id.to_s], { name: name }.merge(options))
     end
 
@@ -117,6 +135,10 @@ module Teamlab
       @request.delete(['report', report_id.to_s])
     end
 
+    #endregion
+
+    #region Projects
+
     def get_projects
       @request.get
     end
@@ -129,11 +151,11 @@ module Teamlab
       @request.get(['@self'])
     end
 
-    def filter_projects(options)
+    def filter_projects(options = {})
       @request.get(['filter'], options)
     end
 
-    def followed_projects
+    def get_followed_projects
       @request.get(['@follow'])
     end
 
@@ -177,13 +199,12 @@ module Teamlab
       @request.post('', { title: title, description: description, responsibleid: responsible_id, tags: tags, private: private}.merge(options))
     end
 
-    def create_template(title, description)
-      @request.post(['template'], { title: title, description: description})
+    def create_template(title)
+      @request.post(['template'], { title: title })
     end
 
-    def add_milestone(project_id, title, deadline, is_key, is_notify, description, responsible, notify_responsible)
-      @request.post([project_id.to_s, 'milestone'], title: title, deadline: deadline, isKey: is_key, isNotify: is_notify,
-                              description: description, responsible: responsible, notifyResponsible: notify_responsible)
+    def add_milestone(project_id, title, deadline, responsible_id, options = {})
+      @request.post([project_id.to_s, 'milestone'], {title: title, deadline: deadline, responsible: responsible_id}.merge(options))
     end
 
     def update_project_tags(id, tags)
@@ -194,8 +215,8 @@ module Teamlab
       @request.put([id.to_s, 'status'], status: status)
     end
 
-    def update_template(id, title, description)
-      @request.put(['template', id.to_s], title: title, description: description)
+    def update_template(id, title)
+      @request.put(['template', id.to_s], title: title)
     end
 
     def follow_unfollow_project(project_id)
@@ -214,20 +235,22 @@ module Teamlab
       @request.delete(['task', id.to_s])
     end
 
-    def get_tasks_by_ids(task_ids)
-      @request.get(['task'], taskid: task_ids)
+    #endregion
+
+    def get_tasks_by_ids(*task_ids)
+      @request.get(['task'], taskid: task_ids.flatten)
     end
 
-    def get_task_order(id)
-      @request.get([id.to_s, 'order'])
+    def get_task_order(project_id)
+      @request.get([project_id.to_s, 'order'])
     end
 
     def get_simple_task_by_filter(project_id, options = {})
       @request.get(%w(task filter simple), { projectid: project_id }.merge(options))
     end
 
-    def add_link(task_id, options = {})
-      @request.post(['task', task_id.to_s, 'link'], options)
+    def add_link(parent_task_id, dependence_task_id, link_type)
+      @request.post(['task', parent_task_id.to_s, 'link'], dependenceTaskId: dependence_task_id, linkType: link_type)
     end
 
     def update_project(id, title, responsible_id, options = {})
@@ -242,12 +265,14 @@ module Teamlab
       @request.put(['task', task_id.to_s], {title: title.to_s}.merge(options))
     end
 
+    #region Team
+
     def get_project_team(project_id)
       @request.get([project_id.to_s, 'team'])
     end
 
-    def get_projects_teams(project_ids)
-      @request.post(%w(team), ids: project_ids)
+    def get_projects_teams(*project_ids)
+      @request.post(%w(team), ids: project_ids.flatten)
     end
 
     def add_to_team(project_id, user_id)
@@ -266,6 +291,10 @@ module Teamlab
       @request.delete([project_id.to_s, 'team'], userId: user_id)
     end
 
+    #endregion
+
+    #region Tasks
+
     def get_my_tasks
       @request.get(%w(task @self))
     end
@@ -290,7 +319,7 @@ module Teamlab
       @request.get(['task', task_id.to_s, 'notify'])
     end
 
-    def get_all_tasts(project_id)
+    def get_all_tasks(project_id)
       @request.get([project_id.to_s, 'task', '@all'])
     end
 

data/lib/teamlab/Modules/Settings.rb

@@ -3,7 +3,7 @@ module Teamlab
   class Settings
 
     def initialize
-      @request = Teamlab::Request
+      @request = Teamlab::Request.new('settings')
     end
 
     def get_settings
@@ -11,23 +11,23 @@ module Teamlab
     end
 
     def get_logo
-      @request.get(['logo'])
+      @request.get(%w(logo))
     end
 
     def get_usage_quota
-      @request.get(['quota'])
+      @request.get(%w('quota))
     end
 
     def get_version
-      @request.get(['version'])
+      @request.get(%w(version))
     end
 
     def get_security(ids = [])
-      @request.get(['security'], ids: ids)
+      @request.get(%w(security), ids: ids)
     end
 
     def get_admin_security(product_id, user_id)
-      @request.get(['security', 'administrator'], productid: product_id, userid: user_id)
+      @request.get(%w(security administrator), productid: product_id, userid: user_id)
     end
 
     def get_product_admin(product_id)
@@ -35,19 +35,19 @@ module Teamlab
     end
 
     def set_version(version_id)
-      @request.put(['version'], versionId: version_id)
+      @request.put(%w(version), versionId: version_id)
     end
 
     def set_security(id, options = {})
-      @request.put(['security'], { id: id }.merge(options))
+      @request.put(%w(security), { id: id }.merge(options))
     end
 
     def set_access(id, enabled = true)
-      @request.put(['access'], items: [id, enabled])
+      @request.put(%w(access), items: [id, enabled])
     end
 
     def set_product_admin(product_id, user_id, administrator = true)
-      @request.put(['security', 'administrator'], productid: product_id, userid: user_id, administrator: administrator)
+      @request.put(%w(security administrator), productid: product_id, userid: user_id, administrator: administrator)
     end
   end
 end

data/lib/teamlab/Request.rb

@@ -9,25 +9,29 @@ module Teamlab
     #include HTTParty
     include HTTMultiParty
 
-    def self.post(*args)
+    def initialize(api_additive)
+      @api_additive = api_additive.to_s
+    end
+
+    def post(*args)
       request(:post, args)
     end
 
-    def self.get(*args)
+    def get(*args)
       request(:get, args)
     end
 
-    def self.put(*args)
+    def put(*args)
       request(:put, args)
     end
 
-    def self.delete(*args)
+    def delete(*args)
       request(:delete, args)
     end
 
     private
 
-    def self.request(type, args)
+    def request(type, args)
       command, opts = parse_args(args)
       url = generate_request_url(command)
       attempts = 0
@@ -44,11 +48,11 @@ module Teamlab
       response
     end
 
-    def self.generate_request_url(command)
-      Teamlab.config.server + Teamlab.config.api_path + Teamlab.config.api_additive + command
+    def generate_request_url(command)
+      Teamlab.config.server + Teamlab.config.api_path + @api_additive + command
     end
 
-    def self.parse_args(args)
+    def parse_args(args)
       command = args.first.instance_of?(Array) ? '/' + args.shift.join('/') : args.shift.to_s
       opts = {}
       opts[:body] = args.last.instance_of?(Hash) ? args.pop : {}

data/lib/teamlab/version.rb

@@ -1,3 +1,3 @@
 module Teamlab
-  VERSION = '0.1.4'
+  VERSION = '0.2.1'
 end

data/lib/teamlab.rb

@@ -15,47 +15,38 @@ require_relative 'teamlab/Modules/Mail'
 module Teamlab
 
   def self.people
-    Teamlab.config.api_additive = 'people'
     @people ||= Teamlab::People.new
   end
 
   def self.group
-    Teamlab.config.api_additive = 'group'
     @group ||= Teamlab::Group.new
   end
 
   def self.settings
-    Teamlab.config.api_additive = 'settings'
     @settings ||= Teamlab::Settings.new
   end
 
   def self.files
-    Teamlab.config.api_additive = 'files'
     @files ||= Teamlab::Files.new
   end
 
   def self.project
-    Teamlab.config.api_additive = 'project'
     @project ||= Teamlab::Project.new
   end
 
   def self.crm
-    Teamlab.config.api_additive = 'crm'
     @crm ||= Teamlab::Crm.new
   end
 
   def self.community
-    Teamlab.config.api_additive = 'community'
     @community ||= Teamlab::Community.new
   end
 
   def self.calendar
-    Teamlab.config.api_additive = 'calendar'
     @calendar ||= Teamlab::Calendar.new
   end
 
   def self.mail
-    Teamlab.config.api_additive = 'mail'
     @mail ||= Teamlab::Mail.new
   end
 end