thoughtbot-clearance 0.3.8 → 0.3.9

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

@@ -5,8 +5,8 @@ module Clearance
 
         def self.included(controller)
           controller.class_eval do
-            before_filter :redirect_to_root, :only => [:new, :create], :if => :logged_in?
-        
+            
+            before_filter :redirect_to_root, :only => [:new, :create], :if => :signed_in?
             filter_parameter_logging :password
         
             def new
@@ -17,7 +17,8 @@ module Clearance
               @user = User.new params[:user]
               if @user.save
                 ClearanceMailer.deliver_confirmation @user
-                flash[:notice] = "You will receive an email within the next few minutes. It contains instructions for you to confirm your account."
+                flash[:notice] = "You will receive an email within the next few minutes. " <<
+                                 "It contains instructions for you to confirm your account."
                 redirect_to url_after_create
               else
                 render :action => "new"

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

@@ -14,8 +14,8 @@ module Clearance
             end
 
             def confirmation(user)
-              recipients user.email
               from       DO_NOT_REPLY
+              recipients user.email
               subject   "Account confirmation"
               body      :user => user
             end

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

@@ -17,27 +17,22 @@ module Clearance
             validates_uniqueness_of   :email, :case_sensitive => false
             validates_format_of       :email, :with => %r{.+@.+\..+}
 
-            before_save :initialize_salt, :encrypt_password
+            before_save :initialize_salt, :encrypt_password, :downcase_email
         
             def self.authenticate(email, password)
               user = find(:first, :conditions => ['LOWER(email) = ?', email.to_s.downcase])
               user && user.authenticated?(password) ? user : nil
             end
-            
-            def email=(value)
-              value = value.to_s.downcase if value
-              write_attribute(:email, value.to_s)
-            end
 
             def authenticated?(password)
-              crypted_password == encrypt(password)
+              encrypted_password == encrypt(password)
             end
 
-            def encrypt(password)
-              Digest::SHA512.hexdigest "--#{salt}--#{password}--"
+            def encrypt(string)
+              Digest::SHA512.hexdigest("--#{salt}--#{string}--")
             end
 
-            def remember_token?
+            def remember?
               remember_token_expires_at && Time.now.utc < remember_token_expires_at
             end
 
@@ -48,7 +43,7 @@ module Clearance
             def remember_me_until(time)
               self.update_attribute :remember_token_expires_at, time
               self.update_attribute :remember_token, 
-                encrypt("#{email}--#{remember_token_expires_at}")
+                encrypt("--#{remember_token_expires_at}--#{password}--")
             end
 
             def forget_me!
@@ -56,25 +51,29 @@ module Clearance
               self.update_attribute :remember_token, nil
             end
 
-            def confirm!
-              self.update_attribute :confirmed, true
+            def confirm_email!
+              self.update_attribute :email_confirmed, true
             end
         
             protected
 
             def initialize_salt
               if new_record?
-                self.salt = Digest::SHA512.hexdigest("--#{Time.now.to_s}--#{email}--")
+                self.salt = encrypt("--#{Time.now.utc.to_s}--#{password}--")
               end
             end
 
             def encrypt_password
               return if password.blank?
-              self.crypted_password = encrypt(password)
+              self.encrypted_password = encrypt(password)
             end
 
             def password_required?
-              crypted_password.blank? || !password.blank?
+              encrypted_password.blank? || !password.blank?
+            end
+            
+            def downcase_email
+              self.email = email.to_s.downcase
             end
         
           end

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

@@ -3,48 +3,36 @@ module Clearance
     module Functional
       module ConfirmationsControllerTest
 
-        def self.included(base)
-          base.class_eval do
-
-            context 'A GET to #new' do
-              context "with the User with the given id's salt" do
+        def self.included(controller_test)
+          controller_test.class_eval do
+            
+            should_filter_params :salt
+            
+            context "Given a user whose email has not been confirmed" do
+              setup { @user = Factory(:registered_user) }
+              
+              context "on GET to #new with correct id and salt" do
                 setup do
-                  @user = Factory :clearance_user
                   get :new, :user_id => @user.to_param, :salt => @user.salt
                 end
 
-                should 'find the User record with the given id and salt' do
-                  assert_equal @user, assigns(:user)
-                end
-
-                should 'confirm the User record with the given id' do
-                  assert assigns(:user).confirmed?
-                end
-
-                should 'log the User in' do
-                  assert_equal @user.id, session[:user_id]
-                end
-
-                should_redirect_to "@controller.send(:url_after_create)"
+                should_be_signed_in_and_email_confirmed_as { @user }
+                should_redirect_to_url_after_create
               end
-
-              context "without the User with the given id's salt" do
+              
+              context "on GET to #new with incorrect salt" do
                 setup do
-                  user = Factory :clearance_user
-                  salt = ''
-                  assert_not_equal salt, user.salt
+                  salt = ""
+                  assert_not_equal salt, @user.salt
 
-                  get :new, :user_id => user.to_param, :salt => ''
+                  get :new, :user_id => @user.to_param, :salt => salt
                 end
 
                 should_respond_with :not_found
-
-                should 'render nothing' do
-                  assert @response.body.blank?
-                end
+                should_render_nothing
               end
             end
-
+          
           end
         end
 

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

@@ -3,13 +3,14 @@ module Clearance
     module Functional
       module PasswordsControllerTest
 
-        def self.included(base)
-          base.class_eval do
+        def self.included(controller_test)
+          controller_test.class_eval do
 
-            should_route :get, '/users/1/password/edit', :action => 'edit', :user_id => '1'
+            should_route :get, '/users/1/password/edit', 
+              :action  => 'edit', :user_id => '1'
 
             context 'with a user' do
-              setup { @user = Factory :clearance_user }
+              setup { @user = Factory(:registered_user) }
 
               context 'A GET to #new' do
                 setup { get :new, :user_id => @user.to_param }
@@ -35,10 +36,10 @@ module Clearance
                     assert_match /#{@user.email}/, flash[:notice]
                   end
 
-                  should_redirect_to "@controller.send(:url_after_create)"
+                  should_redirect_to_url_after_create
                 end
 
-                context 'with a non-existing email address' do
+                context 'with a non-existent email address' do
                   setup do
                     email = 'user1@example.com'
                     assert ! User.exists?(['email = ?', email])
@@ -51,8 +52,8 @@ module Clearance
                     assert ActionMailer::Base.deliveries.empty?
                   end
 
-                  should 'set a :warning flash' do
-                    assert_not_nil flash.now[:warning]
+                  should 'set a :notice flash' do
+                    assert_not_nil flash.now[:notice]
                   end
 
                   should_render_template "new"
@@ -64,7 +65,7 @@ module Clearance
                   setup do
                     get :edit, 
                       :user_id  => @user.to_param, 
-                      :password => @user.crypted_password, 
+                      :password => @user.encrypted_password, 
                       :email    => @user.email
                   end
 
@@ -77,7 +78,7 @@ module Clearance
 
                   should "have a form for the user's email, password, and password confirm" do
                     update_path = ERB::Util.h(user_password_path(@user,
-                          :password => @user.crypted_password,
+                          :password => @user.encrypted_password,
                           :email    => @user.email))
 
                     assert_select 'form[action=?]', update_path do
@@ -94,10 +95,7 @@ module Clearance
                   end
 
                   should_respond_with :not_found
-
-                  should 'render an empty response' do
-                    assert @response.body.blank?
-                  end
+                  should_render_nothing
                 end
               end
 
@@ -108,31 +106,24 @@ module Clearance
                   end
 
                   should "not update the user's password" do
-                    assert_not_equal @encrypted_new_password, @user.crypted_password
-                  end
-
-                  should 'not log the user in' do
-                    assert_nil session[:user_id]
+                    assert_not_equal @encrypted_new_password, @user.encrypted_password
                   end
 
+                  should_not_be_signed_in
                   should_respond_with :not_found
-
-                  should 'render an empty response' do
-                    assert @response.body.blank?
-                  end
+                  should_render_nothing
                 end
 
                 context 'with a matching password and password confirmation' do
                   setup do
                     new_password = 'new_password'
-                    encryption_format = "--#{@user.salt}--#{new_password}--"
-                    @encrypted_new_password = Digest::SHA512.hexdigest encryption_format
-                    assert_not_equal @encrypted_new_password, @user.crypted_password
+                    @encrypted_new_password = @user.encrypt(new_password)
+                    assert_not_equal @encrypted_new_password, @user.encrypted_password
 
                     put(:update,
                         :user_id  => @user,
                         :email    => @user.email,
-                        :password => @user.crypted_password,
+                        :password => @user.encrypted_password,
                         :user => {
                           :password              => new_password,
                           :password_confirmation => new_password
@@ -141,25 +132,21 @@ module Clearance
                   end
 
                   should "update the user's password" do
-                    assert_equal @encrypted_new_password, @user.crypted_password
+                    assert_equal @encrypted_new_password, @user.encrypted_password
                   end
 
-                  should 'log the user in' do
-                    assert_equal session[:user_id], @user.id
-                  end
-
-                  should_redirect_to "user_path(@user)"
+                  should_be_signed_in_as { @user }
+                  should_redirect_to_url_after_update
                 end
 
                 context 'with password but blank password confirmation' do
                   setup do
                     new_password = 'new_password'
-                    encryption_format = "--#{@user.salt}--#{new_password}--"
-                    @encrypted_new_password = Digest::SHA512.hexdigest encryption_format
+                    @encrypted_new_password = @user.encrypt(new_password)
 
                     put(:update,
                         :user_id => @user.to_param,
-                        :password => @user.crypted_password,
+                        :password => @user.encrypted_password,
                         :user => {
                           :password => new_password,
                           :password_confirmation => ''
@@ -168,21 +155,16 @@ module Clearance
                   end
 
                   should "not update the user's password" do
-                    assert_not_equal @encrypted_new_password, @user.crypted_password
-                  end
-
-                  should 'not log the user in' do
-                    assert_nil session[:user_id]
+                    assert_not_equal @encrypted_new_password, @user.encrypted_password
                   end
 
+                  should_not_be_signed_in
                   should_respond_with :not_found
-
-                  should 'render an empty response' do
-                    assert @response.body.blank?
-                  end
+                  should_render_nothing
                 end
               end
             end
+          
           end
         end
 

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

@@ -3,8 +3,9 @@ module Clearance
     module Functional
       module SessionsControllerTest
     
-        def self.included(base)
-          base.class_eval do
+        def self.included(controller_test)
+          controller_test.class_eval do
+            
             should_filter_params :password
 
             context "on GET to /sessions/new" do
@@ -13,9 +14,10 @@ module Clearance
               should_respond_with :success
               should_render_template :new
               should_not_set_the_flash
+              
               should 'display a "sign in" form' do
                 assert_select "form[action=#{session_path}][method=post]", 
-                  true, "There must be a form to log in" do
+                  true, "There must be a form to sign in" do
                     assert_select "input[type=text][name=?]", 
                       "session[email]", true, "There must be an email field"
                     assert_select "input[type=password][name=?]", 
@@ -28,10 +30,8 @@ module Clearance
               end
             end
 
-            context "Given an unconfirmed user" do
-              setup do
-                @user = Factory(:clearance_user, :confirmed => false)
-              end
+            context "Given a registered user" do
+              setup { @user = Factory(:registered_user) }
 
               context "a POST to #create with good credentials" do
                 setup do
@@ -42,16 +42,11 @@ module Clearance
                 end
 
                 should_deny_access(:flash => /confirm/i)
-
-                should "send the confirmation email" do
-                  assert_not_nil email = ActionMailer::Base.deliveries[0]
-                  assert_match /account confirmation/i, email.subject
-                end
               end
             end
 
-            context "Given a confirmed user" do
-              setup { @user = Factory(:clearance_user, :confirmed => true) }
+            context "Given an email confirmed user" do
+              setup { @user = Factory(:email_confirmed_user) }
 
               context "a POST to #create with good credentials" do
                 setup do
@@ -61,8 +56,8 @@ module Clearance
                 end
 
                 should_set_the_flash_to /success/i
-                should_redirect_to '@controller.send(:url_after_create)'
-                should_return_from_session :user_id, "@user.id"
+                should_redirect_to_url_after_create
+                should_be_signed_in_as { @user }
               end
 
               context "a POST to #create with bad credentials" do
@@ -74,7 +69,7 @@ module Clearance
 
                 should_set_the_flash_to /bad/i
                 should_render_template :new
-                should_return_from_session :user_id, "nil"
+                should_not_be_signed_in
               end
           
               context "a POST to #create with good credentials and remember me" do
@@ -86,11 +81,11 @@ module Clearance
                 end
 
                 should_set_the_flash_to /success/i
-                should_redirect_to "@controller.send(:url_after_create)"
-                should_return_from_session :user_id, "@user.id"
+                should_redirect_to_url_after_create
+                should_be_signed_in_as { @user }
                 
                 should 'set the cookie' do
-                  assert ! cookies['auth_token'].empty?
+                  assert ! cookies['remember_token'].empty?
                 end
 
                 should 'set the remember me token in users table' do
@@ -112,7 +107,7 @@ module Clearance
                 should_return_from_session :user_id, "nil"
                 
                 should 'not create the cookie' do
-                  assert_nil cookies['auth_token']
+                  assert_nil cookies['remember_token']
                 end
 
                 should 'not set the remember me token in users table' do
@@ -161,26 +156,26 @@ module Clearance
             public_context do
               context "logging out again" do
                 setup { delete :destroy }
-                should_redirect_to '@controller.send(:url_after_destroy)'
+                should_redirect_to_url_after_destroy
               end
             end
 
-            logged_in_user_context do
+            signed_in_user_context do
               context "a DELETE to #destroy without a cookie" do
                 setup { delete :destroy }
 
-                should_set_the_flash_to(/logged out/i)
-                should_redirect_to '@controller.send(:url_after_destroy)'
+                should_set_the_flash_to(/signed out/i)
+                should_redirect_to_url_after_destroy
               end
 
               context 'a DELETE to #destroy with a cookie' do
                 setup do
-                  cookies['auth_token'] = CGI::Cookie.new 'token', 'value'
+                  cookies['remember_token'] = CGI::Cookie.new 'token', 'value'
                   delete :destroy
                 end
 
                 should 'delete the cookie' do
-                  assert cookies['auth_token'].empty?
+                  assert cookies['remember_token'].empty?
                 end
 
                 should 'delete the remember me token in users table' do
@@ -189,6 +184,7 @@ module Clearance
                 end
               end
             end
+          
           end
         end