authentasaurus 0.8.4 → 0.8.6

data/lib/authentasaurus/ar/migrations.rb

@@ -2,172 +2,164 @@ module Authentasaurus::Ar
   module Migrations
     # Extends ActiveRecord::ConnectionAdapters::SchemaStatements
     module Tables
-      def self.included(base) # :nodoc:
-        base.send :include, InstanceMethods
+      extend ActiveSupport::Concern
+            
+      # creates all tables
+      def authentasaurus_tables
+        authentasaurus_user :authorizable
+        authentasaurus_group
+        authentasaurus_area
+        authentasaurus_permission
+        authentasaurus_validation
+        authentasaurus_user_invitation
+        authentasaurus_recovery
       end
-      
-      module InstanceMethods
-        # creates all tables
-        def authentasaurus_tables
-          authentasaurus_user :authorizable
-          authentasaurus_group
-          authentasaurus_area
-          authentasaurus_permission
-          authentasaurus_validation
-          authentasaurus_user_invitation
-          authentasaurus_recovery
-        end
         
         # creates users table
-        def authentasaurus_user(*opts)
-          create_table :users do |t|
-            t.string :username, :null => false
-            t.string :hashed_password, :null => false
-            t.string :password_seed, :null => false
-            t.string :name, :null => false
-            t.string :email, :null => false
-            t.boolean :active, :null => false, :default => false
-            t.string :remember_me_token
-            
-            if opts.include?(:authorizable) || opts.include?("authorizable")
-              t.integer :group_id, :null => false
-            end
-      
-            t.timestamps
+      def authentasaurus_user(*opts)
+        create_table :users do |t|
+          t.string :username, :null => false
+          t.string :hashed_password, :null => false
+          t.string :password_seed, :null => false
+          t.string :name, :null => false
+          t.string :email, :null => false
+          t.boolean :active, :null => false, :default => false
+          t.string :remember_me_token
+          
+          if opts.include?(:authorizable) || opts.include?("authorizable")
+            t.integer :group_id, :null => false
           end
+          
+          t.timestamps
         end
-        
-        # creates groups table
-        def authentasaurus_group
-          create_table :groups do |t|
-            t.string :name, :null => false
+      end
       
-            t.timestamps
-          end
+      # creates groups table
+      def authentasaurus_group
+        create_table :groups do |t|
+          t.string :name, :null => false
+          
+          t.timestamps
         end
-        
-        # creates areas table
-        def authentasaurus_area
-          create_table :areas do |t|
-            t.string :name, :null => false
+      end
       
-            t.timestamps
-          end
+      # creates areas table
+      def authentasaurus_area
+        create_table :areas do |t|
+          t.string :name, :null => false
+          
+          t.timestamps
         end
-        
-        # creates permissions table
-        def authentasaurus_permission
-          create_table :permissions do |t|
-            t.integer :group_id, :null => false
-            t.integer :area_id, :null => false
-            t.boolean :read, :null => false, :default => false
-            t.boolean :write, :null => false, :default => false
+      end
       
-            t.timestamps
-          end
+      # creates permissions table
+      def authentasaurus_permission
+        create_table :permissions do |t|
+          t.integer :group_id, :null => false
+          t.integer :area_id, :null => false
+          t.boolean :read, :null => false, :default => false
+          t.boolean :write, :null => false, :default => false
+          
+          t.timestamps
         end
-        
-        # creates validations table
-        def authentasaurus_validation
-          create_table :validations do |t|
-            t.integer :user_id, :null => false
-            t.string  :user_type, :null => false
-            t.string :email, :null => false
-            t.string :validation_code, :null => false
+      end
       
-            t.timestamps
-          end
+      # creates validations table
+      def authentasaurus_validation
+        create_table :validations do |t|
+          t.integer :user_id, :null => false
+          t.string  :user_type, :null => false
+          t.string :email, :null => false
+          t.string :validation_code, :null => false
+          
+          t.timestamps
         end
-        
-        # creates user_invitations table
-        def authentasaurus_user_invitation
-          create_table :user_invitations do |t|
-            t.string  :token, :null => false, :unique => true
-            t.string  :email
+      end
       
-            t.timestamps
-          end
-        end
-        
-        # creates recoveries table
-  		  def authentasaurus_recovery
-  		    create_table :recoveries do |t|
-  		      t.integer :user_id, :null => false
-  		      t.string  :email, :null => false
-  		      t.string :token, :null => false, :unique => true
-  		
-  		      t.timestamps
-  		    end
-  		  end
-        
-        # drops all tables
-        def authentasaurus_drop_tables
-          authentasaurus_drop_user
-          authentasaurus_drop_group
-          authentasaurus_drop_area
-          authentasaurus_drop_permission
-          authentasaurus_drop_validation
-          authentasaurus_drop_user_invitation
-          authentasaurus_drop_recovery
-        end
-        
-        # drops users table
-        def authentasaurus_drop_user
-          drop_table :users
-        end
-        
-        # drops groups table
-        def authentasaurus_drop_group
-          drop_table :groups
-        end
-        
-        # drops areas table
-        def authentasaurus_drop_area
-          drop_table :areas
+      # creates user_invitations table
+      def authentasaurus_user_invitation
+        create_table :user_invitations do |t|
+          t.string  :token, :null => false, :unique => true
+          t.string  :email
+          
+          t.timestamps
         end
-        
-        # drops permissions table
-        def authentasaurus_drop_permission
-          drop_table :permissions
-        end
-        
-        # drops validations table
-        def authentasaurus_drop_validation
-          drop_table :validations
-        end
-        
-        # drops user_invitations table
-        def authentasaurus_drop_user_invitation
-          drop_table :user_invitations
-        end
-        
-        # drops recoveries table
-        def authentasaurus_drop_recovery
-          drop_table :recoveries
+      end
+      
+      # creates recoveries table
+		  def authentasaurus_recovery
+		    create_table :recoveries do |t|
+          t.integer :user_id, :null => false
+          t.string  :email, :null => false
+          t.string :token, :null => false, :unique => true
+          
+          t.timestamps
         end
       end
-    end
+      
+      # drops all tables
+      def authentasaurus_drop_tables
+        authentasaurus_drop_user
+        authentasaurus_drop_group
+        authentasaurus_drop_area
+        authentasaurus_drop_permission
+        authentasaurus_drop_validation
+        authentasaurus_drop_user_invitation
+        authentasaurus_drop_recovery
+      end
+      
+      # drops users table
+      def authentasaurus_drop_user
+        drop_table :users
+      end
+      
+      # drops groups table
+      def authentasaurus_drop_group
+        drop_table :groups
+      end
+      
+      # drops areas table
+      def authentasaurus_drop_area
+        drop_table :areas
+      end
+      
+      # drops permissions table
+      def authentasaurus_drop_permission
+        drop_table :permissions
+      end
+      
+      # drops validations table
+      def authentasaurus_drop_validation
+        drop_table :validations
+      end
+      
+      # drops user_invitations table
+      def authentasaurus_drop_user_invitation
+        drop_table :user_invitations
+      end
+      
+      # drops recoveries table
+      def authentasaurus_drop_recovery
+        drop_table :recoveries
+      end
+    end    
     
     # Extends ActiveRecord::ConnectionAdapters::TableDefinition
     module Columns
-      def self.included(base) # :nodoc:
-        base.send :include, InstanceMethods
-      end
-      
-      module InstanceMethods
-        def user(*opts)
-          string :username, :null => false
-          string :hashed_password, :null => false
-          string :password_seed, :null => false
-          string :name, :null => false
-          string :email, :null => false
-          string :remember_me_token
-          boolean :active, :null => false, :default => false
-          if opts.include?(:authorizable)
-            integer :group_id, :null => false
-          end
+      extend ActiveSupport::Concern
+            
+      def user(*opts)
+        string :username, :null => false
+        string :hashed_password, :null => false
+        string :password_seed, :null => false
+        string :name, :null => false
+        string :email, :null => false
+        string :remember_me_token
+        boolean :active, :null => false, :default => false
+        if opts.include?(:authorizable)
+          integer :group_id, :null => false
         end
       end
     end
-  end
+  end    
 end

data/lib/authentasaurus/ar/models/recovery.rb

@@ -1,37 +1,34 @@
 module Authentasaurus::Ar::Models
   module Recovery
-    def self.included(base) # :nodoc:
-      base.send :extend, ClassMethods
-      base.send :include, InstanceMethods
-      
-      base.send :require, "digest/sha1"
+    extend ActiveSupport::Concern
+    
+    included do
+      require "digest/sha1"
       
-      base.send :unloadable
+      unloadable
       
-      base.send :belongs_to, :user
+      belongs_to :user
       
-    	base.send :before_validation, :make_token!, :on => :create
-    	base.send :before_save, :send_recovery
+    	before_validation :make_token!, :on => :create
+      before_save :send_recovery
       
-    	base.send :scope, :valid, lambda { { :conditions => ["updated_at <= ?", Rails.application.config.authentasaurus[:modules][:recoverable][:token_expires_after].days.from_now] } }
+    	scope :valid, lambda { { :conditions => ["updated_at <= ?", Authentasaurus::Configuration.instance.configuration[:modules][:recoverable][:token_expires_after].days.from_now] } }
       
-    	base.send :validates_uniqueness_of, :user_id
-    	base.send :validates_presence_of, :email
-    	base.send :validates_presence_of, :user_id, :message => :"recovery.user_id.blank"
-    	base.send :validates_format_of, :email, :with => %r{[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}}
+    	validates_uniqueness_of :user_id
+    	validates_presence_of :email
+    	validates_presence_of :user_id, :message => :"recovery.user_id.blank"
+    	validates_format_of :email, :with => %r{[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}}
     end
     
     module ClassMethods
     end
+        
+    def make_token!
+      self.token = Digest::SHA1.hexdigest "#{Time.now.to_i} #{rand} #{self.email}"
+    end
     
-    module InstanceMethods
-      def make_token!
-    		self.token = Digest::SHA1.hexdigest "#{Time.now.to_i} #{rand} #{self.email}"
-      end
-      
-      def send_recovery
-    		AuthentasaurusEmailer.deliver_recovery_mail(self.user, self.token) if Rails.application.config.authentasaurus[:modules][:recoverable][:send_email]
-      end
+    def send_recovery
+  		AuthentasaurusEmailer.deliver_recovery_mail(self.user, self.token) if Authentasaurus::Configuration.instance.configuration[:modules][:recoverable][:send_email]
     end
-  end
+  end    
 end

data/lib/authentasaurus/ar/models/session.rb

@@ -3,15 +3,16 @@
 # A session behaves just like an ActiveRecord model
 module Authentasaurus::Ar::Models
   module Session
-    def self.included(base) # :nodoc:
-      base.send :extend, ClassMethods
-      base.send :include, InstanceMethods
-      base.send :include, ActiveModel::Validations
-      base.send :include, ActiveModel::Conversion
+    extend ActiveSupport::Concern
+    
+    included do # :nodoc:      
+      include ActiveModel::Validations
+      include ActiveModel::Conversion
+      
+      attr_accessor :username, :password, :remember
+      validates_presence_of :username, :password
       
-      base.send :attr_accessor, :username, :password, :remember
-      base.send :validates_presence_of, :username, :password
-      base.send :attr_reader, :user
+      attr_reader :user
     end
     
     module ClassMethods
@@ -26,53 +27,52 @@ module Authentasaurus::Ar::Models
       end
       
       # Takes an id (usually from an ActiveController session) and returns a User object
-      def current_user(id, session_type = :user)
+      def current_user(id, session_type = Authentasaurus::Configuration.instance.user_model.to_sym)
         session_type.to_s.camelize.constantize.find id
       end
     end
-    
-    module InstanceMethods
-      # Takes a hash of attributes keys and values just like ActiveRecord models
-      def initialize(attributes = nil)        
-        if attributes
-          attributes.each do |key,value|
-            send(key.to_s + '=', value)
-          end
-        else
-          self.remember = false
-        end
-      end
-      
-      # Authenticates the information saved in the attributes
-      # Returns true or false
-      def save(*session_types)
-        session_types = session_types.flatten
-        
-        if session_types.empty?
-          session_types = [:user]
-        end
         
-        ret = true
-        session_types.each do |type|
-          @user = type.to_s.camelize.constantize.authenticate(self.username.downcase, self.password, self.remember == "1")
-          if @user.nil?
-            self.errors.add_to_base I18n.t(:invalid_login, :scope => [:authentasaurus, :messages, :sessions]) 
-            ret &= false
-          else
-            ret = true
-            break
-          end
+    # Takes a hash of attributes keys and values just like ActiveRecord models
+    def initialize(attributes = nil)        
+      if attributes
+        attributes.each do |key,value|
+          send(key.to_s + '=', value)
         end
-        ret
+      else
+        self.remember = false
       end
+    end
+    
+    # Authenticates the information saved in the attributes
+    # Returns true or false
+    def save(*session_types)
+      session_types = session_types.flatten
       
-      def new_record? #:nodoc:
-        true
+      if session_types.empty?
+        user_model = Authentasaurus::Configuration.instance.user_model.to_sym
+        session_types = [user_model]
       end
       
-      def persisted? #:nodoc:
-        false
+      ret = true
+      session_types.each do |type|
+        @user = type.to_s.camelize.constantize.authenticate(self.username.downcase, self.password, self.remember == "1")
+        if @user.nil?
+          self.errors.add_to_base I18n.t(:invalid_login, :scope => [:authentasaurus, :messages, :sessions]) 
+          ret &= false
+        else
+          ret = true
+          break
+        end
       end
+      ret
+    end
+    
+    def new_record? #:nodoc:
+      true
+    end
+    
+    def persisted? #:nodoc:
+      false
     end
-  end
+  end  
 end