Modularized (most) of the user model

eadz · May 18, 2008 · a2732fb · a2732fb
1 parent 0a29c18
commit a2732fb
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 113 deletions.
diff --git a/generators/authenticated/templates/model.rb b/generators/authenticated/templates/model.rb
@@ -3,6 +3,7 @@
 class <%= class_name %> < ActiveRecord::Base
   include Authentication
   include Authentication::ByPassword
+  include Authentication::ByCookieToken
 <% if options[:stateful] -%>
   include Authorization::StatefulRoles<% end %>
 
@@ -26,7 +27,7 @@ class <%= class_name %> < ActiveRecord::Base
   # anything else you want your user to change should be added here.
   attr_accessible :login, :email, :name, :password, :password_confirmation
 
-<% if options[:include_activation] %>
+<% if options[:include_activation] && !options[:stateful] %>
   # Activates the user in the database.
   def activate!
     @activated = true

diff --git a/lib/authenticated.rb b/lib/authenticated.rb
diff --git a/lib/authenticated/by_password.rb b/lib/authenticated/by_password.rb
diff --git a/lib/authorization/stateful_roles.rb b/lib/authorization/stateful_roles.rb
@@ -1,4 +1,4 @@
-module Authentication
+module Authorization
   module StatefulRoles
     unless Object.constants.include? "STATEFUL_ROLES_CONSTANTS_DEFINED"
       STATEFUL_ROLES_CONSTANTS_DEFINED = 'yup' # sorry for the C idiom