attask 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e3a1d68670cb5fd2f28639ab038293367eaed6a
-  data.tar.gz: a509263ae912cd9d9f438690926c0ba37f37ffab
+  metadata.gz: eb986f9613540989df63bd3034c08f8de48d5c99
+  data.tar.gz: d11435f0f526219dc19c55862d18a9545cc04263
 SHA512:
-  metadata.gz: 288900f25fad2c60ab3fc48e6adc52c18da16738b0eb8c4f1563a690ba5bdd5a5f4616456921ef97024cae4988af3d6cadc42879a065d12d343003950700f2b1
-  data.tar.gz: 44911bb28f9f867c30e75960853d5f5ac99f158fdae1533505ceae2bb1a4ac9e950a89bfd5a3c8435ce000eccaab2d639ce9826221e5d1568fde74da8bafa5ca
+  metadata.gz: 501bf743f90c8ab6dfeb0e1dd25dbc1bc5fd4c66a53a7a566c1f2d2a4449a81ee4e770b332dd1ef43d1f700d3111df08665c499fe620e2cd000fcefb6af90f2d
+  data.tar.gz: 0d558efd5d7221ae4ff6f371d4ff892580082c0f5df480cbf752c8d2e3ed3f86620f1044924895eeafbca24537ed27f3b38d42e0a194651184e24560f02e5913

data/lib/attask/client.rb

@@ -12,77 +12,82 @@ module Attask
     end
 
     def search(object_code, params = {}, fields = [])
-      params = merge_hashes(@session_id, params, fields: fields.join(','))
+      params = merge_hashes(params, fields: fields.join(','))
       path = mount_path(object_code, '/search')
       request(:get, path, params)
     end
 
     def get_list(object_code, ids = [], fields = [])
-      fields = fields.join(',')
-      params = merge_hashes(@session_id, { id: ids.join(',') }, fields: fields)
+      params = merge_hashes({ id: ids.join(',') }, fields: fields.join(','))
       path = mount_path(object_code, '')
       request(:get, path, params)
     end
 
     def get(object_code, object_id, params = {}, fields = [])
-      params = merge_hashes(@session_id, params, fields: fields.join(','))
+      params = merge_hashes(params, fields: fields.join(','))
       path = mount_path(object_code, object_id)
       request(:get, path, params)
     end
 
     def put(object_code, object_id, params = {}, fields = [])
-      params = merge_hashes(@session_id, params, fields: fields.join(','))
+      params = merge_hashes(params, fields: fields.join(','))
       path = mount_path(object_code, object_id)
       request(:put, path, params)
     end
 
     def post(object_code, object_id, params = {}, fields = [])
-      params = merge_hashes(@session_id, params, fields: fields.join(','))
+      params = merge_hashes(params, fields: fields.join(','))
       path = mount_path(object_code, object_id)
       request(:post, path, params)
     end
 
-    def delete(object_code, object_id, params)
+    def delete(object_code, object_id, params = {})
       path = mount_path(object_code, object_id)
       request(:delete, path, params)
     end
 
-    def handle(image_path, multipart_data_format)
-      upload_io = Faraday::UploadIO.new(image_path, multipart_data_format)
-      params = { uploadedFile: upload_io }
-      path = mount_path("upload?sessionID=#{session_id['sessionID']}")
-      request(:post, path, params)['data']['handle']
-    end
-
-    def upload(updates)
-      s_id = @session_id['sessionID']
-      path = mount_path("document?sessionID=#{s_id}&updates=#{updates}")
-      request(:post, path)
+    def upload(updates, image_path, data_format)
+      updates[:handle] = handle(image_path, data_format)
+      params = { updates: updates.to_json }
+      path = mount_path('document')
+      request(:post, path, params)
     end
 
-    def download(download_url, filename, save_to)
-      params = @session_id
-      s_id = @session_id['sessionID']
-      path =
-        "https://#{@app}.attask-ondemand.com/#{download_url}&sessionID=#{s_id}"
+    def download(download_url, filename)
+      path = mount_download_path(download_url)
       response = request(:get, path)
       save_file(filename, response)
     end
 
     private
 
-    def mount_path(object_code, object_id = '')
-      "#{@endpoint}/#{object_code}#{object_id}"
+    def mount_path(object_code, object_id = '', login_path = false)
+      return "#{@endpoint}/#{object_code}#{object_id}" if login_path
+      "#{@endpoint}/#{object_code}#{object_id}?sessionID=#{@session_id}"
+    end
+
+    def mount_download_path(download_url)
+      s_id = @session_id
+      "https://#{@app}.attask-ondemand.com/#{download_url}&sessionID=#{s_id}"
+    end
+
+    def handle(image_path, data_format)
+      params = payload_file(image_path, data_format)
+      path = mount_path('upload')
+      request(:post, path, params)['data']['handle']
+    end
+
+    def payload_file(image_path, data_format)
+      { uploadedFile: Faraday::UploadIO.new(image_path, data_format) }
     end
 
     def session_id
-      { 'sessionID' => login['data']['sessionID'] }
+      login['data']['sessionID']
     end
 
     def login
-      config = Config
-      params = { username: config.username, password: config.password }
-      path = mount_path('login', '')
+      params = { username: Config.username, password: Config.password }
+      path = mount_path('login', '', true)
       request(:post, path, params)
     end
 

data/lib/attask/version.rb

@@ -3,5 +3,5 @@
 
 module Attask
   # The current Attask version.
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attask
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Paulo Henrique Bruce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable