jnunemaker-twitter 0.6.10 → 0.6.11

data/History

@@ -1,3 +1,7 @@
+0.6.11 - May 18, 2009
+* 1 minor addition
+  * Added the ability to sign in with twitter instead of authorizing
+
 0.6.10 - May 18, 2009
 * 1 cool addition
   * Added full support for trends - current, daily and weekly (even allowing excluding of hashtags and for specific dates)

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 6
-:patch: 10
+:patch: 11

data/lib/twitter/oauth.rb

@@ -3,14 +3,21 @@ module Twitter
     extend Forwardable
     def_delegators :access_token, :get, :post
     
-    attr_reader :ctoken, :csecret
+    attr_reader :ctoken, :csecret, :consumer_options
     
-    def initialize(ctoken, csecret)
-      @ctoken, @csecret = ctoken, csecret
+    # Options
+    #   :sign_in => true to just sign in with twitter instead of doing oauth authorization
+    #               (http://apiwiki.twitter.com/Sign-in-with-Twitter)
+    def initialize(ctoken, csecret, options={})
+      @ctoken, @csecret, @consumer_options = ctoken, csecret, {}
+      
+      if options[:sign_in]
+        @consumer_options[:authorize_path] =  '/oauth/authenticate'
+      end
     end
     
     def consumer
-      @consumer ||= ::OAuth::Consumer.new(@ctoken, @csecret, {:site => 'http://twitter.com'})
+      @consumer ||= ::OAuth::Consumer.new(@ctoken, @csecret, {:site => 'http://twitter.com'}.merge(consumer_options))
     end
     
     def request_token

data/test/twitter/oauth_test.rb

@@ -8,6 +8,16 @@ class OAuthTest < Test::Unit::TestCase
     twitter.csecret.should == 'secret'
   end
   
+  should "set autorization path to '/oauth/authorize' by default" do
+    twitter = Twitter::OAuth.new('token', 'secret')
+    twitter.consumer.options[:authorize_path].should == '/oauth/authorize'
+  end
+
+  should "set autorization path to '/oauth/authenticate' if sign_in_with_twitter" do
+    twitter = Twitter::OAuth.new('token', 'secret', :sign_in => true)
+    twitter.consumer.options[:authorize_path].should == '/oauth/authenticate'
+  end
+  
   should "have a consumer" do
     consumer = mock('oauth consumer')
     OAuth::Consumer.expects(:new).with('token', 'secret', {:site => 'http://twitter.com'}).returns(consumer)

data/test/twitter/trends_test.rb

@@ -5,7 +5,7 @@ class TrendsTest < Test::Unit::TestCase
   
   context "Getting current trends" do
     should "work" do
-      stub_get('http://search.twitter.com:80/trends/current.json', 'trends_current.json')
+      stub_get 'http://search.twitter.com:80/trends/current.json', 'trends_current.json'
       trends = Trends.current
       trends.size.should == 10
       trends[0].name.should == '#musicmonday'
@@ -15,7 +15,7 @@ class TrendsTest < Test::Unit::TestCase
     end
     
     should "be able to exclude hashtags" do
-      stub_get('http://search.twitter.com:80/trends/current.json?exclude=hashtags', 'trends_current_exclude.json')
+      stub_get 'http://search.twitter.com:80/trends/current.json?exclude=hashtags', 'trends_current_exclude.json'
       trends = Trends.current(:exclude => 'hashtags')
       trends.size.should == 10
       trends[0].name.should == 'New Divide'
@@ -27,7 +27,7 @@ class TrendsTest < Test::Unit::TestCase
   
   context "Getting daily trends" do
     should "work" do
-      stub_get('http://search.twitter.com:80/trends/daily.json?', 'trends_daily.json')
+      stub_get 'http://search.twitter.com:80/trends/daily.json?', 'trends_daily.json'
       trends = Trends.daily
       trends.size.should == 480
       trends[0].name.should == '#3turnoffwords'
@@ -35,7 +35,7 @@ class TrendsTest < Test::Unit::TestCase
     end
     
     should "be able to exclude hastags" do
-      stub_get('http://search.twitter.com:80/trends/daily.json?exclude=hashtags', 'trends_daily_exclude.json')
+      stub_get 'http://search.twitter.com:80/trends/daily.json?exclude=hashtags', 'trends_daily_exclude.json'
       trends = Trends.daily(:exclude => 'hashtags')
       trends.size.should == 480
       trends[0].name.should == 'Star Trek'
@@ -61,7 +61,7 @@ class TrendsTest < Test::Unit::TestCase
   
   context "Getting weekly trends" do
     should "work" do
-      stub_get('http://search.twitter.com:80/trends/weekly.json?', 'trends_weekly.json')
+      stub_get 'http://search.twitter.com:80/trends/weekly.json?', 'trends_weekly.json'
       trends = Trends.weekly
       trends.size.should == 210
       trends[0].name.should == 'Happy Mothers Day'
@@ -69,7 +69,7 @@ class TrendsTest < Test::Unit::TestCase
     end
     
     should "be able to exclude hastags" do
-      stub_get('http://search.twitter.com:80/trends/weekly.json?exclude=hashtags', 'trends_weekly_exclude.json')
+      stub_get 'http://search.twitter.com:80/trends/weekly.json?exclude=hashtags', 'trends_weekly_exclude.json'
       trends = Trends.weekly(:exclude => 'hashtags')
       trends.size.should == 210
       trends[0].name.should == 'Happy Mothers Day'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnunemaker-twitter
 version: !ruby/object:Gem::Version 
-  version: 0.6.10
+  version: 0.6.11
 platform: ruby
 authors: 
 - John Nunemaker