thoughtbot-clearance 0.4.2 → 0.4.3

data/Rakefile

@@ -35,7 +35,7 @@ task :default => 'test:all'
 
 gem_spec = Gem::Specification.new do |gem_spec|
   gem_spec.name        = "clearance"
-  gem_spec.version     = "0.4.2"
+  gem_spec.version     = "0.4.3"
   gem_spec.summary     = "Rails authentication for developers who write tests."
   gem_spec.email       = "support@thoughtbot.com"
   gem_spec.homepage    = "http://github.com/thoughtbot/clearance"

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

@@ -34,7 +34,7 @@ module Clearance
 
             def user_from_cookie
               if cookies[:remember_token]
-                user = User.find_by_remember_token(cookies[:remember_token])
+                user = User.find_by_token(cookies[:remember_token])
                 user && user.remember? ? user : nil                
               end
             end

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

@@ -6,6 +6,7 @@ module Clearance
         def self.included(controller)
           controller.class_eval do
             
+            before_filter :email_confirmed_user?, :only => :new
             before_filter :existing_user?, :only => :new
             filter_parameter_logging :token
         
@@ -22,6 +23,15 @@ module Clearance
         
             private
             
+            def email_confirmed_user?
+              @user = User.find_by_id(params[:user_id])
+              if @user.nil?
+                render :nothing => true, :status => :not_found
+              elsif @user.email_confirmed?
+                redirect_to new_session_url
+              end
+            end
+            
             def existing_user?
               @user = User.find_by_id_and_token(params[:user_id], params[:token])
               if @user.nil?

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

@@ -22,7 +22,8 @@ module Clearance
                   flash[:notice] = "Signed in successfully"
                   redirect_back_or url_after_create
                 else
-                  deny_access("User has not confirmed email.")
+                  ClearanceMailer.deliver_confirmation(@user)
+                  deny_access("User has not confirmed email.  Confirmation email will be resent.")
                 end
               end
             end

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

@@ -5,12 +5,12 @@ module Clearance
 
         def self.included(controller_test)
           controller_test.class_eval do
-            
+
             should_filter_params :token
-            
+
             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 token" do
                 setup do
                   get :new, :user_id => @user.to_param, :token => @user.token
@@ -21,7 +21,32 @@ module Clearance
                 should_be_signed_in_and_email_confirmed_as { @user }
                 should_redirect_to_url_after_create
               end
-              
+
+              context "on GET to #new with incorrect token" do
+                setup do
+                  token = ""
+                  assert_not_equal token, @user.token
+
+                  get :new, :user_id => @user.to_param, :token => token
+                end
+
+                should_respond_with :not_found
+                should_render_nothing
+              end
+            end
+
+            context "Given a user whose email has been confirmed" do
+              setup { @user = Factory(:email_confirmed_user) }
+
+              context "on GET to #new with correct id and token" do
+                setup do
+                  get :new, :user_id => @user.to_param, :token => @user.token
+                end
+
+                should_not_be_signed_in
+                should_redirect_to 'new_session_url'
+              end
+
               context "on GET to #new with incorrect token" do
                 setup do
                   token = ""
@@ -30,11 +55,23 @@ module Clearance
                   get :new, :user_id => @user.to_param, :token => token
                 end
 
+                should_not_be_signed_in
+                should_redirect_to 'new_session_url'
+              end
+            end
+
+            context "Given no user records" do
+              setup { assert_equal 0, User.count }
+              context "on GET to #new with nonexistent id and token" do
+                setup do
+                  get :new, :user_id => '123', :token => '123'
+                end
+
                 should_respond_with :not_found
                 should_render_nothing
               end
             end
-          
+
           end
         end
 

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

@@ -29,7 +29,13 @@ module Clearance
                                   :password => @user.password }
                 end
 
-                should_deny_access(:flash => /confirm/i)
+                should_deny_access(:flash => /User has not confirmed email.  Confirmation email will be resent./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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thoughtbot-clearance
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-27 21:00:00 -08:00
+date: 2009-01-29 21:00:00 -08:00
 default_executable: 
 dependencies: []