teamlab 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9594febbd8e305bc7a6a4e45ff080cfc909b937b
-  data.tar.gz: 5968c5d7a54068ba6a4459ca70ac353b19873c8a
+  metadata.gz: 64afc8919040b73a3bdaeac1f72f3cca5ceda8d8
+  data.tar.gz: 005141ed5f4a44c4ad2f3aba87325b7ee72020a3
 SHA512:
-  metadata.gz: 9b6777a144983c38ce7451542dcc516454f6257a9b296f9a3239f0a8afce474e39bbc30003525f1310a64524afd0b6aa12dd56920d03f1c02a748a6b16c2206a
-  data.tar.gz: 2583857a20007ade3d8aa913011ee4ec15e41f1bbb2e3bec2648d187d3fbdf52ad866355078bae3314126b5de80f113e4a7b05aea3b4a547d41253072bf9f41a
+  metadata.gz: 91ac731409f97cc4c7ed5219806dd56ad3cefb1f766cdf24fef04a26fa8cfdfd8b40a5516e6a93af88c7c88f100cf0d4fa49e30e7de406b22c1638598dd6a1e9
+  data.tar.gz: 9b86bffb6bf14a071c1c57edd3a18e3ea40a461905e533e81e327f806b927c90fb416ecb7939b8079c1452388bf7126fc3396555fb1afeead7b1f63938ebaf5b

data/lib/teamlab/Modules/Files.rb

@@ -5,89 +5,89 @@ module Teamlab
       @request = Teamlab::Request.new('files')
     end
 
-    def get_my_files
-      @request.get(['@my'])
-    end
+    #region File Creation
 
-    def get_trash
-      @request.get(['@trash'])
+    def create_txt_in_my_docs(title, content)
+      @request.post(%w(@my text), title: title.to_s, content: content.to_s)
     end
 
-    def get_folder(folder_id, options = {})
-      @request.get([folder_id.to_s], options)
+    def create_html_in_my_docs(title, content)
+      @request.post(%w(@my html), title: title.to_s, content: content.to_s)
     end
 
-    def new_folder(folder_id, title)
-      @request.post(['folder', folder_id.to_s], title: title)
+    def create_txt_in_common_docs(title, content)
+      @request.post(%w(@common text), title: title.to_s, content: content.to_s)
     end
 
-    def rename_folder(folder_id, title)
-      @request.put(['folder', folder_id.to_s], title: title)
+    def create_html_in_common_docs(title, content)
+      @request.post(%w(common html), title: title.to_s, content: content.to_s)
     end
 
-    def get_shared_docs
-      @request.get(['@share'])
-    end
-    def get_common_docs
-      @request.get(['@common'])
+    def create_txt(folder_id, title, content)
+      @request.post([folder_id.to_s, 'text'], title: title.to_s, content: content.to_s)
     end
 
-    def search(query)
-      @request.get(['@search', query.to_s])
+    def create_html(folder_id, title, content)
+      @request.post([folder_id.to_s, 'html'], title: title.to_s, content: content.to_s)
     end
 
-    def get_recent_uploaded_files(folder_id)
-      @request.get([folder_id.to_s, 'feeds'])
+    def create_file(folder_id, title)
+      @request.post([folder_id.to_s, 'file'], title: title.to_s)
     end
 
-    def generate_shared_link(file_id, share)
-      @request.put([file_id.to_s, 'sharedlink'], share: share)
-    end
+    #endregion
 
-    def upload_to_my_docs(file)
-      @request.post(%w(@my upload), somefile: File.new(file))
+    #region File operations
+
+    def get_file_operations_list
+      @request.get(%w(fileops))
     end
 
-    def upload_to_common_docs(file)
-      @request.post(%w(@common upload), somefile: File.new(file))
+    def check_conflict(options = {})
+      @request.get(%w(fileops move), options)
     end
 
-    def upload_to_folder(folder_id, file)
-      @request.post([folder_id.to_s, 'upload'], somefile: File.new(file))
+    def check_conversion_status(fileid)
+      @request.get(['fileops', fileid.to_s, 'checkconversion'])
     end
 
-    def chunked_upload(folder_id, filename, file_size)
-      @request.post([folder_id.to_s, 'upload', 'create_session'], fileName: filename, fileSize: file_size)
+    def move_to_folder(dest_folder_id, options = {})
+      @request.put(%w(fileops move), { destFolderId: dest_folder_id }.merge(options))
     end
+    alias_method :move_files, :move_to_folder
 
-    def create_txt_in_my_docs(title, content)
-      @request.post(%w(@my text), title: title.to_s, content: content.to_s)
+    def copy_to_folder(dest_folder_id, options = {})
+      @request.put(%w(fileops copy), { destFolderId: dest_folder_id }.merge(options))
     end
 
-    def create_html_in_my_docs(title, content)
-      @request.post(%w(@my html), title: title.to_s, content: content.to_s)
+    def delete(options = {})
+      @request.put(%w(fileops delete), options)
     end
 
-    def create_txt_in_common_docs(title, content)
-      @request.post(%w(@common text), title: title.to_s, content: content.to_s)
+    def finish_all
+      @request.put(%w(fileops terminate))
     end
 
-    def create_html_in_common_docs(title, content)
-      @request.post(%w(common html), title: title.to_s, content: content.to_s)
+    def mark_as_read
+      @request.put(%w(fileops markasread))
     end
 
-    def create_txt(folder_id, title, content)
-      @request.post([folder_id.to_s, 'text'], title: title.to_s, content: content.to_s)
+    def clear_recycle_bin
+      @request.put(%w(fileops emptytrash))
     end
 
-    def create_html(folder_id, title, content)
-      @request.post([folder_id.to_s, 'html'], title: title.to_s, content: content.to_s)
+    def finish_operations(options = {})
+      @request.put(%w(fileops bulkdownload), options)
     end
 
-    def create_file(folder_id, title)
-      @request.post([folder_id.to_s, 'file'], title: title.to_s)
+    def start_conversion(file_id, start)
+      @request.put(['file', file_id.to_s, 'checkconversion'], start: start)
     end
 
+    #endregion
+
+    #region Files
+
     def get_file_info(file_id)
       @request.get(['file', file_id.to_s])
     end
@@ -96,62 +96,67 @@ module Teamlab
       @request.get(['file', file_id.to_s, 'history'])
     end
 
-    def get_third_party_files(source, options = {})
-      @request.get(['settings', 'import', source.to_s, 'data'], options)
-    end
-
     def update_file_info(file_id, title, last_version)
       @request.put(['file', file_id.to_s], title: title, lastVersion: last_version)
     end
 
-    def finish_importing
-      @request.put(%w(settings import terminate))
+    def delete_file(file_id)
+      @request.delete(['file', file_id.to_s])
     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))
+    #endregion
+
+    #region Folders
+
+    def get_my_docs
+      @request.get(['@my'])
     end
+    alias_method :get_my_files, :get_my_docs
 
-    def delete_file(file_id)
-      @request.delete(['file', file_id.to_s])
+    def get_shared_docs
+      @request.get(['@share'])
     end
 
-    def delete_folder(folder_id)
-      @request.delete(['folder', folder_id.to_s])
+    def get_trash
+      @request.get(['@trash'])
     end
 
-    def get_file_operations_list
-      @request.get(%w(fileops))
+    def get_common_docs
+      @request.get(['@common'])
     end
 
-    def move_files(dest_folder_id, options = {})
-      @request.put(%w(fileops move), { destFolderId: dest_folder_id }.merge(options))
+    def get_projects_folder
+      @request.get(['@projects'])
     end
 
-    def copy_to_folder(dest_folder_id, options = {})
-      @request.put(%w(fileops copy), { destFolderId: dest_folder_id }.merge(options))
+    def get_folder(folder_id, options = {})
+      @request.get([folder_id.to_s], options)
     end
 
-    def delete(options = {})
-      @request.put(%w(fileops copy), options)
+    def get_folder_info(folder_id)
+      @request.get(['folder', folder_id.to_s])
     end
 
-    def finish_all
-      @request.put(%w(fileops terminate))
+    def get_folder_path(folder_id)
+      @request.get(['folder', folder_id.to_s, 'path'])
     end
 
-    def clear_recycle_bin
-      @request.put(%w(fileops emptytrash))
+    def new_folder(folder_id, title)
+      @request.post(['folder', folder_id.to_s], title: title)
     end
 
-    def mark_as_read
-      @request.put(%w(fileops markasread))
+    def rename_folder(folder_id, title)
+      @request.put(['folder', folder_id.to_s], title: title)
     end
 
-    def finish_operations(options = {})
-      @request.put(%w(fileops bulkdownload), options)
+    def delete_folder(folder_id)
+      @request.delete(['folder', folder_id.to_s])
     end
 
+    #endregion
+
+    #region Sharing
+
     def get_file_sharing(file_id)
       @request.get(['file', file_id.to_s, 'share'])
     end
@@ -161,28 +166,66 @@ module Teamlab
     end
 
     def share_file(file_id, user_id, access_type, options = {})
-      @request.put(['file', file_id.to_s, 'share'], { share: { shareTo: user_id, fileShare: access_type}.merge(options) })
+      @request.put(['file', file_id.to_s, 'share'], { share: { shareTo: user_id, fileShare: access_type } }.merge(options))
     end
 
     def share_folder(folder_id, user_id, access_type, options = {})
-      @request.put(['folder', folder_id.to_s, 'share'], { share: { shareTo: user_id, fileShare: access_type}.merge(options) })
+      @request.put(['folder', folder_id.to_s, 'share'], { share: { shareTo: user_id, fileShare: access_type } }.merge(options))
     end
 
-    def remove_file_sharing_rights(file_id, share_to_ids)
-      @request.delete(['file', file_id.to_s, 'share'], shareTo: share_to_ids)
+    def removes_sharing_rights(options = {})
+      @request.delete(['share'], options)
     end
 
-    def remove_folder_sharing_rights(folder_id, share_to_ids)
-      @request.delete(['folder', folder_id.to_s, 'share'], shareTo: share_to_ids)
-    end
+    #endregion
+
+    #region Third-Party Integration
 
     def get_third_party
       @request.get(%w(thirdparty))
     end
 
+    def save_third_party(options = {})
+      @request.post(%w(thirdparty), options)
+    end
+
     def remove_third_party_account(provider_id)
       @request.delete(['thirdparty', provider_id.to_s])
     end
 
+    #endregion
+
+    #region Uploads
+
+    def upload_to_my_docs(file)
+      @request.post(%w(@my upload), somefile: File.new(file))
+    end
+
+    def upload_to_common_docs(file)
+      @request.post(%w(@common upload), somefile: File.new(file))
+    end
+
+    def upload_to_folder(folder_id, file)
+      @request.post([folder_id.to_s, 'upload'], somefile: File.new(file))
+    end
+
+    def insert_file(folder_id, file, title)
+      @request.post([folder_id.to_s, 'insert'], somefile: File.new(file), title: title)
+    end
+
+    def chunked_upload(folder_id, filename, file_size)
+      @request.post([folder_id.to_s, 'upload', 'create_session'], fileName: filename, fileSize: file_size)
+    end
+
+    #endregion
+
+    def search(query)
+      @request.get(['@search', query.to_s])
+    end
+
+    def generate_shared_link(file_id, share)
+      @request.put([file_id.to_s, 'sharedlink'], share: share)
+    end
+
   end
-end
+end

data/lib/teamlab/Modules/Project.rb

@@ -35,6 +35,10 @@ module Teamlab
       @request.get([project_id.to_s, 'message'])
     end
 
+    def get_project_message(message_id)
+      @request.get(['message', message_id.to_s])
+    end
+
     def check_subscription_to_discussion(message_id) #есть тест
       @request.get(['message', message_id.to_s, 'subscribe'])
     end
@@ -84,7 +88,7 @@ module Teamlab
     end
 
     def detach_file_from_message(message_id, file_id) #есть тест
-      @request.delete(['task', message_id.to_s, 'files'], fileid: file_id)
+      @request.delete(['message', message_id.to_s, 'files'], fileid: file_id)
     end
 
     #endregion
@@ -108,7 +112,7 @@ module Teamlab
     end
 
     def add_message_comment(message_id, content, options = {}) #есть тест
-      @request.post(['task', message_id.to_s, 'comment'], { content: content }.merge(options))
+      @request.post(['message', message_id.to_s, 'comment'], { content: content }.merge(options))
     end
 
     def update_comment(comment_id, content) #есть тест
@@ -199,8 +203,8 @@ module Teamlab
       @request.post('', { title: title, description: description, responsibleid: responsible_id, tags: tags, private: private}.merge(options))
     end
 
-    def create_template(title)
-      @request.post(['template'], { title: title })
+    def create_template(title, options = {})
+      @request.post(['template'], { title: title }.merge(options))
     end
 
     def add_milestone(project_id, title, deadline, responsible_id, options = {})
@@ -320,7 +324,7 @@ module Teamlab
     end
 
     def get_all_tasks(project_id)
-      @request.get([project_id.to_s, 'task', '@all'])
+      @request.get([project_id.to_s, 'task'])
     end
 
     def check_subscription_to_task_action(task_id)

data/lib/teamlab/Modules/Settings.rb

@@ -26,6 +26,10 @@ module Teamlab
       @request.get(%w(security), ids: ids)
     end
 
+    def get_ip_restrictions
+      @request.get(%w(iprestrictions))
+    end
+
     def get_admin_security(product_id, user_id)
       @request.get(%w(security administrator), productid: product_id, userid: user_id)
     end
@@ -34,6 +38,14 @@ module Teamlab
       @request.get(['security', 'administrator', product_id.to_s])
     end
 
+    def sms_settings(enable)
+      @request.put(%w(sms), enable: enable)
+    end
+
+    def update_tips(show)
+      @request.put(%w(tips), show: show)
+    end
+
     def set_version(version_id)
       @request.put(%w(version), versionId: version_id)
     end
@@ -42,6 +54,10 @@ module Teamlab
       @request.put(%w(security), { id: id }.merge(options))
     end
 
+    def save_ip_restrictions(ips)
+      @request.put(%w(iprestrictions), ips: ips)
+    end
+
     def set_access(id, enabled = true)
       @request.put(%w(access), items: [id, enabled])
     end
@@ -49,5 +65,9 @@ module Teamlab
     def set_product_admin(product_id, user_id, administrator = true)
       @request.put(%w(security administrator), productid: product_id, userid: user_id, administrator: administrator)
     end
+
+    def update_ip_restrictions(enable)
+      @request.put(%w(iprestrictions settings), enable: enable)
+    end
   end
-end
+end

data/lib/teamlab/Request.rb

@@ -32,7 +32,7 @@ module Teamlab
     private
 
     def request(type, args)
-      command, opts = parse_args(args)
+      command, opts = parse_args(args, type)
       url = generate_request_url(command)
       attempts = 0
       begin
@@ -52,7 +52,7 @@ module Teamlab
       Teamlab.config.server + Teamlab.config.api_path + @api_additive + command
     end
 
-    def parse_args(args)
+    def parse_args(args, type)
       command = args.first.instance_of?(Array) ? '/' + args.shift.join('/') : args.shift.to_s
       opts = {}
       opts[:body] = args.last.instance_of?(Hash) ? args.pop : {}
@@ -61,6 +61,7 @@ module Teamlab
         opts[:query] = opts.delete(:body)
         opts[:detect_mime_type] = true
       end
+      opts[:query] = opts.delete(:body) if type == :get
       [command, opts]
     end
   end

data/lib/teamlab/version.rb

@@ -1,3 +1,3 @@
 module Teamlab
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

data/spec/support/http_data.rb

@@ -1,6 +1,6 @@
-SERVER = ''
-USERNAME = ''
-PASSWORD = ''
+SERVER = 'https://nctautotest-774487760-search-statistics-spec.teamlab.info'
+USERNAME = 'teamlab.ruby@gmail.com'
+PASSWORD = '123456'
 
 DATA_COLLECTOR = {}
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teamlab
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - rzagudaev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Ruby gem for TeamLab