mushikago-sdk 0.3.6 → 0.3.7

data/README.md

@@ -5,7 +5,7 @@ Mushikago SDK for Ruby.
 - **Author**:          Toru Matsuoka
 - **Copyright**:       2011
 - **License**:         Apache License, Version 2.0
-- **Latest Version**:  0.3.6
+- **Latest Version**:  0.3.7
 - **Release Date**:    January 27th 2012
 
 
@@ -151,6 +151,8 @@ $ export MUSHIKAGO_SECRET_KEY=<シークレットキー>
 変更履歴
 --------
 
+- **Feb.14.12**: 0.3.7 release
+  - Multipartでアップロードするファイルの最後に改行が付与される件修正
 - **Jan.27.12**: 0.3.6 release
   - resource_get,script_getに:with_bodyオプション追加
 - **Jan.27.12**: 0.3.4 release

data/lib/mushikago/configuration.rb

@@ -40,6 +40,7 @@ module Mushikago
     add_option :api_key, ENV['MUSHIKAGO_API_KEY'] || ENV['MUSHIKAGO_API_KEY_ID']
     add_option :secret_key, ENV['MUSHIKAGO_SECRET_KEY'] || ENV['MUSHIKAGO_SECRET_ACCESS_KEY']
     add_option :endpoint, 'api.mushikago.org'
+    add_option :use_ssl, true
 
     # @private
     private

data/lib/mushikago/http.rb

@@ -4,8 +4,14 @@ module Mushikago
   module Http
     autoload :Client, 'mushikago/http/client'
     autoload :Request, 'mushikago/http/request'
-    autoload :MultipartRequest, 'mushikago/http/multipart_request'
+    autoload :MultipartRequest, 'mushikago/http/multipart'
     autoload :Response, 'mushikago/http/response'
+    autoload :GetRequest, 'mushikago/http/request/get'
+    autoload :PostRequest, 'mushikago/http/request/post'
+    autoload :PutRequest, 'mushikago/http/request/put'
+    autoload :DeleteRequest, 'mushikago/http/request/delete'
+    autoload :MultipartPostRequest, 'mushikago/http/request/multipart_post'
+    autoload :MultipartPutRequest, 'mushikago/http/request/multipart_put'
   end
 end
 

data/lib/mushikago/http/client.rb

@@ -11,12 +11,16 @@ module Mushikago
       # @return [Signer] signer
       attr_reader :signer
 
+      # @return [Boolean] use_ssl
+      attr_reader :use_ssl
+
       # @param [Hash] options
       # @option options [String] :api_key(Configured value) APIキー
       # @option options [String] :secret_key(Configured value) 秘密鍵
       def initialize options={}
         @api_key = (options[:api_key] || Mushikago.config.api_key).to_s
         @signer = Mushikago::Auth::Signer.new((options[:secret_key] || Mushikago.config.secret_key).to_s)
+        @use_ssl = options.has_key?(:use_ssl) ? options[:use_ssl] : Mushikago.config.use_ssl
       end
 
       # @param [Mushikago::Http::Request] request
@@ -28,7 +32,7 @@ module Mushikago
         request.add_signature!(signer)
 
         # send request
-        Net::HTTP.start(request.host, request.port) do |http|
+        Net::HTTP.start(request.host, request.port, :use_ssl => use_ssl) do |http|
           http_request = request.to_http_request
           http_response = http.request(http_request)
           return Mushikago::Http::Response.new(JSON.parse(http_response.body))

data/lib/mushikago/http/{multipart_request.rb → multipart.rb}

@@ -49,9 +49,7 @@ module Mushikago
             %Q||,
             %Q|#{v.read}|
           ].join(EOL)
-          content << EOL
         end
-        content << EOL
         content << %Q|--#{boundary}--|
         content << EOL
         return content

data/lib/mushikago/http/request.rb

@@ -7,8 +7,6 @@ module Mushikago
     class Request
       # @return [Hash] headers
       attr_reader :headers
-      # @return [String] http_method
-      attr_accessor :http_method
       # @return [String] host 
       attr_accessor :host
       # @return [Integer] port 
@@ -18,13 +16,14 @@ module Mushikago
       # @return [String] params
       attr_reader :params
 
-      def initialize
+      def initialize options={}
         @headers = {}
-        @host = ''
-        @port = 80
+        endpoint = options[:endpoint] || Mushikago.config.endpoint
+        host, port = endpoint.split(':')
+        @host = host
+        @port = port
         @path = '/'
-        @params = {} 
-        @http_method = new_http_request.method
+        @params = {}
       end
 
       # @param [String] key パラメータのキー

data/lib/mushikago/http/request/delete.rb

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+module Mushikago
+  module Http
+    # MushikagoのDELETEリクエストを表す抽象クラス
+    class DeleteRequest < Mushikago::Http::Request
+      def http_method; 'DELETE' end
+      include Mushikago::Auth::Signature
+
+      protected
+      def new_http_request
+        new_http_delete_request("#{path}?#{url_encoded_params}")
+      end
+    end
+  end
+end
+
+

data/lib/mushikago/http/request/get.rb

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+module Mushikago
+  module Http
+    # MushikagoのGETリクエストを表す抽象クラス
+    class GetRequest < Mushikago::Http::Request
+      def http_method; 'GET' end
+      include Mushikago::Auth::Signature
+
+      protected
+      def new_http_request
+        new_http_get_request("#{path}?#{url_encoded_params}")
+      end
+    end
+  end
+end
+

data/lib/mushikago/http/request/multipart_post.rb

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+module Mushikago
+  module Http
+    # MushikagoのPOSTリクエストを表す抽象クラス
+    class MultipartPostRequest < Mushikago::Http::MultipartRequest
+      def http_method; 'POST' end
+      include Mushikago::Auth::Signature
+
+      protected
+      def new_http_request
+        new_http_post_request(path)
+      end
+    end
+  end
+end
+
+
+

data/lib/mushikago/http/request/multipart_put.rb

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+module Mushikago
+  module Http
+    # MushikagoのPUTリクエストを表す抽象クラス
+    class MultipartPutRequest < Mushikago::Http::MultipartRequest
+      def http_method; 'PUT' end
+      include Mushikago::Auth::Signature
+
+      protected
+      def new_http_request
+        new_http_put_request(path)
+      end
+    end
+  end
+end
+
+
+
+

data/lib/mushikago/http/request/post.rb

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+module Mushikago
+  module Http
+    # MushikagoのPOSTリクエストを表す抽象クラス
+    class PostRequest < Mushikago::Http::Request
+      def http_method; 'POST' end
+      include Mushikago::Auth::Signature
+
+      protected
+      def new_http_request
+        new_http_post_request(path)
+      end
+    end
+  end
+end
+
+

data/lib/mushikago/http/request/put.rb

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+module Mushikago
+  module Http
+    # MushikagoのPUTリクエストを表す抽象クラス
+    class PutRequest < Mushikago::Http::Request
+      def http_method; 'PUT' end
+      include Mushikago::Auth::Signature
+
+      protected
+      def new_http_request
+        new_http_put_request(path)
+      end
+    end
+  end
+end
+
+
+

data/lib/mushikago/mitsubachi.rb

@@ -3,8 +3,6 @@ module Mushikago
   # mitsubachiにアクセスするためのモジュール
   module Mitsubachi
     autoload :Client, 'mushikago/mitsubachi/client'
-    autoload :Request, 'mushikago/mitsubachi/request'
-    autoload :MultipartRequest, 'mushikago/mitsubachi/multipart_request'
 
     # project
     autoload :ProjectCreateRequest, 'mushikago/mitsubachi/project_create_request'

data/lib/mushikago/mitsubachi/http_fetch_request.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 module Mushikago
   module Mitsubachi
-    class HttpFetchRequest < Request
-      def method_name; 'http/fetch.json' end
+    class HttpFetchRequest < Mushikago::Http::PostRequest
+      def path; '/1/mitsubachi/http/fetch.json' end
       request_parameter :url
       request_parameter :project_name
       request_parameter :script_name
@@ -23,10 +23,6 @@ module Mushikago
         self.parameters = options[:parameters] if options.has_key?(:parameters)
         self.header_overwrite = options[:header_overwrite] if options.has_key?(:header_overwrite)
       end
-
-      def new_http_request
-        new_http_post_request(path)
-      end
     end
   end
 end

data/lib/mushikago/mitsubachi/http_push_request.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 module Mushikago
   module Mitsubachi
-    class HttpPushRequest < Request
-      def method_name; 'http/fetch.json' end
+    class HttpPushRequest < Mushikago::Http::PostRequest
+      def path; '/1/mitsubachi/http/fetch.json' end
       request_parameter :url
       request_parameter :project_name
       request_parameter :script_name
@@ -25,10 +25,6 @@ module Mushikago
         self.header_overwrite = options[:header_overwrite] if options.has_key?(:header_overwrite)
         self.mime_type = options[:mime_type] if options.has_key?(:mime_type)
       end
-
-      def new_http_request
-        new_http_post_request(path)
-      end
     end
   end
 end

data/lib/mushikago/mitsubachi/project_create_request.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 module Mushikago
   module Mitsubachi
-    class ProjectCreateRequest < Request
-      def method_name; 'project/create' end
+    class ProjectCreateRequest < Mushikago::Http::PostRequest
+      def path; '/1/mitsubachi/project/create' end
       request_parameter :project_name
       request_parameter :dedicated, :default=>false do |v| (v ? 1 : 0).to_s end
       request_parameter :max_lead_time do |v| v.to_i.to_s end
@@ -21,10 +21,6 @@ module Mushikago
         self.system_log = options[:system_log]
         self.log_prefix = options[:log_prefix] if options.has_key?(:log_prefix)
       end
-
-      def new_http_request
-        new_http_post_request(path)
-      end
     end
   end
 end

data/lib/mushikago/mitsubachi/project_delete_request.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 module Mushikago
   module Mitsubachi
-    class ProjectDeleteRequest < Request
-      def method_name; 'project/delete' end
+    class ProjectDeleteRequest < Mushikago::Http::DeleteRequest
+      def path; '/1/mitsubachi/project/delete' end
       request_parameter :project_name
       request_parameter :forcedelete, :default=>true do |v| (v ? 1 : 0).to_s end
 
@@ -11,10 +11,6 @@ module Mushikago
         self.project_name = project_name
         self.forcedelete = options[:forcedelete]
       end
-
-      def new_http_request
-        new_http_delete_request("#{path}?#{url_encoded_params}")
-      end
     end
   end
 end

data/lib/mushikago/mitsubachi/project_discontinue_request.rb

@@ -1,18 +1,14 @@
 # -*- coding: utf-8 -*-
 module Mushikago
   module Mitsubachi
-    class ProjectDiscontinueRequest < Request
-      def method_name; 'project/discontinue' end
+    class ProjectDiscontinueRequest < Mushikago::Http::PostRequest
+      def path; '/1/mitsubachi/project/discontinue' end
       request_parameter :project_name
 
       def initialize project_name, options={}
         super(options)
         self.project_name = project_name
       end
-
-      def new_http_request
-        new_http_post_request(path)
-      end
     end
   end
 end

data/lib/mushikago/mitsubachi/project_info_request.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 module Mushikago
   module Mitsubachi
-    class ProjectInfoRequest < Request
-      def method_name; 'project/info' end
+    class ProjectInfoRequest < Mushikago::Http::GetRequest
+      def path; '/1/mitsubachi/project/info' end
       request_parameter :project_name
       request_parameter :time do |v| v.to_i.to_s end
 

data/lib/mushikago/mitsubachi/project_list_request.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 module Mushikago
   module Mitsubachi
-    class ProjectListRequest < Request
-      def method_name; 'project/list' end
+    class ProjectListRequest < Mushikago::Http::GetRequest
+      def path; '/1/mitsubachi/project/list' end
       request_parameter :limit do |v| v.to_i.to_s end
       request_parameter :offset do |v| v.to_i.to_s end
       request_parameter :filter

data/lib/mushikago/mitsubachi/project_queues_request.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 module Mushikago
   module Mitsubachi
-    class ProjectQueuesRequest < Request
-      def method_name; 'project/queues' end
+    class ProjectQueuesRequest < Mushikago::Http::GetRequest
+      def path; '/1/mitsubachi/project/queues' end
       request_parameter :project_name
 
       def initialize project_name, options={}

data/lib/mushikago/mitsubachi/project_update_request.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 module Mushikago
   module Mitsubachi
-    class ProjectUpdateRequest < Request
-      def method_name; 'project/update' end
+    class ProjectUpdateRequest < Mushikago::Http::PostRequest
+      def path; '/1/mitsubachi/project/update' end
       request_parameter :project_name
       request_parameter :max_lead_time do |v| v.to_i.to_s end
       request_parameter :stdout do |v| (v ? 1 : 0).to_s end
@@ -19,10 +19,6 @@ module Mushikago
         self.system_log = options[:system_log] if options.has_key?(:system_log)
         self.log_prefix = options[:log_prefix] if options.has_key?(:log_prefix)
       end
-
-      def new_http_request
-        new_http_post_request(path)
-      end
     end
   end
 end

data/lib/mushikago/mitsubachi/resource_delete_request.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 module Mushikago
   module Mitsubachi
-    class ResourceDeleteRequest < Request
-      def method_name; 'resource/delete' end
+    class ResourceDeleteRequest < Mushikago::Http::DeleteRequest
+      def path; '/1/mitsubachi/resource/delete' end
       request_parameter :project_name
       request_parameter :file_name
 
@@ -11,10 +11,6 @@ module Mushikago
         self.project_name = project_name
         self.file_name = file_name
       end
-
-      def new_http_request
-        new_http_delete_request("#{path}?#{url_encoded_params}")
-      end
     end
   end
 end

data/lib/mushikago/mitsubachi/resource_get_request.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 module Mushikago
   module Mitsubachi
-    class ResourceGetRequest < Request
-      def method_name; 'resource/get' end
+    class ResourceGetRequest < Mushikago::Http::GetRequest
+      def path; '/1/mitsubachi/resource/get' end
       request_parameter :project_name
       request_parameter :file_name
 

data/lib/mushikago/mitsubachi/resource_list_request.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 module Mushikago
   module Mitsubachi
-    class ResourceListRequest < Request
-      def method_name; 'resource/list' end
+    class ResourceListRequest < Mushikago::Http::GetRequest
+      def path; '/1/mitsubachi/resource/list' end
       request_parameter :project_name
       request_parameter :limit do |v| v.to_i.to_s end
       request_parameter :offset do |v| v.to_i.to_s end

data/lib/mushikago/mitsubachi/resource_store_request.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 module Mushikago
   module Mitsubachi
-    class ResourceStoreRequest < MultipartRequest
-      def method_name; 'resource/store' end
+    class ResourceStoreRequest < Mushikago::Http::MultipartPostRequest
+      def path; '/1/mitsubachi/resource/store' end
       request_parameter :project_name
       request_parameter :file
       request_parameter :file_name
@@ -21,10 +21,6 @@ module Mushikago
         self.content_type = options[:content_type] || MIME::Types.of(file.path).first.to_s
         self.public = options[:public]
       end
-
-      def new_http_request
-        new_http_post_request(path)
-      end
     end
   end
 end

data/lib/mushikago/mitsubachi/script_delete_request.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 module Mushikago
   module Mitsubachi
-    class ScriptDeleteRequest < Request
-      def method_name; 'script/delete' end
+    class ScriptDeleteRequest < Mushikago::Http::DeleteRequest
+      def path; '/1/mitsubachi/script/delete' end
       request_parameter :project_name
       request_parameter :script_name
 
@@ -11,10 +11,6 @@ module Mushikago
         self.project_name = project_name
         self.script_name = script_name
       end
-
-      def new_http_request
-        new_http_delete_request("#{path}?#{url_encoded_params}")
-      end
     end
   end
 end

data/lib/mushikago/mitsubachi/script_deploy_request.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 module Mushikago
   module Mitsubachi
-    class ScriptDeployRequest < MultipartRequest
-      def method_name; 'script/deploy' end
+    class ScriptDeployRequest < Mushikago::Http::MultipartPostRequest
+      def path; '/1/mitsubachi/script/deploy' end
       request_parameter :project_name
       request_parameter :file
       request_parameter :script_name
@@ -17,10 +17,6 @@ module Mushikago
         end
         self.script_name = options[:script_name] || file.path
       end
-
-      def new_http_request
-        new_http_post_request(path)
-      end
     end
   end
 end

data/lib/mushikago/mitsubachi/script_get_request.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 module Mushikago
   module Mitsubachi
-    class ScriptGetRequest < Request
-      def method_name; 'script/get' end
+    class ScriptGetRequest < Mushikago::Http::GetRequest
+      def path; '/1/mitsubachi/script/get' end
       request_parameter :project_name
       request_parameter :script_name
 

data/lib/mushikago/mitsubachi/script_list_request.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 module Mushikago
   module Mitsubachi
-    class ScriptListRequest < Request
-      def method_name; 'script/list' end
+    class ScriptListRequest < Mushikago::Http::GetRequest
+      def path; '/1/mitsubachi/script/list' end
       request_parameter :project_name
       request_parameter :limit do |v| v.to_i.to_s end
       request_parameter :offset do |v| v.to_i.to_s end

data/lib/mushikago/tombo.rb

@@ -3,7 +3,6 @@ module Mushikago
   # Tomboへのアクセスを行うモジュール
   module Tombo
     autoload :Client, 'mushikago/tombo/client'
-    autoload :Request, 'mushikago/tombo/request'
     autoload :CaptureRequest, 'mushikago/tombo/capture_request'
     autoload :CapturesRequest, 'mushikago/tombo/captures_request'
     autoload :DeleteRequest, 'mushikago/tombo/delete_request'

data/lib/mushikago/tombo/capture_request.rb

@@ -2,15 +2,15 @@
 module Mushikago
   module Tombo
     # キャプチャリクエスト
-    class CaptureRequest < Request
-      def method_name; 'capture' end
+    class CaptureRequest < Mushikago::Http::PostRequest
+      def path; '/1/tombo/capture' end
 
-      add_param :url
-      add_param :image_format
-      add_param :image_quality do |v| v.to_i.to_s end
-      add_param :thumbnail do |v| (v ? 1 : 0).to_s end
-      add_param :tags do |v| [v].flatten.compact.join(',') end
-      add_param :useragent
+      request_parameter :url
+      request_parameter :image_format
+      request_parameter :image_quality do |v| v.to_i.to_s end
+      request_parameter :thumbnail do |v| (v ? 1 : 0).to_s end
+      request_parameter :tags do |v| [v].flatten.compact.join(',') end
+      request_parameter :useragent
 
       # @param [String] url キャプチャ対象のURL
       # @param [Hash] options リクエストのオプション
@@ -29,11 +29,6 @@ module Mushikago
         self.useragent = options[:useragent] if options.has_key?(:useragent)
         @headers['Content-type'] = 'application/x-www-form-urlencoded; charset=utf-8'
       end
-
-      # @private
-      def new_http_request
-        new_http_post_request(path)
-      end
     end
   end
 end

data/lib/mushikago/tombo/captures_request.rb

@@ -2,14 +2,14 @@
 module Mushikago
   module Tombo
     # キャプチャ一覧取得リクエスト
-    class CapturesRequest < Request
-      def method_name; 'captures' end
+    class CapturesRequest < Mushikago::Http::GetRequest
+      def path; '/1/tombo/captures' end
 
-      add_param :id
-      add_param :limit
-      add_param :offset
-      add_param :domain
-      add_param :tag
+      request_parameter :id
+      request_parameter :limit
+      request_parameter :offset
+      request_parameter :domain
+      request_parameter :tag
 
       # @param [Hash] options リクエストのオプション
       # @option options [String] :id 画像のID

data/lib/mushikago/tombo/delete_request.rb

@@ -2,10 +2,10 @@
 module Mushikago
   module Tombo
     # Deleteリクエスト
-    class DeleteRequest < Request
-      def method_name; 'delete' end
+    class DeleteRequest < Mushikago::Http::DeleteRequest
+      def path; '/1/tombo/delete' end
 
-      add_param :id
+      request_parameter :id
 
       # @param [String] id 画像のID
       # @param [Hash] options リクエストのオプション
@@ -13,11 +13,6 @@ module Mushikago
         super(options)
         self.id = id
       end
-
-      # @private
-      def new_http_request
-        new_http_delete_request("#{path}?#{url_encoded_params}")
-      end
     end
   end
 end

data/lib/mushikago/tombo/info_request.rb

@@ -2,8 +2,8 @@
 module Mushikago
   module Tombo
     # API使用状況取得リクエスト
-    class InfoRequest < Request
-      def method_name; 'info' end
+    class InfoRequest < Mushikago::Http::GetRequest
+      def path; '/1/tombo/info' end
 
       # @param [Hash] options リクエストのオプション 
       def initialize options={}

data/lib/mushikago/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 module Mushikago
   # Mushikago SDK for Ruby のバージョン
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mushikago-sdk
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-01 00:00:00.000000000Z
+date: 2012-02-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &7374660 !ruby/object:Gem::Requirement
+  requirement: &5026580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7374660
+  version_requirements: *5026580
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &7373800 !ruby/object:Gem::Requirement
+  requirement: &5025320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7373800
+  version_requirements: *5025320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7373040 !ruby/object:Gem::Requirement
+  requirement: &5023960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7373040
+  version_requirements: *5023960
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &7372080 !ruby/object:Gem::Requirement
+  requirement: &5020940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7372080
+  version_requirements: *5020940
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &7371440 !ruby/object:Gem::Requirement
+  requirement: &5020020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7371440
+  version_requirements: *5020020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &7370820 !ruby/object:Gem::Requirement
+  requirement: &5017980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *7370820
+  version_requirements: *5017980
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &7370380 !ruby/object:Gem::Requirement
+  requirement: &5016460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7370380
+  version_requirements: *5016460
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &7367220 !ruby/object:Gem::Requirement
+  requirement: &5015400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7367220
+  version_requirements: *5015400
 description: A SDK for Mushikago Web Service.
 email:
 - t.matsuoka@miningbrownie.co.jp
@@ -114,7 +114,6 @@ files:
 - lib/mushikago/hotaru/client.rb
 - lib/mushikago/auth/signer.rb
 - lib/mushikago/auth/signature.rb
-- lib/mushikago/tombo/request.rb
 - lib/mushikago/tombo/info_request.rb
 - lib/mushikago/tombo/capture_request.rb
 - lib/mushikago/tombo/captures_request.rb
@@ -125,7 +124,6 @@ files:
 - lib/mushikago/mitsubachi/resource_delete_request.rb
 - lib/mushikago/mitsubachi/http_fetch_request.rb
 - lib/mushikago/mitsubachi/resource.rb
-- lib/mushikago/mitsubachi/multipart_request.rb
 - lib/mushikago/mitsubachi/script_delete_request.rb
 - lib/mushikago/mitsubachi/http_push_request.rb
 - lib/mushikago/mitsubachi/resource_get_request.rb
@@ -134,7 +132,6 @@ files:
 - lib/mushikago/mitsubachi/scripts.rb
 - lib/mushikago/mitsubachi/project_update_request.rb
 - lib/mushikago/mitsubachi/resources.rb
-- lib/mushikago/mitsubachi/request.rb
 - lib/mushikago/mitsubachi/projects.rb
 - lib/mushikago/mitsubachi/resource_list_request.rb
 - lib/mushikago/mitsubachi/project.rb
@@ -150,8 +147,14 @@ files:
 - lib/mushikago/version.rb
 - lib/mushikago/auth.rb
 - lib/mushikago/configuration.rb
-- lib/mushikago/http/multipart_request.rb
+- lib/mushikago/http/multipart.rb
 - lib/mushikago/http/request.rb
+- lib/mushikago/http/request/post.rb
+- lib/mushikago/http/request/multipart_put.rb
+- lib/mushikago/http/request/put.rb
+- lib/mushikago/http/request/delete.rb
+- lib/mushikago/http/request/get.rb
+- lib/mushikago/http/request/multipart_post.rb
 - lib/mushikago/http/response.rb
 - lib/mushikago/http/client.rb
 - lib/mushikago/http.rb

data/lib/mushikago/mitsubachi/multipart_request.rb

@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-module Mushikago
-  module Mitsubachi
-    # Mitsubachiのリクエストを表す抽象クラス
-    class MultipartRequest < Mushikago::Http::MultipartRequest
-      include Mushikago::Auth::Signature
-
-      # @param [Hash] options オプション
-      # @option options [String] :endpoint('tombo.mushikago.org') Mitsubachiのエンドポイント
-      def initialize options={}
-        super()
-        endpoint = options[:endpoint] || Mushikago.config.endpoint
-        host, port = endpoint.split(':')
-        @host = host
-        @port = port if port
-        @path = "/#{api_version}/mitsubachi/#{method_name}"
-      end
-
-      # @private
-      private
-      def api_version
-        1
-      end
-
-      # @private
-      private
-      def method_name
-        ''
-      end
-    end
-  end
-end
-

data/lib/mushikago/mitsubachi/request.rb

@@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-module Mushikago
-  module Mitsubachi
-    # Mitsubachiのリクエストを表す抽象クラス
-    class Request < Mushikago::Http::Request
-      include Mushikago::Auth::Signature
-
-      # @param [Hash] options オプション
-      # @option options [String] :endpoint('api.mushikago.org') Mitsubachiのエンドポイント
-      def initialize options={}
-        super()
-        endpoint = options[:endpoint] || Mushikago.config.endpoint
-        host, port = endpoint.split(':')
-        @host = host
-        @port = port if port
-        @path = "/#{api_version}/mitsubachi/#{method_name}"
-      end
-
-      # @private
-      private
-      def api_version
-        1
-      end
-
-      # @private
-      private
-      def method_name
-        ''
-      end
-    end
-  end
-end

data/lib/mushikago/tombo/request.rb

@@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-module Mushikago
-  module Tombo
-    # Tomboのリクエストを表す抽象クラス
-    class Request < Mushikago::Http::Request
-      include Mushikago::Auth::Signature
-
-      # @param [Hash] options オプション
-      # @option options [String] :endpoint('tombo.mushikago.org') Tomboのエンドポイント
-      def initialize options={}
-        super()
-        endpoint = options[:endpoint] || Mushikago.config.endpoint
-        host, port = endpoint.split(':')
-        @host = host
-        @port = port if port
-        @path = "/#{api_version}/tombo/#{method_name}"
-      end
-
-      # @private
-      private
-      def api_version
-        1
-      end
-
-      # @private
-      private
-      def method_name
-        ''
-      end
-    end
-  end
-end