twitter4r 0.5.0 → 0.5.1

data/lib/twitter/client/base.rb

@@ -14,7 +14,7 @@ class Twitter::Client
     # 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)
+      uri = rest_request_uri(path, params)
       if [:get, :delete].include?(method)
         response = atoken.send(method, uri, http_header.merge(headers))
       else
@@ -27,7 +27,7 @@ class Twitter::Client
     # 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)
+      uri = search_request_uri(path, params)
       if method == :get
         response = atoken.send(method, uri, http_header.merge(headers))
       end
@@ -49,39 +49,56 @@ class Twitter::Client
     @@http_header = nil
 
     def rest_consumer
-      unless @consumer
-        @consumer = OAuth::Consumer.new(@oauth_consumer["key"], 
-                                        @oauth_consumer["secret"], 
-                                        :site => construct_site_url)
+      unless @rest_consumer
+        consumer = @oauth_consumer
+        if consumer
+          key = consumer[:key] || consumer["key"]
+          secret = consumer[:secret] || consumer["secret"]
+        end
+        cfg = self.class.config
+        key ||= cfg.oauth_consumer_token
+        secret ||= cfg.oauth_consumer_secret
+        @rest_consumer = OAuth::Consumer.new(key, secret, 
+                                             :site => construct_site_url,
+                                             :proxy => construct_proxy_url)
       end
-      @consumer
+      @rest_consumer
     end
 
     def rest_access_token
-      unless @access_token
-        @access_token = OAuth::AccessToken.new(rest_consumer, 
-                                               @oauth_access["key"], 
-                                               @oauth_access["secret"])
+      unless @rest_access_token
+        key = @oauth_access[:key] || @oauth_access["key"]
+        secret = @oauth_access[:secret] || @oauth_access["secret"]
+        @rest_access_token = OAuth::AccessToken.new(rest_consumer, key, secret)
       end
-      @access_token
+      @rest_access_token
     end
     
     def search_consumer
-      unless @consumer
-        @consumer = OAuth::Consumer.new(@oauth_consumer["key"], 
-                                        @oauth_consumer["secret"], 
-                                        :site => construct_site_url(:search))
+      unless @search_consumer
+        cfg = self.class.config
+        consumer = @oauth_consumer
+        if consumer
+          key = consumer[:key] || consumer["key"] 
+          secret = consumer[:secret] || consumer["secret"]
+        end
+        cfg = self.class.config
+        key ||= cfg.oauth_consumer_token
+        secret ||= cfg.oauth_consumer_secret
+        @search_consumer = OAuth::Consumer.new(key, secret, 
+                                               :site => construct_site_url(:search),
+                                               :proxy => construct_proxy_url)
       end
-      @consumer
+      @search_consumer
     end
 
     def search_access_token
-      unless @access_token
-        @access_token = OAuth::AccessToken.new(search_consumer, 
-                                               @oauth_access["key"], 
-                                               @oauth_access["secret"])
+      unless @search_access_token
+        key = @oauth_access[:key] || @oauth_access["key"]
+        secret = @oauth_access[:secret] || @oauth_access["secret"]
+        @search_access_token = OAuth::AccessToken.new(search_consumer, key, secret)
       end
-      @access_token
+      @search_access_token
     end
 
     def raise_rest_error(response, uri = nil)
@@ -103,36 +120,57 @@ class Twitter::Client
       # create the contents of the HTTP header are determined by other 
       # class variables that are not designed to change after instantiation.
       @@http_header ||= { 
-      	'User-Agent' => "Twitter4R v#{Twitter::Version.to_version} [#{@@config.user_agent}]",
+      	'User-Agent' => "Twitter4R v#{Twitter::Version.to_version} [#{self.class.config.user_agent}]",
       	'Accept' => 'text/x-json',
-      	'X-Twitter-Client' => @@config.application_name,
-      	'X-Twitter-Client-Version' => @@config.application_version,
-      	'X-Twitter-Client-URL' => @@config.application_url,
+      	'X-Twitter-Client' => self.class.config.application_name,
+      	'X-Twitter-Client-Version' => self.class.config.application_version,
+      	'X-Twitter-Client-URL' => self.class.config.application_url,
       }
       @@http_header
     end
 
-    def rest_request_uri(path)
-      "#{@@config.path_prefix}#{path}"
+    def rest_request_uri(path, params = nil)
+      uri = "#{self.class.config.path_prefix}#{path}"
+      uri << "?#{params.to_http_str}" if params
+      uri
     end
     
-    def search_request_uri(path)
-      "#{@@config.search_path_prefix}#{path}"
+    def search_request_uri(path, params = nil)
+      uri = "#{self.class.config.search_path_prefix}#{path}"
+      uri << "?#{params.to_http_str}" if params
+      uri
     end
     
     def uri_components(service = :rest)
       case service
       when :rest
-        return @@config.protocol, @@config.host, @@config.port, 
-          @@config.path_prefix
+        return self.class.config.protocol, self.class.config.host, self.class.config.port, 
+          self.class.config.path_prefix
       when :search
-        return @@config.search_protocol, @@config.search_host, 
-          @@config.search_port, @@config.search_path_prefix
+        return self.class.config.search_protocol, self.class.config.search_host, 
+          self.class.config.search_port, self.class.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}"
+      "#{(protocol == :ssl ? :https : protocol).to_s}://#{host}:#{port}"
+    end
+
+    def construct_proxy_url
+      cfg = self.class.config
+      proxy_user, proxy_pass = cfg.proxy_user, cfg.proxy_pass
+      proxy_host, proxy_port = cfg.proxy_host, cfg.proxy_port
+      protocol = ((cfg.proxy_protocol == :ssl) ? :https : cfg.proxy_protocol).to_s
+      url = nil
+      if proxy_host
+        url = "#{protocol}://"
+        if proxy_user
+          url << "#{proxy_user}:#{proxy_pass}@"
+        end
+        url << "#{proxy_host}:#{proxy_port.to_s}"
+      else
+        url
+      end
     end
 end

data/lib/twitter/client/favorites.rb

@@ -14,9 +14,8 @@ class Twitter::Client
   #  statuses = client.favorites(:page => 2)
   # The above one-liner will get the second page of favorites for the authenticated user.
   def favorites(options = nil)
-    def uri_suffix(opts); opts && opts[:page] ? "?page=#{opts[:page]}" : ""; end
-    uri = '/favorites.json' + uri_suffix(options)
-    response = rest_oauth_connect(:get, uri)
+    uri = '/favorites.json'
+    response = rest_oauth_connect(:get, uri, options)
     bless_models(Twitter::Status.unmarshal(response.body))
   end
 	

data/lib/twitter/client/messaging.rb

@@ -68,7 +68,7 @@ class Twitter::Client
     user = user.to_i if user and user.is_a?(Twitter::User)
     case action
     when :post
-      response = rest_oauth_connect(:post, uri, {:text => value, :user => user, :source => @@config.source})
+      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}")
     end

data/lib/twitter/client/status.rb

@@ -37,14 +37,14 @@ class Twitter::Client
     response = nil
     case action
     when :get
-      response = rest_oauth_connect(:get, "#{uri}?#{{:id => value.to_i}.to_http_str}")
+      response = rest_oauth_connect(:get, uri, {:id => value.to_i})
     when :post
-      response = rest_oauth_connect(:post, uri, :status => value, :source => @@config.source)
+      response = rest_oauth_connect(:post, uri, :status => value, :source => self.class.config.source)
     when :delete
-      response = rest_oauth_connect(:delete, "#{uri}?#{{:id => value.to_i}.to_http_str}")
+      response = rest_oauth_connect(:delete, uri, {:id => value.to_i})
     when :reply
       return nil if (!value.is_a?(Hash) || !value[:status] || !value[:in_reply_to_status_id])
-      params = value.merge(:source => @@config.source)
+      params = value.merge(:source => self.class.config.source)
       response = rest_oauth_connect(:post, uri, params)
     end
     bless_model(Twitter::Status.unmarshal(response.body))

data/lib/twitter/client/timeline.rb

@@ -40,9 +40,10 @@ 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>:per_page</tt> specifies the number of statuses to retrieve at a time.  Only applicable for the :user case.
+  # * <tt>:count</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.
+  # * <tt>include_rts</tt> flags whether to retrieve native retweets in the timeline or not. True values are true, t or 1.
   # 
   # You can also pass this method a block, which will iterate through the results
   # of the requested timeline and apply the block logic for each status returned.

data/lib/twitter/client/user.rb

@@ -35,8 +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)
-    uri = "#{@@USER_URIS[action]}?#{params.to_http_str}"
-    response = rest_oauth_connect(:get, uri)
+    uri = @@USER_URIS[action]
+    response = rest_oauth_connect(:get, uri, params)
     bless_models(Twitter::User.unmarshal(response.body))
   end
   
@@ -60,8 +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)
-    uri = "#{@@USER_URIS[action]}?#{params.to_http_str}"
-    response = rest_oauth_connect(:get, uri)
+    uri = @@USER_URIS[action]
+    response = rest_oauth_connect(:get, uri, params)
     users = Twitter::User.unmarshal(response.body)
     bless_models(users)
   end

data/lib/twitter/config.rb

@@ -12,8 +12,9 @@ module Twitter
   # * <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_protocol</tt> - proxy protocol to use.  Defaults to http.
   # * <tt>proxy_host</tt> - proxy host to use.  Defaults to nil.
-  # * <tt>proxy_port</tt> - proxy host to use.  Defaults to nil.
+  # * <tt>proxy_port</tt> - proxy host to use.  Defaults to 8080.
   # * <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.
@@ -38,6 +39,7 @@ module Twitter
       :search_host,
       :search_port,
       :search_path_prefix,
+      :proxy_protocol,
       :proxy_host, 
       :proxy_port, 
       :proxy_user, 
@@ -77,8 +79,9 @@ module Twitter
                    :search_port => 80,
                    :search_protocol => :http,
                    :search_path_prefix => "",
+                   :proxy_protocol => "http",
                    :proxy_host => nil,
-                   :proxy_port => nil,
+                   :proxy_port => 8080,
                    :user_agent => "default",
                    :application_name => 'Twitter4R',
                    :application_version => Twitter::Version.to_version,
@@ -93,10 +96,15 @@ module Twitter
 
     # Twitter::Client class methods
     class << self
+      # returns configuration object
+      def config
+        @@config
+      end
+
       # Yields to given <tt>block</tt> to configure the Twitter4R API.
       def configure(&block)
         raise ArgumentError, "Block must be provided to configure" unless block_given?
-        yield @@config
+        yield config
       end # configure
     end # class << self    
   end # Client class

data/lib/twitter/ext/stdlib.rb

@@ -35,18 +35,3 @@ class Time
   end
 end
 
-# Extension to Kernel to add #gem_present? without any exceptions raised
-module Kernel
-
-  # Returns whether or not a gem exists without raising a Gem::LoadError exception
-  def gem_present?(gem_name, version = nil)
-    present = false
-    begin
-      present = !!(version ? gem(gem_name, version) : gem(gem_name))
-    rescue Gem::LoadError => le
-      present = false
-      warn("Gem load error: Couldn't load #{gem_name} #{version ? "with version requirement #{version}: #{le.to_s}": ""}")
-    end
-    present
-  end
-end

data/lib/twitter/version.rb

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

data/spec/twitter/client/base_spec.rb

@@ -137,3 +137,103 @@ describe Twitter::Client, "#bless_models" do
     nilize(@twitter, @models)
   end
 end
+
+shared_examples_for "consumer token overrides" do
+  before(:each) do
+    @config_key = "234ufmewroi23o43SFsf"
+    @config_secret = "kfgIYFOasdfsfg236GSka"
+    @key_override = "#{@config_key}-1234"
+    @secret_override = "#{@config_secret}-1234"
+    Twitter::Client.configure do |conf|
+      conf.oauth_consumer_token = @config_key
+      conf.oauth_consumer_secret = @config_secret
+    end
+    @overridded_client = Twitter::Client.new(:oauth_consumer => { :key => @key_override, :secret => @secret_override })
+    @plain_client = Twitter::Client.new
+  end
+
+  it "should be set to key/secret pair passed into constructor when passed in and configuration object already has key/secret set" do
+    consumer = get_consumer(@overridded_client)
+    consumer.instance_eval("@key").should eql(@key_override)
+    consumer.instance_eval("@secret").should eql(@secret_override)
+  end
+
+  it "should be set to key/secret pair set in configuration object when none passed into constructor" do
+    consumer = get_consumer(@plain_client)
+    consumer.instance_eval("@key").should eql(@config_key)
+    consumer.instance_eval("@secret").should eql(@config_secret)
+  end
+
+  after(:each) do
+    Twitter::Client.configure do |conf|
+      conf.oauth_consumer_token = nil
+      conf.oauth_consumer_secret = nil
+    end
+  end
+end
+
+describe Twitter::Client, "rest consumer token" do
+  it_should_behave_like "consumer token overrides"
+
+  def get_consumer(client)
+    client.send(:rest_consumer)
+  end
+end
+
+describe Twitter::Client, "search consumer token" do
+  it_should_behave_like "consumer token overrides"
+
+  def get_consumer(client)
+    client.send(:search_consumer)
+  end
+end
+
+describe Twitter::Client, "#construct_proxy_url" do
+  before(:each) do
+    @host = "localhost"
+    @port = "8080"
+    @user = "user"
+    @pass = "pass123"
+    @client = client_context
+  end
+
+  def configure_host_and_port
+    Twitter::Client.configure do |conf|
+      conf.proxy_host = @host
+      conf.proxy_port = @port
+    end
+  end
+
+  def configure_user_and_password
+    Twitter::Client.configure do |conf|
+      conf.proxy_user = @user
+      conf.proxy_pass = @pass
+    end
+  end
+
+  it "should return the full proxy URL when proxy host and port given" do
+    configure_host_and_port
+    url = "http://#{@host}:#{@port}"
+    @client.send(:construct_proxy_url).should eql(url)
+  end
+
+  it "should return the full proxy URL when proxy host, port, username and password given" do
+    configure_host_and_port
+    configure_user_and_password
+    url = "http://#{@user}:#{@pass}@#{@host}:#{@port}"
+    @client.send(:construct_proxy_url).should eql(url)
+  end
+
+  it "should return nil when no proxy host is given" do
+    @client.send(:construct_proxy_url).should eql(nil)
+  end
+
+  after(:each) do
+    Twitter::Client.configure do |conf|
+      conf.proxy_user = nil
+      conf.proxy_pass = nil
+      conf.proxy_host = nil
+      conf.proxy_port = nil
+    end
+  end
+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(:rest_oauth_connect).with(:get, @uri).and_return(@response)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, @uri, nil).and_return(@response)
     @twitter.favorites
   end
   
   it "should create expected HTTP GET request when giving :page options" do
-    @twitter.should_receive(:rest_oauth_connect).with(:get, "#{@uri}?#{@options.to_http_str}").and_return(@response)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, @uri, @options).and_return(@response)
     @twitter.favorites(@options)
   end
   
@@ -98,34 +98,34 @@ module FavoriteSpecMixin
   end
 end
 
-describe "Twitter::Client#favorite error handling", :shared => true do
+shared_examples_for "Twitter::Client#favorite error handling" do
   it "should raise a Twitter::RESTError exception when a 401 HTTP response is received" do
     connection = mas_net_http(mas_net_http_response(:not_authorized))
     lambda {
       execute_method
     }.should raise_error(Twitter::RESTError)
-  end  
+  end
 
   it "should raise a Twitter::RESTError exception when a 403 HTTP response is received" do
     connection = mas_net_http(mas_net_http_response(:forbidden))
     lambda {
       execute_method
     }.should raise_error(Twitter::RESTError)
-  end  
+  end
 
   it "should raise a Twitter::RESTError exception when a 404 HTTP response is received" do
     connection = mas_net_http(mas_net_http_response(:file_not_found))
     lambda {
       execute_method
     }.should raise_error(Twitter::RESTError)
-  end  
+  end
 
   it "should raise a Twitter::RESTError exception when a 500 HTTP response is received" do
     connection = mas_net_http(mas_net_http_response(:server_error))
     lambda {
       execute_method
     }.should raise_error(Twitter::RESTError)
-  end  
+  end
 end
 
 describe Twitter::Client, "#favorite(:add, status)" do
@@ -169,7 +169,7 @@ describe Twitter::Client, "#favorite(:remove, status)" do
   
   it "should create expected DELETE request for :remove action supplying integer id of status" do
     @twitter.should_receive(:rest_oauth_connect).with(:delete, create_uri(:destroy, @id)).and_return(@request)
-    @twitter.favorite(:remove, @id)
+    execute_method
   end
   
   it "should create expected DELETE request for :remove action supplying status object" do

data/spec/twitter/client/friendship_spec.rb

@@ -32,63 +32,63 @@ describe Twitter::Client, "#friend" do
     @connection = mas_net_http(@response)
     Twitter::User.stub!(:unmarshal).and_return(@friend)
   end
-  
+
   def create_uri(action, id)
-  	"#{@uris[action]}/#{id}.json"
+    "#{@uris[action]}/#{id}.json"
   end
-  
+
   it "should create expected HTTP POST request for :add case using integer user ID" do
-  	# the integer user ID scenario...
+    # the integer user ID scenario...
     @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 POST request for :add case using screen name" do
-  	# the screen name scenario...
+    # the screen name scenario...
     @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...
+  it "should create expected HTTP GET request for :add case using Twitter::User object" do
+    # the Twitter::User object scenario...
     @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...
+    # the integer user ID scenario...
     @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...
+  it "should create expected HTTP GET request for :remove case using screen name" do
+    # the screen name scenario...
     @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...
+    # the Twitter::User object scenario...
     @twitter.should_receive(:rest_oauth_connect).with(:post, create_uri(:remove, @friend.to_i)).and_return(@response)
     @twitter.friend(:remove, @friend)
   end
-  
+
   it "should bless user model returned for :add case" do
     @twitter.should_receive(:bless_model).with(@friend)
     @twitter.friend(:add, @friend)
   end
-  
+
   it "should bless user model returned for :remove case" do
     @twitter.should_receive(:bless_model).with(@friend)
     @twitter.friend(:remove, @friend)
   end
-  
+
   it "should raise ArgumentError if action given is not valid" do
     lambda {
       @twitter.friend(:crap, @friend)
     }.should raise_error(ArgumentError)
   end
-  
+
   after(:each) do
     nilize(@twitter, @id, @uris, @response, @connection)
   end

data/spec/twitter/client/status_spec.rb

@@ -26,17 +26,17 @@ describe Twitter::Client, "#status" do
   end
   
   it "should create expected HTTP GET request for :get case" do
-    @twitter.should_receive(:rest_oauth_connect).with(:get, "#{@uris[:get]}?#{@options.to_http_str}").and_return(@response)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, @uris[:get], @options).and_return(@response)
     @twitter.status(:get, @options[:id])
   end
   
   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(:rest_oauth_connect).with(:get, "#{@uris[:get]}?#{{:id => @float.to_i}.to_http_str}").and_return(@response)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, @uris[:get], {:id => @float.to_i}).and_return(@response)
     @twitter.status(:get, @float)
 
     # Twitter::Status object case
-    @twitter.should_receive(:rest_oauth_connect).with(:get, "#{@uris[:get]}?#{{:id => @status.to_i}.to_http_str}").and_return(@response)    
+    @twitter.should_receive(:rest_oauth_connect).with(:get, @uris[:get], {:id => @status.to_i}).and_return(@response)    
     @twitter.status(:get, @status)
   end
   
@@ -71,17 +71,17 @@ describe Twitter::Client, "#status" do
   end
   
   it "should create expected HTTP DELETE request for :delete case" do
-    @twitter.should_receive(:rest_oauth_connect).with(:delete, "#{@uris[:delete]}?#{@options.to_http_str}").and_return(@response)
+    @twitter.should_receive(:rest_oauth_connect).with(:delete, @uris[:delete], @options).and_return(@response)
     @twitter.status(:delete, @options[:id])
   end
 
   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(:rest_oauth_connect).with(:delete, "#{@uris[:delete]}?#{{:id => @float.to_i}.to_http_str}").and_return(@response)
+    @twitter.should_receive(:rest_oauth_connect).with(:delete, @uris[:delete], {:id => @float.to_i}).and_return(@response)
     @twitter.status(:delete, @float)
 
     # Twitter::Status object case
-    @twitter.should_receive(:rest_oauth_connect).with(:delete, "#{@uris[:delete]}?#{{:id => @status.to_i}.to_http_str}").and_return(@response)
+    @twitter.should_receive(:rest_oauth_connect).with(:delete, @uris[:delete], {:id => @status.to_i}).and_return(@response)
     @twitter.status(:delete, @status)
   end
   

data/spec/twitter/client/user_spec.rb

@@ -19,12 +19,12 @@ describe Twitter::Client, "#user(id, :info)" do
   end
   
   it "should create expected HTTP GET request when giving numeric user id" do
-    @twitter.should_receive(:rest_oauth_connect).with(:get, "#{@uris[:info]}?#{{:user_id => @id}.to_http_str}").and_return(@response)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, @uris[:info], {:user_id => @id}).and_return(@response)
     @twitter.user(@id)
   end
     
   it "should create expected HTTP GET request when giving screen name" do
-    @twitter.should_receive(:rest_oauth_connect).with(:get, "#{@uris[:info]}?#{{:screen_name => @screen_name}.to_http_str}").and_return(@response)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, @uris[:info], {:screen_name => @screen_name}).and_return(@response)
     @twitter.user(@screen_name)
   end
   
@@ -64,7 +64,7 @@ describe Twitter::Client, "#user(id, :friends)" do
   end
   
   it "should create expected HTTP GET request when giving numeric user id" do
-    @twitter.should_receive(:rest_oauth_connect).with(:get, "#{@uris[:friends]}?#{{:user_id => @id}.to_http_str}").and_return(@response)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, @uris[:friends], {:user_id => @id}).and_return(@response)
     @twitter.user(@id, :friends)
   end
   
@@ -74,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(:rest_oauth_connect).with(:get, "#{@uris[:friends]}?#{{:user_id => @user.to_i}.to_http_str}").and_return(@response)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, @uris[:friends], {:user_id => @user.to_i}).and_return(@response)
     @twitter.user(@user, :friends)
   end
   
   it "should create expected HTTP GET request when giving screen name" do
-    @twitter.should_receive(:rest_oauth_connect).with(:get, "#{@uris[:friends]}?#{{:screen_name => @screen_name}.to_http_str}").and_return(@response)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, @uris[:friends], {:screen_name => @screen_name}).and_return(@response)
     @twitter.user(@screen_name, :friends)
   end
   
@@ -122,7 +122,7 @@ describe Twitter::Client, "#my(:info)" do
   end
   
   it "should create expected HTTP GET request" do
-    @twitter.should_receive(:rest_oauth_connect).with(:get, "#{@uris[:info]}?#{{:id => @screen_name}.to_http_str}").and_return(@response)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, @uris[:info], {:id => @screen_name}).and_return(@response)
     @twitter.my(:info)
   end
   
@@ -160,7 +160,7 @@ describe Twitter::Client, "#my(:friends)" do
   end
   
   it "should create expected HTTP GET request" do
-    @twitter.should_receive(:rest_oauth_connect).with(:get, "#{@uris[:friends]}?#{{:id => @screen_name}.to_http_str}").and_return(@response)
+    @twitter.should_receive(:rest_oauth_connect).with(:get, @uris[:friends], {:id => @screen_name}).and_return(@response)
     @twitter.my(:friends)
   end
   

data/spec/twitter/ext/stdlib_spec.rb

@@ -41,19 +41,3 @@ describe Time, "#to_s" do
   end
 end
 
-# TODO: figure out how to stub the gem method to do what we want rather than this monstrousity.  It is dependent on the system installation, which is always a bad thing.  For now it will do so we can ship with 100% C0 coverage.
-describe Kernel, "#gem_present?" do
-  before(:each) do
-    @present_gem = "rake"
-    @uninstalled_gem = "uninstalled-gem-crap"
-  end
-  
-  it "should return true when a gem isn't present on system" do
-    gem_present?(@present_gem).should eql(true)
-  end
-  
-  it "should return false when a gem isn't present on system" do
-    gem_present?(@uninstalled_gem).should eql(false)
-  end
-end
-

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: twitter4r
 version: !ruby/object:Gem::Version 
-  hash: 11
   prerelease: false
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Susan Potter
@@ -15,18 +14,16 @@ autorequire: twitter
 bindir: bin
 cert_chain: []
 
-date: 2010-08-29 00:00:00 -05:00
+date: 2010-09-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: oauth
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 0
         - 4
@@ -38,11 +35,9 @@ dependencies:
   name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 1
         - 1
@@ -122,22 +117,18 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::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"
@@ -146,7 +137,7 @@ requirements:
 - json gem, version 0.4.3 or higher
 - jcode (for unicode support)
 rubyforge_project: twitter4r
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A clean Twitter client API in pure Ruby. Will include Twitter add-ons also in Ruby.