wrike3 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdfbff43092737af55163a57073f3a8337181691
-  data.tar.gz: c63f04c136f47ecd0246d718e0da16f2cc33bd05
+  metadata.gz: 6730c885c7485faeecd911bd9507eca5ec2e4e78
+  data.tar.gz: 19a45be13b7f254c1a4b8ebed370528f85ce2ac4
 SHA512:
-  metadata.gz: 9d0a5a2acd8325edead1f4381944fca694feff891fe11090dea4177ebc54e2ad4ebaf514015878e6ab3da6dfbaf522052b9438816159b64ce038dff63d671bf2
-  data.tar.gz: 16dd2ab76eac0b3078159a588ee8aaf2663be35a84c93a3ca2bb9b7308fa3ed54b572c800c18d16c20e0ffdfca3a3bb720915dafdf073650ab0e0314734dfd7b
+  metadata.gz: 521c81c0174a56a342009fe6435fcdd763d80aaf452d02a9c1fd498dea8bb991a7cb9c8e1234e08373c209a29a02466ac16af78a2a1b69fbc88478cd1d36548d
+  data.tar.gz: 728d95421482246b203150fb287d0e33d0b89353439f3f34dde13e6d91e640e046d8ea406ea83b793c455d5d6ffeceab8ef76413b954dd4f1807fa30535fa817

data/lib/wrike3/account.rb

@@ -7,17 +7,17 @@ module Wrike3
     end
 
     # Get account list
-    def list(options = {})
-      wrike.execute(:get, api_url('accounts'), options)
+    def list(params = {})
+      wrike.execute(:get, api_url('accounts'), params)
     end
 
-    def details(id, options={})
-      wrike.execute(:get, api_url("accounts/#{id}"), options)
+    def details(id, params = {})
+      wrike.execute(:get, api_url("accounts/#{id}"), params)
     end
 
     # Update account
-    def update(id, data = {}, options={})
-      wrike.execute(:put, api_url("accounts/#{id}"), options.merge(data))
+    def update(id, params = {})
+      wrike.execute(:put, api_url("accounts/#{id}"), params)
     end
   end
 end

data/lib/wrike3/attachment.rb

@@ -6,29 +6,29 @@ module Wrike3
       @wrike = wrike
     end
 
-    def list(attachable_type = nil, attachable_id = nil, options={})
-      wrike.execute(:get, api_url(nested_path('attachments', attachable_type, attachable_id)), options)
+    def list(attachable_type = nil, attachable_id = nil, params = {})
+      wrike.execute(:get, api_url(nested_path('attachments', attachable_type, attachable_id)), params)
     end
 
     # Get attachment details
-    def details(id, options={})
-      wrike.execute(:get, api_url("attachments/#{id}"), options)
+    def details(id, params = {})
+      wrike.execute(:get, api_url("attachments/#{id}"), params)
     end
     
     # Upload attachment for specified task
-    def upload(attachable_type, attachable_id, stream, options={})
+    def upload(attachable_type, attachable_id, stream)
       body, headers = http_multipart_data({:stream => stream})
       wrike.execute(:post, api_url(nested_path('attachments', attachable_type, attachable_id)), body, headers)
     end
 
     # Get file binary stream
-    def download(id, options={})
-      wrike.execute(:get, api_url("attachments/#{id}/download"), options)
+    def download(id, params = {})
+      wrike.execute(:get, api_url("attachments/#{id}/download"), params)
     end
 
     # Delete attachments
-    def delete(id, options={})
-      wrike.execute(:delete, api_url("attachments/#{id}"), options)
+    def delete(id, params = {})
+      wrike.execute(:delete, api_url("attachments/#{id}"), params)
     end
   end
 end

data/lib/wrike3/base.rb

@@ -58,24 +58,27 @@ module Wrike3
       @token ||= Wrike3::Token.new(self)
     end
 
-    def auth_headers(options = {})
-      options.merge!('Authorization' => "Bearer #{Wrike3.access_token}")
-      options
-    end
-
     def execute(method, url, parameters = {}, request_headers = {}, include_auth_header = true)
-      request_headers = self.auth_headers(request_headers) if include_auth_header
-      response = HTTParty.send(method.to_s, build_query_with_url(url, parameters), headers: request_headers)
+      request_headers = auth_headers(request_headers) if include_auth_header
+      response = HTTParty.send(method.to_s, url, {:query => to_j(parameters), headers: request_headers})
       response.parsed_response
     end
 
     private
 
-    def build_query_with_url(url, parameters = {})
-      query = []
-      parameters.each { |item| query << "#{item.first.to_s}=#{item.last.to_s}" }
-      url = "#{url}?#{query.join('&')}" if query.any?
-      URI.parse(URI.encode(url))
+    def to_j(parameters = {})
+      parameters.each do |item|
+        if item.last.is_a?(Hash) || item.last.is_a?(Array)
+          parameters[item.first.to_s] = item.last.to_json
+        end
+      end
+
+      parameters
+    end
+
+    def auth_headers(options = {})
+      options.merge!('Authorization' => "Bearer #{Wrike3.access_token}")
+      options
     end
   end
 

data/lib/wrike3/comment.rb

@@ -7,30 +7,30 @@ module Wrike3
     end
 
     # Returns list of comments
-    def list(account_id = nil, options={})
+    def list(account_id = nil, params={})
       path = 'comments'
       path = "accounts/#{account_id}/#{path}" if account_id.present?
-      wrike.execute(:get, api_url(path), options)
+      wrike.execute(:get, api_url(path), params)
     end
 
     # Returns list of comments
-    def details(id, options={})
-      wrike.execute(:get, api_url("comments/#{id}"), options)
+    def details(id, params = {})
+      wrike.execute(:get, api_url("comments/#{id}"), params)
     end
 
     # Add a new comment to a task
-    def add(commentable_type, commentable_id, data = {}, options={})
-      wrike.execute(:post, api_url(nested_path('comments', commentable_type, commentable_id)), options.merge(data))
+    def add(commentable_type, commentable_id, params = {})
+      wrike.execute(:post, api_url(nested_path('comments', commentable_type, commentable_id)), params)
     end
 
     # Update a comment
-    def update(id, data = {}, options={})
-      wrike.execute(:put, api_url("comments/#{id}"), options.merge(data))
+    def update(id, params = {})
+      wrike.execute(:put, api_url("comments/#{id}"), params)
     end
 
     # Delete a comment
     def delete(id)
-      wrike.execute(:delete, api_url("comments/#{id}"), options)
+      wrike.execute(:delete, api_url("comments/#{id}"))
     end
 
   end

data/lib/wrike3/contact.rb

@@ -6,12 +6,12 @@ module Wrike3
       @wrike = wrike
     end
 
-    def list(options = {})
-      wrike.execute(:get, api_url('contacts'), options)
+    def list(params = {})
+      wrike.execute(:get, api_url('contacts'), params)
     end
 
-    def details(ids, options = {})
-      wrike.execute(:get, api_url("contacts/#{ids}"), options)
+    def details(ids, params = {})
+      wrike.execute(:get, api_url("contacts/#{ids}"), params)
     end
   end
 end

data/lib/wrike3/folder.rb

@@ -6,29 +6,29 @@ module Wrike3
       @wrike = wrike
     end
 
-    def tree(folderable_type = nil, folderable_id = nil, options = {})
-      wrike.execute(:get, api_url(nested_path('folders', folderable_type, folderable_id)), options)
+    def tree(folderable_type = nil, folderable_id = nil, params = {})
+      wrike.execute(:get, api_url(nested_path('folders', folderable_type, folderable_id)), params)
     end
 
     # Get folder data
-    def details(ids, params={})
-      wrike.execute(:get, api_url("folders/#{ids}"), to_j(params))
+    def details(ids, params = {})
+      wrike.execute(:get, api_url("folders/#{ids}"), params)
     end
 
     # create a folder
     def create(folder_id = nil, params = {})
       wrike_url = "folders#{(folder_id.present? ? "/#{folder_id}/folders" : '')}"
-      wrike.execute(:post, api_url(wrike_url), to_j(params))
+      wrike.execute(:post, api_url(wrike_url), params)
     end
 
     # Update a folder
     def update(id, params = {})
-      wrike.execute(:put, api_url("folders/#{id}"), to_j(params))
+      wrike.execute(:put, api_url("folders/#{id}"), params)
     end
 
     # Delete folders and all descendants
-    def delete(id, params={})
-      wrike.execute(:delete, api_url("folders/#{id}"), to_j(params))
+    def delete(id, params = {})
+      wrike.execute(:delete, api_url("folders/#{id}"), params)
     end
   end
 end

data/lib/wrike3/task.rb

@@ -7,27 +7,27 @@ module Wrike3
     end
 
     # Get task list
-    def list(taskable_type = nil, taskable_id = nil, options = {})
-      wrike.execute(:get, api_url(nested_path('tasks', taskable_type, taskable_id)), options)
+    def list(taskable_type = nil, taskable_id = nil, params = {})
+      wrike.execute(:get, api_url(nested_path('tasks', taskable_type, taskable_id)), params)
     end
 
-    def details(id, options={})
-      wrike.execute(:get, api_url("tasks/#{id}"), options)
+    def details(id, params = {})
+      wrike.execute(:get, api_url("tasks/#{id}"), params)
     end
 
     # Add a new task
-    def add(folder_id, data = {}, options={})
-      wrike.execute(:post, api_url("folders/#{folder_id}/tasks"), options.merge(data))
+    def add(folder_id, params = {})
+      wrike.execute(:post, api_url("folders/#{folder_id}/tasks"), params)
     end
 
     # Update a task
-    def update(id, data = {}, options={})
-      wrike.execute(:put, api_url("tasks/#{id}"), options.merge(data))
+    def update(id, params = {})
+      wrike.execute(:put, api_url("tasks/#{id}"), params)
     end
 
     # Delete an existing task
-    def delete(id, options={})
-      wrike.execute(:delete, api_url("tasks/#{id}"), options)
+    def delete(id, params = {})
+      wrike.execute(:delete, api_url("tasks/#{id}"), params)
     end
 
   end

data/lib/wrike3/timelog.rb

@@ -6,27 +6,27 @@ module Wrike3
       @wrike = wrike
     end
 
-    def list(logable_type = nil, logable_id = nil, options={})
-      wrike.execute(:get, api_url(nested_path('timelogs', logable_type, logable_id)), options)
+    def list(logable_type = nil, logable_id = nil, params = {})
+      wrike.execute(:get, api_url(nested_path('timelogs', logable_type, logable_id)), params)
     end
 
-    def details(id, options = {})
-      wrike.execute(:get, api_url("timelogs/#{id}"), options)
+    def details(id, params = {})
+      wrike.execute(:get, api_url("timelogs/#{id}"), params)
     end
 
     # Add a new time log
-    def add(task_id, data = {}, options = {})
-      wrike.execute(:get, api_url("tasks/#{task_id}/timelogs"), options.merge(data))
+    def add(task_id, params = {})
+      wrike.execute(:get, api_url("tasks/#{task_id}/timelogs"), params)
     end
 
     # Update time log
-    def update(id, data = {}, options={})
-      wrike.execute(:put, api_url("timelogs/#{id}"), options.merge(data))
+    def update(id, params = {})
+      wrike.execute(:put, api_url("timelogs/#{id}"), params)
     end
 
     # Delete timelog
-    def delete(id, options = {})
-      wrike.execute(:delete, api_url("timelogs/#{id}"), options)
+    def delete(id, params = {})
+      wrike.execute(:delete, api_url("timelogs/#{id}"), params)
     end
   end
 end

data/lib/wrike3/user.rb

@@ -6,12 +6,12 @@ module Wrike3
       @wrike = wrike
     end
 
-    def details(id, options = {})
-      wrike.execute(:get, api_url("users/#{id}"), options)
+    def details(id, params = {})
+      wrike.execute(:get, api_url("users/#{id}"), params)
     end
 
-    def update(id, data = {}, options = {})
-      wrike.execute(:put, api_url("users/#{id}"), options.merge(data))
+    def update(id, params = {})
+      wrike.execute(:put, api_url("users/#{id}"), params)
     end
   end
 end

data/lib/wrike3/version.rb

@@ -1,3 +1,3 @@
 module Wrike3
-  VERSION = '0.3.3'
+  VERSION = '0.3.5'
 end

data/lib/wrike3/workflow.rb

@@ -7,23 +7,23 @@ module Wrike3
     end
 
     # Get task list
-    def list(account_id, options = {})
-      wrike.execute(:get, api_url("accounts/#{account_id}/workflows"), options)
+    def list(account_id, params = {})
+      wrike.execute(:get, api_url("accounts/#{account_id}/workflows"), params)
     end
 
-    def details(account_id, id, options={})
-      matters = wrike.execute(:get, api_url("accounts/#{account_id}/workflows"), options)
+    def details(account_id, id, params = {})
+      matters = wrike.execute(:get, api_url("accounts/#{account_id}/workflows"), params)
       matters['data'].find { |m| m['id'] == id }
     end
 
     # Add a new task
-    def add(account_id, data = {}, options={})
-      wrike.execute(:post, api_url("accounts/#{account_id}/workflows"), options.merge(data))
+    def add(account_id, params = {})
+      wrike.execute(:post, api_url("accounts/#{account_id}/workflows"), params)
     end
 
     # Update a task
-    def update(id, data = {}, options={})
-      wrike.execute(:put, api_url("workflows/#{id}"), options.merge(data))
+    def update(id, params = {})
+      wrike.execute(:put, api_url("workflows/#{id}"), params)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wrike3
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Morshed Alam