mushikago-sdk 0.1.8 → 0.2.1

data/doc/_index.html

@@ -269,7 +269,7 @@
 </div>
     
     <div id="footer">
-  Generated on Tue Sep  6 18:27:42 2011 by 
+  Generated on Thu Sep  8 10:06:59 2011 by 
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.7.2 (ruby-1.8.7).
 </div>

data/doc/file.README.html

@@ -63,11 +63,11 @@
 
 <li><strong>Copyright</strong>: 2011</li>
 
-<li><strong>License</strong>: MIT License</li>
+<li><strong>License</strong>: Apache License, Version 2.0</li>
 
-<li><strong>Latest Version</strong>: 0.1.8</li>
+<li><strong>Latest Version</strong>: 0.2.1</li>
 
-<li><strong>Release Date</strong>: September 6th 2011</li>
+<li><strong>Release Date</strong>: September 8th 2011</li>
 </ul>
 
 <h2 id='id6'>概要</h2>
@@ -168,6 +168,10 @@ $ export MUSHIKAGO_SECRET_KEY=&lt;シークレットキー&gt;
 <h2 id='id10'>変更履歴</h2>
 
 <ul>
+<li>
+<p><strong>Sep.8.11</strong>: 0.2.1 release - ライセンスをApache License, Version 2.0に変更</p>
+</li>
+
 <li>
 <p><strong>Sep.6.11</strong>: 0.1.8 release</p>
 
@@ -180,7 +184,7 @@ $ export MUSHIKAGO_SECRET_KEY=&lt;シークレットキー&gt;
 </ul></div></div>
     
     <div id="footer">
-  Generated on Tue Sep  6 18:27:42 2011 by 
+  Generated on Thu Sep  8 10:06:59 2011 by 
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.7.2 (ruby-1.8.7).
 </div>

data/doc/index.html

@@ -63,11 +63,11 @@
 
 <li><strong>Copyright</strong>: 2011</li>
 
-<li><strong>License</strong>: MIT License</li>
+<li><strong>License</strong>: Apache License, Version 2.0</li>
 
-<li><strong>Latest Version</strong>: 0.1.8</li>
+<li><strong>Latest Version</strong>: 0.2.1</li>
 
-<li><strong>Release Date</strong>: September 6th 2011</li>
+<li><strong>Release Date</strong>: September 8th 2011</li>
 </ul>
 
 <h2 id='id1'>概要</h2>
@@ -168,6 +168,10 @@ $ export MUSHIKAGO_SECRET_KEY=&lt;シークレットキー&gt;
 <h2 id='id5'>変更履歴</h2>
 
 <ul>
+<li>
+<p><strong>Sep.8.11</strong>: 0.2.1 release - ライセンスをApache License, Version 2.0に変更</p>
+</li>
+
 <li>
 <p><strong>Sep.6.11</strong>: 0.1.8 release</p>
 
@@ -180,7 +184,7 @@ $ export MUSHIKAGO_SECRET_KEY=&lt;シークレットキー&gt;
 </ul></div></div>
     
     <div id="footer">
-  Generated on Tue Sep  6 18:27:42 2011 by 
+  Generated on Thu Sep  8 10:06:59 2011 by 
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.7.2 (ruby-1.8.7).
 </div>

data/doc/method_list.html

@@ -145,17 +145,17 @@
   
 
   <li class="r2 ">
-    <span class='object_link'><a href="Mushikago/Tombo/InfoRequest.html#initialize-instance_method" title="Mushikago::Tombo::InfoRequest#initialize (method)">#initialize</a></span> 
+    <span class='object_link'><a href="Mushikago/Tombo/CapturesRequest.html#initialize-instance_method" title="Mushikago::Tombo::CapturesRequest#initialize (method)">#initialize</a></span> 
     
-      <small>Mushikago::Tombo::InfoRequest</small>
+      <small>Mushikago::Tombo::CapturesRequest</small>
     
   </li>
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="Mushikago/Tombo/Request.html#initialize-instance_method" title="Mushikago::Tombo::Request#initialize (method)">#initialize</a></span> 
+    <span class='object_link'><a href="Mushikago/Tombo/CaptureRequest.html#initialize-instance_method" title="Mushikago::Tombo::CaptureRequest#initialize (method)">#initialize</a></span> 
     
-      <small>Mushikago::Tombo::Request</small>
+      <small>Mushikago::Tombo::CaptureRequest</small>
     
   </li>
   
@@ -169,17 +169,17 @@
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="Mushikago/Auth/Signer.html#initialize-instance_method" title="Mushikago::Auth::Signer#initialize (method)">#initialize</a></span> 
+    <span class='object_link'><a href="Mushikago/Tombo/DeleteRequest.html#initialize-instance_method" title="Mushikago::Tombo::DeleteRequest#initialize (method)">#initialize</a></span> 
     
-      <small>Mushikago::Auth::Signer</small>
+      <small>Mushikago::Tombo::DeleteRequest</small>
     
   </li>
   
 
   <li class="r2 ">
-    <span class='object_link'><a href="Mushikago/Tombo/DeleteRequest.html#initialize-instance_method" title="Mushikago::Tombo::DeleteRequest#initialize (method)">#initialize</a></span> 
+    <span class='object_link'><a href="Mushikago/Tombo/InfoRequest.html#initialize-instance_method" title="Mushikago::Tombo::InfoRequest#initialize (method)">#initialize</a></span> 
     
-      <small>Mushikago::Tombo::DeleteRequest</small>
+      <small>Mushikago::Tombo::InfoRequest</small>
     
   </li>
   
@@ -193,25 +193,25 @@
   
 
   <li class="r2 ">
-    <span class='object_link'><a href="Mushikago/Tombo/CaptureRequest.html#initialize-instance_method" title="Mushikago::Tombo::CaptureRequest#initialize (method)">#initialize</a></span> 
+    <span class='object_link'><a href="Mushikago/Auth/Signer.html#initialize-instance_method" title="Mushikago::Auth::Signer#initialize (method)">#initialize</a></span> 
     
-      <small>Mushikago::Tombo::CaptureRequest</small>
+      <small>Mushikago::Auth::Signer</small>
     
   </li>
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="Mushikago/Tombo/CapturesRequest.html#initialize-instance_method" title="Mushikago::Tombo::CapturesRequest#initialize (method)">#initialize</a></span> 
+    <span class='object_link'><a href="Mushikago/Http/Response.html#initialize-instance_method" title="Mushikago::Http::Response#initialize (method)">#initialize</a></span> 
     
-      <small>Mushikago::Tombo::CapturesRequest</small>
+      <small>Mushikago::Http::Response</small>
     
   </li>
   
 
   <li class="r2 ">
-    <span class='object_link'><a href="Mushikago/Http/Response.html#initialize-instance_method" title="Mushikago::Http::Response#initialize (method)">#initialize</a></span> 
+    <span class='object_link'><a href="Mushikago/Tombo/Request.html#initialize-instance_method" title="Mushikago::Tombo::Request#initialize (method)">#initialize</a></span> 
     
-      <small>Mushikago::Http::Response</small>
+      <small>Mushikago::Tombo::Request</small>
     
   </li>
   
@@ -241,9 +241,9 @@
   
 
   <li class="r2 ">
-    <span class='object_link'><a href="Mushikago/Tombo/CaptureRequest.html#method_name-instance_method" title="Mushikago::Tombo::CaptureRequest#method_name (method)">#method_name</a></span> 
+    <span class='object_link'><a href="Mushikago/Tombo/InfoRequest.html#method_name-instance_method" title="Mushikago::Tombo::InfoRequest#method_name (method)">#method_name</a></span> 
     
-      <small>Mushikago::Tombo::CaptureRequest</small>
+      <small>Mushikago::Tombo::InfoRequest</small>
     
   </li>
   
@@ -257,33 +257,33 @@
   
 
   <li class="r2 ">
-    <span class='object_link'><a href="Mushikago/Tombo/CapturesRequest.html#method_name-instance_method" title="Mushikago::Tombo::CapturesRequest#method_name (method)">#method_name</a></span> 
+    <span class='object_link'><a href="Mushikago/Tombo/CaptureRequest.html#method_name-instance_method" title="Mushikago::Tombo::CaptureRequest#method_name (method)">#method_name</a></span> 
     
-      <small>Mushikago::Tombo::CapturesRequest</small>
+      <small>Mushikago::Tombo::CaptureRequest</small>
     
   </li>
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="Mushikago/Tombo/InfoRequest.html#method_name-instance_method" title="Mushikago::Tombo::InfoRequest#method_name (method)">#method_name</a></span> 
+    <span class='object_link'><a href="Mushikago/Tombo/CapturesRequest.html#method_name-instance_method" title="Mushikago::Tombo::CapturesRequest#method_name (method)">#method_name</a></span> 
     
-      <small>Mushikago::Tombo::InfoRequest</small>
+      <small>Mushikago::Tombo::CapturesRequest</small>
     
   </li>
   
 
   <li class="r2 ">
-    <span class='object_link'><a href="Mushikago/Tombo/CaptureRequest.html#new_http_request-instance_method" title="Mushikago::Tombo::CaptureRequest#new_http_request (method)">#new_http_request</a></span> 
+    <span class='object_link'><a href="Mushikago/Tombo/DeleteRequest.html#new_http_request-instance_method" title="Mushikago::Tombo::DeleteRequest#new_http_request (method)">#new_http_request</a></span> 
     
-      <small>Mushikago::Tombo::CaptureRequest</small>
+      <small>Mushikago::Tombo::DeleteRequest</small>
     
   </li>
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="Mushikago/Tombo/DeleteRequest.html#new_http_request-instance_method" title="Mushikago::Tombo::DeleteRequest#new_http_request (method)">#new_http_request</a></span> 
+    <span class='object_link'><a href="Mushikago/Tombo/CaptureRequest.html#new_http_request-instance_method" title="Mushikago::Tombo::CaptureRequest#new_http_request (method)">#new_http_request</a></span> 
     
-      <small>Mushikago::Tombo::DeleteRequest</small>
+      <small>Mushikago::Tombo::CaptureRequest</small>
     
   </li>
   

data/doc/top-level-namespace.html

@@ -94,7 +94,7 @@
 </div>
     
     <div id="footer">
-  Generated on Tue Sep  6 18:27:44 2011 by 
+  Generated on Thu Sep  8 10:07:02 2011 by 
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.7.2 (ruby-1.8.7).
 </div>

data/lib/mushikago/http/request.rb

@@ -59,7 +59,7 @@ module Mushikago
       # @return [Net::HTTPRequest] HTTPリクエスト
       protected
       def new_http_request
-        Net::HTTP::Get.new("#{path}?#{url_encoded_params}")
+        new_http_get_request("#{path}?#{url_encoded_params}")
       end
 
       # URLエンコードされた文字列を取得する
@@ -71,6 +71,21 @@ module Mushikago
         CGI.escape(s).gsub('+', '%20')
       end
 
+      private
+      def new_http_get_request(request_path)
+        Net::HTTP::Get.new(request_path)
+      end
+
+      private
+      def new_http_post_request(request_path)
+        Net::HTTP::Post.new(request_path)
+      end
+
+      private
+      def new_http_delete_request(request_path)
+        Net::HTTP::Delete.new(request_path)
+      end
+
       class << self
         # リクエストパラメータへのアクセサを定義する
         # @param [String] name パラメータ名

data/lib/mushikago/tombo/capture_request.rb

@@ -28,7 +28,7 @@ module Mushikago
 
       # @private
       def new_http_request
-        Net::HTTP::Post.new(path)
+        new_http_post_request(path)
       end
     end
   end

data/lib/mushikago/tombo/delete_request.rb

@@ -15,7 +15,7 @@ module Mushikago
 
       # @private
       def new_http_request
-        Net::HTTP::Delete.new("#{path}?#{url_encoded_params}")
+        new_http_delete_request("#{path}?#{url_encoded_params}")
       end
     end
   end

data/lib/mushikago/version.rb

@@ -1,4 +1,4 @@
 module Mushikago
   # Mushikago SDK for Ruby のバージョン
-  VERSION = '0.1.8'
+  VERSION = '0.2.1'
 end

data/spec/mushikago/auth/signature_spec.rb

@@ -23,7 +23,7 @@ describe Mushikago::Auth::Signature do
     before do
       @request.add_signature!(Mushikago::Auth::Signer.new('secret_key'))
     end
-    subject{ @request }
-    it{ subject.get_param('signature').should == 'sJSFFQREYbNPd2kJK3kuAR3uSgvcbuWtxGFjan+R3w8=' }
+    subject{ @request.get_param('signature') }
+    it{ should == 'sJSFFQREYbNPd2kJK3kuAR3uSgvcbuWtxGFjan+R3w8=' }
   end
 end

data/spec/mushikago/configuration_spec.rb

@@ -24,9 +24,9 @@ describe Mushikago::Config do
   # Mushikago::Configはデフォルトの値を持っている
   context 'has default value' do
     subject{ Mushikago::Config.instance }
-    it{ subject.api_key.should == (ENV['MUSHIKAGO_API_KEY'] || ENV['MUSHIKAGO_API_KEY_ID']) }
-    it{ subject.secret_key.should == (ENV['MUSHIKAGO_SECRET_KEY'] || ENV['MUSHIKAGO_SECRET_ACCESS_KEY']) }
-    it{ subject.tombo_endpoint.should == 'tombo.mushikago.org' }
+    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' }
   end
 
   # Mushikago::Configは値をロードすることができる
@@ -40,9 +40,9 @@ describe Mushikago::Config do
     end
     
     subject{ Mushikago::Config.instance }
-    it{ subject.api_key.should == 'api_key' }
-    it{ subject.secret_key.should == 'secret_key' }
-    it{ subject.tombo_endpoint.should == 'tombo.mushikago.org' }
+    its(:api_key){ should == 'api_key' }
+    its(:secret_key){ should == 'secret_key' }
+    its(:tombo_endpoint){ should == 'tombo.mushikago.org' }
 
     # ロードする際のキーは文字列でもOK
     context 'loading options key can be string' do
@@ -55,9 +55,9 @@ describe Mushikago::Config do
       end
 
       subject{ Mushikago::Config.instance }
-      it{ subject.api_key.should == 'api_key' }
-      it{ subject.secret_key.should == 'secret_key' }
-      it{ subject.tombo_endpoint.should == 'tombo.mushikago.org' }
+      its(:api_key){ should == 'api_key' }
+      its(:secret_key){ should == 'secret_key' }
+      its(:tombo_endpoint){ should == 'tombo.mushikago.org' }
     end
   end
 

data/spec/mushikago/http/client_spec.rb

@@ -13,7 +13,7 @@ describe Mushikago::Http::Client do
 
     subject{ @client }
 
-    it{ subject.api_key.should == Mushikago.config.api_key.to_s }
+    its(:api_key){ should == Mushikago.config.api_key.to_s }
   end
 
   context 'construct with options' do
@@ -25,7 +25,7 @@ describe Mushikago::Http::Client do
 
     subject{ @client }
 
-    it{ subject.api_key.should == 'mushikago api key' }
+    its(:api_key){ should == 'mushikago api key' }
   end
 
   context 'send test request' do

data/spec/mushikago/http/request_spec.rb

@@ -28,11 +28,11 @@ describe Mushikago::Http::Request do
   it{ should respond_to(:set_param) }
   it{ should respond_to(:get_param) }
 
-  it{ subject.http_method.should == 'GET' }
-  it{ subject.host.should == 'tombo.ap-northeast-1.mushikago.org' }
-  it{ subject.port.to_i.should == 80 }
-  it{ subject.path.should == '/1/list.json' }
-  it{ subject.headers.should be_a_kind_of(Hash) }
+  its(:http_method){ should == 'GET' }
+  its(:host){ should == 'tombo.ap-northeast-1.mushikago.org' }
+  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{ subject.get_param('param1').should == 'p1' }
   it{ subject.get_param('param2').should == 'p2' }
@@ -58,9 +58,9 @@ describe Mushikago::Http::Request do
     it{ should respond_to(:sample1, :sample1=) }
     it{ should respond_to(:sample2, :sample2=) }
 
-    it{ subject.sample1.should == 'hoge' }
-    it{ subject.sample2.should == 20 }
-    it{ subject.sample3.should == 'sample3' }
+    its(:sample1){ should == 'hoge' }
+    its(:sample2){ should == 20 }
+    its(:sample3){ should == 'sample3' }
   end
 end
 

data/spec/mushikago/http/response_spec.rb

@@ -21,9 +21,9 @@ describe Mushikago::Http::Response do
   it{ should respond_to(:[]) }
 
   it{ subject.meta[:status].should == 200 }
-  it{ subject.status.should == 200 }
+  its(:status){ should == 200 }
   it{ subject.meta[:message].should == 'OK' }
-  it{ subject.message.should == 'OK' }
+  its(:message){ should == 'OK' }
   it{ subject.response[:hello].should == 'world' }
-  it{ subject[:hello].should == 'world' }
+  its([:hello]){ should == 'world' }
 end

data/spec/mushikago/tombo/capture_request_spec.rb

@@ -27,16 +27,16 @@ describe Mushikago::Tombo::CaptureRequest do
 
     subject{ @request }
 
-    it{ subject.host.should == Mushikago.config.tombo_endpoint }
-    it{ subject.http_method.should == 'POST' }
-    it{ subject.path.should == '/1/capture.json' }
-    it{ subject.url.should == 'http://www.mushikago.org/' }
-    it{ subject.image_format.should == 'png' }
-    it{ subject.image_quality.should == '20' }
-    it{ subject.thumbnail.should == '1' }
-    it{ subject.tags.should == 'hoge,fuga' }
+    its(:host){ should == Mushikago.config.tombo_endpoint }
+    its(:http_method){ should == 'POST' }
+    its(:path){ should == '/1/capture.json' }
+    its(:url){ should == 'http://www.mushikago.org/' }
+    its(:image_format){ should == 'png' }
+    its(:image_quality){ should == '20' }
+    its(:thumbnail){ should == '1' }
+    its(:tags){ should == 'hoge,fuga' }
     it{ subject.headers['Content-type'].should == 'application/x-www-form-urlencoded; charset=utf-8' }
-    it{ subject.url_encoded_params.should == 'image_format=png&image_quality=20&tags=hoge%2Cfuga&thumbnail=1&url=http%3A%2F%2Fwww.mushikago.org%2F' }
+    its(:url_encoded_params){ should == 'image_format=png&image_quality=20&tags=hoge%2Cfuga&thumbnail=1&url=http%3A%2F%2Fwww.mushikago.org%2F' }
   end
 
   context 'tags can be array and thumbnail is false' do
@@ -49,7 +49,7 @@ describe Mushikago::Tombo::CaptureRequest do
     end
 
     subject{ @request }
-    it{ subject.thumbnail.should == '0' }
-    it{ subject.tags.should == 'hoge,fuga' }
+    its(:thumbnail){ should == '0' }
+    its(:tags){ should == 'hoge,fuga' }
   end
 end

data/spec/mushikago/tombo/captures_request_spec.rb

@@ -27,14 +27,14 @@ describe Mushikago::Tombo::CapturesRequest do
 
     subject{ @request }
 
-    it{ subject.host.should == Mushikago.config.tombo_endpoint }
-    it{ subject.http_method.should == 'GET' }
-    it{ subject.path.should == '/1/captures.json' }
-    it{ subject.id.should == 'id' }
-    it{ subject.limit.should == '2' }
-    it{ subject.offset.should == '5' }
-    it{ subject.domain.should == 'hogehoge.com' }
-    it{ subject.tag.should == 'tag' }
-    it{ subject.url_encoded_params.should == 'domain=hogehoge.com&id=id&limit=2&offset=5&tag=tag' }
+    its(:host){ should == Mushikago.config.tombo_endpoint }
+    its(:http_method){ should == 'GET' }
+    its(:path){ should == '/1/captures.json' }
+    its(:id){ should == 'id' }
+    its(:limit){ should == '2' }
+    its(:offset){ should == '5' }
+    its(:domain){ should == 'hogehoge.com' }
+    its(:tag){ should == 'tag' }
+    its(:url_encoded_params){ should == 'domain=hogehoge.com&id=id&limit=2&offset=5&tag=tag' }
   end
 end