teamlab 0.2.2 → 0.3.1

data/lib/teamlab/Modules/Calendar.rb

@@ -51,8 +51,8 @@ module Teamlab
       @request.post([calendar_id.to_s, 'event'], {name: name}.merge(options))
     end
 
-    def import_ical(calendar_id, *files)
-      @request.post([calendar_id.to_s, 'import'], files: files.flatten)
+    def import_ical(calendar_id, file)
+      @request.post([calendar_id.to_s, 'import'], somefile: File.new(file))
     end
 
 #============== TODO: OPTIONAL VARIABLES

data/lib/teamlab/Modules/Community.rb

@@ -214,10 +214,8 @@ module Teamlab
       @request.post(%w(wiki), {name: name.to_s, body: body.to_s})
     end
 
-#================================== TODO: UPLOAD FILES ================================
-
-    def upload_files(*files)
-      @request.post(%w(wiki file), files)
+    def upload_files(file)
+      @request.post(%w(wiki file), somefile: File.new(file))
     end
 
     def create_wiki_page_comment(page_name, content, options = {})

data/lib/teamlab/Modules/Crm.rb

@@ -577,10 +577,8 @@ module Teamlab
       @request.post([entity_type.to_s, entity_id.to_s, 'files', 'text'], title: title, content: content)
     end
 
-#================================== TODO: UPLOAD FILES ================================
-
-    def upload_file(entity_type, entity_id, *files)
-      @request.post([entity_type.to_s, entity_id.to_s, 'files', 'upload'], files)
+    def upload_file(entity_type, entity_id, file)
+      @request.post([entity_type.to_s, entity_id.to_s, 'files', 'upload'], somefile: File.new(file))
     end
 
     def delete_file(id)

data/lib/teamlab/Modules/Files.rb

@@ -45,44 +45,36 @@ module Teamlab
       @request.put([file_id.to_s, 'sharedlink'], share: share)
     end
 
-#================================== TODO: UPLOAD FILES ================================
-
-    def upload_to_my_docs(*files)
-      @request.post(['@my', 'upload'], files, headers: { 'Content-Type' => 'multipart/form-data' } ) #НЕ МАТАТ
+    def upload_to_my_docs(file)
+      @request.post(%w(@my upload), somefile: File.new(file))
     end
 
-#================================== TODO: UPLOAD FILES ================================
-
-    def upload_to_common_docs(*files)
-      @request.post(['@common', 'upload'], files, headers: { 'Content-Type' => 'multipart/form-data' } ) #НЕ МАТАТ
+    def upload_to_common_docs(file)
+      @request.post(%w(@common upload), somefile: File.new(file))
     end
 
-#================================== TODO: UPLOAD FILES ================================
-
-    def upload_to_folder(folder_id, *files)
-      @request.post([folder_id.to_s, 'upload'], files, headers: { 'Content-Type' => 'multipart/form-data' } ) #НЕ МАТАТ
+    def upload_to_folder(folder_id, file)
+      @request.post([folder_id.to_s, 'upload'], somefile: File.new(file))
     end
 
-#================================== TODO: UPLOAD FILES ================================
-
     def chunked_upload(folder_id, filename, file_size)
-      @request.post([folder_id.to_s, 'upload', 'create_session'], fileName: filename, fileSize: file_size) #НЕ МАТАТ
+      @request.post([folder_id.to_s, 'upload', 'create_session'], fileName: filename, fileSize: file_size)
     end
 
     def create_txt_in_my_docs(title, content)
-      @request.post(['@my', 'text'], title: title.to_s, content: content.to_s)
+      @request.post(%w(@my text), title: title.to_s, content: content.to_s)
     end
 
     def create_html_in_my_docs(title, content)
-      @request.post(['@my', 'html'], title: title.to_s, content: content.to_s)
+      @request.post(%w(@my html), title: title.to_s, content: content.to_s)
     end
 
     def create_txt_in_common_docs(title, content)
-      @request.post(['@common', 'text'], title: title.to_s, content: content.to_s)
+      @request.post(%w(@common text), title: title.to_s, content: content.to_s)
     end
 
     def create_html_in_common_docs(title, content)
-      @request.post(['@common', 'html'], title: title.to_s, content: content.to_s)
+      @request.post(%w(common html), title: title.to_s, content: content.to_s)
     end
 
     def create_txt(folder_id, title, content)

data/lib/teamlab/Request.rb

@@ -36,7 +36,7 @@ module Teamlab
       url = generate_request_url(command)
       attempts = 0
       begin
-        response = Teamlab::Response.new(HTTParty.send(type, url, opts))
+        response = Teamlab::Response.new(HTTMultiParty.send(type, url, opts))
       rescue TimeoutError
         attempts += 1
         retry if attempts < 3
@@ -56,10 +56,12 @@ module Teamlab
       command = args.first.instance_of?(Array) ? '/' + args.shift.join('/') : args.shift.to_s
       opts = {}
       opts[:body] = args.last.instance_of?(Hash) ? args.pop : {}
-      opts[:headers] = opts[:body][:headers] ? Teamlab.config.headers.merge(opts[:body].delete(:headers)) : Teamlab.config.headers
-      opts[:query] = opts.delete(:body) if opts[:body].key?(:somefile)
+      opts[:headers] = Teamlab.config.headers
+      if opts[:body].key?(:somefile)
+        opts[:query] = opts.delete(:body)
+        opts[:detect_mime_type] = true
+      end
       [command, opts]
     end
-
   end
 end

data/lib/teamlab/version.rb

@@ -1,3 +1,3 @@
 module Teamlab
-  VERSION = '0.2.2'
+  VERSION = '0.3.1'
 end

data/spec/lib/Teamlab_spec.rb

@@ -41,6 +41,72 @@ describe Teamlab do
     end
   end
 
+  describe 'Preparing enviroment' do
+    describe '#add_user' do
+      it_should_behave_like 'an api request' do
+        let(:teamlab_module) { :people }
+        let(:command) { :add_user }
+        let(:args) { [false, random_email, random_word.capitalize, random_word.capitalize] }
+        let(:add_data_to_collector) { true }
+        let(:data_param) { :user_ids }
+        let(:param_names) { %w(id) }
+      end
+    end
+
+    describe '#get_self' do
+      it_should_behave_like 'an api request' do
+        let(:teamlab_module) { :people }
+        let(:command) { :get_self }
+        let(:add_data_to_collector) { true }
+        let(:data_param) { :self_username }
+        let(:param_names) { %w(userName) }
+      end
+    end
+
+    describe '#get_my_files' do
+      it_should_behave_like 'an api request' do
+        let(:teamlab_module) { :files }
+        let(:command) { :get_my_files }
+        let(:add_data_to_collector) { true }
+        let(:data_param) { :my_documents_ids }
+        let(:param_names) { %w(current id) }
+      end
+    end
+
+    describe '#create_file' do
+      it_should_behave_like 'an api request' do
+        let(:teamlab_module) { :files }
+        let(:command) { :create_file }
+        let(:args) { [random_id(:my_documents), random_word] }
+        let(:add_data_to_collector) { true }
+        let(:data_param) { :file_ids }
+        let(:param_names) { %w(id) }
+      end
+    end
+
+    describe '#create_person' do
+      it_should_behave_like 'an api request' do
+        let(:teamlab_module) { :crm }
+        let(:command) { :create_person }
+        let(:args) { [random_word.capitalize, random_word.capitalize] }
+        let(:add_data_to_collector) { true }
+        let(:data_param) { :contact_ids }
+        let(:param_names) { %w(id) }
+      end
+    end
+
+    describe '#create_project' do
+      it_should_behave_like 'an api request' do
+        let(:teamlab_module) { :project }
+        let(:command) { :create_project }
+        let(:args) { [random_word, random_word, random_id(:user), random_word(3), random_bool] }
+        let(:add_data_to_collector) { true }
+        let(:data_param) { :project_ids }
+        let(:param_names) { %w(id) }
+      end
+    end
+  end
+
   describe '[People]' do
     let(:teamlab_module) { :people }
 
@@ -450,41 +516,38 @@ describe Teamlab do
       end
     end
 
-    #describe '#upload_to_my_docs' do
-    #  it_should_behave_like 'an api request' do
-    #    let(:command) { :upload_to_my_docs }
-    #    let(:args) { FILE_TO_UPLOAD }
-    #  end
-    #end
-    #
-    #describe '#upload_to_common_docs' do
-    #  it_should_behave_like 'an api request' do
-    #    let(:command) { :upload_to_common_docs }
-    #    let(:args) { FILE_TO_UPLOAD }
-    #  end
-    #end
-    #
-    #describe '#upload_to_folder' do
-    #  it_should_behave_like 'an api request' do
-    #    let(:command) { :upload_to_folder }
-    #    let(:args) { [random_id(:new_folder), FILE_TO_UPLOAD] }
-    #  end
-    #end
-    #
-    #describe '#chunked_upload' do
-    #  it_should_behave_like 'an api request' do
-    #    let(:command) { :chunked_upload }
-    #    let(:args) { [random_id(:new_folder), FILE_TO_UPLOAD] }
-    #  end
-    #end
+    describe '#upload_to_my_docs' do
+      it_should_behave_like 'an api request' do
+        let(:command) { :upload_to_my_docs }
+        let(:args) { FILES_FOR_UPLOAD.sample }
+      end
+    end
+
+    describe '#upload_to_common_docs' do
+      it_should_behave_like 'an api request' do
+        let(:command) { :upload_to_common_docs }
+        let(:args) { FILES_FOR_UPLOAD.sample }
+      end
+    end
+
+    describe '#upload_to_folder' do
+      it_should_behave_like 'an api request' do
+        let(:command) { :upload_to_folder }
+        let(:args) { [random_id(:new_folder), FILES_FOR_UPLOAD.sample] }
+      end
+    end
+
+    describe '#chunked_upload' do
+      it_should_behave_like 'an api request' do
+        let(:command) { :chunked_upload }
+        let(:args) { [random_id(:new_folder), File.basename(FILES_FOR_UPLOAD.sample), rand(1..50)] }
+      end
+    end
 
     describe '#create_txt_in_my_docs' do
       it_should_behave_like 'an api request' do
         let(:command) { :create_txt_in_my_docs }
         let(:args) { [random_word, random_word(rand(100))] }
-        #let(:add_data_to_collector) { true }
-        #let(:data_param) {:some_file_ids}
-        #let(:param_names) {%w(current id)}
       end
     end
 
@@ -492,9 +555,6 @@ describe Teamlab do
       it_should_behave_like 'an api request' do
         let(:command) { :create_html_in_my_docs }
         let(:args) { [random_word, random_word(rand(100))] }
-        #let(:add_data_to_collector) { true }
-        #let(:data_param) {:some_file_ids}
-        #let(:param_names) {%w(current id)}
       end
     end
 
@@ -502,9 +562,6 @@ describe Teamlab do
       it_should_behave_like 'an api request' do
         let(:command) { :create_txt_in_common_docs }
         let(:args) { [random_word, random_word(rand(100))] }
-        #let(:add_data_to_collector) { true }
-        #let(:data_param) {:some_file_ids}
-        #let(:param_names) {%w(current id)}
       end
     end
 
@@ -512,9 +569,6 @@ describe Teamlab do
       it_should_behave_like 'an api request' do
         let(:command) { :create_html_in_common_docs }
         let(:args) { [random_word, random_word(rand(100))] }
-        #let(:add_data_to_collector) { true }
-        #let(:data_param) {:some_file_ids}
-        #let(:param_names) {%w(current id)}
       end
     end
 
@@ -522,9 +576,6 @@ describe Teamlab do
       it_should_behave_like 'an api request' do
         let(:command) { :create_txt }
         let(:args) { [random_id(:new_folder), random_word, random_word(rand(100))] }
-        #let(:add_data_to_collector) { true }
-        #let(:data_param) {:some_file_ids}
-        #let(:param_names) {%w(current id)}
       end
     end
 
@@ -532,9 +583,6 @@ describe Teamlab do
       it_should_behave_like 'an api request' do
         let(:command) { :create_html }
         let(:args) { [random_id(:new_folder), random_word, random_word(rand(100))] }
-        #let(:add_data_to_collector) { true }
-        #let(:data_param) {:some_file_ids}
-        #let(:param_names) {%w(current id)}
       end
     end
 
@@ -2382,12 +2430,12 @@ describe Teamlab do
       end
     end
 
-    #describe '#upload_file' do
-    #  it_should_behave_like 'an api request' do
-    #    let(:command) { :upload_file }
-    #    let(:args) { [entity = ENTITY_TYPES.sample, random_id(entity.to_sym), 'files'] }
-    #  end
-    #end
+    describe '#upload_file' do
+      it_should_behave_like 'an api request' do
+        let(:command) { :upload_file }
+        let(:args) { [entity = ENTITY_TYPES.sample, random_id(entity.to_sym), FILES_FOR_UPLOAD.sample] }
+      end
+    end
 
     describe '#create_tag' do
       it_should_behave_like 'an api request' do
@@ -3442,7 +3490,6 @@ describe Teamlab do
 
     describe '#import_ical' do
       it_should_behave_like 'an api request' do
-        pending 'Upload File'
         let(:command) { :import_ical }
         let(:args) { [random_id(:calendar), CALENDAR_TO_UPLOAD] }
       end
@@ -3510,72 +3557,6 @@ describe Teamlab do
 
   describe '[Mail]' do
 
-    describe 'Preparing enviroment' do
-      describe '#add_user' do
-        it_should_behave_like 'an api request' do
-          let(:teamlab_module) { :people }
-          let(:command) { :add_user }
-          let(:args) { [false, random_email, random_word.capitalize, random_word.capitalize] }
-          let(:add_data_to_collector) { true }
-          let(:data_param) { :user_ids }
-          let(:param_names) { %w(id) }
-        end
-      end
-
-      describe '#get_self' do
-        it_should_behave_like 'an api request' do
-          let(:teamlab_module) { :people }
-          let(:command) { :get_self }
-          let(:add_data_to_collector) { true }
-          let(:data_param) { :self_username }
-          let(:param_names) { %w(userName) }
-        end
-      end
-
-      describe '#get_my_files' do
-        it_should_behave_like 'an api request' do
-          let(:teamlab_module) { :files }
-          let(:command) { :get_my_files }
-          let(:add_data_to_collector) { true }
-          let(:data_param) { :my_documents_ids }
-          let(:param_names) { %w(current id) }
-        end
-      end
-
-      describe '#create_file' do
-        it_should_behave_like 'an api request' do
-          let(:teamlab_module) { :files }
-          let(:command) { :create_file }
-          let(:args) { [random_id(:my_documents), random_word] }
-          let(:add_data_to_collector) { true }
-          let(:data_param) { :file_ids }
-          let(:param_names) { %w(id) }
-        end
-      end
-
-      describe '#create_person' do
-        it_should_behave_like 'an api request' do
-          let(:teamlab_module) { :crm }
-          let(:command) { :create_person }
-          let(:args) { [random_word.capitalize, random_word.capitalize] }
-          let(:add_data_to_collector) { true }
-          let(:data_param) { :contact_ids }
-          let(:param_names) { %w(id) }
-        end
-      end
-
-      describe '#create_project' do
-        it_should_behave_like 'an api request' do
-          let(:teamlab_module) { :project }
-          let(:command) { :create_project }
-          let(:args) { [random_word, random_word, random_id(:user), random_word(3), random_bool] }
-          let(:add_data_to_collector) { true }
-          let(:data_param) { :project_ids }
-          let(:param_names) { %w(id) }
-        end
-      end
-    end
-
     let(:teamlab_module) { :mail }
 
     describe '#create_tag' do
@@ -3637,39 +3618,39 @@ describe Teamlab do
 ########################################################################################################################
 ############################################### DELETING ###############################################################
 ########################################################################################################################
+  end
 
-    describe 'Cleaning enviroment' do
+  describe 'Cleaning enviroment' do
 
-      describe '#delete_file' do
-        it_should_behave_like 'an api request' do
-          let(:teamlab_module) { :files }
-          let(:command) { :delete_file }
-          let(:args) { [DATA_COLLECTOR[:file_ids].pop] }
-        end
+    describe '#delete_file' do
+      it_should_behave_like 'an api request' do
+        let(:teamlab_module) { :files }
+        let(:command) { :delete_file }
+        let(:args) { [DATA_COLLECTOR[:file_ids].pop] }
       end
+    end
 
-      describe '#delete_user' do
-        it_should_behave_like 'an api request' do
-          let(:teamlab_module) { :people }
-          let(:command) { :delete_user }
-          let(:args) { [DATA_COLLECTOR[:user_ids].pop] }
-        end
+    describe '#delete_user' do
+      it_should_behave_like 'an api request' do
+        let(:teamlab_module) { :people }
+        let(:command) { :delete_user }
+        let(:args) { [DATA_COLLECTOR[:user_ids].pop] }
       end
+    end
 
-      describe '#delete_contact' do
-        it_should_behave_like 'an api request' do
-          let(:teamlab_module) { :crm }
-          let(:command) { :delete_contact }
-          let(:args) { [DATA_COLLECTOR[:contact_ids].pop] }
-        end
+    describe '#delete_contact' do
+      it_should_behave_like 'an api request' do
+        let(:teamlab_module) { :crm }
+        let(:command) { :delete_contact }
+        let(:args) { [DATA_COLLECTOR[:contact_ids].pop] }
       end
+    end
 
-      describe '#delete_project' do
-        it_should_behave_like 'an api request' do
-          let(:teamlab_module) { :project }
-          let(:command) { :delete_project }
-          let(:args) { [DATA_COLLECTOR[:project_ids].pop] }
-        end
+    describe '#delete_project' do
+      it_should_behave_like 'an api request' do
+        let(:teamlab_module) { :project }
+        let(:command) { :delete_project }
+        let(:args) { [DATA_COLLECTOR[:project_ids].pop] }
       end
     end
   end

data/spec/support/http_data.rb

@@ -59,6 +59,30 @@ SETTINGS_FOR_TALK = { enabled: true }
 #region Files
 FILE_FOR_OPERATIONS_VERSION = 1
 FILES_SHARE_TYPES = %w(None ReadWrite Read Restrict)
+FILES_FOR_UPLOAD = %w(
+/mnt/data_share/Files/DOCX/AllDOCX/InternationalFoodCrisisAutosaved.docx
+/mnt/data_share/Files/DOCX/AllDOCX/dogs dont tell jokes bm.docx
+/mnt/data_share/Files/DOCX/AllDOCX/Demo-Hayden-Management.docx
+/mnt/data_share/Files/DOCX/AllDOCX/6 sınıf AAAAd.docx
+/mnt/data_share/Files/DOCX/AllDOCX/2010-2011 alparlan i.ö.o. 4.sınıf ingilizce 1.dönem.1yazılı sınzva.docx
+/mnt/data_share/Files/DOCX/AllDOCX/2.15.10TheEngagedUniversity.docx
+/mnt/data_share/Files/XLSX/ICO_IMAGES.xlsx
+/mnt/data_share/Files/XLSX/SmokeTopToolbar.xlsx
+/mnt/data_share/Files/XLSX/Hasil TO GANAPATYA.xlsx
+/mnt/data_share/Files/XLSX/FormulaDoc.xlsx
+/mnt/data_share/Files/XLSX/EML_IMAGES.xlsx
+/mnt/data_share/Files/PPTX/AllPPTX/Abiturientu_tolimesnis_mokymasis_2010.pptx
+/mnt/data_share/Files/PPTX/AllPPTX/Disney Magic 5-D.pptx
+/mnt/data_share/Files/PPTX/AllPPTX/Kutatasok_a_kozteruleten.pptx
+/mnt/data_share/Files/PPTX/AllPPTX/oouchida_booster.pptx
+/mnt/data_share/Files/PPTX/AllPPTX/RR_Customer_Deck_FINAL_11.23.09.pptx
+/mnt/data_share/Files/PPTX/AllPPTX/SMB_Forms_ThruPartner.pptx
+/mnt/data_share/Files/JPG/2flash5.jpg
+/mnt/data_share/Files/JPG/3flash6-a.jpg
+/mnt/data_share/Files/JPG/141_014.jpg
+/mnt/data_share/Files/JPG/5350678_085.jpg
+/mnt/data_share/Files/JPG/animal39_animated_70x80_020.jpg
+)
 #endregion
 
 #region Projects
@@ -91,6 +115,6 @@ EVENT_TYPES = %w(None News Order Advert AllNews Poll All)
 
 #region Calendar
 TIME_ZONES = %w(UTC)
-CALENDAR_TO_UPLOAD = 'path_to_file.ics'
+CALENDAR_TO_UPLOAD = '/mnt/data_share/Files/basic.ics'
 #endregion
 #endregion

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teamlab
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty