@@ -58,11 +58,6 @@ class <%= class_name %> < ActiveRecord::Base # the existence of an activation code means they have not activated yet activation_code.nil? end - - # Returns true if the user has just been activated. - def pending? - @activated - end <% end %> # Authenticates a user by their login name and unencrypted password. Returns the user or nil. def self.authenticate(login, password) @@ -113,6 +108,11 @@ class <%= class_name %> < ActiveRecord::Base save(false) end + # Returns true if the user has just been activated. + def recently_activated? + @activated + end + protected # before filter def encrypt_password @@ -135,6 +135,7 @@ class <%= class_name %> < ActiveRecord::Base end def do_activate + @activated = true self.activated_at = Time.now.utc self.deleted_at = self.activation_code = nil end<% end %> generators/authenticated/templates/model.rb @@ -18,7 +18,7 @@ class <%= model_controller_class_name %>Controller < ApplicationController # uncomment at your own risk # reset_session @<%= file_name %> = <%= class_name %>.new(params[:<%= file_name %>]) - @<%= file_name %>.<% if options[:stateful] %>register! if @<%= file_name %>.valid?<% else %>save<% end %> + @<%= file_name %>.save if @<%= file_name %>.errors.empty? self.current_<%= file_name %> = @<%= file_name %> redirect_back_or_default('/') generators/authenticated/templates/model_controller.rb @@ -5,7 +5,7 @@ class <%= class_name %>Observer < ActiveRecord::Observer def after_save(<%= file_name %>) <% if options[:include_activation] %> - <%= class_name %>Mailer.deliver_activation(<%= file_name %>) if <%= file_name %>.pending? + <%= class_name %>Mailer.deliver_activation(<%= file_name %>) if <%= file_name %>.recently_activated? <% end %> end end generators/authenticated/templates/observer.rb @@ -22,7 +22,8 @@ describe <%= class_name %> do <% if options[:include_activation] %> it 'initializes #activation_code' do @creating_<%= file_name %>.call - @<%= file_name %>.reload.activation_code.should_not be_nil + @<%= file_name %>.should be_pending + @<%= file_name %>.activation_code.should_not be_nil end <% end %><% if options[:stateful] %> it 'starts in pending state' do generators/authenticated/templates/unit_spec.rb @@ -15,7 +15,7 @@ class <%= class_name %>Test < Test::Unit::TestCase <% if options[:include_activation] %> def test_should_initialize_activation_code_upon_creation <%= file_name %> = create_<%= file_name %> - assert_not_nil <%= file_name %>.reload.activation_code + assert_not_nil <%= file_name %>.activation_code end <% end %><% if options[:stateful] %> def test_should_create_and_start_in_pending_state generators/authenticated/templates/unit_test.rb 8cad3586db8d6af7c7fe2000b35fe3b7c6785d92 rick technoweenie@gmail.com http://github.com/technoweenie/restful-authentication/commit/6f83ff3a37c4ffc2544fbfd312724d661a7c8ddb 6f83ff3a37c4ffc2544fbfd312724d661a7c8ddb 2008-03-21T10:38:24-07:00 2008-03-21T10:38:24-07:00 the return of #recently_activated? 9403fcb52d2c4547af3f0793bfee05248eb3200f rick technoweenie@gmail.com