mushikago-sdk 0.2.1 → 0.2.3

data/README.md

@@ -5,8 +5,8 @@ Mushikago SDK for Ruby.
 - **Author**:          Toru Matsuoka
 - **Copyright**:       2011
 - **License**:         Apache License, Version 2.0
-- **Latest Version**:  0.2.1
-- **Release Date**:    September 8th 2011
+- **Latest Version**:  0.2.3
+- **Release Date**:    September 13th 2011
 
 
 概要
@@ -118,6 +118,8 @@ $ export MUSHIKAGO_SECRET_KEY=<シークレットキー>
 変更履歴
 --------
 
+- **Sep.13.11**: 0.2.3 release
+  - captureメソッドのuseragentに対応
 - **Sep.8.11**: 0.2.1 release
   - ライセンスをApache License, Version 2.0に変更
 - **Sep.6.11**: 0.1.8 release

data/lib/mushikago/auth/signature.rb

@@ -20,7 +20,7 @@ module Mushikago
       # リクエストに署名を追加する
       # @param signer [Mushikago::Auth::Signer] 署名を作成するオブジェクト
       def add_signature! signer
-        set_param('signature', signer.sign(string_to_sign))
+        self['signature'] = signer.sign(string_to_sign)
       end
     end
   end

data/lib/mushikago/http/client.rb

@@ -22,8 +22,8 @@ module Mushikago
       # @return [Mushikago::Http::Response] response
       def send_request request
         # add authorization
-        request.set_param('api_key', api_key)
-        request.set_param('timestamp', Time.now.utc.strftime('%Y-%m-%dT%H:%M:%SZ'))
+        request['api_key'] = api_key
+        request['timestamp'] = Time.now.utc.strftime('%Y-%m-%dT%H:%M:%SZ')
         request.add_signature!(signer)
 
         # send request

data/lib/mushikago/http/request.rb

@@ -28,13 +28,13 @@ module Mushikago
 
       # @param [String] key パラメータのキー
       # @param [String] value パラメータの値
-      def set_param key, value
+      def []= key, value
         params[key] = value
       end
 
       # @param [String] key パラメータのキー
       # @return [String] パラメータの値
-      def get_param key
+      def [] key
         param = params.detect{|p| p[0] == key}
         param ? param[1] : nil
       end
@@ -97,7 +97,7 @@ module Mushikago
           attr_accessor name
           define_method("#{name}=") do |value|
             value = transform ? transform.call(value) : value
-            set_param(name.to_s, value)
+            self[name.to_s] = value
             instance_variable_set("@#{name}".to_sym, value)
           end
         end

data/lib/mushikago/tombo/capture_request.rb

@@ -9,6 +9,7 @@ module Mushikago
       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
 
       # @param [String] url キャプチャ対象のURL
       # @param [Hash] options リクエストのオプション
@@ -16,6 +17,7 @@ module Mushikago
       # @option options [Integer] :image_quality(80) 画像の品質(0-100)
       # @option options [Boolean] :thumbnail(0) サムネイル取得フラグ(false:取得しない,true:取得する)
       # @option options [String,Array] :tags タグ
+      # @option options [String] :useragent ユーザエージェント
       def initialize url, options={}
         super(options)
         self.url = url
@@ -23,6 +25,7 @@ module Mushikago
         self.image_quality = options[:image_quality] if options.has_key?(:image_quality)
         self.thumbnail = options[:thumbnail] if options.has_key?(:thumbnail)
         self.tags = options[:tags] if options.has_key?(:tags)
+        self.useragent = options[:useragent] if options.has_key?(:useragent)
         @headers['Content-type'] = 'application/x-www-form-urlencoded; charset=utf-8'
       end
 

data/lib/mushikago/version.rb

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

data/spec/mushikago/auth/signature_spec.rb

@@ -10,8 +10,8 @@ describe Mushikago::Auth::Signature do
     @request.http_method = 'GET'
     @request.host = 'mushikago.org'
     @request.path = '/1/someapi.json'
-    @request.set_param('api_key', 'api_key')
-    @request.set_param('timestamp', '2011-09-01T00:00:00Z')
+    @request['api_key'] = 'api_key'
+    @request['timestamp'] = '2011-09-01T00:00:00Z'
   end
 
   context 'generates string to sign' do
@@ -23,7 +23,7 @@ describe Mushikago::Auth::Signature do
     before do
       @request.add_signature!(Mushikago::Auth::Signer.new('secret_key'))
     end
-    subject{ @request.get_param('signature') }
+    subject{ @request['signature'] }
     it{ should == 'sJSFFQREYbNPd2kJK3kuAR3uSgvcbuWtxGFjan+R3w8=' }
   end
 end

data/spec/mushikago/http/request_spec.rb

@@ -12,9 +12,9 @@ describe Mushikago::Http::Request do
     @request.host = 'tombo.ap-northeast-1.mushikago.org'
     @request.path = '/1/list.json'
     @request.headers['hoge'] = 'fuga'
-    @request.set_param('param1', 'p1')
-    @request.set_param('param2', 'p2')
-    @request.set_param('timestamp', '2011-09-01T00:00:00Z')
+    @request['param1'] = 'p1'
+    @request['param2'] = 'p2'
+    @request['timestamp'] = '2011-09-01T00:00:00Z'
   end
 
   subject{ @request }
@@ -25,8 +25,8 @@ describe Mushikago::Http::Request do
   it{ should respond_to(:path, :path=) }
   it{ should respond_to(:headers) }
   it{ should respond_to(:params) }
-  it{ should respond_to(:set_param) }
-  it{ should respond_to(:get_param) }
+  it{ should respond_to(:[]=) }
+  it{ should respond_to(:[]) }
 
   its(:http_method){ should == 'GET' }
   its(:host){ should == 'tombo.ap-northeast-1.mushikago.org' }
@@ -34,11 +34,11 @@ describe Mushikago::Http::Request do
   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' }
-  it{ subject.get_param('timestamp').should == '2011-09-01T00:00:00Z' }
+  its(['param1']){ should == 'p1' }
+  its(['param2']){ should == 'p2' }
+  its(['timestamp']){ should == '2011-09-01T00:00:00Z' }
 
-  it{ subject.url_encoded_params.should == 'param1=p1&param2=p2&timestamp=2011-09-01T00%3A00%3A00Z' }
+  its(:url_encoded_params){ should == 'param1=p1&param2=p2&timestamp=2011-09-01T00%3A00%3A00Z' }
 
   context 'to http request' do
     subject{ @request.to_http_request }

data/spec/mushikago/tombo/capture_request_spec.rb

@@ -12,6 +12,7 @@ describe Mushikago::Tombo::CaptureRequest do
   it{ should respond_to(:image_quality) }
   it{ should respond_to(:thumbnail) }
   it{ should respond_to(:tags) }
+  it{ should respond_to(:useragent) }
   it{ should respond_to(:add_signature!) }
 
   context 'with options' do
@@ -21,6 +22,7 @@ describe Mushikago::Tombo::CaptureRequest do
         :image_quality => '20',
         :thumbnail => true,
         :tags => 'hoge,fuga',
+        :useragent => 'sampleua',
       }
       @request = Mushikago::Tombo::CaptureRequest.new('http://www.mushikago.org/', options)
     end
@@ -34,9 +36,10 @@ describe Mushikago::Tombo::CaptureRequest do
     its(:image_format){ should == 'png' }
     its(:image_quality){ should == '20' }
     its(:thumbnail){ should == '1' }
+    its(:useragent){ should == 'sampleua' }
     its(:tags){ should == 'hoge,fuga' }
     it{ subject.headers['Content-type'].should == 'application/x-www-form-urlencoded; charset=utf-8' }
-    its(: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&useragent=sampleua' }
   end
 
   context 'tags can be array and thumbnail is false' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mushikago-sdk
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Toru Matsuoka
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-08 00:00:00 Z
+date: 2011-09-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json