examples/httpauth.rb lib/twitter/httpauth.rb test/twitter/httpauth_test.rb @@ -35,6 +35,7 @@ directory = File.dirname(__FILE__) $:.unshift(directory) unless $:.include?(directory) require 'twitter/oauth' +require 'twitter/httpauth' require 'twitter/request' require 'twitter/base' require 'twitter/search' \ No newline at end of file lib/twitter.rb @@ -2,10 +2,12 @@ module Twitter class Base extend Forwardable - def_delegators :@client, :get, :post + def_delegators :client, :get, :post - def initialize(oauth) - @client = oauth.access_token + attr_reader :client + + def initialize(client) + @client = client end # Options: since_id, max_id, count, page, since lib/twitter/base.rb @@ -1,5 +1,8 @@ module Twitter class OAuth + extend Forwardable + def_delegators :access_token, :get, :post + attr_reader :ctoken, :csecret def initialize(ctoken, csecret) @@ -24,8 +27,6 @@ module Twitter @access_token ||= ::OAuth::AccessToken.new(consumer, @atoken, @asecret) end - alias client access_token - def authorize_from_access(atoken, asecret) @atoken, @asecret = atoken, asecret end lib/twitter/oauth.rb @@ -2,20 +2,20 @@ module Twitter class Request extend Forwardable - def self.get(base, path, options={}) - new(base, :get, path, options).perform + def self.get(client, path, options={}) + new(client, :get, path, options).perform end - def self.post(base, path, options={}) - new(base, :post, path, options).perform + def self.post(client, path, options={}) + new(client, :post, path, options).perform end - attr_reader :base, :method, :path, :options + attr_reader :client, :method, :path, :options - def_delegators :base, :get, :post + def_delegators :client, :get, :post - def initialize(base, method, path, options={}) - @base, @method, @path, @options = base, method, path, options + def initialize(client, method, path, options={}) + @client, @method, @path, @options = client, method, path, options end def uri lib/twitter/request.rb @@ -20,15 +20,17 @@ def fixture_file(filename) File.read(file_path) end +def twitter_url(url) + url =~ /^http/ ? url : "http://twitter.com:80#{url}" +end + def stub_get(url, filename, status=nil) - url = url =~ /^http/ ? url : "http://twitter.com:80#{url}" - options = {:string => fixture_file(filename)} options.merge!({:status => status}) unless status.nil? - FakeWeb.register_uri(:get, url, options) + FakeWeb.register_uri(:get, twitter_url(url), options) end def stub_post(url, filename) - FakeWeb.register_uri(:post, "http://twitter.com:80#{url}", :string => fixture_file(filename)) + FakeWeb.register_uri(:post, twitter_url(url), :string => fixture_file(filename)) end test/test_helper.rb @@ -10,8 +10,9 @@ class BaseTest < Test::Unit::TestCase end context "initialize" do - should "require an oauth object" do - @twitter.instance_variable_get('@client').should == @access_token + should "require a client" do + @twitter.client.should respond_to(:get) + @twitter.client.should respond_to(:post) end end test/twitter/base_test.rb @@ -53,10 +53,19 @@ class OAuthTest < Test::Unit::TestCase twitter.access_token.secret.should == 'asecret' end - should "alias oauth token to client" do + should "delegate get to access token" do + access_token = mock('access token') twitter = Twitter::OAuth.new('token', 'secret') - twitter.authorize_from_access('atoken', 'asecret') - - twitter.client.should == twitter.access_token + twitter.stubs(:access_token).returns(access_token) + access_token.expects(:get).returns(nil) + twitter.get('/foo') + end + + should "delegate post to access token" do + access_token = mock('access token') + twitter = Twitter::OAuth.new('token', 'secret') + twitter.stubs(:access_token).returns(access_token) + access_token.expects(:post).returns(nil) + twitter.post('/foo') end end test/twitter/oauth_test.rb @@ -3,12 +3,12 @@ require File.dirname(__FILE__) + '/../test_helper' class RequestTest < Test::Unit::TestCase context "new get request" do setup do - @base = mock('twitter base') - @request = Twitter::Request.new(@base, :get, '/statuses/user_timeline.json', {:query => {:since_id => 1234}}) + @client = mock('twitter client') + @request = Twitter::Request.new(@client, :get, '/statuses/user_timeline.json', {:query => {:since_id => 1234}}) end - should "have base" do - @request.base.should == @base + should "have client" do + @request.client.should == @client end should "have method" do @@ -34,7 +34,7 @@ class RequestTest < Test::Unit::TestCase stubs(:code).returns('200') end - @base.expects(:get).returns(response) + @client.expects(:get).returns(response) @object = @request.perform end @@ -52,7 +52,7 @@ class RequestTest < Test::Unit::TestCase stubs(:code).returns('200') end - @base.expects(:get).returns(response) + @client.expects(:get).returns(response) @object = @request.perform end @@ -64,21 +64,21 @@ class RequestTest < Test::Unit::TestCase context "with no query string" do should "not have any query string" do - request = Twitter::Request.new(@base, :get, '/statuses/user_timeline.json') + request = Twitter::Request.new(@client, :get, '/statuses/user_timeline.json') request.uri.should == '/statuses/user_timeline.json' end end context "with blank query string" do should "not have any query string" do - request = Twitter::Request.new(@base, :get, '/statuses/user_timeline.json', :query => {}) + request = Twitter::Request.new(@client, :get, '/statuses/user_timeline.json', :query => {}) request.uri.should == '/statuses/user_timeline.json' end end should "have get shortcut to initialize and perform all in one" do Twitter::Request.any_instance.expects(:perform).returns(nil) - Twitter::Request.get(@base, '/foo') + Twitter::Request.get(@client, '/foo') end should "allow setting query string and headers" do @@ -87,15 +87,15 @@ class RequestTest < Test::Unit::TestCase stubs(:code).returns('200') end - @base.expects(:get).with('/statuses/friends_timeline.json?since_id=1234', {'Foo' => 'Bar'}).returns(response) - Twitter::Request.get(@base, '/statuses/friends_timeline.json?since_id=1234', :headers => {'Foo' => 'Bar'}) + @client.expects(:get).with('/statuses/friends_timeline.json?since_id=1234', {'Foo' => 'Bar'}).returns(response) + Twitter::Request.get(@client, '/statuses/friends_timeline.json?since_id=1234', :headers => {'Foo' => 'Bar'}) end end context "new post request" do setup do - @base = mock('twitter base') - @request = Twitter::Request.new(@base, :post, '/statuses/update.json', {:body => {:status => 'Woohoo!'}}) + @client = mock('twitter client') + @request = Twitter::Request.new(@client, :post, '/statuses/update.json', {:body => {:status => 'Woohoo!'}}) end should "allow setting body and headers" do @@ -104,8 +104,8 @@ class RequestTest < Test::Unit::TestCase stubs(:code).returns('200') end - @base.expects(:post).with('/statuses/update.json', {:status => 'Woohoo!'}, {'Foo' => 'Bar'}).returns(response) - Twitter::Request.post(@base, '/statuses/update.json', :body => {:status => 'Woohoo!'}, :headers => {'Foo' => 'Bar'}) + @client.expects(:post).with('/statuses/update.json', {:status => 'Woohoo!'}, {'Foo' => 'Bar'}).returns(response) + Twitter::Request.post(@client, '/statuses/update.json', :body => {:status => 'Woohoo!'}, :headers => {'Foo' => 'Bar'}) end context "performing request" do @@ -115,7 +115,7 @@ class RequestTest < Test::Unit::TestCase stubs(:code).returns('200') end - @base.expects(:post).returns(response) + @client.expects(:post).returns(response) @object = @request.perform end @@ -126,7 +126,7 @@ class RequestTest < Test::Unit::TestCase should "have post shortcut to initialize and perform all in one" do Twitter::Request.any_instance.expects(:perform).returns(nil) - Twitter::Request.post(@base, '/foo') + Twitter::Request.post(@client, '/foo') end end @@ -134,69 +134,69 @@ class RequestTest < Test::Unit::TestCase setup do oauth = Twitter::OAuth.new('token', 'secret') oauth.authorize_from_access('atoken', 'asecret') - @base = Twitter::Base.new(oauth) + @client = Twitter::Base.new(oauth) end should "not raise error for 200" do stub_get('http://twitter.com:80/foo', '', ['200']) lambda { - Twitter::Request.get(@base, '/foo') + Twitter::Request.get(@client, '/foo') }.should_not raise_error end should "not raise error for 304" do stub_get('http://twitter.com:80/foo', '', ['304']) lambda { - Twitter::Request.get(@base, '/foo') + Twitter::Request.get(@client, '/foo') }.should_not raise_error end should "raise RateLimitExceeded for 400" do stub_get('http://twitter.com:80/foo', 'rate_limit_exceeded.json', ['400']) lambda { - Twitter::Request.get(@base, '/foo') + Twitter::Request.get(@client, '/foo') }.should raise_error(Twitter::RateLimitExceeded) end should "raise Unauthorized for 401" do stub_get('http://twitter.com:80/foo', '', ['401']) lambda { - Twitter::Request.get(@base, '/foo') + Twitter::Request.get(@client, '/foo') }.should raise_error(Twitter::Unauthorized) end should "raise General for 403" do stub_get('http://twitter.com:80/foo', '', ['403']) lambda { - Twitter::Request.get(@base, '/foo') + Twitter::Request.get(@client, '/foo') }.should raise_error(Twitter::General) end should "raise NotFound for 404" do stub_get('http://twitter.com:80/foo', '', ['404']) lambda { - Twitter::Request.get(@base, '/foo') + Twitter::Request.get(@client, '/foo') }.should raise_error(Twitter::NotFound) end should "raise InformTwitter for 500" do stub_get('http://twitter.com:80/foo', '', ['500']) lambda { - Twitter::Request.get(@base, '/foo') + Twitter::Request.get(@client, '/foo') }.should raise_error(Twitter::InformTwitter) end should "raise Unavailable for 502" do stub_get('http://twitter.com:80/foo', '', ['502']) lambda { - Twitter::Request.get(@base, '/foo') + Twitter::Request.get(@client, '/foo') }.should raise_error(Twitter::Unavailable) end should "raise Unavailable for 503" do stub_get('http://twitter.com:80/foo', '', ['503']) lambda { - Twitter::Request.get(@base, '/foo') + Twitter::Request.get(@client, '/foo') }.should raise_error(Twitter::Unavailable) end end test/twitter/request_test.rb 9d4fd990b428bff5c4add4963112a347d22f208c John Nunemaker nunemaker@gmail.com http://github.com/jnunemaker/twitter/commit/d713ecfbe80edde688009fa6bfbf32a2de687a39 d713ecfbe80edde688009fa6bfbf32a2de687a39 2009-04-10T22:49:36-07:00 2009-04-10T22:48:13-07:00 First shot at http auth seems to be working. f8cc090935dbeabb725cf9399be46917f49c2ae0 John Nunemaker nunemaker@gmail.com