twitter4r 0.3.2 → 0.5.0

data/spec/twitter/client/timeline_spec.rb

@@ -24,12 +24,12 @@ describe Twitter::Client, "Timeline API" do
   end
   
   it "should call #http_get with expected parameters for :public case" do
-    @client.should_receive(:http_connect).and_return(mas_net_http_response(:success, @json))
+    @client.should_receive(:rest_oauth_connect).and_return(mas_net_http_response(:success, @json))
     @client.timeline_for(:public)
   end
   
   it "should yield to block for each status in timeline" do
-    @client.should_receive(:http_connect).and_return(mas_net_http_response(:success, @json))
+    @client.should_receive(:rest_oauth_connect).and_return(mas_net_http_response(:success, @json))
     Twitter::Status.should_receive(:unmarshal).and_return(@timeline)
     count = 0
     @client.timeline_for(:public) do |status|
@@ -40,25 +40,25 @@ describe Twitter::Client, "Timeline API" do
   end
   
   it "should generate expected HTTP GET request for generic :public case" do
-    @client.should_receive(:create_http_get_request).with(@uris[:public], {}).and_return(@request)
+    @client.should_receive(:rest_oauth_connect).with(:get, @uris[:public], {}).and_return(@response)
     timeline = @client.timeline_for(:public)
     timeline.should eql(@timeline)
   end
   
   it "should generate expected HTTP GET request for :public case with expected parameters" do
-    @client.should_receive(:create_http_get_request).with(@uris[:public], @params[:public]).and_return(@request)
+    @client.should_receive(:rest_oauth_connect).with(:get, @uris[:public], @params[:public]).and_return(@response)
     timeline = @client.timeline_for(:public, @params[:public])
     timeline.should eql(@timeline)
   end
   
   it "should generate expected HTTP GET request for generic :friends case" do
-  	@client.should_receive(:create_http_get_request).with(@uris[:friends], {}).and_return(@request)
+  	@client.should_receive(:rest_oauth_connect).with(:get, @uris[:friends], {}).and_return(@response)
   	timeline = @client.timeline_for(:friends)
   	timeline.should eql(@timeline)
   end
   
   it "should generate expected HTTP GET request for :friends case with expected parameters" do
-    @client.should_receive(:create_http_get_request).with(@uris[:friends], @params[:friends]).and_return(@request)
+    @client.should_receive(:rest_oauth_connect).with(:get, @uris[:friends], @params[:friends]).and_return(@response)
     timeline = @client.timeline_for(:friends, @params[:friends])
     timeline.should eql(@timeline)
   end

data/spec/twitter/client/user_spec.rb

@@ -11,22 +11,20 @@ describe Twitter::Client, "#user(id, :info)" do
     	:location => 'London'
     )
     @json = JSON.unparse(@user.to_hash)
-    @request = mas_net_http_get(:basic_auth => nil)
     @response = mas_net_http_response(:success, @json)
     @connection = mas_net_http(@response)
     @uris = Twitter::Client.class_eval("@@USER_URIS")
-    @twitter.stub!(:create_http_get_request).and_return(@request)
     Twitter::User.stub!(:unmarshal).and_return(@user)
     Net::HTTP.stub!(:new).and_return(@connection)
   end
   
   it "should create expected HTTP GET request when giving numeric user id" do
-    @twitter.should_receive(:create_http_get_request).with(@uris[:info], {:user_id => @id}).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, "#{@uris[:info]}?#{{:user_id => @id}.to_http_str}").and_return(@response)
     @twitter.user(@id)
   end
     
   it "should create expected HTTP GET request when giving screen name" do
-    @twitter.should_receive(:create_http_get_request).with(@uris[:info], {:screen_name => @screen_name}).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, "#{@uris[:info]}?#{{:screen_name => @screen_name}.to_http_str}").and_return(@response)
     @twitter.user(@screen_name)
   end
   
@@ -41,7 +39,7 @@ describe Twitter::Client, "#user(id, :info)" do
   end
 
   after(:each) do
-    nilize(@request, @response, @connection, @twitter, @id, @screen_name, @user)
+    nilize(@response, @connection, @twitter, @id, @screen_name, @user)
   end
 end
 
@@ -58,17 +56,15 @@ describe Twitter::Client, "#user(id, :friends)" do
       :location => 'Urbana, IL'
     )
     @json = JSON.unparse(@user.to_hash)
-    @request = mas_net_http_get(:basic_auth => nil)
     @response = mas_net_http_response(:success, @json)
     @connection = mas_net_http(@response)
     @uris = Twitter::Client.class_eval("@@USER_URIS")
-    @twitter.stub!(:create_http_get_request).and_return(@request)
     Twitter::User.stub!(:unmarshal).and_return(@user)
     Net::HTTP.stub!(:new).and_return(@connection)
   end
   
   it "should create expected HTTP GET request when giving numeric user id" do
-    @twitter.should_receive(:create_http_get_request).with(@uris[:friends], {:user_id => @id}).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, "#{@uris[:friends]}?#{{:user_id => @id}.to_http_str}").and_return(@response)
     @twitter.user(@id, :friends)
   end
   
@@ -78,12 +74,12 @@ describe Twitter::Client, "#user(id, :friends)" do
   end
   
   it "should create expected HTTP GET request when giving Twitter::User object" do
-    @twitter.should_receive(:create_http_get_request).with(@uris[:friends], {:user_id => @user.to_i}).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, "#{@uris[:friends]}?#{{:user_id => @user.to_i}.to_http_str}").and_return(@response)
     @twitter.user(@user, :friends)
   end
   
   it "should create expected HTTP GET request when giving screen name" do
-    @twitter.should_receive(:create_http_get_request).with(@uris[:friends], {:screen_name => @screen_name}).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, "#{@uris[:friends]}?#{{:screen_name => @screen_name}.to_http_str}").and_return(@response)
     @twitter.user(@screen_name, :friends)
   end
   
@@ -103,7 +99,7 @@ describe Twitter::Client, "#user(id, :friends)" do
   end
   
   after(:each) do
-    nilize(@request, @response, @connection, @twitter, @id, @screen_name, @user)
+    nilize(@response, @connection, @twitter, @id, @screen_name, @user)
   end
 end
 
@@ -117,17 +113,16 @@ describe Twitter::Client, "#my(:info)" do
       :location => 'Glamorous Urbana'
     )
     @json = JSON.unparse(@user.to_hash)
-    @request = mas_net_http_get(:basic_auth => nil)
     @response = mas_net_http_response(:success, @json)
     @connection = mas_net_http(@response)
     @uris = Twitter::Client.class_eval("@@USER_URIS")
-    @twitter.stub!(:create_http_get_request).and_return(@request)
+    @twitter.stub!(:rest_oauth_connect).and_return(@response)
     Net::HTTP.stub!(:new).and_return(@connection)
     Twitter::User.stub!(:unmarshal).and_return(@user)
   end
   
   it "should create expected HTTP GET request" do
-    @twitter.should_receive(:create_http_get_request).with(@uris[:info], :id => @screen_name).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, "#{@uris[:info]}?#{{:id => @screen_name}.to_http_str}").and_return(@response)
     @twitter.my(:info)
   end
   
@@ -142,7 +137,7 @@ describe Twitter::Client, "#my(:info)" do
   end
 
   after(:each) do
-    nilize(@request, @response, @connection, @twitter, @user, @screen_name)
+    nilize(@response, @connection, @twitter, @user, @screen_name)
   end
 end
 
@@ -157,17 +152,15 @@ describe Twitter::Client, "#my(:friends)" do
       Twitter::User.new(:screen_name => 'elizabeth_jane_newson'),
     ]
     @json = JSON.unparse(@friends.collect {|f| f.to_hash })
-    @request = mas_net_http_get(:basic_auth => nil)
     @response = mas_net_http_response(:success, @json)
     @connection = mas_net_http(@response)
     @uris = Twitter::Client.class_eval("@@USER_URIS")
-    @twitter.stub!(:create_http_get_request).and_return(@request)
     Twitter::User.stub!(:unmarshal).and_return(@friends)
     Net::HTTP.stub!(:new).and_return(@connection)
   end
   
   it "should create expected HTTP GET request" do
-    @twitter.should_receive(:create_http_get_request).with(@uris[:friends], :id => @screen_name).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, "#{@uris[:friends]}?#{{:id => @screen_name}.to_http_str}").and_return(@response)
     @twitter.my(:friends)
   end
   
@@ -182,7 +175,7 @@ describe Twitter::Client, "#my(:friends)" do
   end
   
   after(:each) do
-    nilize(@request, @response, @connection, @twitter, @friends, @screen_name)
+    nilize(@response, @connection, @twitter, @friends, @screen_name)
   end
 end
 

data/spec/twitter/extras_spec.rb

@@ -4,7 +4,6 @@ describe Twitter::Client, "#featured(:users)" do
   before(:each) do
     @twitter = client_context
     @uris = Twitter::Client.class_eval("@@FEATURED_URIS")
-    @request = mas_net_http_get(:basic_auth => nil)
     @response = mas_net_http_response(:success)
     @connection = mas_net_http(@response)
     Net::HTTP.stub!(:new).and_return(@connection)
@@ -16,7 +15,7 @@ describe Twitter::Client, "#featured(:users)" do
   end
   
   it "should create expected HTTP GET request" do
-    @twitter.should_receive(:create_http_get_request).with(@uris[:users]).and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, @uris[:users]).and_return(@response)
     @twitter.featured(:users)
   end
   
@@ -26,7 +25,7 @@ describe Twitter::Client, "#featured(:users)" do
   end
   
   after(:each) do
-    nilize(@twitter, @uris, @request, @response, @connection)
+    nilize(@twitter, @uris, @response, @connection)
   end
 end
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twitter4r
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  hash: 11
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Susan Potter
@@ -9,19 +15,41 @@ autorequire: twitter
 bindir: bin
 cert_chain: []
 
-date: 2009-10-27 00:00:00 -05:00
+date: 2010-08-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: oauth
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 4
+        - 1
+        version: 0.4.1
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 1
+        - 1
         version: 1.1.1
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: 
 email: twitter4r-users@googlegroups.com
 executables: []
@@ -34,52 +62,52 @@ extra_rdoc_files:
 - TODO
 - MIT-LICENSE
 files: 
-- lib/twitter.rb
-- lib/twitter/config.rb
-- lib/twitter/model.rb
-- lib/twitter/ext/stdlib.rb
-- lib/twitter/ext.rb
-- lib/twitter/meta.rb
-- lib/twitter/client.rb
-- lib/twitter/console.rb
-- lib/twitter/client/graph.rb
-- lib/twitter/client/blocks.rb
-- lib/twitter/client/profile.rb
+- lib/twitter/extras.rb
+- lib/twitter/version.rb
 - lib/twitter/client/status.rb
 - lib/twitter/client/timeline.rb
+- lib/twitter/client/search.rb
+- lib/twitter/client/graph.rb
 - lib/twitter/client/favorites.rb
-- lib/twitter/client/account.rb
-- lib/twitter/client/base.rb
-- lib/twitter/client/messaging.rb
 - lib/twitter/client/friendship.rb
-- lib/twitter/client/search.rb
+- lib/twitter/client/messaging.rb
+- lib/twitter/client/account.rb
+- lib/twitter/client/profile.rb
 - lib/twitter/client/user.rb
+- lib/twitter/client/base.rb
+- lib/twitter/client/blocks.rb
 - lib/twitter/client/auth.rb
-- lib/twitter/version.rb
-- lib/twitter/extras.rb
+- lib/twitter/ext/stdlib.rb
+- lib/twitter/ext.rb
 - lib/twitter/core.rb
-- spec/twitter/client_spec.rb
-- spec/twitter/ext/stdlib_spec.rb
-- spec/twitter/console_spec.rb
+- lib/twitter/console.rb
+- lib/twitter/client.rb
+- lib/twitter/meta.rb
+- lib/twitter/model.rb
+- lib/twitter/config.rb
+- lib/twitter.rb
 - spec/twitter/version_spec.rb
-- spec/twitter/model_spec.rb
-- spec/twitter/config_spec.rb
-- spec/twitter/client/messaging_spec.rb
 - spec/twitter/client/friendship_spec.rb
+- spec/twitter/client/blocks_spec.rb
 - spec/twitter/client/graph_spec.rb
-- spec/twitter/client/base_spec.rb
-- spec/twitter/client/favorites_spec.rb
-- spec/twitter/client/account_spec.rb
-- spec/twitter/client/status_spec.rb
 - spec/twitter/client/search_spec.rb
-- spec/twitter/client/blocks_spec.rb
-- spec/twitter/client/timeline_spec.rb
 - spec/twitter/client/auth_spec.rb
+- spec/twitter/client/account_spec.rb
 - spec/twitter/client/user_spec.rb
+- spec/twitter/client/favorites_spec.rb
+- spec/twitter/client/messaging_spec.rb
 - spec/twitter/client/profile_spec.rb
+- spec/twitter/client/base_spec.rb
+- spec/twitter/client/timeline_spec.rb
+- spec/twitter/client/status_spec.rb
 - spec/twitter/extras_spec.rb
-- spec/twitter/meta_spec.rb
+- spec/twitter/ext/stdlib_spec.rb
+- spec/twitter/model_spec.rb
+- spec/twitter/client_spec.rb
 - spec/twitter/core_spec.rb
+- spec/twitter/meta_spec.rb
+- spec/twitter/config_spec.rb
+- spec/twitter/console_spec.rb
 - README
 - CHANGES
 - TODO
@@ -94,23 +122,31 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.8.2
-  version: 
+      hash: 59
+      segments: 
+      - 1
+      - 8
+      - 6
+      version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
-- Ruby 1.8.4+
+- Ruby 1.8.6+
 - json gem, version 0.4.3 or higher
 - jcode (for unicode support)
 rubyforge_project: twitter4r
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A clean Twitter client API in pure Ruby. Will include Twitter add-ons also in Ruby.