authentasaurus 0.8.4 → 0.8.6

data/lib/authentasaurus/ac/controllers/validations_controller.rb

@@ -1,53 +1,48 @@
 module Authentasaurus::Ac::Controllers
   module ValidationsController
-    def self.included(base) # :nodoc:
-      base.send :extend, ClassMethods
-      base.send :include, InstanceMethods
-    end
+    extend ActiveSupport::Concern
     
     module ClassMethods
     end
-    
-    module InstanceMethods
-      def validate
-        respond_to do |format|
-          format.html
-        end
+        
+    def validate
+      respond_to do |format|
+        format.html
       end
-      
-      def activate
-    		respond_to do |format|
-          validation = Validation.find_by_validation_code(params[:vcode])
-    			if validation
-            validation.user.activate
-            validation.destroy
-            format.html { redirect_to login_url, :notice => I18n.t(:validation_successful, :scope => [:authentasaurus, :messages, :validations])}
-          else
-            flash.now[:alert] = I18n.t(:validation_failed, :scope => [:authentasaurus, :messages, :validations])
-            format.html { render :validate }
-          end
+    end
+    
+    def activate
+  		respond_to do |format|
+        validation = Validation.find_by_validation_code(params[:vcode])
+  			if validation
+          validation.user.activate
+          validation.destroy
+          format.html { redirect_to login_url, :notice => I18n.t(:validation_successful, :scope => [:authentasaurus, :messages, :validations])}
+        else
+          flash.now[:alert] = I18n.t(:validation_failed, :scope => [:authentasaurus, :messages, :validations])
+          format.html { render :validate }
         end
       end
-      
-    	def resend_validation_email
-    	  respond_to do |format|
-          format.html
-        end
+    end
+    
+  	def resend_validation_email
+  	  respond_to do |format|
+        format.html
       end
+    end
+    
+    def do_resend_validation_email
+      validation = Validation.find_by_email params[:email]
       
-      def do_resend_validation_email
-        validation = Validation.find_by_email params[:email]
-        
-        respond_to do |format|
-          unless validation.nil?
-            validation.send_validation
-            format.html {redirect_to login_url, :notice => I18n.t(:validation_email_sent, :scope => [:authentasaurus, :messages, :validations])}
-          else
-            flash.now[:alert] = I18n.t(:validation_email_invalid, :scope => [:authentasaurus, :messages, :validations], :email => params[:email])
-            format.html { render :resend_validation_email }
-          end
+      respond_to do |format|
+        unless validation.nil?
+          validation.send_validation
+          format.html {redirect_to login_url, :notice => I18n.t(:validation_email_sent, :scope => [:authentasaurus, :messages, :validations])}
+        else
+          flash.now[:alert] = I18n.t(:validation_email_invalid, :scope => [:authentasaurus, :messages, :validations], :email => params[:email])
+          format.html { render :resend_validation_email }
         end
       end
     end
-  end
+  end  
 end

data/lib/authentasaurus/ac/routing.rb

@@ -1,90 +1,86 @@
 ## Authentasaurus routes helper
 module Authentasaurus::Ac
   module Routing
-    def self.included(base) # :nodoc:
-      base.send :include, InstanceMethods
-    end
-    
-    module InstanceMethods
-      # TODO: add documentation here
-      def authentasaurus_routes(*opts)
-        options = opts.extract_options!
-        
-        # Authenticatable
-        authentasaurus_sessions options.dup
-        authentasaurus_users options.dup
-        # Recoverable
-        authentasaurus_recoverable
-        
-        # Authorizable
-        if opts.include?(:authorization)
-          authentasaurus_authorizable options.dup
-        end
+    extend ActiveSupport::Concern
         
-        # Validatable
-        if opts.include?(:validation)
-          authentasaurus_validatable
-        end
-        
-        # Invitable
-        if opts.include?(:invitation)
-          authentasaurus_invitable options.dup
-          authentasaurus_invitable_public
-        end
-      end
+    # TODO: add documentation here
+    def authentasaurus_routes(*opts)
+      options = opts.extract_options!
       
-      # TODO: add documentation here
-      def authentasaurus_sessions(*opts)
-        get     "/sessions/sign-in(.:format)" => "sessions#new", :as => :new_session
-        post    "/sessions(.:format)" => "sessions#create", :as => :sessions
-        delete  "/sessions/sign-out(.:format)" => "sessions#destroy", :as => :session
-        get     "/sessions/no-access(.:format)" => "sessions#no_access", :as => :no_access_sessions
-      end
+      # Authenticatable
+      authentasaurus_sessions options.dup
+      authentasaurus_users options.dup
+      # Recoverable
+      authentasaurus_recoverable
       
-      # TODO: add documentation here
-      def authentasaurus_users(*opts)
-        options = opts.extract_options!
-        
-        resources :users, options.dup
+      # Authorizable
+      if opts.include?(:authorization)
+        authentasaurus_authorizable options.dup
       end
       
-      # TODO: add documentation here
-      def authentasaurus_authorizable(*opts)
-        options = opts.extract_options!
-        
-        resources :groups, options.dup
-        resources :areas, options.dup
-        resources :permissions, options.dup
+      # Validatable
+      if opts.include?(:validation)
+        authentasaurus_validatable
       end
       
-      # TODO: add documentation here
-      def authentasaurus_validatable
-        match "/validate" => "validations#validate", :as => 'validate'
-        match "/activate" => "validations#activate", :as => 'activate'
-        match "/resend-validation" => "validations#resend_validation_email", :via => :get, :as => 'recover_password'
-        match "/resend-validation" => "validations#do_resend_validation_email", :via => :post, :as => 'do_recover_password'
+      # Invitable
+      if opts.include?(:invitation)
+        authentasaurus_invitable options.dup
+        authentasaurus_invitable_public
       end
+    end
+    
+    # TODO: add documentation here
+    def authentasaurus_sessions(*opts)
+      get     "/sessions/sign-in(.:format)" => "sessions#new", :as => :new_authentasaurus_session
+      post    "/sessions(.:format)" => "sessions#create", :as => :authentasaurus_sessions
+      delete  "/sessions/sign-out(.:format)" => "sessions#destroy", :as => :authentasaurus_session
+      get     "/sessions/no-access(.:format)" => "sessions#no_access", :as => :no_access_authentasaurus_sessions
+    end
+    
+    # TODO: add documentation here
+    def authentasaurus_users(*opts)
+      options = opts.extract_options!
       
-      # TODO: add documentation here
-      def authentasaurus_invitable(*opts)
-        options = opts.extract_options!
-        
-        resources :user_invitations, options.dup.merge({:except => [:show, :edit, :update]})
-      end
+      resources :users, options.dup
+    end
+    
+    # TODO: add documentation here
+    def authentasaurus_authorizable(*opts)
+      options = opts.extract_options!
       
-      def authentasaurus_invitable_public(*opts)
-        options = opts.extract_options!
-        
-        resources :registrations, :only => [:new, :create], :path_prefix => "/:token", :requirements => {:token => /[0-9a-zA-Z]+/}
-      end
+      resources :groups, options.dup
+      resources :areas, options.dup
+      resources :permissions, options.dup
+    end
+    
+    # TODO: add documentation here
+    def authentasaurus_validatable
+      match "/validate" => "validations#validate", :as => 'validate'
+      match "/activate" => "validations#activate", :as => 'activate'
+      match "/resend-validation" => "validations#resend_validation_email", :via => :get, :as => 'recover_password'
+      match "/resend-validation" => "validations#do_resend_validation_email", :via => :post, :as => 'do_recover_password'
+    end
+    
+    # TODO: add documentation here
+    def authentasaurus_invitable(*opts)
+      options = opts.extract_options!
       
-      # TODO: add documentation here
-      def authentasaurus_recoverable      
-        match "/forgot-password" => "recoveries#new", :via => :get, :as => 'forgot_password'
-        match "/forgot-password" => "recoveries#create", :via => :post, :as => 'do_forgot_password'
-        match "/recover-password/:token" => "recoveries#edit", :via => :get, :as => 'recover_password'
-        match "/recover-password/:token" => "recoveries#destroy", :via => :delete, :as => 'do_recover_password'
-      end
+      resources :user_invitations, options.dup.merge({:except => [:show, :edit, :update]})
+    end
+    
+    def authentasaurus_invitable_public(*opts)
+      options = opts.extract_options!
+      
+      resources :registrations, :only => [:new, :create], :path_prefix => "/:token", :requirements => {:token => /[0-9a-zA-Z]+/}
+    end
+    
+    # TODO: add documentation here
+    def authentasaurus_recoverable      
+      match "/forgot-password" => "recoveries#new", :via => :get, :as => 'forgot_password'
+      match "/forgot-password" => "recoveries#create", :via => :post, :as => 'do_forgot_password'
+      match "/recover-password/:token" => "recoveries#edit", :via => :get, :as => 'recover_password'
+      match "/recover-password/:token" => "recoveries#destroy", :via => :delete, :as => 'do_recover_password'
     end
-  end
+  end    
 end

data/lib/authentasaurus/ar/acts_as_authenticatable.rb

@@ -1,13 +1,9 @@
 module Authentasaurus::Ar
   module ActsAsAuthenticatable
-    def self.included(base)
-      base.send :extend, ClassMethods
-      base.send :include, InstanceMethods
-    end
+    extend ActiveSupport::Concern
     
     module ClassMethods
-      
-      case Rails.application.config.authentasaurus[:hashing] 
+      case Authentasaurus::Configuration.instance.hashing
       when "SHA2"
         require 'digest/sha2'
       when "SHA1"
@@ -37,7 +33,7 @@ module Authentasaurus::Ar
       def encrypt_password(password, password_seed)
   			pass_to_hash=password + "Securasaurus" + password_seed
         
-        case Rails.application.config.authentasaurus[:hashing] 
+        case Authentasaurus::Configuration.instance.hashing
         when "SHA2"
           Digest::SHA2.hexdigest(pass_to_hash)
         when "SHA1"
@@ -51,63 +47,61 @@ module Authentasaurus::Ar
       end
     end
     
-    module InstanceMethods
-      def username=(username)      
-        super(username.downcase)
-      end
-      
-      ## Password attribute (used when creating a user)
-      def password
-        return @password
-      end
-      
-      def password=(pwd)
-        @password = pwd
-        return if pwd.blank?
-        create_salt
-        self.hashed_password = self.class.encrypt_password(@password, self.password_seed)
-      end
-      
-      ## New password attribute (used when editing a user)
-      def new_password
-        return @new_password
-      end
-      
-      def new_password=(pwd)
-        @new_password = pwd
-        return if pwd.blank?
-        create_salt
-        self.hashed_password = self.class.encrypt_password(@new_password, self.password_seed)
-      end
-      
-      def activate
-        self.update_attribute :active, true
-      end
-      
-      def deactivate
-        self.update_attribute :active, false
-      end
-      
-      def create_remember_me_token
-        pass_to_hash=Time.now.to_i.to_s + "Securasaurus" + password_seed
-        self.update_attribute :remember_me_token, Digest::SHA1.hexdigest(pass_to_hash)
-        self.remember_me_token
-      end
-      
-      private
-      def new_password_blank? 
-  			self.new_password.blank?
-      end
-      
-  		## Creates password seed (salt)
-      def create_salt
-  			self.password_seed = self.object_id.to_s + rand.to_s
-      end
+    def username=(username)      
+      super(username.downcase)
+    end
       
-  		## Dont delete the last user
-      def dont_delete_admin
-  		  raise "You cannot delete the last admin" if self.id == 1 || User.count == 1
-      end
+    ## Password attribute (used when creating a user)
+    def password
+      return @password
+    end
+    
+    def password=(pwd)
+      @password = pwd
+      return if pwd.blank?
+      create_salt
+      self.hashed_password = self.class.encrypt_password(@password, self.password_seed)
+    end
+    
+    ## New password attribute (used when editing a user)
+    def new_password
+      return @new_password
+    end
+    
+    def new_password=(pwd)
+      @new_password = pwd
+      return if pwd.blank?
+      create_salt
+      self.hashed_password = self.class.encrypt_password(@new_password, self.password_seed)
+    end
+    
+    def activate
+      self.update_attribute :active, true
+    end
+    
+    def deactivate
+      self.update_attribute :active, false
+    end
+    
+    def create_remember_me_token
+      pass_to_hash=Time.now.to_i.to_s + "Securasaurus" + password_seed
+      self.update_attribute :remember_me_token, Digest::SHA1.hexdigest(pass_to_hash)
+      self.remember_me_token
+    end
+    
+    private
+    def new_password_blank? 
+			self.new_password.blank?
+    end
+    
+		## Creates password seed (salt)
+    def create_salt
+			self.password_seed = self.object_id.to_s + rand.to_s
+    end
+    
+		## Dont delete the last user
+    def dont_delete_admin
+		  raise "You cannot delete the last admin" if self.id == 1 || User.count == 1
     end
-  end
+  end  
 end

data/lib/authentasaurus/ar/acts_as_authenticatable_validatable.rb

@@ -1,10 +1,9 @@
 module Authentasaurus::Ar
   module ActsAsAuthenticatableValidatable
-    def self.included(base)
-      base.send :extend, ActsAsAuthenticatable::ClassMethods
-      base.send :include, ActsAsAuthenticatable::InstanceMethods
-      base.send :extend, ClassMethods
-      base.send :include, InstanceMethods
+    extend ActiveSupport::Concern
+    
+    included do      
+      include ActsAsAuthenticatable
     end
     
     module ClassMethods
@@ -23,16 +22,14 @@ module Authentasaurus::Ar
       end
     end
     
-    module InstanceMethods
-      private
-  		def send_validation
-  			unless self.active
-  				validation = self.build_validation(:email => self.email, :validation_code => User.encrypt_password(self.username,self.password_seed))
-  				unless validation.save
-  					raise "Could not create validation record"
-  				end
-  			end
-  		end
+    private
+    def send_validation
+      unless self.active
+				validation = self.build_validation(:email => self.email, :validation_code => User.encrypt_password(self.username,self.password_seed))
+        unless validation.save
+					raise "Could not create validation record"
+        end
+      end
     end
-  end
+  end    
 end

data/lib/authentasaurus/ar/acts_as_overrider.rb

@@ -2,9 +2,7 @@ module Authentasaurus::Ar
   Dir[File.dirname(__FILE__) + '/models/*.rb'].each {|file| require file }
   
   module ActsAsOverrider
-    def self.included(base)
-      base.send :extend, ClassMethods
-    end
+    extend ActiveSupport::Concern    
     
     module ClassMethods
       def acts_as_area        

data/lib/authentasaurus/ar/authenticatable.rb

@@ -1,8 +1,6 @@
 module Authentasaurus::Ar
   module Authenticatable
-    def self.included(base)
-      base.send :extend, ClassMethods
-    end
+    extend ActiveSupport::Concern
     
     module ClassMethods
       def authenticatable(*args)