jnunemaker-twitter 0.6.14 → 0.6.15

data/Rakefile

@@ -5,22 +5,25 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name              = "twitter"
-    gem.summary           = %Q{wrapper for the twitter api (oauth only)}
+    gem.summary           = %Q{wrapper for the twitter api}
     gem.email             = "nunemaker@gmail.com"
     gem.homepage          = "http://github.com/jnunemaker/twitter"
     gem.authors           = ["John Nunemaker"]
     gem.rubyforge_project = "twitter"
     gem.files             = FileList["[A-Z]*", "{examples,lib,test}/**/*"]
     
-    gem.add_dependency('oauth', '>= 0.3.4')
+    gem.add_dependency('oauth', '>= 0.3.5')
     gem.add_dependency('mash', '0.0.3')
     gem.add_dependency('httparty', '0.4.3')
     
-    gem.add_development_dependency('thoughtbot-shoulda')
-    gem.add_development_dependency('jeremymcanally-matchy')
-    gem.add_development_dependency('mocha')
-    gem.add_development_dependency('fakeweb')
-    gem.add_development_dependency('mash')
+    gem.add_development_dependency('thoughtbot-shoulda', '>= 2.10.1')
+    gem.add_development_dependency('jeremymcanally-matchy', '0.4.0')
+    gem.add_development_dependency('mocha', '0.9.4')
+    gem.add_development_dependency('fakeweb', '>= 1.2.5')
+  end
+  
+  Jeweler::RubyforgeTasks.new do |rubyforge|
+    rubyforge.doc_task = "rdoc"
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
@@ -64,40 +67,3 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-begin
-  require 'rake/contrib/sshpublisher'
-  namespace :rubyforge do
-    
-    desc "Release gem and RDoc documentation to RubyForge"
-    task :release => ["rubyforge:release:gem", "rubyforge:release:website", "rubyforge:release:docs"]
-    
-    namespace :release do
-      desc "Publish RDoc to RubyForge."
-      task :docs => [:rdoc] do
-        config = YAML.load(
-            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-        )
-
-        host = "#{config['username']}@rubyforge.org"
-        remote_dir = "/var/www/gforge-projects/twitter/rdoc"
-        local_dir = 'rdoc'
-
-        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-      end
-      
-      task :website do
-        config = YAML.load(
-            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-        )
-
-        host = "#{config['username']}@rubyforge.org"
-        remote_dir = "/var/www/gforge-projects/twitter/"
-        local_dir = 'website'
-        
-        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-      end
-    end
-  end
-rescue LoadError
-  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
-end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 6
-:patch: 14
 :major: 0
+:minor: 6
+:patch: 15

data/examples/oauth.rb

@@ -0,0 +1,27 @@
+require 'pp'
+require 'pathname'
+dir = Pathname(__FILE__).dirname.expand_path
+require (dir + '..' + 'lib' + 'twitter').expand_path
+require dir + 'helpers' + 'config_store'
+
+config  = ConfigStore.new("#{ENV['HOME']}/.twitter")
+oauth   = Twitter::OAuth.new(config['token'], config['secret'])
+rtoken  = oauth.request_token.token
+rsecret = oauth.request_token.secret
+
+puts "> redirecting you to twitter to authorize..."
+%x(open #{oauth.request_token.authorize_url})
+
+print "> what was the PIN twitter provided you with? "
+pin = gets.chomp
+
+begin
+  oauth.authorize_from_request(rtoken, rsecret, pin)
+  
+  twitter = Twitter::Base.new(oauth)
+  twitter.user_timeline.each do |tweet|
+    puts "#{tweet.user.screen_name}: #{tweet.text}"
+  end
+rescue OAuth::Unauthorized
+  puts "> FAIL!"
+end

data/lib/twitter.rb

@@ -1,7 +1,7 @@
 require 'forwardable'
 require 'rubygems'
 
-gem 'oauth', '>= 0.3.4'
+gem 'oauth', '>= 0.3.5'
 require 'oauth'
 
 gem 'mash', '0.0.3'

data/lib/twitter/oauth.rb

@@ -20,13 +20,23 @@ module Twitter
       @consumer ||= ::OAuth::Consumer.new(@ctoken, @csecret, {:site => 'http://twitter.com'}.merge(consumer_options))
     end
     
-    def request_token
-      @request_token ||= consumer.get_request_token
+    def set_callback_url(url)
+      clear_request_token
+      request_token(:oauth_callback => url)
     end
     
-    def authorize_from_request(rtoken, rsecret)
+    # Note: If using oauth with a web app, be sure to provide :oauth_callback.
+    # Options:
+    #   :oauth_callback => String, url that twitter should redirect to
+    def request_token(options={})
+      @request_token ||= consumer.get_request_token(options)
+    end
+    
+    # For web apps use params[:oauth_verifier], for desktop apps,
+    # use the verifier is the pin that twitter gives users.
+    def authorize_from_request(rtoken, rsecret, verifier_or_pin)
       request_token = ::OAuth::RequestToken.new(consumer, rtoken, rsecret)
-      access_token = request_token.get_access_token
+      access_token = request_token.get_access_token(:oauth_verifier => verifier_or_pin)
       @atoken, @asecret = access_token.token, access_token.secret
     end
     
@@ -37,5 +47,10 @@ module Twitter
     def authorize_from_access(atoken, asecret)
       @atoken, @asecret = atoken, asecret
     end
+    
+    private
+      def clear_request_token
+        @request_token = nil
+      end
   end
 end

data/test/test_helper.rb

@@ -1,5 +1,12 @@
-require 'rubygems'
 require 'test/unit'
+require 'pathname'
+require 'rubygems'
+
+gem 'thoughtbot-shoulda', '>= 2.10.1'
+gem 'jnunemaker-matchy', '0.4.0'
+gem 'mocha', '0.9.4'
+gem 'fakeweb', '>= 1.2.5'
+
 require 'shoulda'
 require 'matchy'
 require 'mocha'
@@ -7,9 +14,8 @@ require 'fakeweb'
 
 FakeWeb.allow_net_connect = false
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'twitter'
+dir = (Pathname(__FILE__).dirname + '../lib').expand_path
+require dir + 'twitter'
 
 class Test::Unit::TestCase
 end
@@ -25,12 +31,12 @@ def twitter_url(url)
 end
 
 def stub_get(url, filename, status=nil)
-  options = {:string => fixture_file(filename)}
+  options = {:body => fixture_file(filename)}
   options.merge!({:status => status}) unless status.nil?
   
   FakeWeb.register_uri(:get, twitter_url(url), options)
 end
 
 def stub_post(url, filename)
-  FakeWeb.register_uri(:post, twitter_url(url), :string => fixture_file(filename))
+  FakeWeb.register_uri(:post, twitter_url(url), :body => fixture_file(filename))
 end

data/test/twitter/base_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class BaseTest < Test::Unit::TestCase
   context "base" do

data/test/twitter/httpauth_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class HTTPAuthTest < Test::Unit::TestCase
   context "Creating new instance" do

data/test/twitter/oauth_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OAuthTest < Test::Unit::TestCase
   should "initialize with consumer token and secret" do
@@ -36,17 +36,44 @@ class OAuthTest < Test::Unit::TestCase
     twitter.request_token.should == request_token
   end
   
-  should "be able to create access token from request token and secret" do
+  context "set_callback_url" do
+    should "clear request token and set the callback url" do
+      consumer = mock('oauth consumer')
+      request_token = mock('request token')
+      
+      OAuth::Consumer.
+        expects(:new).
+        with('token', 'secret', {:site => 'http://twitter.com'}).
+        returns(consumer)
+      
+      twitter = Twitter::OAuth.new('token', 'secret')
+      
+      consumer.
+        expects(:get_request_token).
+        with({:oauth_callback => 'http://myapp.com/oauth_callback'})
+      
+      twitter.set_callback_url('http://myapp.com/oauth_callback')
+    end
+  end
+  
+  should "be able to create access token from request token, request secret and verifier" do
     twitter = Twitter::OAuth.new('token', 'secret')
     consumer = OAuth::Consumer.new('token', 'secret', {:site => 'http://twitter.com'})
     twitter.stubs(:consumer).returns(consumer)
     
-    access_token = mock('access token', :token => 'atoken', :secret => 'asecret')
+    access_token  = mock('access token', :token => 'atoken', :secret => 'asecret')
     request_token = mock('request token')
-    request_token.expects(:get_access_token).returns(access_token)
-    OAuth::RequestToken.expects(:new).with(consumer, 'rtoken', 'rsecret').returns(request_token)
+    request_token.
+      expects(:get_access_token).
+      with(:oauth_verifier => 'verifier').
+      returns(access_token)
+      
+    OAuth::RequestToken.
+      expects(:new).
+      with(consumer, 'rtoken', 'rsecret').
+      returns(request_token)
     
-    twitter.authorize_from_request('rtoken', 'rsecret')
+    twitter.authorize_from_request('rtoken', 'rsecret', 'verifier')
     twitter.access_token.class.should be(OAuth::AccessToken)
     twitter.access_token.token.should == 'atoken'
     twitter.access_token.secret.should == 'asecret'

data/test/twitter/request_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class RequestTest < Test::Unit::TestCase
   context "new get request" do

data/test/twitter/search_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class SearchTest < Test::Unit::TestCase
   context "searching" do

data/test/twitter/trends_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class TrendsTest < Test::Unit::TestCase
   include Twitter

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnunemaker-twitter
 version: !ruby/object:Gem::Version 
-  version: 0.6.14
+  version: 0.6.15
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-16 00:00:00 -07:00
+date: 2009-08-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.4
+        version: 0.3.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: mash
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.10.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: jeremymcanally-matchy
@@ -58,9 +58,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.4.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: mocha
@@ -68,9 +68,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: fakeweb
@@ -80,17 +80,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: mash
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.2.5
     version: 
 description: 
 email: nunemaker@gmail.com
@@ -112,6 +102,7 @@ files:
 - examples/helpers/config_store.rb
 - examples/httpauth.rb
 - examples/ids.rb
+- examples/oauth.rb
 - examples/search.rb
 - examples/timeline.rb
 - examples/unauthorized.rb
@@ -178,7 +169,7 @@ rubyforge_project: twitter
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: wrapper for the twitter api (oauth only)
+summary: wrapper for the twitter api
 test_files: 
 - test/test_helper.rb
 - test/twitter/base_test.rb
@@ -193,6 +184,7 @@ test_files:
 - examples/helpers/config_store.rb
 - examples/httpauth.rb
 - examples/ids.rb
+- examples/oauth.rb
 - examples/search.rb
 - examples/timeline.rb
 - examples/unauthorized.rb