twitter4r 0.3.2 → 0.5.0

data/spec/twitter/client/auth_spec.rb

@@ -10,25 +10,25 @@ describe Twitter::Client, "#authenticate?" do
     @error_response = mas_net_http_response(404, "Resource Not Found")
     @connection = mas_net_http(@response)
     Net::HTTP.stub!(:new).and_return(@connection)
-    @login = "applestillsucks"
-    @password = "linuxstillrocks"
+    @access_key = "applestillsucks"
+    @access_secret = "linuxstillrocks"
   end
   
   it "creates expected HTTP GET request" do
-    @twitter.should_receive(:create_http_get_request).with(@uri).and_return(@request)
-    @twitter.authenticate?(@login, @password)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, @uri).and_return(@request)
+    @twitter.authenticate?(@access_key, @access_secret)
   end
   
   it "should return true if HTTP response is 20X" do
-    @twitter.authenticate?(@login, @password).should be(true)
+    @twitter.authenticate?(@access_key, @access_secret).should be(true)
   end
   
   it "should return false if HTTP response is not 20X" do
-    Net::HTTP.stub!(:new).and_return(mas_net_http(@error_response))
-    @twitter.authenticate?(@login, @password).should be(false)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, @uri).and_return(@error_response)
+    @twitter.authenticate?(@access_key, @access_secret).should be(false)
   end
   
   after(:each) do
-    nilize(@uri, @request, @twitter, @default_header, @response, @error_response, @connection, @login, @password)
+    nilize(@uri, @request, @twitter, @default_header, @response, @error_response, @connection, @access_key, @access_secret)
   end
 end

data/spec/twitter/client/base_spec.rb

@@ -11,7 +11,6 @@ describe "Twitter::Client" do
       client = Twitter::Client.new(@init_hash)
     end.should_not raise_error
     client.send(:login).should eql(@init_hash[:login])
-    client.send(:password).should eql(@init_hash[:password])
   end  
 end
 
@@ -68,108 +67,6 @@ describe Twitter::Client, "#http_header" do
   end
 end
 
-describe Twitter::Client, "#create_http_get_request" do
-  before(:each) do
-  	@uri = '/some/path'
-  	@expected_get_request = mock(Net::HTTP::Get)
-    @twitter = client_context
-  	@default_header = @twitter.send(:http_header)
-  end
-  
-  it "should create new Net::HTTP::Get object with expected initialization arguments" do
-  	Net::HTTP::Get.should_receive(:new).with(@uri, @default_header).and_return(@expected_get_request)
-		@twitter.send(:create_http_get_request, @uri)
-  end
-  
-  after(:each) do
-    nilize(@twitter, @uri, @expected_get_request, @default_header)
-  end
-end
-
-describe Twitter::Client, "#create_http_post_request" do
-  before(:each) do
-  	@uri = '/some/path'
-  	@expected_post_request = mock(Net::HTTP::Post)
-  	@twitter = client_context
-  	@default_header = @twitter.send(:http_header)
-  end
-    
-  it "should create new Net::HTTP::Post object with expected initialization arguments" do
-  	Net::HTTP::Post.should_receive(:new).with(@uri, @default_header).and_return(@expected_post_request)
-    @twitter.send(:create_http_post_request, @uri)
-  end
-  
-  after(:each) do
-    nilize(@twitter, @uri, @expected_post_request, @default_header)    
-  end
-end
-
-describe Twitter::Client, "#create_http_delete_request" do
-  before(:each) do
-    @uri = '/a/stupid/path/that/is/not/restful/since/twitter.com/cannot/do/consistent/restful/apis'
-    @expected_delete_request = mock(Net::HTTP::Delete)
-    @twitter = client_context
-    @default_header = @twitter.send(:http_header)
-  end
-  
-  it "should create new Net::HTTP::Delete object with expected initialization arguments" do
-    Net::HTTP::Delete.should_receive(:new).with(@uri, @default_header).and_return(@expected_delete_request)
-    @twitter.send(:create_http_delete_request, @uri)
-  end
-  
-  after(:each) do
-    nilize(@twitter, @uri, @expected_delete_request, @default_header)
-  end
-end
-
-describe Twitter::Client, "#http_connect" do
-  before(:each) do
-    @request = mas_net_http_get(:basic_auth => nil)
-    @good_response = mas_net_http_response(:success)
-    @bad_response = mas_net_http_response(:server_error)
-    @http_stubs = {:is_a? => true}
-    @block = Proc.new do |conn|
-      conn.is_a?(Net::HTTP).should be(true)
-      @has_yielded = true
-      @request
-    end
-    @twitter = client_context
-    @has_yielded = false
-  end
-  
-  def generate_bad_response
-    @http = mas_net_http(@bad_response, @http_stubs)
-    Net::HTTP.stub!(:new).and_return(@http)
-  end
-  
-  def generate_good_response
-    @http = mas_net_http(@good_response, @http_stubs)
-    Net::HTTP.stub!(:new).and_return(@http)
-  end
-  
-  it "should yield HTTP connection when response is good" do
-    generate_good_response
-    @http.should_receive(:is_a?).with(Net::HTTP).and_return(true)
-    lambda do
-      @twitter.send(:http_connect, &@block)
-    end.should_not raise_error
-    @has_yielded.should be(true)
-  end
-  
-  it "should yield HTTP connection when response is bad" do
-    generate_bad_response
-    @http.should_receive(:is_a?).with(Net::HTTP).and_return(true)
-    lambda {
-      @twitter.send(:http_connect, &@block)
-    }.should raise_error(Twitter::RESTError)
-    @has_yielded.should be(true)
-  end
-  
-  after(:each) do
-    nilize(@good_response, @bad_response, @http)
-  end
-end
-
 describe Twitter::Client, "#bless_model" do
   before(:each) do
     @twitter = client_context

data/spec/twitter/client/blocks_spec.rb

@@ -20,37 +20,37 @@ describe Twitter::Client, "#block" do
   
   it "should create expected HTTP GET request for :add case using integer user ID" do
   	# the integer user ID scenario...
-    @twitter.should_receive(:create_http_get_request).with(create_uri(:add, @id)).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, create_uri(:add, @id)).and_return(@response)
     @twitter.block(:add, @id)
   end
   
   it "should create expected HTTP GET request for :add case using screen name" do
     # the screen name scenario...
-    @twitter.should_receive(:create_http_get_request).with(create_uri(:add, @screen_name)).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, create_uri(:add, @screen_name)).and_return(@response)
     @twitter.block(:add, @screen_name)
   end
 
   it "should create expected HTTP GET request for :add case using Twitter::User object" do
     # the Twitter::User object scenario...
-    @twitter.should_receive(:create_http_get_request).with(create_uri(:add, @friend.to_i)).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, create_uri(:add, @friend.to_i)).and_return(@response)
     @twitter.block(:add, @friend)
   end
   
   it "should create expected HTTP GET request for :remove case using integer user ID" do
     # the integer user ID scenario...
-    @twitter.should_receive(:create_http_get_request).with(create_uri(:remove, @id)).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, create_uri(:remove, @id)).and_return(@response)
     @twitter.block(:remove, @id)
   end
 
   it "should create expected HTTP GET request for :remove case using screen name" do
     # the screen name scenario...
-    @twitter.should_receive(:create_http_get_request).with(create_uri(:remove, @screen_name)).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, create_uri(:remove, @screen_name)).and_return(@response)
     @twitter.block(:remove, @screen_name)
   end
 
   it "should create expected HTTP GET request for :remove case using Twitter::User object" do
     # the Twitter::User object scenario...
-    @twitter.should_receive(:create_http_get_request).with(create_uri(:remove, @friend.to_i)).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, create_uri(:remove, @friend.to_i)).and_return(@response)
     @twitter.block(:remove, @friend)
   end
   

data/spec/twitter/client/favorites_spec.rb

@@ -15,12 +15,12 @@ describe Twitter::Client, "#favorites" do
   end
   
   it "should create expected HTTP GET request when not giving options" do
-    @twitter.should_receive(:create_http_get_request).with(@uri).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, @uri).and_return(@response)
     @twitter.favorites
   end
   
   it "should create expected HTTP GET request when giving :page options" do
-    @twitter.should_receive(:create_http_get_request).with("#{@uri}?#{@options.to_http_str}").and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, "#{@uri}?#{@options.to_http_str}").and_return(@response)
     @twitter.favorites(@options)
   end
   
@@ -141,12 +141,12 @@ describe Twitter::Client, "#favorite(:add, status)" do
   end
   
   it "should create expected POST request for :add action supplying integer id of status" do
-    @twitter.should_receive(:create_http_post_request).with(create_uri(:create, @id)).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:post, create_uri(:create, @id)).and_return(@request)
     @twitter.favorite(:add, @id)
   end
   
   it "should create expected POST request for :add action supplying status object" do
-    @twitter.should_receive(:create_http_post_request).with(create_uri(:create, @id)).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:post, create_uri(:create, @id)).and_return(@request)
     @twitter.favorite(:add, @status)
   end
   
@@ -168,12 +168,12 @@ describe Twitter::Client, "#favorite(:remove, status)" do
   end
   
   it "should create expected DELETE request for :remove action supplying integer id of status" do
-    @twitter.should_receive(:create_http_delete_request).with(create_uri(:destroy, @id)).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:delete, create_uri(:destroy, @id)).and_return(@request)
     @twitter.favorite(:remove, @id)
   end
   
   it "should create expected DELETE request for :remove action supplying status object" do
-    @twitter.should_receive(:create_http_delete_request).with(create_uri(:destroy, @id)).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:delete, create_uri(:destroy, @id)).and_return(@request)
     @twitter.favorite(:remove, @status)
   end
   

data/spec/twitter/client/friendship_spec.rb

@@ -1,16 +1,35 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
 
+describe Twitter::Client, "#friendships" do
+  before(:each) do
+    @twitter = client_context
+    @uris = Twitter::Client.class_eval("@@FRIENDSHIP_URIS")
+    @response = mas_net_http_response(:success)
+    @connection = mas_net_http(@response)
+    @result = { :id_list => { :ids => [] } }
+    JSON.stub!(:parse).and_return(@result)
+  end
+
+  it "should create expected HTTP GET request for :incoming case" do
+    @twitter.should_receive(:rest_oauth_connect).with(:get, @uris[:incoming]).and_return(@response)
+    @twitter.friendships(:incoming)
+  end
+
+  it "should create expected HTTP GET request for :outgoing case" do
+    @twitter.should_receive(:rest_oauth_connect).with(:get, @uris[:outgoing]).and_return(@response)
+    @twitter.friendships(:outgoing)
+  end
+end
+
 describe Twitter::Client, "#friend" do
   before(:each) do
     @twitter = client_context
     @id = 1234567
     @screen_name = 'dummylogin'
     @friend = Twitter::User.new(:id => @id, :screen_name => @screen_name)
-    @uris = Twitter::Client.class_eval("@@FRIENDSHIP_URIS")
-    @request = mas_net_http_post(:basic_auth => nil)
+    @uris = Twitter::Client.class_eval("@@FRIEND_URIS")
     @response = mas_net_http_response(:success)
     @connection = mas_net_http(@response)
-    Net::HTTP.stub!(:new).and_return(@connection)
     Twitter::User.stub!(:unmarshal).and_return(@friend)
   end
   
@@ -18,39 +37,39 @@ describe Twitter::Client, "#friend" do
   	"#{@uris[action]}/#{id}.json"
   end
   
-  it "should create expected HTTP GET request for :add case using integer user ID" do
+  it "should create expected HTTP POST request for :add case using integer user ID" do
   	# the integer user ID scenario...
-    @twitter.should_receive(:create_http_post_request).with(create_uri(:add, @id)).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:post, create_uri(:add, @id)).and_return(@response)
     @twitter.friend(:add, @id)
   end
   
-  it "should create expected HTTP GET request for :add case using screen name" do
+  it "should create expected HTTP POST request for :add case using screen name" do
   	# the screen name scenario...
-    @twitter.should_receive(:create_http_post_request).with(create_uri(:add, @screen_name)).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:post, create_uri(:add, @screen_name)).and_return(@response)
     @twitter.friend(:add, @screen_name)
   end
 
 	it "should create expected HTTP GET request for :add case using Twitter::User object" do
   	# the Twitter::User object scenario...
-    @twitter.should_receive(:create_http_post_request).with(create_uri(:add, @friend.to_i)).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:post, create_uri(:add, @friend.to_i)).and_return(@response)
     @twitter.friend(:add, @friend)
   end
   
   it "should create expected HTTP GET request for :remove case using integer user ID" do
   	# the integer user ID scenario...
-    @twitter.should_receive(:create_http_post_request).with(create_uri(:remove, @id)).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:post, create_uri(:remove, @id)).and_return(@response)
     @twitter.friend(:remove, @id)
   end
 
 	it "should create expected HTTP GET request for :remove case using screen name" do
   	# the screen name scenario...
-    @twitter.should_receive(:create_http_post_request).with(create_uri(:remove, @screen_name)).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:post, create_uri(:remove, @screen_name)).and_return(@response)
     @twitter.friend(:remove, @screen_name)
   end
 
   it "should create expected HTTP GET request for :remove case using Twitter::User object" do
   	# the Twitter::User object scenario...
-    @twitter.should_receive(:create_http_post_request).with(create_uri(:remove, @friend.to_i)).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:post, create_uri(:remove, @friend.to_i)).and_return(@response)
     @twitter.friend(:remove, @friend)
   end
   
@@ -71,6 +90,6 @@ describe Twitter::Client, "#friend" do
   end
   
   after(:each) do
-    nilize(@twitter, @id, @uris, @request, @response, @connection)
+    nilize(@twitter, @id, @uris, @response, @connection)
   end
 end

data/spec/twitter/client/graph_spec.rb

@@ -21,37 +21,37 @@ describe Twitter::Client, "#graph(:friends...)" do
   
   it "should create expected HTTP GET request for :friends case using integer user ID" do
   	# the integer user ID scenario...
-    @twitter.should_receive(:create_http_get_request).with(create_uri(:friends), :id => @id).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, create_uri(:friends), :id => @id).and_return(@response)
     @twitter.graph(:friends, @id)
   end
   
   it "should create expected HTTP GET request for :friends case using screen name" do
     # the screen name scenario...
-    @twitter.should_receive(:create_http_get_request).with(create_uri(:friends), :id => @screen_name).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, create_uri(:friends), :id => @screen_name).and_return(@response)
     @twitter.graph(:friends, @screen_name)
   end
 
   it "should create expected HTTP GET request for :friends case using Twitter::User object" do
     # the Twitter::User object scenario...
-    @twitter.should_receive(:create_http_get_request).with(create_uri(:friends), :id => @friend.to_i).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, create_uri(:friends), :id => @friend.to_i).and_return(@response)
     @twitter.graph(:friends, @friend)
   end
   
   it "should create expected HTTP GET request for :followers case using integer user ID" do
     # the integer user ID scenario...
-    @twitter.should_receive(:create_http_get_request).with(create_uri(:followers), :id => @id).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, create_uri(:followers), :id => @id).and_return(@response)
     @twitter.graph(:followers, @id)
   end
 
   it "should create expected HTTP GET request for :followers case using screen name" do
     # the screen name scenario...
-    @twitter.should_receive(:create_http_get_request).with(create_uri(:followers), :id => @screen_name).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, create_uri(:followers), :id => @screen_name).and_return(@response)
     @twitter.graph(:followers, @screen_name)
   end
 
   it "should create expected HTTP GET request for :followers case using Twitter::User object" do
     # the Twitter::User object scenario...
-    @twitter.should_receive(:create_http_get_request).with(create_uri(:followers), :id => @friend.to_i).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, create_uri(:followers), :id => @friend.to_i).and_return(@response)
     @twitter.graph(:followers, @friend)
   end
   

data/spec/twitter/client/messaging_spec.rb

@@ -14,7 +14,7 @@ describe Twitter::Client, "#messages" do
   end
   
   it "should create expected HTTP GET request for :received case" do
-    @twitter.should_receive(:create_http_get_request).with(@uris[:received], {}).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, @uris[:received], {}).and_return(@request)
     @twitter.messages(:received)
   end
   
@@ -24,7 +24,7 @@ describe Twitter::Client, "#messages" do
   end
   
   it "should create expected HTTP GET request for :sent case" do
-    @twitter.should_receive(:create_http_get_request).with(@uris[:sent], {}).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, @uris[:sent], {}).and_return(@request)
     @twitter.messages(:sent)
   end
   
@@ -46,7 +46,7 @@ describe Twitter::Client, "#messages" do
   end
 
   it "should generate expected GET HTTP request for paging case" do
-    @twitter.should_receive(:create_http_get_request).with(@uris[:received], {:page => @page}).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, @uris[:received], {:page => @page}).and_return(@request)
     @twitter.messages(:received, :page => @page)
   end
 
@@ -82,12 +82,13 @@ describe Twitter::Client, "#message" do
   end
   
   it "should invoke #http_connect with expected arguments for :post case" do
-  	@twitter.should_receive(:http_connect).with({:text => @message.text, :user => @message.recipient.to_i, :source => @source}.to_http_str).and_return(@response)
+  	@twitter.should_receive(:rest_oauth_connect).with(:post, @uris[:post], {:text => @message.text, :user => @message.recipient.to_i, :source => @source}).and_return(@response)
     @twitter.message(:post, @message.text, @message.recipient)
   end
   
   it "should create expected HTTP POST request for :post case" do
-    @twitter.should_receive(:create_http_post_request).with(@uris[:post]).and_return(@request)
+    params = {:source => @source, :user => @attributes[:recipient][:id], :text => @attributes[:text]}
+    @twitter.should_receive(:rest_oauth_connect).with(:post, @uris[:post], params).and_return(@request)
     @twitter.message(:post, @message.text, @message.recipient)
   end
   
@@ -97,7 +98,7 @@ describe Twitter::Client, "#message" do
   end
   
   it "should create expected HTTP DELETE request for :delete case" do
-    @twitter.should_receive(:create_http_delete_request).with(@uris[:delete], {:id => @message.to_i}).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:delete, "#{@uris[:delete]}/#{@message.to_i}").and_return(@request)
     @twitter.message(:delete, @message)
   end
   

data/spec/twitter/client/profile_spec.rb

@@ -38,36 +38,21 @@ describe Twitter::Client, "#profile" do
     Twitter::User.stub!(:unmarshal).and_return(@user)
   end
   
-  it "should invoke #http_connect with expected arguments for :info case" do
-  	@twitter.should_receive(:http_connect).with(@info_attrs.to_http_str).and_return(@response)
+  it "should invoke #rest_oauth_connect with expected arguments for :info case" do
+  	@twitter.should_receive(:rest_oauth_connect).with(:post, @uris[:info], @info_attrs).and_return(@response)
     @twitter.profile(:info, @info_attrs)
   end
 
-  it "should invoke #http_connect with expected arguments for :colors case" do
-  	@twitter.should_receive(:http_connect).with(@colors_attrs.to_http_str).and_return(@response)
+  it "should invoke #rest_oauth_connect with expected arguments for :colors case" do
+  	@twitter.should_receive(:rest_oauth_connect).with(:post, @uris[:colors], @colors_attrs).and_return(@response)
     @twitter.profile(:colors, @colors_attrs)
   end
   
-  it "should invoke #http_connect with expected arguments for :device case" do
-  	@twitter.should_receive(:http_connect).with(@device_attrs.to_http_str).and_return(@response)
-    @twitter.profile(:info, @device_attrs)
-  end
-  
-  it "should create expected HTTP POST request for :info case" do
-    @twitter.should_receive(:create_http_post_request).with(@uris[:info]).and_return(@request)
-    @twitter.profile(:info, @info_attrs)
-  end
-  
-  it "should create expected HTTP POST request for :colors case" do
-    @twitter.should_receive(:create_http_post_request).with(@uris[:colors]).and_return(@request)
-    @twitter.profile(:colors, @colors_attrs)
-  end
-  
-  it "should create expected HTTP POST request for :device case" do
-    @twitter.should_receive(:create_http_post_request).with(@uris[:device]).and_return(@request)
+  it "should invoke #rest_oauth_connect with expected arguments for :device case" do
+  	@twitter.should_receive(:rest_oauth_connect).with(:post, @uris[:device], @device_attrs).and_return(@response)
     @twitter.profile(:device, @device_attrs)
   end
-
+  
   it "should bless returned Twitter::User object for :info case" do
     @twitter.should_receive(:bless_model).with(@user)
     @twitter.profile(:info, @info_attrs)
@@ -83,8 +68,6 @@ describe Twitter::Client, "#profile" do
     @twitter.profile(:device, @device_attrs)
   end
   
-  it "should raise an ArgumentError when giving an invalid profile action"
-  
   after(:each) do
     nilize(@twitter, @uris, @request, @response, @connection, @sender, @recipient, @user, @attributes)
   end

data/spec/twitter/client/search_spec.rb

@@ -17,7 +17,7 @@ describe Twitter::Client, "#search" do
   end
   
   it "should create expected HTTP GET request using :to" do
-    @twitter.should_receive(:create_http_get_request).with(@uris[:basic], {:to => @to}).and_return(@request)
+    @twitter.should_receive(:search_oauth_connect).with(:get, @uris[:basic], {:to => @to}).and_return(@response)
     @twitter.search(:to => @to)
   end
   
@@ -27,7 +27,7 @@ describe Twitter::Client, "#search" do
   end
   
   it "should create expected HTTP GET request using :from" do
-    @twitter.should_receive(:create_http_get_request).with(@uris[:basic], {:from => @from}).and_return(@request)
+    @twitter.should_receive(:search_oauth_connect).with(:get, @uris[:basic], {:from => @from}).and_return(@response)
     @twitter.search(:from => @from)
   end
   
@@ -37,7 +37,7 @@ describe Twitter::Client, "#search" do
   end
   
   it "should create expected HTTP GET request using :keywords" do
-    @twitter.should_receive(:create_http_get_request).with(@uris[:basic], {:keywords => @keywords}).and_return(@request)
+    @twitter.should_receive(:search_oauth_connect).with(:get, @uris[:basic], {:keywords => @keywords}).and_return(@response)
     @twitter.search(:keywords => @keywords)
   end
   
@@ -53,7 +53,7 @@ describe Twitter::Client, "#search" do
   end
 
   it "should generate expected GET HTTP request for paging case" do
-    @twitter.should_receive(:create_http_get_request).with(@uris[:basic], {:page => @page}).and_return(@request)
+    @twitter.should_receive(:search_oauth_connect).with(:get, @uris[:basic], {:page => @page}).and_return(@response)
     @twitter.search(:page => @page)
   end
 

data/spec/twitter/client/status_spec.rb

@@ -26,36 +26,30 @@ describe Twitter::Client, "#status" do
   end
   
   it "should create expected HTTP GET request for :get case" do
-    @twitter.should_receive(:create_http_get_request).with(@uris[:get], @options).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, "#{@uris[:get]}?#{@options.to_http_str}").and_return(@response)
     @twitter.status(:get, @options[:id])
   end
   
-  it "should invoke @twitter#create_http_get_request with given parameters equivalent to {:id => value.to_i} for :get case" do
+  it "should invoke @twitter#rest_oauth_connect with given parameters equivalent to {:id => value.to_i} for :get case" do
     # Float case
-    @twitter.should_receive(:create_http_get_request).with(@uris[:get], {:id => @float.to_i}).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, "#{@uris[:get]}?#{{:id => @float.to_i}.to_http_str}").and_return(@response)
     @twitter.status(:get, @float)
 
     # Twitter::Status object case
-    @twitter.should_receive(:create_http_get_request).with(@uris[:get], {:id => @status.to_i}).and_return(@request)    
+    @twitter.should_receive(:rest_oauth_connect).with(:get, "#{@uris[:get]}?#{{:id => @status.to_i}.to_http_str}").and_return(@response)    
     @twitter.status(:get, @status)
   end
   
+  it "should create expected HTTP POST request for :post case" do
+    @twitter.should_receive(:rest_oauth_connect).with(:post, @uris[:post], :status => @message, :source => @source).and_return(@response)
+    @twitter.status(:post, @message)
+  end
+
   it "should return nil if nil is passed as value argument for :post case" do
     status = @twitter.status(:post, nil)
     status.should be_nil
   end
   
-  it "should not call @twitter#http_connect when passing nil for value argument in :post case" do
-    @twitter.should_not_receive(:http_connect)
-    @twitter.status(:post, nil)
-  end
-  
-  it "should create expected HTTP POST request for :post case" do
-    @twitter.should_receive(:create_http_post_request).with(@uris[:post]).and_return(@request)
-    @connection.should_receive(:request).with(@request, {:status => @message, :source => @source}.to_http_str).and_return(@response)
-    @twitter.status(:post, @message)
-  end
-  
   it "should return nil if no :status key-value given in the value argument for :reply case" do
     status = @twitter.status(:reply, {})
     status.should be_nil
@@ -66,19 +60,8 @@ describe Twitter::Client, "#status" do
     status.should be_nil
   end
   
-  it "should not call @twitter#http_connect when passing a value Hash argument that has no :status key-value in :reply case" do
-    @twitter.should_not_receive(:http_connect)
-    @twitter.status(:reply, {})
-  end
-  
-  it "should not call @twitter#http_connect when passing nil for value argument in :reply case" do
-    @twitter.should_not_receive(:http_connect)
-    @twitter.status(:reply, nil)
-  end
-  
   it "should create expected HTTP POST request for :reply case" do
-    @twitter.should_receive(:create_http_post_request).with(@uris[:reply]).and_return(@request)
-    @connection.should_receive(:request).with(@request, {:status => @message, :source => @source, :in_reply_to_status_id => @reply_to_status_id}.to_http_str).and_return(@response)
+    @twitter.should_receive(:rest_oauth_connect).with(:post, @uris[:reply], :status => @message, :source => @source, :in_reply_to_status_id => @reply_to_status_id).and_return(@response)
     @twitter.status(:reply, :status => @message, :in_reply_to_status_id => @reply_to_status_id)
   end
   
@@ -87,23 +70,18 @@ describe Twitter::Client, "#status" do
     status.should be_nil
   end
   
-  it "should not call @twitter#http_connect when passing nil for value argument in :delete case" do
-    @twitter.should_not_receive(:http_connect)
-    @twitter.status(:delete, nil)
-  end
-  
   it "should create expected HTTP DELETE request for :delete case" do
-    @twitter.should_receive(:create_http_delete_request).with(@uris[:delete], @options).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:delete, "#{@uris[:delete]}?#{@options.to_http_str}").and_return(@response)
     @twitter.status(:delete, @options[:id])
   end
 
-  it "should invoke @twitter#create_http_get_request with given parameters equivalent to {:id => value.to_i} for :delete case" do
+  it "should invoke @twitter#rest_oauth_connect with given parameters equivalent to {:id => value.to_i} for :delete case" do
     # Float case
-    @twitter.should_receive(:create_http_delete_request).with(@uris[:delete], {:id => @float.to_i}).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:delete, "#{@uris[:delete]}?#{{:id => @float.to_i}.to_http_str}").and_return(@response)
     @twitter.status(:delete, @float)
 
     # Twitter::Status object case
-    @twitter.should_receive(:create_http_delete_request).with(@uris[:delete], {:id => @status.to_i}).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:delete, "#{@uris[:delete]}?#{{:id => @status.to_i}.to_http_str}").and_return(@response)
     @twitter.status(:delete, @status)
   end