teamlab 0.3.16 → 0.4.0

data/lib/teamlab/{Modules/Mail.rb → modules/mail.rb}

@@ -1,14 +1,13 @@
 module Teamlab
   class Mail
-
     def initialize
       @request = Teamlab::Request.new('mail')
     end
 
-    #region Messages
+    # region Messages
 
     def get_filtered_messages(page, options = {})
-      @request.get(%w(messages), {page: page}.merge(options))
+      @request.get(%w(messages), { page: page }.merge(options))
     end
 
     def get_message(id, options = {})
@@ -28,15 +27,15 @@ module Teamlab
     end
 
     def set_message_crm_status(emails, *user_ids)
-      @request.post(%w(messages update_crm), {emails: emails, userIds: user_ids.flatten})
+      @request.post(%w(messages update_crm), emails: emails, userIds: user_ids.flatten)
     end
 
     def attach_teamlab_document(message_id, file_id, options = {})
-      @request.post(['messages', message_id.to_s, 'document'], {fileId: file_id}.merge(options))
+      @request.post(['messages', message_id.to_s, 'document'], { fileId: file_id }.merge(options))
     end
 
     def set_message_status(status, *ids)
-      @request.put(%w(messages mark), {status: status, ids: ids.flatten})
+      @request.put(%w(messages mark), status: status, ids: ids.flatten)
     end
 
     def move_messages_to_folder(folder_id, *message_ids)
@@ -44,11 +43,11 @@ module Teamlab
     end
 
     def send_message(id, options = {})
-      @request.put(%w(messages send), {id: id}.merge(options))
+      @request.put(%w(messages send), { id: id }.merge(options))
     end
 
     def save_message(id, options = {})
-      @request.put(%w(messages save), {id: id}.merge(options))
+      @request.put(%w(messages save), { id: id }.merge(options))
     end
 
     def remove_messages(*ids)
@@ -75,25 +74,25 @@ module Teamlab
       @request.delete(['messages', message_id.to_s, 'attachments', attachment_id.to_s])
     end
 
-    #endregion
+    # endregion
 
-    #region HelpCenter
+    # region HelpCenter
 
     def get_html_of_help_center
       @request.get(%w(helpcenter))
     end
 
-    #endregion
+    # endregion
 
     def get_meail_signature(mailbox_id)
       @request.get(['signature', mailbox_id.to_s])
     end
 
     def update_signature(mailbox_id, html, options = {})
-      @request.post(['signature', 'update', mailbox_id.to_s], {html: html}.merge(options))
+      @request.post(['signature', 'update', mailbox_id.to_s], { html: html }.merge(options))
     end
 
-    #region Accounts
+    # region Accounts
 
     def get_account_list
       @request.get(%w(accounts))
@@ -108,19 +107,19 @@ module Teamlab
     end
 
     def create_account_with_custom_mail_service(name, email, account, password, options = {})
-      @request.post(%w(accounts), {name: name, email: email, account: account, password: password}.merge(options))
+      @request.post(%w(accounts), { name: name, email: email, account: account, password: password }.merge(options))
     end
 
     def create_oauth_account(email, token, options = {})
-      @request.post(%w(accounts oauth), {email: email, token: token}.merge(options))
+      @request.post(%w(accounts oauth), { email: email, token: token }.merge(options))
     end
 
     def create_account_by_email(email, password)
-      @request.post(%w(accounts simple), {email: email, password: password})
+      @request.post(%w(accounts simple), email: email, password: password)
     end
 
     def update_account(name, email, password, options = {})
-      @request.put(%w(accounts), {name: name, email: email, password: password}.merge(options))
+      @request.put(%w(accounts), { name: name, email: email, password: password }.merge(options))
     end
 
     def set_account_state(email, state)
@@ -134,12 +133,12 @@ module Teamlab
     def delete_account(email)
       @request.delete(['accounts', email.to_s])
     rescue
-      @request.delete(['accounts'], {email: email.to_s}) # for version 8.7
+      @request.delete(['accounts'], email: email.to_s) # for version 8.7
     end
 
-    #endregion
+    # endregion
 
-    #region Alerts
+    # region Alerts
 
     def get_alerts_list
       @request.get('alert')
@@ -149,9 +148,9 @@ module Teamlab
       @request.delete(['alert', id.to_s])
     end
 
-    #endregion
+    # endregion
 
-    #region Contacts
+    # region Contacts
 
     def get_contact_list_for_auto_complete(term)
       @request.get(%w(contacts), term: term)
@@ -161,9 +160,9 @@ module Teamlab
       @request.get(%w(crm linked entities), messageId: message_id)
     end
 
-    #endregion
+    # endregion
 
-    #region Conversations
+    # region Conversations
 
     def get_filtered_conversations(options = {})
       @request.get(%w(conversations), options)
@@ -213,9 +212,9 @@ module Teamlab
       @request.put(['conversations', 'tag', tag_id.to_s, 'unset'], messages: conversation_ids.flatten)
     end
 
-    #endregion
+    # endregion
 
-    #region Folders
+    # region Folders
 
     def get_folders(options = {})
       @request.get(%w(folders), options)
@@ -229,17 +228,17 @@ module Teamlab
       @request.get(['folders', folder_id.to_s, 'messages'])
     end
 
-    #endregion
+    # endregion
 
-    #region GUID
+    # region GUID
 
     def generate_custom_guid
       @request.get(%w(random_guid))
     end
 
-    #endregion
+    # endregion
 
-    #region IMAGES
+    # region IMAGES
 
     def get_trusted_addresses
       @request.get(%w(display_messages addresses))
@@ -253,20 +252,20 @@ module Teamlab
       @request.delete(%w(display_messages addresses), addres: address)
     end
 
-    #endregion
+    # endregion
 
-    #region Tags
+    # region Tags
 
     def get_tag_list
       @request.get(%w(tags))
     end
 
     def create_tag(name, options = {})
-      @request.post(%w(tags), {name: name}.merge(options))
+      @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))
+      @request.put(['tags', id.to_s], { name: name }.merge(options))
     end
 
     def set_tag_to_messages(id, *message_ids)
@@ -281,7 +280,6 @@ module Teamlab
       @request.delete(['tags', id.to_s])
     end
 
-    #endregion
+    # endregion
   end
 end
-

data/lib/teamlab/{Modules/People.rb → modules/people.rb}

@@ -1,7 +1,5 @@
 module Teamlab
-
   class People
-
     def initialize
       @request = Teamlab::Request.new('people')
     end
@@ -15,7 +13,7 @@ module Teamlab
     end
 
     def search_people(query)
-      @request.get(['search'], { query: query })
+      @request.get(['search'], query: query)
     end
 
     def filter_people(filters)
@@ -35,19 +33,19 @@ module Teamlab
     end
 
     def remind_password(user_id, email)
-      @request.get([user_id, 'password'], { email: email })
+      @request.get([user_id, 'password'], email: email)
     end
 
     def search_with_status(status, query)
-      @request.get(['status', status.to_s, 'search'], {query: query.to_s})
+      @request.get(['status', status.to_s, 'search'], query: query.to_s)
     end
 
     def add_user(is_visitor, email, firstname, lastname, options = {})
-      @request.post(nil , { isVisitor: is_visitor, email: email, firstname: firstname, lastname: lastname}.merge(options))
+      @request.post(nil, { isVisitor: is_visitor, email: email, firstname: firstname, lastname: lastname }.merge(options))
     end
 
     def active(options = {})
-      @request.post(['active'], options)          #требуется запиливание
+      @request.post(['active'], options) # TODO: need some fixing
     end
 
     def update_contacts(user_id, contacts = {})
@@ -55,35 +53,35 @@ module Teamlab
     end
 
     def send_invite(*user_ids)
-      @request.put(['invite'], { userIds: user_ids.flatten })
+      @request.put(['invite'], userIds: user_ids.flatten)
     end
 
     def delete(*user_ids)
-      @request.put(['delete'], { userIds: user_ids.flatten })
+      @request.put(['delete'], userIds: user_ids.flatten)
     end
 
     def update_user(user_id, is_visitor, email, firstname, lastname, options = {})
-      @request.put([user_id.to_s], { isVisitor: is_visitor, email: email, firstname: firstname, lastname: lastname}.merge(options) )
+      @request.put([user_id.to_s], { isVisitor: is_visitor, email: email, firstname: firstname, lastname: lastname }.merge(options))
     end
 
     def change_people_type(type, user_ids)
-      @request.put(['type', type.to_s], { userIds: user_ids })
+      @request.put(['type', type.to_s], userIds: user_ids)
     end
 
     def update_photo(user_id, path)
-      @request.put([user_id.to_s, 'photo'], { files: path })
+      @request.put([user_id.to_s, 'photo'], files: path)
     end
 
     def change_people_status(status, user_ids)
-      @request.put(['status', status], { userIds: user_ids })
+      @request.put(['status', status], userIds: user_ids)
     end
 
     def add_contacts(contacts, user_id)
-      @request.put([user_id, 'contacts'], { contacts: contacts })
+      @request.put([user_id, 'contacts'], contacts: contacts)
     end
 
     def link_account(profile)
-      @request.put([%w(thirdparty linkaccount)], { serializedProfile: profile })
+      @request.put([%w(thirdparty linkaccount)], serializedProfile: profile)
     end
 
     def delete_user(user_id)
@@ -95,11 +93,11 @@ module Teamlab
     end
 
     def delete_contacts(user_id, contacts)
-      @request.delete([user_id, 'contacts'], { contacts: contacts })
+      @request.delete([user_id, 'contacts'], contacts: contacts)
     end
 
     def unlink_account(provider)
-      @request.delete([%W(thirdparty unlinkaccount)], { provider: provider})
+      @request.delete([%w(thirdparty unlinkaccount)], provider: provider)
     end
   end
-end
+end

data/lib/teamlab/modules/portals.rb

@@ -0,0 +1,15 @@
+module Teamlab
+  class Portal
+    def initialize
+      @request = Teamlab::Request.new('portal')
+    end
+
+    def invite_user_url
+      @request.get(%w(users invite user))
+    end
+
+    def invite_visitor_url
+      @request.get(%w(users invite visitor))
+    end
+  end
+end

data/lib/teamlab/{Modules/Project.rb → modules/project.rb}

@@ -4,7 +4,7 @@ module Teamlab
       @request = Teamlab::Request.new('project')
     end
 
-    #region Import
+    # region Import
 
     def get_import_status
       @request.get(['import'])
@@ -12,26 +12,26 @@ module Teamlab
 
     def add_importing_url_to_queue(company_url, username, password, import_closed, disable_notifications, import_users_as_collaborators, projects = [])
       @request.post(%w(import), url: company_url, userName: username, password: password, importClosed: import_closed,
-      disableNotifications: disable_notifications, importUsersAsCollaborators: import_users_as_collaborators, projects: projects)
+                                disableNotifications: disable_notifications, importUsersAsCollaborators: import_users_as_collaborators, projects: projects)
     end
 
     def get_projects_for_import(url, username, password)
       @request.post(%w(import projects), url: url, userName: username, password: password)
     end
 
-    #endregion
+    # endregion
 
-    #region Discussions
+    # region Discussions
 
-    def get_latest_discussion_messages #есть тест
+    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
 
@@ -39,65 +39,65 @@ module Teamlab
       @request.get(['message', message_id.to_s])
     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 = {}) #есть тест
+    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 update_message_status(message_id, status)
-      @request.put(['message', message_id.to_s, 'status'], { status: status })
+      @request.put(['message', message_id.to_s, 'status'], status: status)
     end
 
-    def subscribe_to_message_action(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
 
-    #endregion
+    # endregion
 
-    #region Files
+    # region Files
 
-    def get_task_files(task_id) #есть тест
+    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(['message', message_id.to_s, 'files'], fileid: file_id)
     end
 
-    #endregion
+    # endregion
 
-    #region Comment
+    # region Comment
 
     def get_comment(comment_id)
       @request.get(['comment', comment_id.to_s])
@@ -111,25 +111,25 @@ 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(['message', 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
 
-    #endregion
+    # endregion
 
-    #region Report Template
+    # region Report Template
 
     def create_report_template(name, options = {})
       @request.post(['report'], { name: name }.merge(options))
@@ -143,9 +143,9 @@ module Teamlab
       @request.delete(['report', report_id.to_s])
     end
 
-    #endregion
+    # endregion
 
-    #region Projects
+    # region Projects
 
     def get_projects
       @request.get
@@ -204,7 +204,7 @@ module Teamlab
     end
 
     def create_project(title, description, responsible_id, tags, private, options = {})
-      @request.post('', { title: title, description: description, responsibleid: responsible_id, tags: tags, private: private}.merge(options))
+      @request.post('', { title: title, description: description, responsibleid: responsible_id, tags: tags, private: private }.merge(options))
     end
 
     def create_template(title, options = {})
@@ -212,7 +212,7 @@ module Teamlab
     end
 
     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))
+      @request.post([project_id.to_s, 'milestone'], { title: title, deadline: deadline, responsible: responsible_id }.merge(options))
     end
 
     def update_project_tags(id, tags)
@@ -243,7 +243,7 @@ module Teamlab
       @request.delete(['task', id.to_s])
     end
 
-    #endregion
+    # endregion
 
     def get_tasks_by_ids(*task_ids)
       @request.get(['task'], taskid: task_ids.flatten)
@@ -270,10 +270,10 @@ module Teamlab
     end
 
     def update_project_task(task_id, title, options = {})
-      @request.put(['task', task_id.to_s], {title: title.to_s}.merge(options))
+      @request.put(['task', task_id.to_s], { title: title.to_s }.merge(options))
     end
 
-    #region Team
+    # region Team
 
     def get_project_team(project_id)
       @request.get([project_id.to_s, 'team'])
@@ -299,9 +299,9 @@ module Teamlab
       @request.delete([project_id.to_s, 'team'], userId: user_id)
     end
 
-    #endregion
+    # endregion
 
-    #region Tasks
+    # region Tasks
 
     def get_my_tasks
       @request.get(%w(task @self))
@@ -344,7 +344,7 @@ module Teamlab
     end
 
     def create_subtask(task_id, responsible_id, title)
-      @request.post(['task', task_id.to_s], { responsible: responsible_id, title: title })
+      @request.post(['task', task_id.to_s], responsible: responsible_id, title: title)
     end
 
     def add_task(project_id, title, options = {})
@@ -379,9 +379,9 @@ module Teamlab
       @request.delete(['task', task_id.to_s, subtask_id.to_s])
     end
 
-    #endregion
+    # endregion
 
-    #region Contacts
+    # region Contacts
 
     def get_projects_for_contact(contact_id)
       @request.get(['contact', contact_id.to_s])
@@ -395,9 +395,9 @@ module Teamlab
       @request.delete([project_id.to_s, 'contact'], contactId: contact_id)
     end
 
-    #endregion
+    # endregion
 
-    #region Tags
+    # region Tags
 
     def get_project_tags
       @request.get(%w(tag))
@@ -411,7 +411,7 @@ module Teamlab
       @request.get(%w(tag search), tagName: tag_name)
     end
 
-    #endregion
+    # endregion
 
     def get_upcoming_milestones
       @request.get(%w(milestone))
@@ -481,4 +481,4 @@ module Teamlab
       @request.delete(%w(time times remove), timeIds: time_ids.flatten)
     end
   end
-end
+end

data/lib/teamlab/{Modules/Settings.rb → modules/settings.rb}

@@ -1,7 +1,5 @@
 module Teamlab
-
   class Settings
-
     def initialize
       @request = Teamlab::Request.new('settings')
     end
@@ -71,7 +69,7 @@ module Teamlab
     end
 
     def set_access(id, enabled = true)
-      @request.put(%w(security access), items:[{key: id, value: enabled}])
+      @request.put(%w(security access), items: [{ key: id, value: enabled }])
     end
 
     def set_product_admin(product_id, user_id, administrator = true)

data/lib/teamlab/{Request.rb → request.rb}

@@ -2,11 +2,11 @@ require 'net/http'
 require 'json'
 require 'httparty'
 require 'httmultiparty'
-require_relative 'Response'
+require_relative 'response'
 
 module Teamlab
   class Request
-    #include HTTParty
+    # include HTTParty
     include HTTMultiParty
 
     def initialize(api_additive)
@@ -42,9 +42,9 @@ module Teamlab
         retry if attempts < 3
         raise "Can't #{type} to #{url} because of TimeoutError: #{timeout_exception}"
       rescue Exception => e
-        fail e
+        raise e
       end
-      fail "Error #{response.code}: #{response.error.to_s}" unless response.success
+      fail "Error #{response.code}: #{response.error}" unless response.success
       response
     end
 
@@ -65,4 +65,4 @@ module Teamlab
       [command, opts]
     end
   end
-end
+end

data/lib/teamlab/{Response.rb → response.rb}

@@ -1,12 +1,10 @@
 module Teamlab
-
   class Response
-
     attr_reader :body, :error, :code, :success
 
     def initialize(http_response)
       if http_response.is_a?(String) && http_response.code < 400
-        @body = {:'response' => http_response.to_s}
+        @body = { response: http_response.to_s }
         @success = true
         @code = 201
       else
@@ -15,8 +13,8 @@ module Teamlab
         fail "Error #{@code}" if @code >= 400
         fail TimeoutError, 'Portal is warming up' if http_response.parsed_response.include?('portal is being warmed')
         @body = http_response.respond_to?(:parsed_response) && http_response.parsed_response.key?('result') ? http_response.parsed_response['result'] : http_response.to_hash
-        @error = @body['error']['message'] if @body.key?('error') && @body['error'].key?('message')      
+        @error = @body['error']['message'] if @body.key?('error') && @body['error'].key?('message')
       end
     end
   end
-end
+end

data/lib/teamlab/version.rb

@@ -1,3 +1,3 @@
 module Teamlab
-  VERSION = '0.3.16'
+  VERSION = '0.4.0'
 end