authentasaurus 0.6.21 → 0.7.3

data/app/models/authentasaurus_emailer.rb

@@ -1,8 +1,8 @@
 class AuthentasaurusEmailer < ActionMailer::Base
   def validation_mail(name, email, validation_code, sent_at = Time.now)
-    subject    AUTHENTASAURUS[:modules][:validatable][:mail_subject]
+    subject    Rails.application.config.authentasaurus[:modules][:validatable][:mail_subject]
     recipients email
-    from       AUTHENTASAURUS[:modules][:validatable][:mail_from]
+    from       Rails.application.config.authentasaurus[:modules][:validatable][:mail_from]
     sent_on    sent_at
     
     body       :name => name, :vcode => validation_code
@@ -10,9 +10,9 @@ class AuthentasaurusEmailer < ActionMailer::Base
   end
   
   def recovery_mail(user, token, sent_at = Time.now)
-    subject    AUTHENTASAURUS[:modules][:recoverable][:mail_subject]
+    subject    Rails.application.config.authentasaurus[:modules][:recoverable][:mail_subject]
     recipients user.email
-    from       AUTHENTASAURUS[:modules][:recoverable][:mail_from] # dont forget to change me
+    from       Rails.application.config.authentasaurus[:modules][:recoverable][:mail_from] # dont forget to change me
     sent_on    sent_at
     
     body       :name => user.name, :token => token
@@ -20,9 +20,9 @@ class AuthentasaurusEmailer < ActionMailer::Base
   end
   
   def invitation_mail(email, token, sent_at = Time.now)
-    subject   AUTHENTASAURUS[:modules][:invitable][:mail_subject]
+    subject   Rails.application.config.authentasaurus[:modules][:invitable][:mail_subject]
     recipients email
-    from       AUTHENTASAURUS[:modules][:invitable][:mail_from]
+    from       Rails.application.config.authentasaurus[:modules][:invitable][:mail_from]
     sent_on    sent_at
     
     body       :token => token

data/app/views/authentasaurus_emailer/invitation_mail.html.erb

@@ -1,4 +1,4 @@
-<p>You've been invited to create an account at <%= AUTHENTASAURUS[:mail][:host] %> follow this <%= link_to "link", new_registrations_url(:host => AUTHENTASAURUS[:mail][:host], :token => @token) %> to respond to the invitation.</p>
+<p>You've been invited to create an account at <%= Rails.application.config.authentasaurus[:mail][:host] %> follow this <%= link_to "link", new_registrations_url(:host => Rails.application.config.authentasaurus[:mail][:host], :token => @token) %> to respond to the invitation.</p>
 
 <p>Best Regards,</p>
-<p><%= AUTHENTASAURUS[:mail][:host] %> Team</p>
+<p><%= Rails.application.config.authentasaurus[:mail][:host] %> Team</p>

data/app/views/authentasaurus_emailer/recovery_mail.html.erb

@@ -1,7 +1,7 @@
 <p>Dear <%= @name %>,</p>
 
 <p>A request has been made to recover your account's password.</p>
-<p>Please visit this <%= link_to "link", recover_password_url(:host => AUTHENTASAURUS[:mail][:host], :token => @token) %> and follow the instructions.</p>
+<p>Please visit this <%= link_to "link", recover_password_url(:host => Rails.application.config.authentasaurus[:mail][:host], :token => @token) %> and follow the instructions.</p>
 
 <p>Best Regards,</p>
-<p><%= AUTHENTASAURUS[:mail][:host] %> Team</p>
+<p><%= Rails.application.config.authentasaurus[:mail][:host] %> Team</p>

data/app/views/authentasaurus_emailer/validation_mail.html.erb

@@ -1,6 +1,6 @@
 <p>Dear <%= @name %>,</p>
 
-<p>Please validate your account at <%= AUTHENTASAURUS[:mail][:host] %> by visiting this <%= link_to "link", activate_url(:host => AUTHENTASAURUS[:mail][:host] , :code => @vcode) %>.</p>
+<p>Please validate your account at <%= Rails.application.config.authentasaurus[:mail][:host] %> by visiting this <%= link_to "link", activate_url(:host => Rails.application.config.authentasaurus[:mail][:host] , :code => @vcode) %>.</p>
 
 <p>Best Regards,</p>
-<p><%= AUTHENTASAURUS[:mail][:host] %> Team</p>
+<p><%= Rails.application.config.authentasaurus[:mail][:host] %> Team</p>

data/lib/action_controller/authorization.rb

@@ -156,7 +156,7 @@ module ActionController::Authorization
       user_model = User if user_model.nil?
       
       if cookies[:remember_me_token]
-        user = user_model.find_by_remember_me_token cookies.signed[:remember_me_token]
+        user = user_model.find_by_remember_me_token cookies[:remember_me_token]
         if user.nil?
           cookies.delete :remember_me_token
           return false

data/lib/active_record/acts_as_authenticatable.rb

@@ -6,7 +6,7 @@ module ActiveRecord::ActsAsAuthenticatable
   
   module ClassMethods
     
-    case AUTHENTASAURUS[:hashing] 
+    case Rails.application.config.authentasaurus[:hashing] 
     when "SHA2"
       require 'digest/sha2'
     when "SHA1"
@@ -36,7 +36,7 @@ module ActiveRecord::ActsAsAuthenticatable
 		def encrypt_password(password, password_seed)
 			pass_to_hash=password + "Securasaurus" + password_seed
 			
-			case AUTHENTASAURUS[:hashing] 
+			case Rails.application.config.authentasaurus[:hashing] 
       when "SHA2"
         Digest::SHA2.hexdigest(pass_to_hash)
       when "SHA1"

data/lib/active_record/authenticatable.rb

@@ -14,7 +14,7 @@ module ActiveRecord::Authenticatable
       # basic attributes
       validates_presence_of :username, :hashed_password, :password_seed, :email, :name
       validates_uniqueness_of :username, :email
-      validates_format_of :username, :with => /^[a-z0-9]*([a-z0-9_-]{4})+[a-z0-9_-]*[a-z0-9]*$/ # alpha-numeric only and at least 4 characters
+      validates_format_of :username, :with => /^[a-z0-9]*([a-z0-9]{4})+[a-z0-9]*$/ # alpha-numeric only and at least 4 characters
       validates_format_of :email, :with => %r{[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}}
       # password validations
       validates_confirmation_of :password, :on => :create, :if => Proc.new {|user| user.hashed_password.nil? || user.password_seed.nil? }

data/lib/active_resource/authenticatable.rb

@@ -11,10 +11,10 @@ module ActiveResource::Authenticatable
       self.unloadable
       options = args.extract_options!
       
-      self.site = options[:site] || AUTHENTASAURUS[:modules][:remote][self.name.underscore.gsub(/_sync/, "").to_sym][:site]
-      self.element_name = options[:session_element].try(:to_s) || AUTHENTASAURUS[:modules][:remote][self.name.underscore.gsub(/_sync/, "").to_sym][:session_element]
-      self.sync = options[:sync] || AUTHENTASAURUS[:modules][:remote][self.name.underscore.gsub(/_sync/, "").to_sym][:sync]
-      self.sync_to = options[:sync_to].try(:to_s).try(:camelize).try(:constantize) || AUTHENTASAURUS[:modules][:remote][self.name.underscore.gsub(/_sync/, "").to_sym][:sync_to].camelize.constantize
+      self.site = options[:site] || Rails.application.config.authentasaurus[:modules][:remote][self.name.underscore.gsub(/_sync/, "").to_sym][:site]
+      self.element_name = options[:session_element].try(:to_s) || Rails.application.config.authentasaurus[:modules][:remote][self.name.underscore.gsub(/_sync/, "").to_sym][:session_element]
+      self.sync = options[:sync] || Rails.application.config.authentasaurus[:modules][:remote][self.name.underscore.gsub(/_sync/, "").to_sym][:sync]
+      self.sync_to = options[:sync_to].try(:to_s).try(:camelize).try(:constantize) || Rails.application.config.authentasaurus[:modules][:remote][self.name.underscore.gsub(/_sync/, "").to_sym][:sync_to].camelize.constantize
       
     
       # include authentication methods

data/lib/authentasaurus.rb

@@ -1,21 +1,65 @@
 module Authentasaurus
-  def self.evaluate_method(method, *args, &block)
-    case method
-      when Symbol
-        object = args.shift
-        object.send(method, *args, &block)
-      when String
-        eval(method, args.first.instance_eval { binding })
-      when Proc, Method
-        method.call(*args, &block)
-      else
-        if method == true || method == false
-          return method
-        else
-          raise ArgumentError,
-            "Callbacks must be a symbol denoting the method to call, a string to be evaluated, " +
-            "a block to be invoked, or a condition."
-        end
+  # NEVER EVER REMOVE THIS !!!
+  require 'authentasaurus/railtie' if defined?(Rails)
+  # Controller stubs
+  require 'authentasaurus/areas_controller' if defined?(ActionController)
+  require 'authentasaurus/groups_controller' if defined?(ActionController)
+  require 'authentasaurus/permissions_controller' if defined?(ActionController)
+  require 'authentasaurus/recoveries_controller' if defined?(ActionController)
+  require 'authentasaurus/registrations_controller' if defined?(ActionController)
+  require 'authentasaurus/sessions_controller' if defined?(ActionController)
+  require 'authentasaurus/user_invitations_controller' if defined?(ActionController)
+  require 'authentasaurus/users_controller' if defined?(ActionController)
+  require 'authentasaurus/validations_controller' if defined?(ActionController)
+  # Model stubs
+  require 'authentasaurus/models/area' if defined?(ActiveRecord)
+  require 'authentasaurus/models/group' if defined?(ActiveRecord)
+  require 'authentasaurus/models/permission' if defined?(ActiveRecord)
+  require 'authentasaurus/models/recovery' if defined?(ActiveRecord)
+  require 'authentasaurus/models/session' if defined?(ActiveRecord)
+  require 'authentasaurus/models/user_invitation' if defined?(ActiveRecord)
+  require 'authentasaurus/models/validation' if defined?(ActiveRecord)
+  # Overriders ^^
+  require 'action_controller/authorization'
+  require 'action_view/authorization'  
+  require 'active_record/authenticatable'  
+  require 'active_resource/authenticatable'
+  require 'helpers/migrations'
+  require 'helpers/routing'  
+  
+  if defined?(ActionController)
+    class ActionController::Base
+      include ActionController::Authorization
+    end
+    
+    class ActionView::Base
+      include ActionView::Authorization
+    end
+    
+    class ActionDispatch::Routing::Mapper
+      include Routing
+    end
+  end
+  
+  if defined?(ActiveRecord)
+    class ActiveRecord::Base
+      include ActiveRecord::Authenticatable
+    end
+    
+    class ActiveRecord::ConnectionAdapters::AbstractAdapter
+      include Migrations::Tables
+    end
+    
+    class ActiveRecord::ConnectionAdapters::TableDefinition
+      include Migrations::Columns
+    end
+  end
+  
+  if defined?(ActiveResource)
+    class ActiveResource::Base
+      class_inheritable_accessor :sync, :sync_to
+      include ActiveResource::Authenticatable
     end
   end
+
 end

data/lib/authentasaurus/models/area.rb

@@ -1,19 +1,21 @@
-module Authentasaurus::Models::Area
-  def self.included(base) # :nodoc:
-    base.send :extend, ClassMethods
-    base.send :include, InstanceMethods
+module Authentasaurus::Models
+  module Area
+    def self.included(base) # :nodoc:
+      base.send :extend, ClassMethods
+      base.send :include, InstanceMethods
+      
+      base.send :unloadable
+      
+      base.send :has_many, :permissions, :dependent => :destroy
+      base.send :has_many, :groups, :through => :permissions
+      
+      base.send :validates_presence_of, :name
+    end
     
-    base.send :unloadable
+    module ClassMethods
+    end
     
-    base.send :has_many, :permissions, :dependent => :destroy
-    base.send :has_many, :groups, :through => :permissions
-    
-    base.send :validates_presence_of, :name
-  end
-  
-  module ClassMethods
-  end
-  
-  module InstanceMethods
+    module InstanceMethods
+    end
   end
 end

data/lib/authentasaurus/models/group.rb

@@ -1,17 +1,19 @@
-module Authentasaurus::Models::Group
-  def self.included(base) # :nodoc:
-    base.send :extend, ClassMethods
-    base.send :include, InstanceMethods
+module Authentasaurus::Models
+  module Group
+    def self.included(base) # :nodoc:
+      base.send :extend, ClassMethods
+      base.send :include, InstanceMethods
+      
+      base.send :has_many, :permissions, :dependent => :destroy
+      base.send :has_many, :areas, :through => :permissions
+      
+      base.send :validates_presence_of, :name
+    end
     
-    base.send :has_many, :permissions, :dependent => :destroy
-    base.send :has_many, :areas, :through => :permissions
+    module ClassMethods
+    end
     
-    base.send :validates_presence_of, :name
-  end
-  
-  module ClassMethods
-  end
-  
-  module InstanceMethods
+    module InstanceMethods
+    end
   end
 end

data/lib/authentasaurus/models/permission.rb

@@ -1,22 +1,24 @@
-module Authentasaurus::Models::Permission
-  def self.included(base) # :nodoc:
-    base.send :extend, ClassMethods
-    base.send :include, InstanceMethods
+module Authentasaurus::Models
+  module Permission
+    def self.included(base) # :nodoc:
+      base.send :extend, ClassMethods
+      base.send :include, InstanceMethods
+      
+      base.send :unloadable
+      
+      base.send :belongs_to, :group
+      base.send :belongs_to, :area
+      
+      # Check that everything is there
+      base.send :validates_presence_of, :group_id, :area_id
+      # Check foreign keys
+      base.send :validates_associated, :group, :area
+    end
     
-    base.send :unloadable
+    module ClassMethods
+    end
     
-    base.send :belongs_to, :group
-    base.send :belongs_to, :area
-  
-    # Check that everything is there
-    base.send :validates_presence_of, :group_id, :area_id
-    # Check foreign keys
-    base.send :validates_associated, :group, :area
-  end
-  
-  module ClassMethods
-  end
-  
-  module InstanceMethods
+    module InstanceMethods
+    end
   end
 end

data/lib/authentasaurus/models/recovery.rb

@@ -1,35 +1,37 @@
-module Authentasaurus::Models::Recovery
-  def self.included(base) # :nodoc:
-    base.send :extend, ClassMethods
-    base.send :include, InstanceMethods
+module Authentasaurus::Models
+  module Recovery
+    def self.included(base) # :nodoc:
+      base.send :extend, ClassMethods
+      base.send :include, InstanceMethods
+      
+      base.send :require, "digest/sha1"
+      
+      base.send :unloadable
+      
+      base.send :belongs_to, :user
+      
+    	base.send :before_validation_on_create, :make_token!
+    	base.send :before_save, :send_recovery
+      
+    	base.send :named_scope, :valid, lambda { { :conditions => ["updated_at <= ?", Rails.application.config.authentasaurus[: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}}
+    end
     
-    base.send :require, "digest/sha1"
+    module ClassMethods
+    end
     
-    base.send :unloadable
-    
-    base.send :belongs_to, :user
-	
-  	base.send :before_validation_on_create, :make_token!
-  	base.send :before_save, :send_recovery
-  	
-  	base.send :named_scope, :valid, lambda { { :conditions => ["updated_at <= ?", AUTHENTASAURUS[: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}}
-  end
-  
-  module ClassMethods
-  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 AUTHENTASAURUS[:modules][:recoverable][:send_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
+    end
   end
-end
+end

data/lib/authentasaurus/models/session.rb

@@ -1,71 +1,78 @@
 # This class represents a session model, a session authenticates a username and a password.
 #
 # A session behaves just like an ActiveRecord model
-module Authentasaurus::Models::Session
-  def self.included(base) # :nodoc:
-    base.send :extend, ClassMethods
-    base.send :include, InstanceMethods
-    
-    base.send :attr_accessor, :username, :password, :remember
-    base.send :attr_accessor, :errors
-    base.send :attr_reader, :user
-  end
-  
-  module ClassMethods
-    # Takes a hash of attributes keys and values just like new and authenticates the information.
-    # Returns true or false
-    def create(*attrs)
-      attributes = attrs.extract_options!
-      attrs = attrs.flatten
-      self_obj = self.new attributes
-      self_obj.save(attrs)
-      return self_obj
+module Authentasaurus::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
+      
+      base.send :attr_accessor, :username, :password, :remember
+      base.send :validates_presence_of, :username, :password
+      base.send :attr_reader, :user
     end
     
-    # Takes an id (usually from an ActiveController session) and returns a User object
-    def current_user(id, session_type = :user)
-      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)
-      self.errors = ActiveRecord::Errors.new(self)
-      if attributes
-        attributes.each do |key,value|
-          send(key.to_s + '=', value)
-        end
-      else
-        self.remember = false
+    module ClassMethods
+      # Takes a hash of attributes keys and values just like new and authenticates the information.
+      # Returns true or false
+      def create(*attrs)
+        attributes = attrs.extract_options!
+        attrs = attrs.flatten
+        self_obj = self.new attributes
+        self_obj.save(attrs)
+        return self_obj
+      end
+      
+      # Takes an id (usually from an ActiveController session) and returns a User object
+      def current_user(id, session_type = :user)
+        session_type.to_s.camelize.constantize.find id
       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]
+    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
       
-      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
+      # 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
         end
+        ret
+      end
+      
+      def new_record? #:nodoc:
+        true
+      end
+      
+      def persisted? #:nodoc:
+        false
       end
-      ret
-    end
-    
-    def new_record? #:nodoc:
-      true
     end
   end
 end