twitter4r 0.5.2 → 0.5.3

data/README

@@ -14,7 +14,7 @@ Code:
 * Carl Crawley <cwcrawley at gmail dot com> - Friendship get => post fix
 * Christian Johansen <christian at cjohansen dot no> - in_reply_to attributes in Twitter::Status
 * Harry Love <harrylove at gmail dot com> - added attributes to Twitter::Status
-* Filipe Giusti <filipegiusti at gmail dot com> - fixed users/show issue that Twitter.com changed from under us
+* Filipe Giusti <filipegiusti at gmail dot com> - fixed users/show issue that Twitter.com changed from under us, also inspired the v0.5.2 bugfix release by submitting great issue example code.
 * Seth Cousins <seth.cousins at gmail dot com> - added HTTP timeout option and provided a patch that inspired the OAuth support for Twitter4R
 * John McKerrell <@mcknut on twitter> - added geo attribute to Twitter::Message.
 

data/lib/twitter/client/base.rb

@@ -61,6 +61,8 @@ class Twitter::Client
         @rest_consumer = OAuth::Consumer.new(key, secret, 
                                              :site => construct_site_url,
                                              :proxy => construct_proxy_url)
+        http = @rest_consumer.http
+        http.read_timeout = cfg.timeout
       end
       @rest_consumer
     end
@@ -94,6 +96,8 @@ class Twitter::Client
         @search_consumer = OAuth::Consumer.new(key, secret, 
                                                :site => construct_site_url(:search),
                                                :proxy => construct_proxy_url)
+        http = @search_consumer.http
+        http.read_timeout = cfg.timeout
       end
       @search_consumer
     end

data/lib/twitter/client/messaging.rb

@@ -3,7 +3,7 @@ class Twitter::Client
     :received => '/direct_messages.json',
     :sent => '/direct_messages/sent.json',
     :post => '/direct_messages/new.json',
-    :delete => '/direct_messages/destroy',
+    :delete => '/direct_messages/destroy.json',
   }
 
   # Provides access to Twitter's Messaging API for received and 
@@ -70,7 +70,7 @@ class Twitter::Client
     when :post
       response = rest_oauth_connect(:post, uri, {:text => value, :user => user, :source => self.class.config.source})
     when :delete
-      response = rest_oauth_connect(:delete, "#{uri}/#{value.to_i}")
+      response = rest_oauth_connect(:delete, uri, :id => value.to_i)
     end
     message = Twitter::Message.unmarshal(response.body)
     bless_model(message)

data/lib/twitter/version.rb

@@ -4,7 +4,7 @@
 module Twitter::Version #:nodoc:
   MAJOR = 0
   MINOR = 5
-  REVISION = 2
+  REVISION = 3
   class << self
     # Returns X.Y.Z formatted version string
     def to_version

data/spec/twitter/client/account_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
 
 describe Twitter::Client, "#account_info" do
   before(:each) do
@@ -9,7 +9,6 @@ describe Twitter::Client, "#account_info" do
     @response = mas_net_http_response(:success)
     @connection = mas_net_http(@response)
     @response.stub!(:body).and_return("{}")
-    Net::HTTP.stub!(:new).and_return(@connection)
     @rate_limit_status = mock(Twitter::RateLimitStatus)
     @twitter.stub!(:bless_models).and_return({})
   end

data/spec/twitter/client/auth_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
 
 describe Twitter::Client, "#authenticate?" do
   before(:each) do
@@ -9,7 +9,6 @@ describe Twitter::Client, "#authenticate?" do
     @response = mas_net_http_response(:success)
     @error_response = mas_net_http_response(404, "Resource Not Found")
     @connection = mas_net_http(@response)
-    Net::HTTP.stub!(:new).and_return(@connection)
     @access_key = "applestillsucks"
     @access_secret = "linuxstillrocks"
   end

data/spec/twitter/client/base_spec.rb

@@ -1,4 +1,27 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+
+shared_examples_for "consumer initialization with timeout" do
+  before(:each) do
+    @old_timeout = nil
+    Twitter::Client.configure do |conf|
+      @old_timeout = conf.timeout
+      conf.timeout = @timeout
+    end
+    @client = client_context
+  end
+
+  it "should set timeout on underlying HTTP object" do
+    consumer = get_consumer
+    http = consumer.http
+    http.read_timeout.should == timeout
+  end
+
+  after(:each) do
+    Twitter::Client.configure do |conf|
+      conf.timeout = @old_timeout
+    end
+  end
+end
 
 describe "Twitter::Client" do
   before(:each) do
@@ -237,3 +260,33 @@ describe Twitter::Client, "#construct_proxy_url" do
     end
   end
 end
+
+describe Twitter::Client, "#rest_consumer" do
+  it_should_behave_like "consumer initialization with timeout"
+  before(:each) do
+    @timeout = 49
+  end
+
+  def timeout
+    @timeout
+  end
+
+  def get_consumer
+    @client.send(:rest_consumer)
+  end
+end
+
+describe Twitter::Client, "#search_consumer" do
+  it_should_behave_like "consumer initialization with timeout"
+  before(:each) do
+    @timeout = 96
+  end
+
+  def timeout
+    @timeout
+  end
+
+  def get_consumer
+    @client.send(:search_consumer)
+  end
+end

data/spec/twitter/client/blocks_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
 
 describe Twitter::Client, "#block" do
   before(:each) do
@@ -10,7 +10,6 @@ describe Twitter::Client, "#block" do
     @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)
     Twitter::User.stub!(:unmarshal).and_return(@friend)
   end
   

data/spec/twitter/client/favorites_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
 
 describe Twitter::Client, "#favorites" do
   before(:each) do
@@ -9,7 +9,6 @@ describe Twitter::Client, "#favorites" do
     @response = mas_net_http_response(:success)
     @connection = mas_net_http(@response)
     @options = { :page => 4 }
-    Net::HTTP.stub!(:new).and_return(@connection)
     @favorites = []
     Twitter::Status.stub!(:unmarshal).and_return(@favorites)
   end
@@ -79,7 +78,6 @@ module FavoriteSpecMixin
     @default_header = @twitter.send(:http_header)
     @response = mas_net_http_response(:success)
     @connection = mas_net_http(@response)
-    Net::HTTP.stub!(:new).and_return(@connection)
     @id = 234923423
     @status = mas_twitter_status(:id => @id, :to_i => @id)
     Twitter::Status.stub!(:unmarshal).and_return(@status)

data/spec/twitter/client/friendship_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
 
 describe Twitter::Client, "#friendships" do
   before(:each) do

data/spec/twitter/client/graph_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
 
 describe Twitter::Client, "#graph(:friends...)" do
   before(:each) do
@@ -11,7 +11,6 @@ describe Twitter::Client, "#graph(:friends...)" do
     @response = mas_net_http_response(:success)
     @response.stub!(:body).and_return("[1, 2, 3, 4, 5, 6]")
     @connection = mas_net_http(@response)
-    Net::HTTP.stub!(:new).and_return(@connection)
     Twitter::User.stub!(:unmarshal).and_return(@friend)
   end
   

data/spec/twitter/client/messaging_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
 
 describe Twitter::Client, "#messages" do
   before(:each) do
@@ -7,7 +7,6 @@ describe Twitter::Client, "#messages" do
     @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)
     @messages = []
     Twitter::Message.stub!(:unmarshal).and_return(@messages)
     @page = 2
@@ -77,7 +76,6 @@ describe Twitter::Client, "#message" do
     @connection = mas_net_http(@response)
     @source = Twitter::Client.class_eval("@@defaults[:source]")
 
-    Net::HTTP.stub!(:new).and_return(@connection)
     Twitter::Message.stub!(:unmarshal).and_return(@message)
   end
   
@@ -98,7 +96,7 @@ describe Twitter::Client, "#message" do
   end
   
   it "should create expected HTTP DELETE request for :delete case" do
-    @twitter.should_receive(:rest_oauth_connect).with(:delete, "#{@uris[:delete]}/#{@message.to_i}").and_return(@request)
+    @twitter.should_receive(:rest_oauth_connect).with(:delete, @uris[:delete], :id => @message.to_i).and_return(@request)
     @twitter.message(:delete, @message)
   end
   

data/spec/twitter/client/profile_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
 
 describe Twitter::Client, "#profile" do
   before(:each) do
@@ -34,7 +34,6 @@ describe Twitter::Client, "#profile" do
     @response = mas_net_http_response(:success, @json)
     @connection = mas_net_http(@response)
 
-    Net::HTTP.stub!(:new).and_return(@connection)
     Twitter::User.stub!(:unmarshal).and_return(@user)
   end
   

data/spec/twitter/client/search_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
 
 describe Twitter::Client, "#search" do
   before(:each) do
@@ -7,7 +7,6 @@ describe Twitter::Client, "#search" do
     @request = mas_net_http_get(:basic_auth => nil)
     @response = mas_net_http_response(:success, "{\"results\": [], \"refresh_url\":\"?since_id=1768746401&q=blabla\"}")
     @connection = mas_net_http(@response)
-    Net::HTTP.stub!(:new).and_return(@connection)
     @statuses = []
     Twitter::Status.stub!(:unmarshal).and_return(@statuses)
     @page = 2

data/spec/twitter/client/status_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
 
 describe Twitter::Client, "#status" do
   before(:each) do

data/spec/twitter/client/timeline_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
 
 describe Twitter::Client, "Timeline API" do
   before(:each) do

data/spec/twitter/client/user_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
 
 describe Twitter::Client, "#user(id, :info)" do
   before(:each) do
@@ -15,7 +15,6 @@ describe Twitter::Client, "#user(id, :info)" do
     @connection = mas_net_http(@response)
     @uris = Twitter::Client.class_eval("@@USER_URIS")
     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
@@ -60,7 +59,6 @@ describe Twitter::Client, "#user(id, :friends)" do
     @connection = mas_net_http(@response)
     @uris = Twitter::Client.class_eval("@@USER_URIS")
     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
@@ -117,7 +115,6 @@ describe Twitter::Client, "#my(:info)" do
     @connection = mas_net_http(@response)
     @uris = Twitter::Client.class_eval("@@USER_URIS")
     @twitter.stub!(:rest_oauth_connect).and_return(@response)
-    Net::HTTP.stub!(:new).and_return(@connection)
     Twitter::User.stub!(:unmarshal).and_return(@user)
   end
   
@@ -156,7 +153,6 @@ describe Twitter::Client, "#my(:friends)" do
     @connection = mas_net_http(@response)
     @uris = Twitter::Client.class_eval("@@USER_URIS")
     Twitter::User.stub!(:unmarshal).and_return(@friends)
-    Net::HTTP.stub!(:new).and_return(@connection)
   end
   
   it "should create expected HTTP GET request" do

data/spec/twitter/client_spec.rb

@@ -1,2 +1,2 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 

data/spec/twitter/config_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 describe Twitter::Client, ".configure" do
   it "should respond to :configure class method" do

data/spec/twitter/console_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 describe Twitter::Client, ".from_config" do
   before(:each) do

data/spec/twitter/core_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 describe "Twitter::ClassUtilMixin mixed-in class" do
   before(:each) do

data/spec/twitter/ext/stdlib_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
 
 describe Hash, "#to_http_str" do
   before(:each) do
@@ -40,4 +40,3 @@ describe Time, "#to_s" do
     nilize(@time, @expected_string)
   end
 end
-

data/spec/twitter/extras_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 describe Twitter::Client, "#featured(:users)" do
   before(:each) do
@@ -6,7 +6,6 @@ describe Twitter::Client, "#featured(:users)" do
     @uris = Twitter::Client.class_eval("@@FEATURED_URIS")
     @response = mas_net_http_response(:success)
     @connection = mas_net_http(@response)
-    Net::HTTP.stub!(:new).and_return(@connection)
     @users = [
       Twitter::User.new(:screen_name => 'twitter4r'),
       Twitter::User.new(:screen_name => 'dictionary'),      

data/spec/twitter/meta_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 def glob_files(*path_elements)
   Dir.glob(File.join(*path_elements))

data/spec/twitter/model_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 module Test
   class Model

data/spec/twitter/version_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 VERSION_LIST = [Twitter::Version::MAJOR, Twitter::Version::MINOR, Twitter::Version::REVISION]
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twitter4r
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Susan Potter
@@ -15,7 +15,7 @@ autorequire: twitter
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 -05:00
+date: 2010-09-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency