rubytter 0.4.4 → 0.4.5

data/lib/rubytter.rb

@@ -10,7 +10,7 @@ class Rubytter
   class APIError < StandardError; end
 
   APP_NAME = 'Rubytter'
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
   HOMEPAGE = 'http://github.com/jugyo/rubytter'
 
   def initialize(login, password, options = {})
@@ -64,13 +64,13 @@ class Rubytter
     if /%s$/ =~ path
       eval <<-EOS
         def #{method}(id, params = {})
-          #{http_method}('#{path}' % id, params)
+          #{http_method}(@host, '#{path}' % id, params)
         end
       EOS
     else
       eval <<-EOS
         def #{method}(params = {})
-          #{http_method}('#{path}', params)
+          #{http_method}(@host, '#{path}', params)
         end
       EOS
     end
@@ -91,30 +91,29 @@ class Rubytter
               when Hash
                 arg
               end
-    path = '/search.json?' + to_param_str(params)
-    req = create_request(Net::HTTP::Post.new(path))
-    http_request(req, nil, "search.#{@host}")
+    get("search.#{@host}", '/search', params)
   end
 
-  def get(path, params = {})
+  def get(host, path, params = {})
+    host ||= @host
     path += '.json'
     param_str = '?' + to_param_str(params)
     path = path + param_str unless param_str.empty?
     req = create_request(Net::HTTP::Get.new(path))
-    http_request(req)
+    http_request(host, req)
   end
 
-  def post(path, params = {})
+  def post(host, path, params = {})
+    host ||= @host
     path += '.json'
     param_str = to_param_str(params)
     req = create_request(Net::HTTP::Post.new(path))
-    http_request(req, param_str)
+    http_request(host, req, param_str)
   end
 
   alias delete post
 
-  def http_request(req, param_str = nil, host = nil)
-    host ||= @host
+  def http_request(host, req, param_str = nil)
     res = @connection.start(host) do |http|
       if param_str
         http.request(req, param_str)
@@ -160,6 +159,7 @@ class Rubytter
   end
 
   def to_param_str(hash)
+    raise ArgumentError, 'Argument must be a Hash object' unless hash.is_a?(Hash)
     hash.to_a.map{|i| i[0].to_s + '=' + CGI.escape(i[1].to_s) }.join('&')
   end
 end

data/spec/rubytter_spec.rb

@@ -20,106 +20,118 @@ class Rubytter
 
     it 'should get or post' do
       # TODO: split specs
-      @rubytter.should_receive(:get).with('/statuses/replies', {})
+      @rubytter.should_receive(:get).with('twitter.com', '/statuses/replies', {})
       @rubytter.replies
 
-      @rubytter.should_receive(:get).with('/statuses/replies', {:page => 2})
+      @rubytter.should_receive(:get).with('twitter.com', '/statuses/replies', {:page => 2})
       @rubytter.replies(:page => 2)
 
-      @rubytter.should_receive(:get).with('/statuses/user_timeline/1', {})
+      @rubytter.should_receive(:get).with('twitter.com', '/statuses/user_timeline/1', {})
       @rubytter.user_timeline(1)
 
-      @rubytter.should_receive(:get).with('/users/show/1', {})
+      @rubytter.should_receive(:get).with('twitter.com', '/users/show/1', {})
       @rubytter.user(1)
 
-      @rubytter.should_receive(:delete).with('/statuses/destroy/1', {})
+      @rubytter.should_receive(:delete).with('twitter.com', '/statuses/destroy/1', {})
       @rubytter.remove_status(1)
     end
 
     # direct_messages
 
     it 'should respond to direct_messages' do
-      @rubytter.should_receive(:get).with('/direct_messages', {})
+      @rubytter.should_receive(:get).with('twitter.com', '/direct_messages', {})
       @rubytter.direct_messages()
     end
 
     it 'should respond to sent_direct_messages' do
-      @rubytter.should_receive(:get).with('/direct_messages/sent', {})
+      @rubytter.should_receive(:get).with('twitter.com', '/direct_messages/sent', {})
       @rubytter.sent_direct_messages()
     end
 
     it 'should respond to send_direct_message' do
-      @rubytter.should_receive(:post).with('/direct_messages/new', {})
+      @rubytter.should_receive(:post).with('twitter.com', '/direct_messages/new', {})
       @rubytter.send_direct_message()
     end
 
     it 'should respond to destroy_direct_message' do
-      @rubytter.should_receive(:delete).with('/direct_messages/destroy/1', {})
+      @rubytter.should_receive(:delete).with('twitter.com', '/direct_messages/destroy/1', {})
       @rubytter.remove_direct_message(1)
     end
 
     it 'should respond to direct_message' do
-      @rubytter.should_receive(:post).with('/direct_messages/new', {:user => 'test', :text => 'aaaaaaaaaaaaa'})
+      @rubytter.should_receive(:post).with('twitter.com', '/direct_messages/new', {:user => 'test', :text => 'aaaaaaaaaaaaa'})
       @rubytter.direct_message('test', 'aaaaaaaaaaaaa')
     end
 
     # statuses
 
     it 'should respond to update' do
-      @rubytter.should_receive(:post).with('/statuses/update', {:status => 'test'})
+      @rubytter.should_receive(:post).with('twitter.com', '/statuses/update', {:status => 'test'})
       @rubytter.update('test')
     end
 
     it 'should respond to update_status' do
-      @rubytter.should_receive(:post).with('/statuses/update', {:status => 'test'})
+      @rubytter.should_receive(:post).with('twitter.com', '/statuses/update', {:status => 'test'})
       @rubytter.update_status(:status => 'test')
     end
 
     # friendship
 
     it 'should respond to follow' do
-      @rubytter.should_receive(:post).with('/friendships/create/test', {})
+      @rubytter.should_receive(:post).with('twitter.com', '/friendships/create/test', {})
       @rubytter.follow('test')
     end
 
     it 'should respond to leave' do
-      @rubytter.should_receive(:delete).with('/friendships/destroy/test', {})
+      @rubytter.should_receive(:delete).with('twitter.com', '/friendships/destroy/test', {})
       @rubytter.leave('test')
     end
 
     it 'should respond to friendship_exists' do
-      @rubytter.should_receive(:get).with('/friendships/exists', {:user_a => 'a', :user_b => 'b'})
+      @rubytter.should_receive(:get).with('twitter.com', '/friendships/exists', {:user_a => 'a', :user_b => 'b'})
       @rubytter.friendship_exists(:user_a => 'a', :user_b => 'b')
     end
 
     # Social Graph Methods
 
     it 'should respond to followers_ids' do
-      @rubytter.should_receive(:get).with('/friends/ids/test', {})
+      @rubytter.should_receive(:get).with('twitter.com', '/friends/ids/test', {})
       @rubytter.friends_ids('test')
     end
 
     it 'should respond to followers_ids' do
-      @rubytter.should_receive(:get).with('/followers/ids/test', {})
+      @rubytter.should_receive(:get).with('twitter.com', '/followers/ids/test', {})
       @rubytter.followers_ids('test')
     end
 
     it 'should respond to http_request' do
-      @rubytter.should_receive(:http_request) {|req, param_str| param_str.should == 'status=test'}
+      @rubytter.should_receive(:http_request) {|host, req, param_str| param_str.should == 'status=test'}
       @rubytter.update_status(:status => 'test')
     end
 
-    it 'should respond to search' do
-      @rubytter.should_receive(:http_request) do |req, param_str, host|
+    it 'should respond to search (1)' do
+      @rubytter.should_receive(:get).with('search.twitter.com', '/search', {:q => 'test'})
+      @rubytter.search('test')
+    end
+
+    it 'should respond to search (2)' do
+      @rubytter.should_receive(:http_request) do |host, req, param_str|
         req.path.should == '/search.json?q=test'
         host.should == 'search.twitter.com'
       end
       @rubytter.search('test')
     end
 
-    it 'should respond to search with params' do
-      @rubytter.should_receive(:http_request) do |req, param_str, host|
-        req.path.should == '/search.json?lang=ja&q=test'
+    it 'should respond to search with params (1)' do
+      @rubytter.should_receive(:get).with('search.twitter.com', "/search", {:q=>"test", :lang=>"ja"})
+      @rubytter.search(:q => 'test', :lang => 'ja')
+    end
+
+    it 'should respond to search with params (2)' do
+      @rubytter.should_receive(:http_request) do |host, req, param_str|
+        req.path.should =~ /\/search.json\?/
+        req.path.should =~ /q=test/
+        req.path.should =~ /lang=ja/
       end
       @rubytter.search(:q => 'test', :lang => 'ja')
     end
@@ -128,6 +140,12 @@ class Rubytter
       @rubytter.to_param_str(:page => 2, :foo => 'bar').should == 'foo=bar&page=2'
     end
 
+    it 'should raise when call to_param_str with invalid arg' do
+      lambda { @rubytter.to_param_str(nil) }.should raise_error ArgumentError
+      lambda { @rubytter.to_param_str('foo') }.should raise_error ArgumentError
+      lambda { @rubytter.to_param_str(:bar) }.should raise_error ArgumentError
+    end
+
     it 'should create struct from json' do
       hash = {
         :a => 'a',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubytter
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - jugyo