rubytter 0.4.6 → 0.4.7

data/examples/search.rb

@@ -3,12 +3,7 @@
 require 'rubygems'
 require 'rubytter'
 
-if ARGV.size < 2
-  puts "Usage: ruby #{File.basename(__FILE__)} user_id password"
-  exit
-end
-
-client = Rubytter.new(ARGV[0], ARGV[1])
-client.search('ruby').results.each do |status|
+client = Rubytter.new
+client.search(ARGV[0] || 'rubytter').results.each do |status|
   puts "#{status.from_user}: #{status.text}"
 end

data/lib/rubytter.rb

@@ -10,17 +10,17 @@ class Rubytter
   class APIError < StandardError; end
 
   APP_NAME = 'Rubytter'
-  VERSION = '0.4.6'
+  VERSION = '0.4.7'
   HOMEPAGE = 'http://github.com/jugyo/rubytter'
 
   attr_reader :login
   attr_accessor :host, :header
 
-  def initialize(login, password, options = {})
+  def initialize(login = nil, password = nil, options = {})
     @login = login
     @password = password
     @host = options[:host] || 'twitter.com'
-    @header = options[:header] || {'User-Agent', "#{APP_NAME}/#{VERSION} (#{HOMEPAGE})"}
+    @header = options[:header] || {'User-Agent' => "#{APP_NAME}/#{VERSION} (#{HOMEPAGE})"}
     @connection = Connection.new(options)
   end
 
@@ -68,13 +68,13 @@ class Rubytter
     if /%s$/ =~ path
       eval <<-EOS
         def #{method}(id, params = {})
-          #{http_method}(@host, '#{path}' % id, params)
+          #{http_method}('#{path}' % id, params)
         end
       EOS
     else
       eval <<-EOS
         def #{method}(params = {})
-          #{http_method}(@host, '#{path}', params)
+          #{http_method}('#{path}', params)
         end
       EOS
     end
@@ -88,31 +88,27 @@ class Rubytter
     send_direct_message(params.merge({:user => user, :text => text}))
   end
 
-  def search(arg)
-    params =  case arg
-              when String
-                {:q => arg}
-              when Hash
-                arg
-              end
-    get("search.#{@host}", '/search', params)
+  def search(query, params = {})
+    path = '/search.json'
+    param_str = '?' + to_param_str(params.merge({:q => query}))
+    path = path + param_str unless param_str.empty?
+    req = create_request(Net::HTTP::Get.new(path), false)
+    http_request("search.#{@host}", req)
   end
 
-  def get(host, path, params = {})
-    host ||= @host
+  def get(path, params = {})
     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(host, req)
+    http_request(@host, req)
   end
 
-  def post(host, path, params = {})
-    host ||= @host
+  def post(path, params = {})
     path += '.json'
     param_str = to_param_str(params)
     req = create_request(Net::HTTP::Post.new(path))
-    http_request(host, req, param_str)
+    http_request(@host, req, param_str)
   end
 
   alias delete post
@@ -134,9 +130,9 @@ class Rubytter
     end
   end
 
-  def create_request(req)
+  def create_request(req, basic_auth = true)
     @header.each {|k, v| req.add_field(k, v) }
-    req.basic_auth(@login, @password)
+    req.basic_auth(@login, @password) if basic_auth
     req
   end
 

data/spec/rubytter_spec.rb

@@ -20,87 +20,87 @@ class Rubytter
 
     it 'should get or post' do
       # TODO: split specs
-      @rubytter.should_receive(:get).with('twitter.com', '/statuses/replies', {})
+      @rubytter.should_receive(:get).with('/statuses/replies', {})
       @rubytter.replies
 
-      @rubytter.should_receive(:get).with('twitter.com', '/statuses/replies', {:page => 2})
+      @rubytter.should_receive(:get).with('/statuses/replies', {:page => 2})
       @rubytter.replies(:page => 2)
 
-      @rubytter.should_receive(:get).with('twitter.com', '/statuses/user_timeline/1', {})
+      @rubytter.should_receive(:get).with('/statuses/user_timeline/1', {})
       @rubytter.user_timeline(1)
 
-      @rubytter.should_receive(:get).with('twitter.com', '/users/show/1', {})
+      @rubytter.should_receive(:get).with('/users/show/1', {})
       @rubytter.user(1)
 
-      @rubytter.should_receive(:delete).with('twitter.com', '/statuses/destroy/1', {})
+      @rubytter.should_receive(:delete).with('/statuses/destroy/1', {})
       @rubytter.remove_status(1)
     end
 
     # direct_messages
 
     it 'should respond to direct_messages' do
-      @rubytter.should_receive(:get).with('twitter.com', '/direct_messages', {})
+      @rubytter.should_receive(:get).with('/direct_messages', {})
       @rubytter.direct_messages()
     end
 
     it 'should respond to sent_direct_messages' do
-      @rubytter.should_receive(:get).with('twitter.com', '/direct_messages/sent', {})
+      @rubytter.should_receive(:get).with('/direct_messages/sent', {})
       @rubytter.sent_direct_messages()
     end
 
     it 'should respond to send_direct_message' do
-      @rubytter.should_receive(:post).with('twitter.com', '/direct_messages/new', {})
+      @rubytter.should_receive(:post).with('/direct_messages/new', {})
       @rubytter.send_direct_message()
     end
 
     it 'should respond to destroy_direct_message' do
-      @rubytter.should_receive(:delete).with('twitter.com', '/direct_messages/destroy/1', {})
+      @rubytter.should_receive(:delete).with('/direct_messages/destroy/1', {})
       @rubytter.remove_direct_message(1)
     end
 
     it 'should respond to direct_message' do
-      @rubytter.should_receive(:post).with('twitter.com', '/direct_messages/new', {:user => 'test', :text => 'aaaaaaaaaaaaa'})
+      @rubytter.should_receive(:post).with('/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('twitter.com', '/statuses/update', {:status => 'test'})
+      @rubytter.should_receive(:post).with('/statuses/update', {:status => 'test'})
       @rubytter.update('test')
     end
 
     it 'should respond to update_status' do
-      @rubytter.should_receive(:post).with('twitter.com', '/statuses/update', {:status => 'test'})
+      @rubytter.should_receive(:post).with('/statuses/update', {:status => 'test'})
       @rubytter.update_status(:status => 'test')
     end
 
     # friendship
 
     it 'should respond to follow' do
-      @rubytter.should_receive(:post).with('twitter.com', '/friendships/create/test', {})
+      @rubytter.should_receive(:post).with('/friendships/create/test', {})
       @rubytter.follow('test')
     end
 
     it 'should respond to leave' do
-      @rubytter.should_receive(:delete).with('twitter.com', '/friendships/destroy/test', {})
+      @rubytter.should_receive(:delete).with('/friendships/destroy/test', {})
       @rubytter.leave('test')
     end
 
     it 'should respond to friendship_exists' do
-      @rubytter.should_receive(:get).with('twitter.com', '/friendships/exists', {:user_a => 'a', :user_b => 'b'})
+      @rubytter.should_receive(:get).with('/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('twitter.com', '/friends/ids/test', {})
+      @rubytter.should_receive(:get).with('/friends/ids/test', {})
       @rubytter.friends_ids('test')
     end
 
     it 'should respond to followers_ids' do
-      @rubytter.should_receive(:get).with('twitter.com', '/followers/ids/test', {})
+      @rubytter.should_receive(:get).with('/followers/ids/test', {})
       @rubytter.followers_ids('test')
     end
 
@@ -110,11 +110,6 @@ class Rubytter
     end
 
     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'
@@ -123,17 +118,12 @@ class Rubytter
     end
 
     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')
+      @rubytter.search('test', :lang => 'ja')
     end
 
     it 'should respond to to_param_str' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubytter
 version: !ruby/object:Gem::Version 
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors: 
 - jugyo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-22 00:00:00 +09:00
+date: 2009-03-05 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency