@@ -23,7 +23,7 @@ end The mixin provides a number of methods. The most common are: <pre><code> - @user.activate # activates (and saves) the user + @user.activate! # activates (and saves) the user @user.activated? # Returns the "active" status of the user @user.active? # Alias for activated? </pre></code> README.textile @@ -10,7 +10,7 @@ class MerbAuthSliceActivation::Activations < MerbAuthSliceActivation::Applicati session.user = Merb::Authentication.user_class.find_with_activation_code(params[:activation_code]) raise NotFound if session.user.nil? if session.authenticated? && !session.user.activated? - session.user.activate + session.user.activate! end "" end app/controllers/activations.rb @@ -48,8 +48,8 @@ module Merb module InstanceMethods - # Activates the user. - def activate + # Activates and saves the user. + def activate! self.reload unless self.new_record? # Make sure the model is up to speed before we try to save it set_activated_data! self.save lib/merb-auth-slice-activation/mixins/activated_user.rb @@ -17,7 +17,7 @@ describe "Activation in the controller" do before(:each) do @active_user = User.create( user_attributes(:login => "fred") ) - @active_user.activate + @active_user.activate! @user = User.create( user_attributes(:login => "barney", :email => "barney@example.com")) class TestStrategy < Merb::Authentication::Strategy @@ -57,7 +57,7 @@ describe "Activation in the controller" do @user.should_not be_active result = request("/foos", :params => {:login => "barney"}) result.status.should == 401 - @user.activate + @user.activate! result = request("/foos", :params => {:login => "barney"}) result.should be_successful result.body.should == "INDEX" spec/controllers/activations_spec.rb @@ -89,33 +89,33 @@ describe "Actviated User" do it "should mark users as active" do @user.should_not be_active - @user.activate + @user.activate! @user.should be_active @user.reload @user.should be_active end it "should mark user as (just) activated" do - @user.activate + @user.activate! @user.should be_recently_activated end it "should set the activated_at property to the current date and time" do now = DateTime.now DateTime.should_receive(:now).and_return(now) - @user.activate + @user.activate! @user.activated_at.should == now end it "should clear out the activation code" do @user.activation_code.should_not be_nil - @user.activate + @user.activate! @user.activation_code.should be_nil end it "should send out the activation notification" do @user.should_receive(:send_activation_notification) - @user.activate + @user.activate! end end spec/mixins/activated_user_spec.rb d728cb7bfd94d55e3c0ab502cdc1981abe583d53 Christian Kebekus christian@kebek.us http://github.com/ck/merb-auth-slice-activation/commit/8f6fe795fc140eb719ebf41b32a77268a4ab7934 8f6fe795fc140eb719ebf41b32a77268a4ab7934 2008-10-25T06:22:51-07:00 2008-10-25T06:22:51-07:00 Renamed <user>.activate to <user>.activate! , since it also saves the user model. a5bf8d4543650d112696e9753150860cde1ce401 Christian Kebekus christian@kebek.us