twitter4r 0.3.2 → 0.5.0

data/README

@@ -15,6 +15,8 @@ Code:
 * 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
+* 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.
 
 Design Suggestions:
 * Bosco So <rubymeetup at boscoso dot com> - making Twitter::Error a RuntimeError instead of an Exception to prevent irb from crashing out.

data/lib/twitter/client/account.rb

@@ -13,12 +13,7 @@ class Twitter::Client
   #  account_status = client.account_info
   #  puts account_status.remaining_hits
   def account_info(type = :rate_limit_status)
-    connection = create_http_connection
-    connection.start do |connection|
-      response = http_connect do |conn|
-        create_http_get_request(@@ACCOUNT_URIS[type])
-      end
-      bless_models(Twitter::RateLimitStatus.unmarshal(response.body))
-    end
+    response = rest_oauth_connect(:get, @@ACCOUNT_URIS[type])
+    bless_models(Twitter::RateLimitStatus.unmarshal(response.body))
   end
 end

data/lib/twitter/client/auth.rb

@@ -2,26 +2,20 @@ class Twitter::Client
   @@AUTHENTICATION_URIS = {
     :verify => '/account/verify_credentials',
   }
-  
-	# Provides access to the Twitter verify credentials API.
-	# 
-	# You can verify Twitter user credentials with minimal overhead using this method.
+
+  # Provides access to the Twitter verify credentials API.
+  # 
+  # You can verify Twitter user credentials with minimal overhead using this method.
   # 
-	# Example:
-	#  client.authenticate?("osxisforlightweights", "l30p@rd_s^cks!")
-	def authenticate?(login, password)
+  # Example:
+  #  client.authenticate?("osxisforlightweights", "l30p@rd_s^cks!")
+  def authenticate?(login, password)
     verify_credentials(login, password)
-	end
-	
-private
+  end
+
+  private
   def verify_credentials(username, passwd)
-  	connection = create_http_connection
-  	connection.start do |connection|
-  	  request = create_http_get_request("#{@@AUTHENTICATION_URIS[:verify]}.json")
-  		request.basic_auth(username, passwd)
-  		response = connection.request(request)
-  		response.is_a?(Net::HTTPSuccess) ? true : false
-    end
+    response = rest_oauth_connect(:get, "#{@@AUTHENTICATION_URIS[:verify]}.json")
+    response.is_a?(Net::HTTPSuccess) ? true : false
   end
 end
-

data/lib/twitter/client/base.rb

@@ -4,24 +4,37 @@ class Twitter::Client
   def inspect
     s = old_inspect
     s.gsub!(/@password=".*?"/, '@password="XXXX"')
+    s.gsub!(/"secret"=>".*?"/, '"secret"=>"XXXX"')
+    s
   end
 
   protected
-    attr_accessor :login, :password
-    
-    # Returns the response of the HTTP connection.  
-    def http_connect(body = nil, require_auth = true, service = :rest, &block)
-    	require_block(block_given?)
-    	connection = create_http_connection(service)
-    	connection.start do |connection|
-    		request = yield connection if block_given?
-    		request.basic_auth(@login, @password) if require_auth
-    		response = connection.request(request, body)
-    		handle_rest_response(response)
-    		response
+    attr_accessor :login, :oauth_consumer, :oauth_access
+
+    # Returns the response of the OAuth/HTTP(s) request for REST API requests (not Search)
+    def rest_oauth_connect(method, path, params = {}, headers = {}, require_auth = true)
+      atoken = rest_access_token
+      uri = rest_request_uri(path)
+      if [:get, :delete].include?(method)
+        response = atoken.send(method, uri, http_header.merge(headers))
+      else
+        response = atoken.send(method, uri, params, http_header.merge(headers))
       end
+    	handle_rest_response(response)
+    	response
     end
-    
+
+    # Returns the response of the OAuth/HTTP(s) request for Search API requests (not REST)
+    def search_oauth_connect(method, path, params = {}, headers = {}, require_auth = true)
+      atoken = search_access_token
+      uri = search_request_uri(path)
+      if method == :get
+        response = atoken.send(method, uri, http_header.merge(headers))
+      end
+    	handle_rest_response(response)
+    	response
+    end
+
     # "Blesses" model object with client information
     def bless_model(model)
     	model.bless(self) if model
@@ -34,7 +47,43 @@ class Twitter::Client
     
   private
     @@http_header = nil
+
+    def rest_consumer
+      unless @consumer
+        @consumer = OAuth::Consumer.new(@oauth_consumer["key"], 
+                                        @oauth_consumer["secret"], 
+                                        :site => construct_site_url)
+      end
+      @consumer
+    end
+
+    def rest_access_token
+      unless @access_token
+        @access_token = OAuth::AccessToken.new(rest_consumer, 
+                                               @oauth_access["key"], 
+                                               @oauth_access["secret"])
+      end
+      @access_token
+    end
     
+    def search_consumer
+      unless @consumer
+        @consumer = OAuth::Consumer.new(@oauth_consumer["key"], 
+                                        @oauth_consumer["secret"], 
+                                        :site => construct_site_url(:search))
+      end
+      @consumer
+    end
+
+    def search_access_token
+      unless @access_token
+        @access_token = OAuth::AccessToken.new(search_consumer, 
+                                               @oauth_access["key"], 
+                                               @oauth_access["secret"])
+      end
+      @access_token
+    end
+
     def raise_rest_error(response, uri = nil)
       map = JSON.parse(response.body)
       raise Twitter::RESTError.new(:code => response.code, 
@@ -49,23 +98,6 @@ class Twitter::Client
       end
     end
     
-    def create_http_connection(service = :rest)
-      case service
-      when :rest
-        protocol, host, port = @@config.protocol, @@config.host, @@config.port
-      when :search
-        protocol, host, port = @@config.search_protocol, @@config.search_host, @@config.search_port
-      end
-      conn = Net::HTTP.new(host, port, 
-                            @@config.proxy_host, @@config.proxy_port,
-                            @@config.proxy_user, @@config.proxy_pass)
-      if protocol == :ssl
-        conn.use_ssl = true
-        conn.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
-      conn
-    end
-
     def http_header
       # can cache this in class variable since all "variables" used to 
       # create the contents of the HTTP header are determined by other 
@@ -79,18 +111,28 @@ class Twitter::Client
       }
       @@http_header
     end
-    
-    def create_http_get_request(uri, params = {})
-    	path = (params.size > 0) ? "#{uri}?#{params.to_http_str}" : uri
-      Net::HTTP::Get.new(path, http_header)
+
+    def rest_request_uri(path)
+      "#{@@config.path_prefix}#{path}"
     end
     
-    def create_http_post_request(uri)
-    	Net::HTTP::Post.new(uri, http_header)
+    def search_request_uri(path)
+      "#{@@config.search_path_prefix}#{path}"
     end
     
-    def create_http_delete_request(uri, params = {})
-    	path = (params.size > 0) ? "#{uri}?#{params.to_http_str}" : uri
-    	Net::HTTP::Delete.new(path, http_header)
+    def uri_components(service = :rest)
+      case service
+      when :rest
+        return @@config.protocol, @@config.host, @@config.port, 
+          @@config.path_prefix
+      when :search
+        return @@config.search_protocol, @@config.search_host, 
+          @@config.search_port, @@config.search_path_prefix
+      end
+    end
+
+    def construct_site_url(service = :rest)
+      protocol, host, port, path_prefix = uri_components(service)
+      "#{protocol == :ssl ? :https : protocol}://#{host}:#{port}"
     end
 end

data/lib/twitter/client/blocks.rb

@@ -29,7 +29,7 @@ class Twitter::Client
     raise ArgumentError, "Invalid friend action provided: #{action}" unless @@BLOCK_URIS.keys.member?(action)
     value = value.to_i unless value.is_a?(String)
     uri = "#{@@BLOCK_URIS[action]}/#{value}.json"
-    response = http_connect {|conn| create_http_get_request(uri) }
+    response = rest_oauth_connect(:get, uri)
     bless_model(Twitter::User.unmarshal(response.body))
   end
 end

data/lib/twitter/client/favorites.rb

@@ -16,7 +16,7 @@ class Twitter::Client
   def favorites(options = nil)
     def uri_suffix(opts); opts && opts[:page] ? "?page=#{opts[:page]}" : ""; end
     uri = '/favorites.json' + uri_suffix(options)
-    response = http_connect {|conn|	create_http_get_request(uri) }
+    response = rest_oauth_connect(:get, uri)
     bless_models(Twitter::Status.unmarshal(response.body))
   end
 	
@@ -44,9 +44,9 @@ class Twitter::Client
     uri = "#{@@FAVORITES_URIS[action]}/#{value}.json"
     case action
     when :add
-      response = http_connect {|conn| create_http_post_request(uri) }
+      response = rest_oauth_connect(:post, uri)
     when :remove
-      response = http_connect {|conn| create_http_delete_request(uri) }
+      response = rest_oauth_connect(:delete, uri)
     end
     bless_model(Twitter::Status.unmarshal(response.body))
   end

data/lib/twitter/client/friendship.rb

@@ -1,8 +1,13 @@
 class Twitter::Client
-  @@FRIENDSHIP_URIS = {
+  @@FRIEND_URIS = {
     :add => '/friendships/create',
     :remove => '/friendships/destroy',
   }
+
+  @@FRIENDSHIP_URIS = {
+    :incoming => '/friendships/incoming.json',
+    :outgoing => '/friendships/outgoing.json',
+  }
 	
   # Provides access to the Twitter Friendship API.
   # 
@@ -26,10 +31,24 @@ class Twitter::Client
   #  client.friend(:add, user)
   #  client.friend(:remove, user)
   def friend(action, value)
-    raise ArgumentError, "Invalid friend action provided: #{action}" unless @@FRIENDSHIP_URIS.keys.member?(action)
+    raise ArgumentError, "Invalid friend action provided: #{action}" unless @@FRIEND_URIS.keys.member?(action)
     value = value.to_i unless value.is_a?(String)
-    uri = "#{@@FRIENDSHIP_URIS[action]}/#{value}.json"
-    response = http_connect {|conn| create_http_post_request(uri) }
+    uri = "#{@@FRIEND_URIS[action]}/#{value}.json"
+    response = rest_oauth_connect(:post, uri)
     bless_model(Twitter::User.unmarshal(response.body))
   end
+
+  # Provides friendship information for the following scenarios:
+  # * <tt>:incoming</tt> - returns an array of numeric IDs for every user who has a pending request to follow the authenticating user.
+  # * <tt>:outgoing</tt> - returns an array of numeric IDs for every protected user for whom the authenticating user has a pending follow request.
+  #
+  # Examples:
+  #  client.friendships(:incoming) 
+  #  #=> { :id_list => { :ids => [30592818, 21249843], :next_cursor => 1288724293877798413, :previous_cursor => -1300794057949944903 }}
+  def friendships(action)
+    raise ArgumentError, "Invalid friend action provided: #{action}" unless @@FRIENDSHIP_URIS.keys.member?(action)
+    uri = @@FRIENDSHIP_URIS[action]
+    response = rest_oauth_connect(:get, uri)
+    JSON.parse(response.body)
+  end
 end

data/lib/twitter/client/graph.rb

@@ -31,7 +31,7 @@ class Twitter::Client
     id ||= value
     id ||= @login
     uri = "#{@@GRAPH_URIS[action]}.json"
-    response = http_connect {|conn| create_http_get_request(uri, :id => id) }
+    response = rest_oauth_connect(:get, uri, :id => id)
     JSON.parse(response.body)
   end
 end

data/lib/twitter/client/messaging.rb

@@ -1,5 +1,4 @@
 class Twitter::Client
-
   @@MESSAGING_URIS = {
     :received => '/direct_messages.json',
     :sent => '/direct_messages/sent.json',
@@ -20,7 +19,7 @@ class Twitter::Client
   def messages(action, options = {})
     raise ArgumentError, "Invalid messaging action: #{action}" unless [:sent, :received].member?(action)
     uri = @@MESSAGING_URIS[action]
-    response = http_connect {|conn|	create_http_get_request(uri, options) }
+    response = rest_oauth_connect(:get, uri, options)
     bless_models(Twitter::Message.unmarshal(response.body))
   end
   
@@ -69,9 +68,9 @@ class Twitter::Client
     user = user.to_i if user and user.is_a?(Twitter::User)
     case action
     when :post
-      response = http_connect({:text => value, :user => user, :source => @@config.source}.to_http_str) {|conn| create_http_post_request(uri) }
+      response = rest_oauth_connect(:post, uri, {:text => value, :user => user, :source => @@config.source})
     when :delete
-      response = http_connect {|conn| create_http_delete_request(uri, :id => value.to_i) }
+      response = rest_oauth_connect(:delete, "#{uri}/#{value.to_i}")
     end
     message = Twitter::Message.unmarshal(response.body)
     bless_model(message)

data/lib/twitter/client/profile.rb

@@ -18,12 +18,7 @@ class Twitter::Client
   #  user = client.profile(:info, :location => "University Library")
   #  puts user.inspect
   def profile(action, attributes)
-    connection = create_http_connection
-    connection.start do |connection|
-      response = http_connect(attributes.to_http_str) do |conn|
-        create_http_post_request(@@PROFILE_URIS[action])
-      end
-      bless_models(Twitter::User.unmarshal(response.body))
-    end
+    response = rest_oauth_connect(:post, @@PROFILE_URIS[action], attributes)
+    bless_models(Twitter::User.unmarshal(response.body))
   end
 end

data/lib/twitter/client/search.rb

@@ -1,5 +1,4 @@
 class Twitter::Client
-
   @@SEARCH_URIS = {
     :basic => "/search.json",
   }
@@ -18,9 +17,8 @@ class Twitter::Client
   # * +:received+
   # * +:sent+
   def search(options = {})
-#    raise ArgumentError, "Invalid messaging action: #{action}"
     uri = @@SEARCH_URIS[:basic]
-    response = http_connect(nil, false, :search) {|conn|	create_http_get_request(uri, options) }
+    response = search_oauth_connect(:get, uri, options)
     json = JSON.parse(response.body)
     bless_models(Twitter::Status.unmarshal(JSON.dump(json["results"])))
   end

data/lib/twitter/client/status.rb

@@ -3,7 +3,7 @@ class Twitter::Client
   	:get => '/statuses/show.json',
   	:post => '/statuses/update.json',
   	:delete => '/statuses/destroy.json',
-  	:reply => '/statuses/update.json',
+  	:reply => '/statuses/update.json'
   }
   
   # Provides access to individual statuses via Twitter's Status APIs
@@ -37,14 +37,15 @@ class Twitter::Client
     response = nil
     case action
     when :get
-    	response = http_connect {|conn|	create_http_get_request(uri, :id => value.to_i) }
+      response = rest_oauth_connect(:get, "#{uri}?#{{:id => value.to_i}.to_http_str}")
     when :post
-    	response = http_connect({:status => value, :source => @@config.source}.to_http_str) {|conn| create_http_post_request(uri) }
+      response = rest_oauth_connect(:post, uri, :status => value, :source => @@config.source)
     when :delete
-    	response = http_connect {|conn| create_http_delete_request(uri, :id => value.to_i) }
+      response = rest_oauth_connect(:delete, "#{uri}?#{{:id => value.to_i}.to_http_str}")
     when :reply
       return nil if (!value.is_a?(Hash) || !value[:status] || !value[:in_reply_to_status_id])
-      response = http_connect(value.merge(:source => @@config.source).to_http_str) {|conn| create_http_post_request(uri) }
+      params = value.merge(:source => @@config.source)
+      response = rest_oauth_connect(:post, uri, params)
     end
     bless_model(Twitter::Status.unmarshal(response.body))
   end

data/lib/twitter/client/timeline.rb

@@ -1,11 +1,16 @@
 class Twitter::Client
   @@TIMELINE_URIS = {
     :public => '/statuses/public_timeline.json',
+    :home => '/statuses/home_timeline.json',
     :friends => '/statuses/friends_timeline.json',
     :friend => '/statuses/friends_timeline.json',
     :user => '/statuses/user_timeline.json',
     :me => '/statuses/user_timeline.json',
     :replies => '/statuses/replies.json',
+    :mentions => '/statuses/mentions.json',
+    :retweetsbyme => '/statuses/retweeted_by_me.json',
+    :retweetstome => '/statuses/retweeted_to_me.json',
+    :retweetsofme => '/statuses/retweets_of_me.json',
   }
 
   # Provides access to Twitter's Timeline APIs
@@ -35,7 +40,8 @@ class Twitter::Client
   # <tt>options</tt> can also include the following keys:
   # * <tt>:id</tt> is the user ID, screen name of Twitter::User representation of a <tt>Twitter</tt> user.
   # * <tt>:since</tt> is a Time object specifying the date-time from which to return results for.  Applicable for the :friend, :friends, :user and :me cases.
-  # * <tt>:count</tt> specifies the number of statuses to retrieve.  Only applicable for the :user case.
+  # * <tt>:per_page</tt> specifies the number of statuses to retrieve at a time.  Only applicable for the :user case.
+  # * <tt>:page</tt> specifies page number to retrieve.
   # * <tt>since_id</tt> is the status id of the public timeline from which to retrieve statuses for <tt>:public</tt>.  Only applicable for the :public case.
   # 
   # You can also pass this method a block, which will iterate through the results
@@ -61,10 +67,15 @@ class Twitter::Client
   # * +:friend+
   # * +:user+
   # * +:me+
+  # * +:mentions+
+  # * +:replies+
+  # * +:retweetsbyme+
+  # * +:retweetstome+
+  # * +:retweetsofme+
   def timeline_for(type, options = {}, &block)
     raise ArgumentError, "Invalid timeline type: #{type}" unless @@TIMELINE_URIS.keys.member?(type)
     uri = @@TIMELINE_URIS[type]
-    response = http_connect {|conn| create_http_get_request(uri, options) }
+    response = rest_oauth_connect(:get, uri, options)
     timeline = Twitter::Status.unmarshal(response.body)
     timeline.each {|status| bless_model(status); yield status if block_given? }
     timeline

data/lib/twitter/client/user.rb

@@ -35,7 +35,8 @@ class Twitter::Client
     id = id.to_i if id.is_a?(Twitter::User)
     id_param = id.is_a?(String) ? :screen_name : :user_id
     params = options.merge(id_param => id)
-    response = http_connect {|conn| create_http_get_request(@@USER_URIS[action], params) }
+    uri = "#{@@USER_URIS[action]}?#{params.to_http_str}"
+    response = rest_oauth_connect(:get, uri)
     bless_models(Twitter::User.unmarshal(response.body))
   end
   
@@ -59,7 +60,8 @@ class Twitter::Client
   def my(action, options = {})
     raise ArgumentError, "Invalid user action: #{action}" unless @@USER_URIS.keys.member?(action)
     params = options.merge(:id => @login)
-    response = http_connect {|conn| create_http_get_request(@@USER_URIS[action], params) }
+    uri = "#{@@USER_URIS[action]}?#{params.to_http_str}"
+    response = rest_oauth_connect(:get, uri)
     users = Twitter::User.unmarshal(response.body)
     bless_models(users)
   end

data/lib/twitter/config.rb

@@ -7,24 +7,37 @@ module Twitter
   # * <tt>protocol</tt> - <tt>:http</tt>, <tt>:https</tt> or <tt>:ssl</tt> supported.  <tt>:ssl</tt> is an alias for <tt>:https</tt>.  Defaults to <tt>:ssl</tt>
   # * <tt>host</tt> - hostname to connect to for the Twitter service.  Defaults to <tt>'twitter.com'</tt>.
   # * <tt>port</tt> - port to connect to for the Twitter service.  Defaults to <tt>443</tt>.
+  # * <tt>path_prefix</tt> - path to prefix URIs of REST API calls.  Defaults to <tt>""</tt>.
+  # * <tt>search_protocol</tt> - <tt>:http</tt>, <tt>:https</tt> or <tt>:ssl</tt> supported.  <tt>:ssl</tt> is an alias for <tt>:https</tt>.  Defaults to <tt>:ssl</tt>
+  # * <tt>search_host</tt> - hostname to connect to for the Twitter Search service.  Defaults to <tt>'twitter.com'</tt>.
+  # * <tt>search_port</tt> - port to connect to for the Twitter Search service.  Defaults to <tt>443</tt>.
+  # * <tt>search_path_prefix</tt> - path to prefix URIs of Search API calls.  Defaults to <tt>""</tt>.
   # * <tt>proxy_host</tt> - proxy host to use.  Defaults to nil.
   # * <tt>proxy_port</tt> - proxy host to use.  Defaults to nil.
   # * <tt>proxy_user</tt> - proxy username to use.  Defaults to nil.
   # * <tt>proxy_pass</tt> - proxy password to use.  Defaults to nil.
   # * <tt>user_agent</tt> - user agent string to use for each request of the HTTP header.
-  # * <tt>application_name</tt> - name of your client application.  Defaults to 'Twitter4R'
+  # * <tt>application_name</tt> - name of your client application.  Defaults to 'Twitter4R'.
   # * <tt>application_version</tt> - version of your client application.  Defaults to current <tt>Twitter::Version.to_version</tt>.
   # * <tt>application_url</tt> - URL of your client application.  Defaults to http://twitter4r.rubyforge.org.
   # * <tt>source</tt> - the source id given to you by Twitter to identify your application in their web interface.  Note: you must contact Twitter.com developer directly so they can configure their servers appropriately.
+  # * <tt>timeout</tt> - the timeout in second for HTTP requests.
+  # * <tt>oauth_consumer_token</tt> - the OAuth consumer token for your application
+  # * <tt>oauth_consumer_secret</tt> - the OAuth consumer secret for your application
+  # * <tt>oauth_request_token_path</tt> - the URI path for Twitter API's OAuth request token call. Not usually necessary to override.
+  # * <tt>oauth_access_token_path</tt> - the URI path for Twitter API's OAuth access token call. Not usually necessary to override.
+  # * <tt>oauth_authorize_path</tt> - the URI path for Twitter API's OAuth authorize call. Not usually necessary to override.
   class Config
     include ClassUtilMixin
     @@ATTRIBUTES = [
       :protocol, 
       :host, 
       :port, 
+      :path_prefix,
       :search_protocol,
       :search_host,
       :search_port,
+      :search_path_prefix,
       :proxy_host, 
       :proxy_port, 
       :proxy_user, 
@@ -34,8 +47,15 @@ module Twitter
       :application_version,
       :application_url,
       :source,
+      :timeout,
+      :oauth_consumer_token,
+      :oauth_consumer_secret,
+      :oauth_request_token_path,
+      :oauth_access_token_path,
+      :oauth_authorize_path,
     ]
-    attr_accessor *@@ATTRIBUTES
+
+    attr_accessor(*@@ATTRIBUTES)
     
     # Override of Object#eql? to ensure RSpec specifications run 
     # correctly. Also done to follow Ruby best practices.
@@ -52,9 +72,11 @@ module Twitter
     @@defaults = { :host => 'twitter.com', 
                    :port => 443, 
                    :protocol => :ssl,
+                   :path_prefix => "",
                    :search_host => 'search.twitter.com',
                    :search_port => 80,
                    :search_protocol => :http,
+                   :search_path_prefix => "",
                    :proxy_host => nil,
                    :proxy_port => nil,
                    :user_agent => "default",
@@ -62,6 +84,10 @@ module Twitter
                    :application_version => Twitter::Version.to_version,
                    :application_url => 'http://twitter4r.rubyforge.org',
                    :source => 'twitter4r',
+                   :timeout => 20,
+                   :oauth_request_token_path => '/oauth/request_token',
+                   :oauth_access_token_path => '/oauth/access_token',
+                   :oauth_authorize_path => '/oauth/authorize',
     }
     @@config = Twitter::Config.new(@@defaults)
 

data/lib/twitter/extras.rb

@@ -18,7 +18,7 @@ class Twitter::Client
   # represent Twitter's featured users.
   def featured(type)
     uri = @@FEATURED_URIS[type]
-    response = http_connect {|conn| create_http_get_request(uri) }
+    response = rest_oauth_connect(:get, uri)
     bless_models(Twitter::User.unmarshal(response.body))
   end
 end

data/lib/twitter/model.rb

@@ -164,8 +164,8 @@ module Twitter
       :profile_sidebar_border_color, :profile_background_image_url, 
       :profile_background_tile, :utc_offset, :time_zone, 
       :following, :notifications, :favourites_count, :followers_count, 
-      :friends_count, :statuses_count, :created_at,  ]
-    attr_accessor *@@ATTRIBUTES
+      :friends_count, :statuses_count, :created_at ]
+    attr_accessor(*@@ATTRIBUTES)
 
     class << self
       # Used as factory method callback
@@ -227,8 +227,8 @@ module Twitter
     include ModelMixin
     @@ATTRIBUTES = [:id, :text, :source, :truncated, :created_at, :user, :from_user, :to_user,
                     :favorited, :in_reply_to_status_id, :in_reply_to_user_id,
-                    :in_reply_to_screen_name]
-    attr_accessor *@@ATTRIBUTES
+                    :in_reply_to_screen_name, :geo]
+    attr_accessor(*@@ATTRIBUTES)
 
     class << self
       # Used as factory method callback
@@ -288,8 +288,8 @@ module Twitter
   # Represents a direct message on <tt>Twitter</tt> between <tt>Twitter</tt> users.
   class Message
     include ModelMixin
-    @@ATTRIBUTES = [:id, :recipient, :sender, :text, :created_at]
-    attr_accessor *@@ATTRIBUTES
+    @@ATTRIBUTES = [:id, :recipient, :sender, :text, :geo, :created_at]
+    attr_accessor(*@@ATTRIBUTES)
     
     class << self
       # Used as factory method callback
@@ -350,7 +350,7 @@ module Twitter
   class RateLimitStatus
     include ModelMixin
     @@ATTRIBUTES = [:remaining_hits, :hourly_limit, :reset_time_in_seconds, :reset_time]
-    attr_accessor *@@ATTRIBUTES
+    attr_accessor(*@@ATTRIBUTES)
     
     class << self
       # Used as factory method callback

data/lib/twitter/version.rb

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

data/lib/twitter.rb

@@ -21,7 +21,11 @@ require('net/https')
 require('uri')
 require('cgi')
 require('json')
-require('yaml')
+require('oauth')
+
+if RUBY_VERSION < "1.9.0"
+  require('yaml')
+end
 
 # Ordering matters...pay attention here!
 require_local('twitter/ext')

data/spec/twitter/client/account_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
 describe Twitter::Client, "#account_info" do
   before(:each) do
     @uri = Twitter::Client.class_eval("@@ACCOUNT_URIS[:rate_limit_status]")
-    @request = mas_net_http_get(:basic_auth => nil)
+    @request = mas_net_http_get
     @twitter = client_context
     @default_header = @twitter.send(:http_header)
     @response = mas_net_http_response(:success)
@@ -15,7 +15,7 @@ describe Twitter::Client, "#account_info" do
   end
 
   it "should create expected HTTP GET request" 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.account_info
   end