wrike3 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6730c885c7485faeecd911bd9507eca5ec2e4e78
-  data.tar.gz: 19a45be13b7f254c1a4b8ebed370528f85ce2ac4
+  metadata.gz: f54978dd72a534d731f5c74636aa7816fd372c56
+  data.tar.gz: fa1346a2bc9d1ac028f2e991f8d7d9082ce2168e
 SHA512:
-  metadata.gz: 521c81c0174a56a342009fe6435fcdd763d80aaf452d02a9c1fd498dea8bb991a7cb9c8e1234e08373c209a29a02466ac16af78a2a1b69fbc88478cd1d36548d
-  data.tar.gz: 728d95421482246b203150fb287d0e33d0b89353439f3f34dde13e6d91e640e046d8ea406ea83b793c455d5d6ffeceab8ef76413b954dd4f1807fa30535fa817
+  metadata.gz: 1cb4dd8c87a3e8844cce1058c996b3005fb702ab99213b4c3dcbba1f25ac6c7ba4ec75ca968a17dabc8e87a110aaef1968e5d23be9b3dd12971b01786b194a05
+  data.tar.gz: e7d1b27a6da9d2acfd5d4873acb7e39163ce09bdd424e2ed32c8bfae7807bd04eef0cc858567cc430d8b263c9a2b0282df93af93672ad7ee9209243e050ee2d5

data/lib/wrike3.rb

@@ -4,7 +4,6 @@ require 'mime/types'
 
 require 'wrike3/error'
 require 'wrike3/common'
-require 'wrike3/utils'
 
 require 'wrike3/base'
 require 'wrike3/token'

data/lib/wrike3/attachment.rb

@@ -1,6 +1,9 @@
+require 'open-uri'
+
 module Wrike3
   class Attachment
     include Wrike3::Common
+    CRLF = "\r\n"
 
     def initialize(wrike)
       @wrike = wrike
@@ -14,11 +17,11 @@ module Wrike3
     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)
-      body, headers = http_multipart_data({:stream => stream})
-      wrike.execute(:post, api_url(nested_path('attachments', attachable_type, attachable_id)), body, headers)
+    def upload(attachable_type, attachable_id, params)
+      body, headers = http_multipart_data(params)
+      wrike.execute(:post, api_url(nested_path('attachments', attachable_type, attachable_id)), {}, headers, true, body)
     end
 
     # Get file binary stream
@@ -30,5 +33,17 @@ module Wrike3
     def delete(id, params = {})
       wrike.execute(:delete, api_url("attachments/#{id}"), params)
     end
+
+    private
+
+    def http_multipart_data(params = {})
+      headers = {
+          'X-Requested-With' => 'XMLHttpRequest',
+          'X-File-Name'      => params['file_name'],
+          'Content-Type'     => params['content_type']
+      }
+
+      return params['stream'], headers
+    end
   end
-end
+end

data/lib/wrike3/base.rb

@@ -2,9 +2,9 @@ module Wrike3
   class Base
     def initialize(options={})
       # API settings
-      Wrike3.api_version = options.fetch(:api_version) { 'v3' }
-      Wrike3.protocol = options.fetch(:protocol) { 'https' }
-      Wrike3.api_host = options.fetch(:api_host) { 'www.wrike.com' }
+      Wrike3.api_version  = options.fetch(:api_version) { 'v3' }
+      Wrike3.protocol     = options.fetch(:protocol) { 'https' }
+      Wrike3.api_host     = options.fetch(:api_host) { 'www.wrike.com' }
       # Access settings
       Wrike3.access_token = options.fetch(:access_token) { '' }
     end
@@ -58,9 +58,12 @@ module Wrike3
       @token ||= Wrike3::Token.new(self)
     end
 
-    def execute(method, url, parameters = {}, request_headers = {}, include_auth_header = true)
+    def execute(method, url, parameters = {}, request_headers = {}, include_auth_header = true, body = nil)
       request_headers = auth_headers(request_headers) if include_auth_header
-      response = HTTParty.send(method.to_s, url, {:query => to_j(parameters), headers: request_headers})
+      params          = {:query => to_j(parameters), headers: request_headers}
+      params[:body]   = body if body.present?
+
+      response = HTTParty.send(method.to_s, url, params)
       response.parsed_response
     end
 

data/lib/wrike3/common.rb

@@ -12,15 +12,5 @@ module Wrike3
       path = "#{type}/#{id}/#{path}" if type.present? && id.present?
       path
     end
-
-    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
   end
 end

data/lib/wrike3/version.rb

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

data/wrike3.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.9.3'
 
   s.add_runtime_dependency('httparty', '~> 0.13.7')
-  s.add_runtime_dependency('mime-types', '~> 2.99', '>= 2.99.1')
+  s.add_runtime_dependency('mime-types')
   s.add_runtime_dependency('shoulda', '~> 3.5')
   s.add_runtime_dependency('mocha', '~> 1.1')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wrike3
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Morshed Alam
@@ -28,22 +28,16 @@ dependencies:
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.99'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.99.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.99'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.99.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +92,6 @@ files:
 - lib/wrike3/timelog.rb
 - lib/wrike3/token.rb
 - lib/wrike3/user.rb
-- lib/wrike3/utils.rb
 - lib/wrike3/version.rb
 - lib/wrike3/workflow.rb
 - test/.DS_Store

data/lib/wrike3/utils.rb

@@ -1,33 +0,0 @@
-module Wrike3
-  class Helper
-    CRLF = "\r\n"
-
-    class << self
-      def http_multipart_data(params)
-        body = ''
-        headers = {}
-        boundary = Time.now.to_i.to_s(16)
-        headers["Content-Type"] = "multipart/form-data; boundary=#{boundary}"
-
-        # params.each do |key, value|
-        #   esc_key = OAuth::Helper.escape(key.to_s)
-        #   body << "--#{boundary}#{CRLF}"
-        #
-        #   if value.respond_to?(:read)
-        #     mime_type = MIME::Types.type_for(value.path)[0] || MIME::Types["application/octet-stream"][0]
-        #     body << "Content-Disposition: form-data; name=\"#{esc_key}\"; filename=\"#{File.basename(value.path)}\"#{CRLF}"
-        #     body << "Content-Type: #{mime_type.simplified}#{CRLF*2}"
-        #     body << value.read
-        #   else
-        #     body << "Content-Disposition: form-data; name=\"#{esc_key}\"#{CRLF*2}#{value}"
-        #   end
-        # end
-
-        body << "--#{boundary}--#{CRLF*2}"
-        headers["Content-Length"] = body.size.to_s
-
-        return [body, headers]
-      end
-    end
-  end
-end