esa 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68f57d011747ff152b15ebe7eccd82591ef53acc
-  data.tar.gz: bd1c794d59fffb421390f764e17eb5b4e35baedb
+  metadata.gz: 329f57a926a65830b8354c22344a8157c1b3de43
+  data.tar.gz: 17a14d17d1e788b3741eb8bd3c69aea848abff7c
 SHA512:
-  metadata.gz: 2ac4eac59e6e15e59a1d8afa2debf2e2723f5b6760e3d3b734ad79650a0fe37764cc3a7cf2a69e585c8c1c3cb85ac3d9fc5867ce27b8ad87d618cfbe3a1e7b3a
-  data.tar.gz: 757bb7c3a20dc6bb22f312e5f16f6d2db2996a4c4854ba04b279f065b4a06968171ad3d1e874a5b53f2a0abac6a366d4690c73423cbbeb482d5c449768f88a50
+  metadata.gz: a61640a6684988e31e0a88d9024533204243fd3777a559a64ef2540315064e98a6a47112203d59ed8ba3e84b9554462ddbfa526eb144087e0ae563007380e1ed
+  data.tar.gz: a8a8587f8dab6de832b47e3c1dada4f8e8a27800224adee3da4b876b6a7511b5b1fdac62ca5d7f5f686d44a29d4bc42bddf014075a36c1e025c036f6dc7cb633

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.1.0 (2015-10-01)
+- [Enable to Upload Attachment by fukayatsu · Pull Request #13 · esaio/esa-ruby](https://github.com/esaio/esa-ruby/pull/13)
+
 ## 1.0.0 (2015-09-25)
 - Production Ready (\\( ⁰⊖⁰)/)
 - [Add Stats API by fukayatsu · Pull Request #12 · esaio/esa-ruby](https://github.com/esaio/esa-ruby/pull/12)

data/README.md

@@ -74,6 +74,12 @@ client.update_comment(comment_id, body_md: 'bazbaz')
 client.delete_comment(comment_id)
 #=> DELETE /v1/teams/foobar/comments/123
 
+
+# Upload Attachment(beta)
+client.upload_attachment('/Users/foo/Desktop/foo.png')              # Path
+client.upload_attachment(File.open('/Users/foo/Desktop/foo.png'))   # File
+client.upload_attachment('http://example.com/foo.png')              # URL
+
 ```
 
 

data/esa.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "faraday", "~> 0.9"
   spec.add_runtime_dependency "faraday_middleware"
+  spec.add_runtime_dependency "mime-types", '~> 2.6'
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "pry"

data/lib/esa/api_methods.rb

@@ -1,5 +1,7 @@
 module Esa
   module ApiMethods
+    HTTP_REGEX = %r{^https?://}
+
     def teams(params = nil, headers = nil)
       send_get("/v1/teams", params, headers)
     end
@@ -52,6 +54,33 @@ module Esa
       send_delete("/v1/teams/#{current_team!}/comments/#{comment_id}", params, headers)
     end
 
+    class PathStringIO < StringIO
+      attr_accessor :path
+
+      def initialize(*args)
+        super(*args[1..-1])
+        @path = args[0]
+      end
+    end
+
+    # beta
+    def upload_attachment(path_or_file_or_url, params = {}, headers = nil)
+      file = file_from(path_or_file_or_url)
+      setup_params_for_upload(params, file)
+
+      response = send_post("/v1/teams/#{current_team!}/attachments/policies", params, headers)
+      return response unless response.status == 200
+
+      attachment = response.body['attachment']
+      form_data  = response.body['form'].merge(file: Faraday::UploadIO.new(file, params[:type]))
+
+      s3_response = send_s3_request(:post, attachment['endpoint'], form_data)
+      return s3_response unless s3_response.status == 204
+
+      response.body.delete('form')
+      response
+    end
+
     private
 
     def wrap(params, envelope)
@@ -60,5 +89,34 @@ module Esa
       return params if params.has_key?(envelope.to_sym) || params.has_key?(envelope.to_s)
       { envelope => params }
     end
+
+    def content_type_from_file(file)
+      require 'mime/types'
+      if mime_type = MIME::Types.type_for(file.path).first
+        mime_type.content_type
+      end
+    rescue LoadError
+      msg = 'Please pass content_type or install mime-types gem to guess content type from file'
+      raise MissingContentTypeErrork, msg
+    end
+
+    def file_from(path_or_file_or_url)
+      if path_or_file_or_url.respond_to?(:read)
+        path_or_file_or_url
+      elsif path_or_file_or_url.is_a?(String) && HTTP_REGEX.match(path_or_file_or_url)
+        remote_url = path_or_file_or_url
+        response = send_simple_request(:get, remote_url)
+        PathStringIO.new(File.basename(remote_url), response.body)
+      else
+        path = path_or_file_or_url
+        File.new(path, "r+b")
+      end
+    end
+
+    def setup_params_for_upload(params, file)
+      params[:type] = params.delete(:content_type) || content_type_from_file(file)
+      params[:size] = file.size
+      params[:name] = File.basename(file.path)
+    end
   end
 end

data/lib/esa/client.rb

@@ -1,6 +1,6 @@
+require 'esa/errors'
 require 'esa/api_methods'
 require "esa/response"
-require 'esa/errors'
 
 module Esa
   class Client
@@ -38,15 +38,38 @@ module Esa
       send_request(:delete, path, params, headers)
     end
 
-    def send_request(method, path, params, headers)
-      Esa::Response.new(connection.send(method, path, params, headers))
+    def send_request(method, path, params = nil, headers = nil)
+      Esa::Response.new(esa_connection.send(method, path, params, headers))
+    end
+
+    def send_s3_request(method, path, params = nil, headers = nil)
+      Esa::Response.new(s3_connection.send(method, path, params, headers))
+    end
+
+    def send_simple_request(method, path, params = nil, headers = nil)
+      Esa::Response.new(simple_connection.send(method, path, params, headers))
     end
 
-    def connection
-      @connection ||= Faraday.new(faraday_options) do |c|
-        c.request  :json
+    def esa_connection
+      @esa_connection ||= Faraday.new(faraday_options) do |c|
+        c.request :json
         c.response :json
-        c.adapter  Faraday.default_adapter
+        c.adapter Faraday.default_adapter
+      end
+    end
+
+    def s3_connection
+      @s3_connection ||= Faraday.new do |c|
+        c.request :multipart
+        c.request :url_encoded
+        c.response :xml
+        c.adapter Faraday.default_adapter
+      end
+    end
+
+    def simple_connection
+      @simple_connection ||= Faraday.new do |c|
+        c.adapter Faraday.default_adapter
       end
     end
 
@@ -55,7 +78,7 @@ module Esa
     def faraday_options
       {
         url:     faraday_url,
-        headers: faraday_headers,
+        headers: faraday_headers
       }
     end
 

data/lib/esa/errors.rb

@@ -1,4 +1,5 @@
 module Esa
   class EsaError < StandardError; end
   class TeamNotSpecifiedError < EsaError; end
+  class MissingContentTypeError < EsaError; end
 end

data/lib/esa/version.rb

@@ -1,3 +1,3 @@
 module Esa
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esa
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - fukayatsu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement