twitter-login 0.2.1 → 0.2.3

data/README.markdown

@@ -24,16 +24,23 @@ You have to require 'twitter/login' in your app. If you're using Bundler:
     gem 'twitter-login', :require_as => 'twitter/login'
 
 Now configure your app to use the middleware. This might be different across web
-frameworks.
+frameworks. For Sinatra this would be:
 
     ## Sinatra
     enable :sessions
     use Twitter::Login, :consumer_key => 'KEY', :secret => 'SECRET'
     helpers Twitter::Login::Helpers
-    
+
+In Rails:
+
     ## Rails
+    # Gemfile (if using Bundler)
+    gem 'twitter-login', '~> 0.2.1', :require => 'twitter/login'
+    
     # environment.rb:
-    config.middleware.use Twitter::Login, :consumer_key => 'KEY', :secret => 'SECRET'
+    # (config.gem only in case you're not using Bundler)
+    config.gem 'twitter-login', :version => '~> 0.2.1', :lib => 'twitter/login'
+    config.middleware.use 'Twitter::Login', :consumer_key => 'KEY', :secret => 'SECRET'
     
     # application_controller.rb
     include Twitter::Login::Helpers

data/lib/twitter/login.rb

@@ -42,7 +42,7 @@ class Twitter::Login
   module Helpers
     def twitter_client
       oauth = twitter_oauth
-      oauth.authorize_from_access(*session[:access_token])
+      oauth.authorize_from_access(*session[:twitter_access_token])
       Twitter::Base.new oauth
     end
     
@@ -57,7 +57,7 @@ class Twitter::Login
     end
     
     def twitter_logout
-      [:access_token, :twitter_user].each do |key|
+      [:twitter_access_token, :twitter_user].each do |key|
         session[key] = nil # work around a Rails 2.3.5 bug
         session.delete key
       end
@@ -88,7 +88,7 @@ class Twitter::Login
   def redirect_to_twitter(request)
     # create a request token and store its parameter in session
     oauth.set_callback_url(request.url)
-    request.session[:request_token] = [oauth.request_token.token, oauth.request_token.secret]
+    request.session[:twitter_request_token] = [oauth.request_token.token, oauth.request_token.secret]
     # redirect to Twitter authorization page
     redirect oauth.request_token.authorize_url
   end
@@ -118,8 +118,9 @@ class Twitter::Login
   end
   
   def handle_denied_access(request)
-    request.session[:request_token] = nil # work around a Rails 2.3.5 bug
-    request.session.delete(:request_token)
+    request.session[:twitter_request_token] = nil # work around a Rails 2.3.5 bug
+    request.session.delete(:twitter_request_token)
+    request.session[:twitter_error] = 'user_denied'
     redirect_to_return_path(request)
   end
   
@@ -127,11 +128,11 @@ class Twitter::Login
   
   # replace the request token in session with access token
   def authorize_from_request(request)
-    rtoken, rsecret = request.session[:request_token]
+    rtoken, rsecret = request.session[:twitter_request_token]
     oauth.authorize_from_request(rtoken, rsecret, request[:oauth_verifier])
     
-    request.session.delete(:request_token)
-    request.session[:access_token] = [oauth.access_token.token, oauth.access_token.secret]
+    request.session.delete(:twitter_request_token)
+    request.session[:twitter_access_token] = [oauth.access_token.token, oauth.access_token.secret]
   end
   
   def redirect_to_return_path(request)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twitter-login
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -14,30 +15,34 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-10 00:00:00 -02:00
+date: 2010-08-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: twitter
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 0
-        - 8
-        - 0
-        version: 0.8.0
+        - 9
+        - 5
+        version: 0.9.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -49,9 +54,11 @@ dependencies:
   name: fakeweb
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 2
@@ -81,23 +88,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rack middleware to provide login functionality through Twitter