mbleigh-twitter-auth 0.1.21 → 0.1.22

data/CHANGELOG.markdown

@@ -1,6 +1,10 @@
 Change Log
 ==========
 
+== 0.1.22 - June 19, 2009
+
+- Merged in @pengwynn's OAuth 1.0a support patch. Thanks!
+
 == 0.1.19 - April 23, 2009
 
 - Added this changelog to keep track of additions to TwitterAuth

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
+:patch: 22
 :major: 0
 :minor: 1
-:patch: 21

data/app/controllers/sessions_controller.rb

@@ -1,7 +1,10 @@
 class SessionsController < ApplicationController
+  unloadable
+
   def new
     if TwitterAuth.oauth?
-      @request_token = TwitterAuth.consumer.get_request_token
+      oauth_callback = request.protocol + request.host_with_port + '/oauth_callback'
+      @request_token = TwitterAuth.consumer.get_request_token({:oauth_callback=>oauth_callback})
       session[:request_token] = @request_token.token
       session[:request_token_secret] = @request_token.secret
      
@@ -34,7 +37,8 @@ class SessionsController < ApplicationController
 
     @request_token = OAuth::RequestToken.new(TwitterAuth.consumer, session[:request_token], session[:request_token_secret])
 
-    @access_token = @request_token.get_access_token
+    oauth_verifier = params["oauth_verifier"]
+    @access_token = @request_token.get_access_token(:oauth_verifier => oauth_verifier)
     
     # The request token has been invalidated
     # so we nullify it in the session.
@@ -48,7 +52,7 @@ class SessionsController < ApplicationController
     cookies[:remember_token] = @user.remember_me
 
     authentication_succeeded 
-  rescue Net::HTTPServerException, Net::HTTPFatalError, TwitterAuth::Dispatcher::Error => e
+  rescue Net::HTTPServerException => e
     case e.message
       when '401 "Unauthorized"'
         authentication_failed('This authentication request is no longer valid. Please try again.') and return

data/app/models/twitter_auth/generic_user.rb

@@ -24,12 +24,14 @@ module TwitterAuth
       :utc_offset
     ]
     
-    validates_presence_of :login, :twitter_id
-    validates_format_of :login, :with => /\A[a-z0-9_]+\z/i
-    validates_length_of :login, :in => 1..15
-    validates_uniqueness_of :login, :case_sensitive => false
-    validates_uniqueness_of :twitter_id, :message => "ID has already been taken."
-    validates_uniqueness_of :remember_token, :allow_blank => true
+    with_options :if => :utilize_default_validations do |v|
+      v.validates_presence_of :login, :twitter_id
+      v.validates_format_of :login, :with => /\A[a-z0-9_]+\z/i
+      v.validates_length_of :login, :in => 1..15
+      v.validates_uniqueness_of :login, :case_sensitive => false
+      v.validates_uniqueness_of :twitter_id, :message => "ID has already been taken."
+      v.validates_uniqueness_of :remember_token, :allow_blank => true
+    end
     
     def self.table_name; 'users' end
 
@@ -70,6 +72,10 @@ module TwitterAuth
       include TwitterAuth::BasicUser
     end
 
+    def utilize_default_validations
+      true
+    end
+
     def twitter
       if TwitterAuth.oauth?
         TwitterAuth::Dispatcher::Oauth.new(self)

data/lib/twitter_auth.rb

@@ -60,7 +60,8 @@ module TwitterAuth
     [ :authorize_path, 
       :request_token_path,
       :access_token_path,
-      :scheme ].each do |oauth_option|
+      :scheme,
+      :signature_method ].each do |oauth_option|
       options[oauth_option] = TwitterAuth.config[oauth_option.to_s] if TwitterAuth.config[oauth_option.to_s]
     end
 

data/lib/twitter_auth/controller_extensions.rb

@@ -16,11 +16,18 @@ module TwitterAuth
 
     def authentication_succeeded(message = 'You have logged in successfully.', destination = '/')
       flash[:notice] = message
-      redirect_to destination
+      redirect_back_or_default destination
     end
 
     def current_user
-      @current_user ||= User.find_by_id(session[:user_id]) || User.from_remember_token(cookies[:remember_token])
+      @current_user ||= 
+        if session[:user_id]
+          User.find_by_id(session[:user_id])
+        elsif cookies[:remember_token]
+          User.from_remember_token(cookies[:remember_token])
+        else
+          false
+        end
     end
 
     def current_user=(new_user)
@@ -55,8 +62,8 @@ module TwitterAuth
     end
 
     def logout_keeping_session!
-      @current_user = nil
       session[:user_id] = nil
+      @current_user = nil
       cookies.delete(:remember_token)
     end
   end

data/spec/controllers/controller_extensions_spec.rb

@@ -151,7 +151,7 @@ describe TwitterAuthTestController do
     it 'should unset current_user' do
       controller.send(:current_user).should == @user
       get :logout_keeping_session_action
-      controller.send(:current_user).should be_nil
+      controller.send(:current_user).should be_false
     end
 
     it 'should unset the cookie' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mbleigh-twitter-auth
 version: !ruby/object:Gem::Version 
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-27 00:00:00 -07:00
+date: 2009-06-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,66 +42,49 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - CHANGELOG.markdown
-- Rakefile
 - README.markdown
+- Rakefile
 - VERSION.yml
-- generators/twitter_auth
-- generators/twitter_auth/templates
+- app/controllers/sessions_controller.rb
+- app/models/twitter_auth/basic_user.rb
+- app/models/twitter_auth/generic_user.rb
+- app/models/twitter_auth/oauth_user.rb
+- app/views/sessions/_login_form.html.erb
+- app/views/sessions/new.html.erb
+- config/routes.rb
+- generators/twitter_auth/USAGE
 - generators/twitter_auth/templates/migration.rb
 - generators/twitter_auth/templates/twitter_auth.yml
 - generators/twitter_auth/templates/user.rb
 - generators/twitter_auth/twitter_auth_generator.rb
-- generators/twitter_auth/USAGE
-- lib/twitter_auth
+- lib/twitter_auth.rb
 - lib/twitter_auth/controller_extensions.rb
 - lib/twitter_auth/cryptify.rb
-- lib/twitter_auth/dispatcher
 - lib/twitter_auth/dispatcher/basic.rb
 - lib/twitter_auth/dispatcher/oauth.rb
 - lib/twitter_auth/dispatcher/shared.rb
-- lib/twitter_auth.rb
-- spec/controllers
+- rails/init.rb
 - spec/controllers/controller_extensions_spec.rb
 - spec/controllers/sessions_controller_spec.rb
-- spec/fixtures
-- spec/fixtures/config
 - spec/fixtures/config/twitter_auth.yml
 - spec/fixtures/factories.rb
 - spec/fixtures/fakeweb.rb
 - spec/fixtures/twitter.rb
-- spec/models
-- spec/models/twitter_auth
 - spec/models/twitter_auth/basic_user_spec.rb
 - spec/models/twitter_auth/generic_user_spec.rb
 - spec/models/twitter_auth/oauth_user_spec.rb
 - spec/schema.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/twitter_auth
 - spec/twitter_auth/cryptify_spec.rb
-- spec/twitter_auth/dispatcher
 - spec/twitter_auth/dispatcher/basic_spec.rb
 - spec/twitter_auth/dispatcher/oauth_spec.rb
 - spec/twitter_auth/dispatcher/shared_spec.rb
 - spec/twitter_auth_spec.rb
-- config/routes.rb
-- app/controllers
-- app/controllers/sessions_controller.rb
-- app/models
-- app/models/twitter_auth
-- app/models/twitter_auth/basic_user.rb
-- app/models/twitter_auth/generic_user.rb
-- app/models/twitter_auth/oauth_user.rb
-- app/views
-- app/views/sessions
-- app/views/sessions/_login_form.html.erb
-- app/views/sessions/new.html.erb
-- rails/init.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/mbleigh/twitter-auth
 post_install_message: 
 rdoc_options: 
-- --inline-source
 - --charset=UTF-8
 require_paths: 
 - lib
@@ -122,7 +105,21 @@ requirements: []
 rubyforge_project: twitter-auth
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: TwitterAuth is a Rails plugin gem that provides Single Sign-On capabilities for Rails applications via Twitter.
-test_files: []
-
+test_files: 
+- spec/controllers/controller_extensions_spec.rb
+- spec/controllers/sessions_controller_spec.rb
+- spec/fixtures/factories.rb
+- spec/fixtures/fakeweb.rb
+- spec/fixtures/twitter.rb
+- spec/models/twitter_auth/basic_user_spec.rb
+- spec/models/twitter_auth/generic_user_spec.rb
+- spec/models/twitter_auth/oauth_user_spec.rb
+- spec/schema.rb
+- spec/spec_helper.rb
+- spec/twitter_auth/cryptify_spec.rb
+- spec/twitter_auth/dispatcher/basic_spec.rb
+- spec/twitter_auth/dispatcher/oauth_spec.rb
+- spec/twitter_auth/dispatcher/shared_spec.rb
+- spec/twitter_auth_spec.rb