mushikago-sdk 0.2.3 → 0.3.1

data/lib/mushikago/mitsubachi/script_deploy_request.rb

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+module Mushikago
+  module Mitsubachi
+    class ScriptDeployRequest < MultipartRequest
+      def method_name; 'script/deploy' end
+      request_parameter :project_name
+      request_parameter :file
+      request_parameter :script_name
+
+      def initialize project_name, file_or_file_name, options={}
+        super(options)
+        self.project_name = project_name
+        if(file_or_file_name.kind_of?(File))
+          self.file = file_or_file_name
+        else
+          self.file = File.new(file_or_file_name.to_s)
+        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

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+module Mushikago
+  module Mitsubachi
+    class ScriptGetRequest < Request
+      def method_name; 'script/get' end
+      request_parameter :project_name
+      request_parameter :script_name
+
+      def initialize project_name, script_name, options={}
+        super(options)
+        self.project_name = project_name
+        self.script_name = script_name
+      end
+    end
+  end
+end
+
+

data/lib/mushikago/mitsubachi/script_list_request.rb

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+module Mushikago
+  module Mitsubachi
+    class ScriptListRequest < Request
+      def method_name; 'script/list' end
+      request_parameter :project_name
+      request_parameter :limit do |v| v.to_i end
+      request_parameter :offset do |v| v.to_i end
+      request_parameter :filter
+
+      def initialize project_name, options={}
+        super(options)
+        self.project_name = project_name
+        self.limit = options[:limit] if options.has_key?(:limit)
+        self.offset = options[:offset] if options.has_key?(:offset)
+        self.filter = options[:filter] if options.has_key?(:filter)
+      end
+    end
+  end
+end
+

data/lib/mushikago/tombo.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module Mushikago
   # Tomboへのアクセスを行うモジュール
   module Tombo

data/lib/mushikago/tombo/capture_request.rb

@@ -1,8 +1,9 @@
+# -*- coding: utf-8 -*-
 module Mushikago
   module Tombo
     # キャプチャリクエスト
     class CaptureRequest < Request
-      def method_name; 'capture.json' end
+      def method_name; 'capture' end
 
       add_param :url
       add_param :image_format

data/lib/mushikago/tombo/captures_request.rb

@@ -1,8 +1,9 @@
+# -*- coding: utf-8 -*-
 module Mushikago
   module Tombo
     # キャプチャ一覧取得リクエスト
     class CapturesRequest < Request
-      def method_name; 'captures.json' end
+      def method_name; 'captures' end
 
       add_param :id
       add_param :limit

data/lib/mushikago/tombo/client.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module Mushikago
   module Tombo
     # Tomboサービスを利用する

data/lib/mushikago/tombo/delete_request.rb

@@ -1,8 +1,9 @@
+# -*- coding: utf-8 -*-
 module Mushikago
   module Tombo
     # Deleteリクエスト
     class DeleteRequest < Request
-      def method_name; 'delete.json' end
+      def method_name; 'delete' end
 
       add_param :id
 

data/lib/mushikago/tombo/info_request.rb

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

data/lib/mushikago/tombo/request.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module Mushikago
   module Tombo
     # Tomboのリクエストを表す抽象クラス
@@ -8,11 +9,11 @@ module Mushikago
       # @option options [String] :endpoint('tombo.mushikago.org') Tomboのエンドポイント
       def initialize options={}
         super()
-        endpoint = options[:endpoint] || Mushikago.config.tombo_endpoint
+        endpoint = options[:endpoint] || Mushikago.config.endpoint
         host, port = endpoint.split(':')
         @host = host
         @port = port if port
-        @path = "/#{api_version}/#{method_name}"
+        @path = "/#{api_version}/tombo/#{method_name}"
       end
 
       # @private

data/lib/mushikago/version.rb

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

data/spec/mushikago/auth/signature_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'spec_helper'
 
 class TestRequest < Mushikago::Http::Request

data/spec/mushikago/auth/signer_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'spec_helper'
 
 describe Mushikago::Auth::Signer do

data/spec/mushikago/configuration_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'spec_helper'
 
 describe Mushikago::Config do
@@ -18,7 +19,7 @@ describe Mushikago::Config do
     subject{ Mushikago::Config.instance }
     it{ should respond_to(:api_key) }
     it{ should respond_to(:secret_key) }
-    it{ should respond_to(:tombo_endpoint) }
+    it{ should respond_to(:endpoint) }
   end
 
   # Mushikago::Configはデフォルトの値を持っている
@@ -26,7 +27,7 @@ describe Mushikago::Config do
     subject{ Mushikago::Config.instance }
     its(:api_key){ should == (ENV['MUSHIKAGO_API_KEY'] || ENV['MUSHIKAGO_API_KEY_ID']) }
     its(:secret_key){ should == (ENV['MUSHIKAGO_SECRET_KEY'] || ENV['MUSHIKAGO_SECRET_ACCESS_KEY']) }
-    its(:tombo_endpoint){ should == 'tombo.mushikago.org' }
+    its(:endpoint){ should == 'api.mushikago.org' }
   end
 
   # Mushikago::Configは値をロードすることができる
@@ -35,14 +36,14 @@ describe Mushikago::Config do
       Mushikago::Config.instance.load(
         :api_key => 'api_key',
         :secret_key => 'secret_key',
-        :tombo_endpoint => 'tombo.mushikago.org'
+        :endpoint => 'tombo.mushikago.org'
       )
     end
     
     subject{ Mushikago::Config.instance }
     its(:api_key){ should == 'api_key' }
     its(:secret_key){ should == 'secret_key' }
-    its(:tombo_endpoint){ should == 'tombo.mushikago.org' }
+    its(:endpoint){ should == 'tombo.mushikago.org' }
 
     # ロードする際のキーは文字列でもOK
     context 'loading options key can be string' do
@@ -50,14 +51,14 @@ describe Mushikago::Config do
         Mushikago::Config.instance.load(
           'api_key' => 'api_key',
           'secret_key' => 'secret_key',
-          'tombo_endpoint' => 'tombo.mushikago.org'
+          'endpoint' => 'tombo.mushikago.org'
         )
       end
 
       subject{ Mushikago::Config.instance }
       its(:api_key){ should == 'api_key' }
       its(:secret_key){ should == 'secret_key' }
-      its(:tombo_endpoint){ should == 'tombo.mushikago.org' }
+      its(:endpoint){ should == 'tombo.mushikago.org' }
     end
   end
 

data/spec/mushikago/http/client_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'spec_helper'
 
 class TestRequest < Mushikago::Http::Request
@@ -31,8 +32,8 @@ describe Mushikago::Http::Client do
   context 'send test request' do
     before :all do
       request = TestRequest.new
-      request.host = 'tombo.mushikago.org'
-      request.path = '/1/info.json'
+      request.host = 'api.mushikago.org'
+      request.path = '/1/tombo/info'
       client = Mushikago::Http::Client.new
       @response = client.send_request(request)
     end

data/spec/mushikago/http/request_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'spec_helper'
 
 class SampleRequest < Mushikago::Http::Request
@@ -33,7 +34,7 @@ describe Mushikago::Http::Request do
   its('port.to_i'){ should == 80 }
   its(:path){ should == '/1/list.json' }
   its(:headers){ should be_a_kind_of(Hash) }
-  it{ subject.headers['hoge'].should == 'fuga' }
+  it 'header["hoge"] should "fuga"' do subject.headers['hoge'].should == 'fuga' end
   its(['param1']){ should == 'p1' }
   its(['param2']){ should == 'p2' }
   its(['timestamp']){ should == '2011-09-01T00:00:00Z' }
@@ -57,6 +58,7 @@ describe Mushikago::Http::Request do
 
     it{ should respond_to(:sample1, :sample1=) }
     it{ should respond_to(:sample2, :sample2=) }
+    it{ should respond_to(:sample3, :sample3=) }
 
     its(:sample1){ should == 'hoge' }
     its(:sample2){ should == 20 }

data/spec/mushikago/http/response_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'spec_helper'
 
 describe Mushikago::Http::Response do

data/spec/mushikago/tombo/capture_request_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'spec_helper'
 
 describe Mushikago::Tombo::CaptureRequest do
@@ -29,9 +30,9 @@ describe Mushikago::Tombo::CaptureRequest do
 
     subject{ @request }
 
-    its(:host){ should == Mushikago.config.tombo_endpoint }
+    its(:host){ should == Mushikago.config.endpoint }
     its(:http_method){ should == 'POST' }
-    its(:path){ should == '/1/capture.json' }
+    its(:path){ should == '/1/tombo/capture' }
     its(:url){ should == 'http://www.mushikago.org/' }
     its(:image_format){ should == 'png' }
     its(:image_quality){ should == '20' }

data/spec/mushikago/tombo/captures_request_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'spec_helper'
 
 describe Mushikago::Tombo::CapturesRequest do
@@ -27,9 +28,9 @@ describe Mushikago::Tombo::CapturesRequest do
 
     subject{ @request }
 
-    its(:host){ should == Mushikago.config.tombo_endpoint }
+    its(:host){ should == Mushikago.config.endpoint }
     its(:http_method){ should == 'GET' }
-    its(:path){ should == '/1/captures.json' }
+    its(:path){ should == '/1/tombo/captures' }
     its(:id){ should == 'id' }
     its(:limit){ should == '2' }
     its(:offset){ should == '5' }

data/spec/mushikago/tombo/client_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'spec_helper'
 
 describe Mushikago::Tombo::Client do
@@ -14,72 +15,130 @@ describe Mushikago::Tombo::Client do
   it{ should respond_to(:captures) }
   it{ should respond_to(:delete) }
   it{ should respond_to(:info) }
-  
-  context 'send capture request' do
+
+  share_examples_for 'Basic response of request' do
+    it{ should be_a_kind_of(Mushikago::Http::Response) }
+    its(:meta){ should_not be_nil }
+    it 'meta status should 200' do subject.meta['status'].should == 200 end
+    it 'meta message should "OK"' do subject.meta['message'].should == 'OK' end
+    its(:response){ should_not be_nil }
+  end
+
+  def create_http_mock(body)
+    http = Net::HTTP.new('localhost')
+    http.should_receive(:request).and_return do |request|
+      response = Net::HTTPOK.new(nil, 200, nil)
+      response.stub!(:body).and_return(body)
+      response
+    end
+    Net::HTTP.should_receive(:new).and_return(http)
+  end
+
+  context 'send capture request and get mock response' do
     before :all do
+      response = {
+        :meta => {:status => 200, :message => 'OK'},
+        :response => {
+          :id => 'image_id',
+          :image_url => 'http://img.tombo.ne.jp/sample.jpg',
+          :thumbnail_url => 'http://img.tombo.ne.jp/t/sample.jpg'
+        }
+      }
+      create_http_mock(response.to_json)
       @response = @client.capture('http://www.tombo.ne.jp/', :thumbnail=>1)
     end
 
     subject{ @response }
 
-    it{ subject.meta['status'].should == 200 }
-    it{ subject.meta['message'].should == 'OK' }
-    its(:response){ should_not be_nil }
-    its(['id']){ should_not be_nil }
-    its(['image_url']){ should_not be_nil }
-    its(['thumbnail_url']){ should_not be_nil }
+    it_should_behave_like 'Basic response of request'
+    its(['id']){ should == 'image_id'}
+    its(['image_url']){ should == 'http://img.tombo.ne.jp/sample.jpg' }
+    its(['thumbnail_url']){ should == 'http://img.tombo.ne.jp/t/sample.jpg' }
   end
 
-  context 'send captures request' do
+  context 'send captures request and get mock response' do
     before :all do
+      response = {
+        :meta => {:status => 200, :message => 'OK'},
+        :response => {
+          :total => 2,
+          :images => [
+            {
+              :image_id => 'image_id',
+              :image_url => 'http://img.tombo.ne.jp/sample.jpg',
+              :image_size => 300,
+              :source_url => 'http://tombo.mushikago.org/',
+              :image_format => 'jpg',
+              :image_quality => 80,
+              :state => 'requested',
+              :tags => ['tag1', 'tag2'],
+            },
+            {}
+          ]
+        }
+      }
+      create_http_mock(response.to_json)
       @response = @client.captures
     end
 
     subject{ @response }
-    it{ subject.meta['status'].should == 200 }
-    it{ subject.meta['message'].should == 'OK' }
-    its(:response){ should_not be_nil }
-    its(['total']){ should_not be_nil }
-    its(['images']){ should_not be_nil }
+
+    it_should_behave_like 'Basic response of request'
+    its(['total']){ should == 2 }
     its(['images']){ should be_a_kind_of(Enumerable) }
-    it{ subject['images'].should have_at_most(subject['total'].to_i).items }
+    its(['images']){ should have_exactly(2).items }
 
     context 'returned images should have keys' do
       subject{ @response['images'].first }
-      its(['image_id']){ should_not be_nil }
-      its(['image_url']){ should_not be_nil }
-      its(['image_size']){ should_not be_nil }
-      its(['source_url']){ should_not be_nil }
-      its(['image_format']){ should_not be_nil }
-      its(['image_quality']){ should_not be_nil }
-      its(['state']){ should_not be_nil }
-      its(['tags']){ should_not be_nil }
+      its(['image_id']){ should == 'image_id' }
+      its(['image_url']){ should == 'http://img.tombo.ne.jp/sample.jpg' }
+      its(['image_size']){ should == 300 }
+      its(['source_url']){ should == 'http://tombo.mushikago.org/' }
+      its(['image_format']){ should == 'jpg' }
+      its(['image_quality']){ should == 80 }
+      its(['state']){ should == 'requested' }
       its(['tags']){ should be_a_kind_of(Enumerable) }
+      its(['tags']){ should have_exactly(2).items }
     end
   end
 
-  context 'send delete request' do
+  context 'send delete request and get mock response' do
     before :all do
-      @response = @client.delete('391d7fe4-e9d4-4975-85a3-e5d38a4cd97f')
+      response = {
+        :meta => {:status => 200, :message => 'OK'},
+        :response => {
+          :id => '391d7fe4-e9d4-4975-85a3-e5d38a4cd97f'
+        }
+      }
+      create_http_mock(response.to_json)
+      @response = @client.delete('s391d7fe4-e9d4-4975-85a3-e5d38a4cd97f')
     end
 
     subject{ @response }
 
-    it{ subject.meta['status'].should == 200 }
-    its(['id']){ should_not be_nil }
+    it_should_behave_like 'Basic response of request'
     its(['id']){ should == '391d7fe4-e9d4-4975-85a3-e5d38a4cd97f' }
   end
   
-  context 'send info request' do
+  context 'send info request and get mock response' do
     before :all do
+      response = {
+        :meta => {:status => 200, :message => 'OK'},
+        :response => {
+          :api_count => 500,
+          :disk_usage => 5500,
+          :image_num => 2,
+        }
+      }
+      create_http_mock(response.to_json)
       @response = @client.info
     end
 
     subject{ @response }
 
-    it{ subject.meta['status'].should == 200 }
-    its(['api_count']){ should_not be_nil }
-    its(['disk_usage']){ should_not be_nil }
-    its(['image_num']){ should_not be_nil }
+    it_should_behave_like 'Basic response of request'
+    its(['api_count']){ should == 500 }
+    its(['disk_usage']){ should == 5500 }
+    its(['image_num']){ should == 2 }
   end
 end