thoughtbot-clearance 0.5.0 → 0.5.1

data/CHANGELOG.textile

@@ -1,3 +1,15 @@
+h1. 0.5.1 (2/27/2009)
+
+* [#46] A user with unconfirmed email who resets password now confirms email.
+(Marcel Görner)
+* Refactored user_from_cookie, user_from_session, User#authenticate to use
+more direct return code instead of ugly, harder to read ternary. (Dan Croak)
+* Switch order of cookies and sessions to take advantage of Rails 2.3's "Rack-based lazy-loaded sessions":http://is.gd/i23E. (Dan Croak)
+* Altered generator to interact with application_controller.rb instead of
+application.rb in Rails 2.3 apps. (Dan Croak)
+* [#42] Bug fix. Rack-based session change altered how to test remember me
+cookie. (Mihai Anca)
+
 h2. 0.5.0 (2/27/2009)
 
 * Fixed problem with Cucumber features. (Dan Croak)

data/README.textile

@@ -73,4 +73,4 @@ h2. Authors
 
 Clearance was extracted out of "Hoptoad":http://hoptoadapp.com. We merged the authentication code from two of thoughtbot's client's Rails apps. The following people have made significant contributions, suggestions, and generally improved the library. Thank you!
 
-Dan Croak, Mike Burns, Jason Morrison, Joe Ferris, Eugene Bolshakov, Josh Nichols, Mike Breen, Marcel Görner, Bence Nagy, Ben Mabey, Eloy Duran, & Tim Pope.
+Dan Croak, Mike Burns, Jason Morrison, Joe Ferris, Eugene Bolshakov, Josh Nichols, Mike Breen, Marcel Görner, Bence Nagy, Ben Mabey, Eloy Duran, Tim Pope, & Mihai Anca.

data/Rakefile

@@ -51,14 +51,16 @@ task :default => ['test:all', 'test:features']
 
 gem_spec = Gem::Specification.new do |gem_spec|
   gem_spec.name        = "clearance"
-  gem_spec.version     = "0.5.0"
+  gem_spec.version     = "0.5.1"
   gem_spec.summary     = "Rails authentication for developers who write tests."
   gem_spec.email       = "support@thoughtbot.com"
   gem_spec.homepage    = "http://github.com/thoughtbot/clearance"
   gem_spec.description = "Simple, complete Rails authentication scheme."
-  gem_spec.authors     = ["thoughtbot, inc.", "Dan Croak", "Mike Burns", "Jason Morrison",
-                          "Eugene Bolshakov", "Josh Nichols", "Mike Breen", "Joe Ferris", 
-                          "Bence Nagy", "Marcel Görner", "Ben Mabey", "Tim Pope", "Eloy Duran"]
+  gem_spec.authors     = ["thoughtbot, inc.", "Dan Croak", "Mike Burns", 
+                          "Jason Morrison", "Eugene Bolshakov", "Josh Nichols",
+                          "Mike Breen", "Joe Ferris", "Bence Nagy", 
+                          "Marcel Görner", "Ben Mabey", "Tim Pope", 
+                          "Eloy Duran", "Mihai Anca"]
   gem_spec.files       = FileList["[A-Z]*", "{generators,lib,shoulda_macros,rails}/**/*"]
 end
 

data/generators/clearance/clearance_generator.rb

@@ -3,55 +3,59 @@ require File.expand_path(File.dirname(__FILE__) + "/lib/rake_commands.rb")
 require 'factory_girl'
 
 class ClearanceGenerator < Rails::Generator::Base
-  
+
   def manifest
     record do |m|
       m.directory File.join("app", "controllers")
-      file = "app/controllers/application.rb"
+      if Rails.version >= "2.3.0"
+        file = "app/controllers/application_controller.rb"
+      else
+        file = "app/controllers/application.rb"
+      end
       if File.exists?(file)
         m.insert_into file, "include Clearance::App::Controllers::ApplicationController"
       else
         m.file file, file 
       end
-     
+
       ["app/controllers/confirmations_controller.rb",
        "app/controllers/passwords_controller.rb", 
        "app/controllers/sessions_controller.rb", 
        "app/controllers/users_controller.rb"].each do |file|
         m.file file, file
       end
-      
+
       m.directory File.join("app", "models")
       ["app/models/user.rb", "app/models/clearance_mailer.rb"].each do |file|
         m.file file, file
       end
-      
+
       m.directory File.join("app", "views")
-      
+
       m.directory File.join("app", "views", "passwords")
       ["app/views/passwords/new.html.erb",
        "app/views/passwords/edit.html.erb"].each do |file|
         m.file file, file
       end
-      
+
       m.directory File.join("app", "views", "sessions")
       ["app/views/sessions/new.html.erb"].each do |file|
         m.file file, file
       end
-      
+
       m.directory File.join("app", "views", "clearance_mailer")
       ["app/views/clearance_mailer/change_password.html.erb",
        "app/views/clearance_mailer/confirmation.html.erb"].each do |file|
         m.file file, file
       end
-      
+
       m.directory File.join("app", "views", "users")
       ["app/views/users/_form.html.erb",
        "app/views/users/edit.html.erb",
        "app/views/users/new.html.erb"].each do |file|
         m.file file, file
       end
-      
+
       m.directory File.join("test", "functional")
       ["test/functional/confirmations_controller_test.rb",
        "test/functional/passwords_controller_test.rb",
@@ -59,34 +63,34 @@ class ClearanceGenerator < Rails::Generator::Base
        "test/functional/users_controller_test.rb"].each do |file|
         m.file file, file
       end
-      
+
       m.directory File.join("test", "unit")
       ["test/unit/clearance_mailer_test.rb",
        "test/unit/user_test.rb"].each do |file|
         m.file file, file
       end
-      
+
       m.directory File.join("test", "factories")
       ["test/factories/clearance.rb"].each do |file|
         m.file file, file
       end
-      
-      m.route_resources ':passwords'      
-      m.route_resource  ':session'      
-      m.route_resources ':users, :has_one => [:password, :confirmation]'      
-      
-      if ActiveRecord::Base.connection.table_exists?(:users)      
+
+      m.route_resources ':passwords'
+      m.route_resource  ':session'
+      m.route_resources ':users, :has_one => [:password, :confirmation]'
+
+      if ActiveRecord::Base.connection.table_exists?(:users)
         m.migration_template 'db/migrate/update_users_with_clearance_columns.rb', 
           'db/migrate', :migration_file_name => 'create_or_update_users_with_clearance_columns'
       else
         m.migration_template 'db/migrate/create_users_with_clearance_columns.rb', 
           'db/migrate', :migration_file_name => 'create_or_update_users_with_clearance_columns'
       end
-            
+
       m.rake_db_migrate
-      
+
       m.readme "README"
     end
   end
-  
+
 end

data/generators/clearance_features/templates/features/password_reset.feature

@@ -8,24 +8,24 @@ Feature: Password reset
       When I request password reset link to be sent to "email@person.com"
       Then I should see "Unknown email"
   
-    Scenario: User requests password reset
-      Given I am signed up and confirmed as "email@person.com/password"
+    Scenario: User is signed up and requests password reset
+      Given I signed up with "email@person.com/password"
       When I request password reset link to be sent to "email@person.com"
       Then I should see "instructions for changing your password"
       And a password reset message should be sent to "email@person.com"
-      
-    Scenario: User updated his password and types wrong confirmation
-      Given I am signed up and confirmed as "email@person.com/password"
+    
+    Scenario: User is signed up updated his password and types wrong confirmation
+      Given I signed up with "email@person.com/password"
       When I follow the password reset link sent to "email@person.com"
       And I update my password with "newpassword/wrongconfirmation"
       Then I should see error messages
-      And I should not be signed in      
-      
-    Scenario: User updates his password
-      Given I am signed up and confirmed as "email@person.com/password"
+      And I should not be signed in
+
+    Scenario: User is signed up and updates his password
+      Given I signed up with "email@person.com/password"
       When I follow the password reset link sent to "email@person.com"
       And I update my password with "newpassword/newpassword"
       Then I should be signed in
       When I sign out
       And I sign in as "email@person.com/newpassword"
-      Then I should be signed in
+      Then I should be signed in

data/lib/clearance/app/controllers/application_controller.rb

@@ -2,44 +2,44 @@ module Clearance
   module App
     module Controllers
       module ApplicationController
-    
+
         def self.included(controller)
           controller.send(:include, InstanceMethods)
-          
+
           controller.class_eval do
             helper_method :current_user
             helper_method :signed_in?
-            
+
             hide_action :current_user, :signed_in?
           end
         end
-        
+
         module InstanceMethods
           def current_user
-            @_current_user ||= (user_from_session || user_from_cookie)
+            @_current_user ||= (user_from_cookie || user_from_session)
           end
 
           def signed_in?
             ! current_user.nil?
           end
-          
+
           protected
-          
+
           def authenticate
             deny_access unless signed_in?
           end
 
           def user_from_session
             if session[:user_id]
-              user = User.find_by_id(session[:user_id])
-              user && user.email_confirmed? ? user : nil                
+              return nil  unless user = User.find_by_id(session[:user_id])
+              return user if     user.email_confirmed?
             end
           end
 
           def user_from_cookie
-            if cookies[:remember_token]
-              user = User.find_by_token(cookies[:remember_token])
-              user && user.remember? ? user : nil                
+            if token = cookies[:remember_token]
+              return nil  unless user = User.find_by_token(token)
+              return user if     user.remember?
             end
           end
 
@@ -55,9 +55,9 @@ module Clearance
 
           def redirect_back_or(default)
             session[:return_to] ||= params[:return_to]
-            if session[:return_to] 
+            if session[:return_to]
               redirect_to(session[:return_to])
-            else 
+            else
               redirect_to(default)
             end
             session[:return_to] = nil
@@ -77,7 +77,7 @@ module Clearance
             render :template => "/sessions/new", :status => :unauthorized 
           end
         end
-        
+
       end
     end
   end

data/lib/clearance/app/controllers/passwords_controller.rb

@@ -19,16 +19,15 @@ module Clearance
           end
 
           def create
-            user = User.find_by_email(params[:password][:email])
-            if user.nil?
-              flash.now[:notice] = "Unknown email"
-              render :action => :new
-            else
+            if user = User.find_by_email(params[:password][:email])
               user.forgot_password!
               ClearanceMailer.deliver_change_password user
               flash[:notice] = "You will receive an email within the next few minutes. " <<
                                "It contains instructions for changing your password."
               redirect_to url_after_create
+            else
+              flash.now[:notice] = "Unknown email"
+              render :action => :new
             end
           end
 
@@ -41,6 +40,7 @@ module Clearance
 
             if @user.update_password(params[:user][:password], 
                                      params[:user][:password_confirmation])
+              @user.confirm_email! unless @user.email_confirmed?
               sign_user_in(@user)
               redirect_to url_after_update
             else
@@ -49,7 +49,7 @@ module Clearance
           end
         end
 
-        module PrivateMethods  
+        module PrivateMethods
           private
 
           def forbid_missing_token

data/lib/clearance/app/controllers/sessions_controller.rb

@@ -6,13 +6,13 @@ module Clearance
         def self.included(controller)
           controller.send(:include, Actions)
           controller.send(:include, PrivateMethods)
-          
+
           controller.class_eval do
             protect_from_forgery :except => :create
-            filter_parameter_logging :password            
+            filter_parameter_logging :password
           end
         end
-        
+
         module Actions
           def create
             @user = User.authenticate(params[:session][:email], 
@@ -40,14 +40,14 @@ module Clearance
             redirect_to url_after_destroy
           end
         end
-        
+
         module PrivateMethods
           private
-          
+
           def remember?
             params[:session] && params[:session][:remember_me] == "1"
           end
-          
+
           def remember(user)
             user.remember_me!
             cookies[:remember_token] = { :value   => user.token, 
@@ -67,7 +67,7 @@ module Clearance
             new_session_url
           end
         end
-          
+
       end
     end
   end

data/lib/clearance/app/models/user.rb

@@ -56,9 +56,9 @@ module Clearance
             save(false)
           end
 
-          def update_password(pass, pass_confirmation)
-            self.password              = pass
-            self.password_confirmation = pass_confirmation
+          def update_password(new_password, new_password_confirmation)
+            self.password              = new_password
+            self.password_confirmation = new_password_confirmation
             clear_token if valid?
             save
           end
@@ -100,15 +100,15 @@ module Clearance
 
           def remember_me_until!(time)
             self.token_expires_at = time
-            self.token            = encrypt("--#{token_expires_at}--#{password}--")
+            self.token = encrypt("--#{token_expires_at}--#{password}--")
             save(false)
           end
         end
 
         module ClassMethods
           def authenticate(email, password)
-            user = find(:first, :conditions => ['email = ?', email.to_s])
-            user && user.authenticated?(password) ? user : nil
+            return nil  unless user = find_by_email(email)
+            return user if     user.authenticated?(password)
           end
         end
 

data/lib/clearance/test/functional/passwords_controller_test.rb

@@ -9,10 +9,9 @@ module Clearance
             should_route :get, '/users/1/password/edit', 
               :action  => 'edit', :user_id => '1'
 
-            context "a user with confirmed email" do
+            context "a signed up user" do
               setup do
-                @user = Factory(:email_confirmed_user)
-                @user.confirm_email!
+                @user = Factory(:user)
               end
 
               context "on GET to #new" do
@@ -48,13 +47,13 @@ module Clearance
                     email = "user1@example.com"
                     assert ! User.exists?(['email = ?', email])
                     ActionMailer::Base.deliveries.clear
-                    assert_nil @user.reload.token
+                    assert_equal @user.token, @user.reload.token
 
                     post :create, :password => { :email => email }
                   end
                   
                   should "not generate a token for the change your password email" do
-                    assert_nil @user.reload.token                                   
+                    assert_equal @user.token, @user.reload.token                                   
                   end                  
 
                   should "not send a password reminder email" do
@@ -70,9 +69,9 @@ module Clearance
               end
             end
             
-            context "a user with confirmed email and forgotten password" do
+            context "a signed up user and forgotten password" do
               setup do
-                @user = Factory(:email_confirmed_user)
+                @user = Factory(:user)
                 @user.forgot_password!
               end
               

data/lib/clearance/test/functional/sessions_controller_test.rb

@@ -2,19 +2,18 @@ module Clearance
   module Test
     module Functional
       module SessionsControllerTest
-    
+
         def self.included(controller_test)
           controller_test.class_eval do
-            
+
             should_filter_params :password
 
             context "on GET to /sessions/new" do
               setup { get :new }
-        
+
               should_respond_with    :success
               should_render_template :new
               should_not_set_the_flash
-              
               should_display_a_sign_in_form
             end
 
@@ -42,7 +41,7 @@ module Clearance
             context "Given an email confirmed user" do
               setup do
                 @user = Factory(:user)
-                @user.confirm_email!              
+                @user.confirm_email!
               end 
 
               context "a POST to #create with good credentials" do
@@ -69,7 +68,7 @@ module Clearance
                 should_render_template :new
                 should_not_be_signed_in
               end
-          
+
               context "a POST to #create with good credentials and remember me" do
                 setup do
                   post :create, :session => { 
@@ -81,7 +80,7 @@ module Clearance
                 should_set_the_flash_to /success/i
                 should_redirect_to_url_after_create
                 should_be_signed_in_as { @user }
-                
+
                 should 'set the cookie' do
                   assert ! cookies['remember_token'].empty?
                 end
@@ -91,7 +90,7 @@ module Clearance
                   assert_not_nil @user.reload.token_expires_at
                 end
               end
-              
+
               context "a POST to #create with bad credentials and remember me" do
                 setup do
                   post :create, :session => { 
@@ -104,7 +103,7 @@ module Clearance
                 should_respond_with    :unauthorized
                 should_render_template :new
                 should_return_from_session :user_id, "nil"
-                
+
                 should 'not create the cookie' do
                   assert_nil cookies['remember_token']
                 end
@@ -114,42 +113,42 @@ module Clearance
                   assert_nil @user.reload.token_expires_at
                 end
               end
-              
+
               context "a POST to #create with good credentials and A URL to return back" do
                 context "in the session" do
                   setup do
                     @request.session[:return_to] = '/url_in_the_session'
-                    post :create, :session => { 
-                                    :email    => @user.email, 
-                                    :password => @user.password }                    
+                    post :create, :session => {
+                                    :email    => @user.email,
+                                    :password => @user.password }
                   end
-                  
+
                   should_redirect_to "'/url_in_the_session'"
                 end
-                
+
                 context "in the request" do
                   setup do
                     post :create, :session => { 
                                     :email => @user.email, 
                                     :password => @user.password },
-                                    :return_to => '/url_in_the_request'                    
+                                    :return_to => '/url_in_the_request'
                   end
-                  
+
                   should_redirect_to "'/url_in_the_request'"
-                end   
-                             
+                end
+
                 context "in the request and in the session" do
                   setup do
                     @request.session[:return_to] = '/url_in_the_session'
                     post :create, :session => { 
                                     :email    => @user.email, 
                                     :password => @user.password },
-                                    :return_to => '/url_in_the_request'                    
+                                    :return_to => '/url_in_the_request'
                   end
-                  
+
                   should_redirect_to "'/url_in_the_session'"
                 end
-              end              
+              end
             end
 
             public_context do
@@ -169,12 +168,17 @@ module Clearance
 
               context 'a DELETE to #destroy with a cookie' do
                 setup do
-                  cookies['remember_token'] = CGI::Cookie.new('token', 'value')
+                  @request.cookies['remember_token'] = {
+                    :name  => 'token', 
+                    :value => 'value'
+                  }
+                  @controller.request = @request
                   delete :destroy
                 end
 
                 should 'delete the cookie' do
-                  assert cookies['remember_token'].empty?
+                  assert cookies['remember_token'].nil? || # Rails >= 2.3
+                         cookies['remember_token'].empty?  # Rails <  2.3
                 end
 
                 should 'delete the remember me token in users table' do
@@ -183,7 +187,7 @@ module Clearance
                 end
               end
             end
-          
+
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thoughtbot-clearance
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -17,6 +17,7 @@ authors:
 - Ben Mabey
 - Tim Pope
 - Eloy Duran
+- Mihai Anca
 autorequire: 
 bindir: bin
 cert_chain: []