lam_auth 0.1.2 → 0.1.3

data/lib/lam_auth/controller_extensions.rb

@@ -1,22 +1,30 @@
 module LamAuth
   module ControllerExtensions
     def lam_auth_for(klass)
-      class_inheritable_accessor :model_class
-      self.model_class = klass.to_s.classify.constantize
+      class_inheritable_writer :user_model_class
+      self.user_model_class = klass
+      
       helper_method(:current_user, :logged_in?)
       before_filter :login_from_cookie
       
+      extend ClassMethods
       include InstanceMethods
       protected :logged_in?, :current_user, :current_user=, :auth_token, :login_from_cookie, :login_required
     end
     
+    module ClassMethods
+      def user_model_class
+        read_inheritable_attribute(:user_model_class).to_s.classify.constantize
+      end
+    end
+    
     module InstanceMethods
       def logged_in?
         !!current_user
       end
   
       def current_user
-        @current_user ||= session[:user] && model_class.find_by_id(session[:user])
+        @current_user ||= session[:user] && self.class.user_model_class.find_by_id(session[:user])
       end
   
       def current_user=(new_user)
@@ -33,7 +41,7 @@ module LamAuth
         if logged_in?
           !auth_token && self.current_user = nil
         else
-          auth_token && self.current_user = model_class.find_by_auth_token(auth_token)
+          auth_token && self.current_user = self.class.user_model_class.find_by_auth_token(auth_token)
         end
       end
   

data/lib/lam_auth/version.rb

@@ -1,3 +1,3 @@
 module LamAuth
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lam_auth
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Max Macovsky
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 +04:00
+date: 2011-04-23 00:00:00 +04:00
 default_executable: 
 dependencies: []