Show message in view instead of flash and remove user after 72 hours without activation

Caio SBA
1 parent ab83d73d
Showing 10 changed files with 84 additions and 15 deletions Show diff stats
app/controllers/public/account_controller.rb
app/models/user.rb
app/views/account/login.rhtml
app/views/account/signup.rhtml
lib/user_activation_job.rb
test/functional/account_controller_test.rb
test/integration/signup_test.rb
test/integration/user_registers_at_the_application_test.rb
test/unit/user_activation_job_test.rb
test/unit/user_test.rb
@@ -19,11 +19,11 @@ class AccountController &lt; ApplicationController
   def activate
     @user = User.find_by_activation_code(params[:activation_code]) if params[:activation_code]
     if @user and @user.activate
-      session[:notice] = _("Your account has been activated, now you can log in!")
-      redirect_to :action => 'login', :userlogin => @user.login
+      @message = _("Your account has been activated, now you can log in!")
+      render :action => 'login', :userlogin => @user.login
     else
       session[:notice] = _("It looks like you're trying to activate an account. Perhaps have already activated this account?")
-      redirect_back_or_default(:controller => 'home')
+      redirect_to :controller => :home
     end
   end
@@ -78,8 +78,7 @@ class AccountController &lt; ApplicationController
           invitation.update_attributes!({:friend => @user.person})
           invitation.finish
         end
-        session[:notice] = _("Thanks for signing up! Now go to your e-mail and activate your account.")
-        redirect_back_or_default(:controller => 'home')
+        @register_pending = true
       end
     rescue ActiveRecord::RecordInvalid
       @person.valid?
@@ -37,6 +37,7 @@ class User &lt; ActiveRecord::Base
     user.person.save!
   end
   after_create :deliver_activation_code
+  after_create :delay_activation_check
   attr_writer :person_data
   def person_data
@@ -290,4 +291,8 @@ class User &lt; ActiveRecord::Base
     def deliver_activation_code
       User::Mailer.deliver_activation_code(self) unless self.activation_code.blank?
     end
+
+    def delay_activation_check
+      Delayed::Job.enqueue(UserActivationJob.new(self.id), 0, 72.hours.from_now)
+    end
 end
@@ -5,6 +5,8 @@
 <% @user ||= User.new %>
 <% is_thickbox ||= false %>
+<%= @message %>
+
 <% labelled_form_for :user, @user, :url => login_url do |f| %>
      <%= f.text_field :login, :id => 'main_user_login', :onchange => 'this.value = convToValidLogin( this.value )', :value => params[:userlogin] %>
 <h1><%= _('Signup') %></h1>
-<%= render :partial => 'signup_form' %>
+<% if @register_pending %>
+  <%= _('Thanks for signing up! Now check your e-mail to activate your account!') %>
+  <p style="text-align: center"><%= link_to(_('Go to the homepage'), '/') %></p>
+<% else %>
+  <%= render :partial => 'signup_form' %>
+<% end %>
@@ -0,0 +1,6 @@
+class UserActivationJob < Struct.new(:user_id)
+  def perform
+    user = User.find(user_id)
+    user.destroy unless user.activated?
+  end
+end
@@ -70,7 +70,8 @@ class AccountControllerTest &lt; Test::Unit::TestCase
   def test_should_allow_signup
     assert_difference User, :count do
       new_user
-      assert_response :redirect
+      assert_response :success
+      assert_not_nil assigns(:register_pending)
     end
   end
@@ -79,6 +80,7 @@ class AccountControllerTest &lt; Test::Unit::TestCase
       new_user(:login => nil)
       assert assigns(:user).errors.on(:login)
       assert_response :success
+      assert_nil assigns(:register_pending)
     end
   end
@@ -87,6 +89,7 @@ class AccountControllerTest &lt; Test::Unit::TestCase
       new_user(:password => nil)
       assert assigns(:user).errors.on(:password)
       assert_response :success
+      assert_nil assigns(:register_pending)
     end
   end
@@ -95,6 +98,7 @@ class AccountControllerTest &lt; Test::Unit::TestCase
       new_user(:password_confirmation => nil)
       assert assigns(:user).errors.on(:password_confirmation)
       assert_response :success
+      assert_nil assigns(:register_pending)
     end
   end
@@ -103,6 +107,7 @@ class AccountControllerTest &lt; Test::Unit::TestCase
       new_user(:email => nil)
       assert assigns(:user).errors.on(:email)
       assert_response :success
+      assert_nil assigns(:register_pending)
     end
   end
@@ -111,6 +116,7 @@ class AccountControllerTest &lt; Test::Unit::TestCase
       Environment.default.update_attributes(:terms_of_use => 'some terms ...')
       new_user
       assert_response :success
+      assert_nil assigns(:register_pending)
     end
   end
@@ -118,7 +124,8 @@ class AccountControllerTest &lt; Test::Unit::TestCase
     assert_difference User, :count do
       Environment.default.update_attributes(:terms_of_use => 'some terms ...')      
       new_user(:terms_accepted => '1')
-      assert_response :redirect
+      assert_response :success
+      assert_not_nil assigns(:register_pending)
     end
   end
@@ -643,7 +650,7 @@ class AccountControllerTest &lt; Test::Unit::TestCase
     Person.any_instance.stubs(:required_fields).returns(['organization'])
     assert_difference User, :count do
       post :signup, :user => { :login => 'testuser', :password => '123456', :password_confirmation => '123456', :email => 'testuser@example.com' }, :profile_data => { :organization => 'example.com' }
-      assert_redirected_to :controller => 'home'
+      assert_response :success
     end
     assert_equal 'example.com', Person['testuser'].organization
   end
@@ -692,7 +699,8 @@ class AccountControllerTest &lt; Test::Unit::TestCase
   should 'activate user when activation code is present and correct' do
     user = User.create! :login => 'testuser', :password => 'test123', :password_confirmation => 'test123', :email => 'test@test.org'
     get :activate, :activation_code => user.activation_code
-    assert_redirected_to :action => :login, :userlogin => user.login
+    assert_not_nil assigns(:message)
+    assert_response :success
     post :login, :user => {:login => 'testuser', :password => 'test123'}
     assert_not_nil session[:user]
     assert_redirected_to :controller => 'profile_editor', :profile => 'testuser'
@@ -702,6 +710,7 @@ class AccountControllerTest &lt; Test::Unit::TestCase
     @request.env["HTTP_REFERER"] = '/bli'
     user = User.create! :login => 'testuser', :password => 'test123', :password_confirmation => 'test123', :email => 'test@test.org'
     get :activate
+    assert_nil assigns(:message)
     post :login, :user => {:login => 'testuser', :password => 'test123'}
     assert_nil session[:user]
     assert_redirected_to '/bli'
@@ -711,6 +720,7 @@ class AccountControllerTest &lt; Test::Unit::TestCase
     @request.env["HTTP_REFERER"] = '/bli'
     user = User.create! :login => 'testuser', :password => 'test123', :password_confirmation => 'test123', :email => 'test@test.org'
     get :activate, :activation_code => 'wrongcode'
+    assert_nil assigns(:message)
     post :login, :user => {:login => 'testuser', :password => 'test123'}
     assert_nil session[:user]
     assert_redirected_to '/bli'
@@ -24,10 +24,8 @@ class SignupTest &lt; ActionController::IntegrationTest
     assert_equal mail_count, ActionMailer::Base.deliveries.count
     post '/account/signup', :user => { :login => 'shouldaccepterms', :password => 'test', :password_confirmation => 'test', :email => 'shouldaccepterms@example.com', :terms_accepted => '1' }, :profile_data => person_data
-    assert_response :redirect
+    assert_response :success
-    follow_redirect!
-    assert_response :redirect
     assert_equal count + 1, User.count
     assert_equal mail_count + 1, ActionMailer::Base.deliveries.count
@@ -13,9 +13,8 @@ class UserRegistersAtTheApplicationTest &lt; ActionController::IntegrationTest
     assert_response :success
     post '/account/signup', :user => { :login => 'mylogin', :password => 'mypassword', :password_confirmation => 'mypassword', :email => 'mylogin@example.com' }
-    assert_response :redirect
+    assert_response :success
-    follow_redirect!
     assert_tag :tag => 'a', :attributes => { :href => /^\/account\/login/ }
   end
@@ -0,0 +1,39 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class NotifyActivityToProfilesJobTest < ActiveSupport::TestCase
+
+  should 'create job on user creation' do
+    assert_difference Delayed::Job, :count, 1 do
+      user = new_user :login => 'test1'
+      assert_equal user.id, YAML.load(Delayed::Job.last.handler).user_id
+    end
+    process_delayed_job_queue
+  end
+
+  should 'destroy user if not activated' do
+    user = new_user :login => 'test2'
+    job = UserActivationJob.new(user.id)
+    assert_difference User, :count, -1 do
+      job.perform
+      process_delayed_job_queue
+    end
+  end
+
+  should 'not destroy user if activated' do
+    user = new_user :login => 'test3'
+    user.activate
+    job = UserActivationJob.new(user.id)
+    assert_no_difference User, :count do
+      job.perform
+      process_delayed_job_queue
+    end
+  end
+
+  protected
+    def new_user(options = {})
+      user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))
+      user.save
+      user
+    end
+
+end
@@ -472,6 +472,12 @@ class UserTest &lt; Test::Unit::TestCase
     assert user.activated?
   end
+  should 'delay activation check' do
+    assert_difference Delayed::Job, :count, 1 do
+      user = new_user
+    end
+  end
+
   protected
     def new_user(options = {})
       user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))
	@@ -5,6 +5,8 @@		@@ -5,6 +5,8 @@
5	<% @user \|\|= User.new %>	5	<% @user \|\|= User.new %>
6	<% is_thickbox \|\|= false %>	6	<% is_thickbox \|\|= false %>
7		7
		8	+<%= @message %>
		9	+
8	<% labelled_form_for :user, @user, :url => login_url do \|f\| %>	10	<% labelled_form_for :user, @user, :url => login_url do \|f\| %>
9		11
10	<%= f.text_field :login, :id => 'main_user_login', :onchange => 'this.value = convToValidLogin( this.value )', :value => params[:userlogin] %>	12	<%= f.text_field :login, :id => 'main_user_login', :onchange => 'this.value = convToValidLogin( this.value )', :value => params[:userlogin] %>
1	<h1><%= _('Signup') %></h1>	1	<h1><%= _('Signup') %></h1>
2	-<%= render :partial => 'signup_form' %>	2	+<% if @register_pending %>
		3	+ <%= _('Thanks for signing up! Now check your e-mail to activate your account!') %>
		4	+ <p style="text-align: center"><%= link_to(_('Go to the homepage'), '/') %></p>
		5	+<% else %>
		6	+ <%= render :partial => 'signup_form' %>
		7	+<% end %>
@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
	1	+class UserActivationJob < Struct.new(:user_id)
	2	+ def perform
	3	+ user = User.find(user_id)
	4	+ user.destroy unless user.activated?
	5	+ end
	6	+end
	@@ -13,9 +13,8 @@ class UserRegistersAtTheApplicationTest < ActionController::IntegrationTest		@@ -13,9 +13,8 @@ class UserRegistersAtTheApplicationTest < ActionController::IntegrationTest
13	assert_response :success	13	assert_response :success
14		14
15	post '/account/signup', :user => { :login => 'mylogin', :password => 'mypassword', :password_confirmation => 'mypassword', :email => 'mylogin@example.com' }	15	post '/account/signup', :user => { :login => 'mylogin', :password => 'mypassword', :password_confirmation => 'mypassword', :email => 'mylogin@example.com' }
16	- assert_response :redirect	16	+ assert_response :success
17		17
18	- follow_redirect!
19	assert_tag :tag => 'a', :attributes => { :href => /^\/account\/login/ }	18	assert_tag :tag => 'a', :attributes => { :href => /^\/account\/login/ }
20	end	19	end
21		20
@@ -0,0 +1,39 @@		@@ -0,0 +1,39 @@
	1	+require File.dirname(__FILE__) + '/../test_helper'
	2	+
	3	+class NotifyActivityToProfilesJobTest < ActiveSupport::TestCase
	4	+
	5	+ should 'create job on user creation' do
	6	+ assert_difference Delayed::Job, :count, 1 do
	7	+ user = new_user :login => 'test1'
	8	+ assert_equal user.id, YAML.load(Delayed::Job.last.handler).user_id
	9	+ end
	10	+ process_delayed_job_queue
	11	+ end
	12	+
	13	+ should 'destroy user if not activated' do
	14	+ user = new_user :login => 'test2'
	15	+ job = UserActivationJob.new(user.id)
	16	+ assert_difference User, :count, -1 do
	17	+ job.perform
	18	+ process_delayed_job_queue
	19	+ end
	20	+ end
	21	+
	22	+ should 'not destroy user if activated' do
	23	+ user = new_user :login => 'test3'
	24	+ user.activate
	25	+ job = UserActivationJob.new(user.id)
	26	+ assert_no_difference User, :count do
	27	+ job.perform
	28	+ process_delayed_job_queue
	29	+ end
	30	+ end
	31	+
	32	+ protected
	33	+ def new_user(options = {})
	34	+ user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))
	35	+ user.save
	36	+ user
	37	+ end
	38	+
	39	+end
	@@ -472,6 +472,12 @@ class UserTest < Test::Unit::TestCase		@@ -472,6 +472,12 @@ class UserTest < Test::Unit::TestCase
472	assert user.activated?	472	assert user.activated?
473	end	473	end
474		474
		475	+ should 'delay activation check' do
		476	+ assert_difference Delayed::Job, :count, 1 do
		477	+ user = new_user
		478	+ end
		479	+ end
		480	+
475	protected	481	protected
476	def new_user(options = {})	482	def new_user(options = {})
477	user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))	483	user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))