mushikago-sdk 0.1.2 → 0.1.3

data/lib/mushikago/client.rb

@@ -25,7 +25,7 @@ module Mushikago
       request.add_signature!(signer)
 
       # send request
-      Net::HTTP.start(request.host) do |http|
+      Net::HTTP.start(request.host, request.port) 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/request.rb

@@ -9,6 +9,8 @@ module Mushikago
       attr_accessor :http_method
       # @return [String] host 
       attr_accessor :host
+      # @return [Integer] port 
+      attr_accessor :port
       # @return [String] path
       attr_accessor :path
       # @return [String] params
@@ -17,6 +19,7 @@ module Mushikago
       def initialize
         @headers = {}
         @host = ''
+        @port = 80
         @path = '/'
         @params = {} 
         @http_method = new_http_request.method

data/lib/mushikago/tombo/captures_request.rb

@@ -14,7 +14,6 @@ module Mushikago
         self.offset = options[:offset] if options.has_key?(:offset)
         self.domain = options[:domain] if options.has_key?(:domain)
         self.tag = options[:tag] if options.has_key?(:tag)
-        @host = options[:endpoint] ||= Mushikago.config.tombo_endpoint
         @path = "/#{api_version}/captures.json"
       end
     end

data/lib/mushikago/tombo/request.rb

@@ -5,7 +5,10 @@ module Mushikago
 
       def initialize options={}
         super()
-        @host = options[:endpoint] ||= Mushikago.config.tombo_endpoint
+        endpoint = options[:endpoint] || Mushikago.config.tombo_endpoint
+        host, port = endpoint.split(':')
+        self.host = host
+        self.port = port if port
       end
 
       def api_version

data/lib/mushikago/version.rb

@@ -1,3 +1,3 @@
 module Mushikago
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/mushikago/http/request_spec.rb

@@ -15,6 +15,7 @@ describe Mushikago::Http::Request do
   
   it{ should respond_to(:http_method) }
   it{ should respond_to(:host, :host=) }
+  it{ should respond_to(:port, :port=) }
   it{ should respond_to(:path, :path=) }
   it{ should respond_to(:headers) }
   it{ should respond_to(:params) }
@@ -23,6 +24,7 @@ describe Mushikago::Http::Request do
 
   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) }
   it{ subject.headers['hoge'].should == 'fuga' }

data/spec/mushikago/tombo/client_spec.rb

@@ -14,7 +14,7 @@ describe Mushikago::Tombo::Client do
   it{ should respond_to(:captures) }
   it{ should respond_to(:delete) }
   it{ should respond_to(:info) }
-=begin 
+  
   context 'send capture request' do
     before :all do
       @response = @client.capture('http://www.tombo.ne.jp/', :thumbnail=>1)
@@ -29,7 +29,6 @@ describe Mushikago::Tombo::Client do
     it{ subject['image_url'].should_not be_nil }
     it{ subject['thumbnail_url'].should_not be_nil }
   end
-=end
 
   context 'send captures request' do
     before :all do

data/spec/mushikago/tombo/request_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Mushikago::Tombo::Request do
+  before :all do
+    @request = Mushikago::Tombo::Request.new
+  end
+
+  subject{ @request }
+
+  it{ should respond_to(:api_version) }
+  it{ subject.api_version.should == 1 }
+  it{ subject.host.should == Mushikago.config.tombo_endpoint }
+
+  context 'construct with options' do
+    before :all do
+      @request = Mushikago::Tombo::Request.new(:endpoint => 'localhost:18080')
+    end
+
+    subject{ @request }
+
+    it{ subject.host.should == 'localhost' }
+    it{ subject.port.to_i.should == 18080 }
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mushikago-sdk
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Toru Matsuoka
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-05 00:00:00 Z
+date: 2011-09-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -150,6 +150,7 @@ files:
 - spec/mushikago/auth/signer_spec.rb
 - spec/mushikago/auth/signature_spec.rb
 - spec/mushikago/tombo/client_spec.rb
+- spec/mushikago/tombo/request_spec.rb
 - spec/mushikago/tombo/delete_request_spec.rb
 - spec/mushikago/tombo/captures_request_spec.rb
 - spec/mushikago/tombo/info_request_spec.rb
@@ -196,6 +197,7 @@ test_files:
 - spec/mushikago/auth/signer_spec.rb
 - spec/mushikago/auth/signature_spec.rb
 - spec/mushikago/tombo/client_spec.rb
+- spec/mushikago/tombo/request_spec.rb
 - spec/mushikago/tombo/delete_request_spec.rb
 - spec/mushikago/tombo/captures_request_spec.rb
 - spec/mushikago/tombo/info_request_spec.rb