authentasaurus 0.8.4 → 0.8.6

data/CHANGELIST

@@ -1,3 +1,7 @@
-=Version 0.4.14 > 0.5.4
+=Version 0.8.4 > 0.8.5
 
-* Improved inheritance of models by adding _model to all models in the libs folder
+* Convert mixins to use ActiveSupport::Concern
+* Improved configuration access
+* Added user_model option to specify the default user model application wide
+* Changed views generator template path to app instead of lib/generators/authentasaurus/views/templates
+* Prefixed session model and routes with authentasaurus to avoid name collisions

data/TODO

@@ -1,6 +1,8 @@
 * Integrate with ActiveModel instead of ActiveRecord
 * Complete documentation
+* Add HAML support
 --
+* Convert mixins to use ActiveSupport::Concern [DONE]
 * Update views to use the new flash convention [DONE]
   * flash[:notice] for information messages [DONE]
   * flash[:alert] for error messages [DONE]

data/app/controllers/sessions_controller.rb

@@ -1,3 +1,3 @@
 class SessionsController < ApplicationController
   acts_as_sessions
-end
+end

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    Rails.application.config.authentasaurus[:modules][:validatable][:mail_subject]
+    subject    Authentasaurus::Configuration.instance.configuration[:modules][:validatable][:mail_subject]
     recipients email
-    from       Rails.application.config.authentasaurus[:modules][:validatable][:mail_from]
+    from       Authentasaurus::Configuration.instance.configuration[: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    Rails.application.config.authentasaurus[:modules][:recoverable][:mail_subject]
+    subject    Authentasaurus::Configuration.instance.configuration[:modules][:recoverable][:mail_subject]
     recipients user.email
-    from       Rails.application.config.authentasaurus[:modules][:recoverable][:mail_from] # dont forget to change me
+    from       Authentasaurus::Configuration.instance.configuration[: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   Rails.application.config.authentasaurus[:modules][:invitable][:mail_subject]
+    subject   Authentasaurus::Configuration.instance.configuration[:modules][:invitable][:mail_subject]
     recipients email
-    from       Rails.application.config.authentasaurus[:modules][:invitable][:mail_from]
+    from       Authentasaurus::Configuration.instance.configuration[:modules][:invitable][:mail_from]
     sent_on    sent_at
     
     body       :token => token

data/app/models/{session.rb → authentasaurus_session.rb}

@@ -1,3 +1,3 @@
-class Session
+class AuthentasaurusSession
   include Authentasaurus::Ar::Models::Session
 end

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

@@ -1,4 +1,4 @@
-<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>You've been invited to create an account at <%= Authentasaurus::Configuration.instance.configuration[:mail][:host] %> follow this <%= link_to "link", new_registrations_url(:host => Authentasaurus::Configuration.instance.configuration[:mail][:host], :token => @token) %> to respond to the invitation.</p>
 
 <p>Best Regards,</p>
-<p><%= Rails.application.config.authentasaurus[:mail][:host] %> Team</p>
+<p><%= Authentasaurus::Configuration.instance.configuration[: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 => Rails.application.config.authentasaurus[:mail][:host], :token => @token) %> and follow the instructions.</p>
+<p>Please visit this <%= link_to "link", recover_password_url(:host => Authentasaurus::Configuration.instance.configuration[:mail][:host], :token => @token) %> and follow the instructions.</p>
 
 <p>Best Regards,</p>
-<p><%= Rails.application.config.authentasaurus[:mail][:host] %> Team</p>
+<p><%= Authentasaurus::Configuration.instance.configuration[: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 <%= 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>Please validate your account at <%= Authentasaurus::Configuration.instance.configuration[:mail][:host] %> by visiting this <%= link_to "link", activate_url(:host => Authentasaurus::Configuration.instance.configuration[:mail][:host] , :code => @vcode) %>.</p>
 
 <p>Best Regards,</p>
-<p><%= Rails.application.config.authentasaurus[:mail][:host] %> Team</p>
+<p><%= Authentasaurus::Configuration.instance.configuration[:mail][:host] %> Team</p>

data/lib/authentasaurus.rb

@@ -1,5 +1,6 @@
 module Authentasaurus  
-  require 'authentasaurus/railtie' if defined?(Rails) # NEVER EVER REMOVE THIS LINE !!!
+  require 'authentasaurus/configuration'
+  require 'authentasaurus/railtie' #if defined?(Rails) # NEVER EVER REMOVE THIS LINE !!!  
   # Authorization Helpers
   require 'authentasaurus/authorization'
   # Controllers, Views and Routes helpers
@@ -9,6 +10,9 @@ module Authentasaurus
   require 'authentasaurus/ar/acts_as_overrider'
   require 'authentasaurus/ar/authenticatable'
   require 'authentasaurus/ar/migrations'
+  require 'authentasaurus/ar/acts_as_authenticatable'
+  require 'authentasaurus/ar/acts_as_authenticatable_validatable'
+  require 'authentasaurus/arel/acts_as_authenticatable'
   # ActiveResource Helpers
   require 'authentasaurus/arel/authenticatable'
   

data/lib/authentasaurus/ac/acts_as_overrider.rb

@@ -1,10 +1,8 @@
-module Authentasaurus::Ac
+module Authentasaurus::Ac  
   Dir[File.dirname(__FILE__) + '/controllers/*.rb'].each {|file| require file }
   
   module ActsAsOverrider
-    def self.included(base)
-      base.send :extend, ClassMethods
-    end
+    extend ActiveSupport::Concern    
     
     module ClassMethods      
       def acts_as_areas
@@ -27,7 +25,10 @@ module Authentasaurus::Ac
         include Authentasaurus::Ac::Controllers::RegistrationsController
       end
       
-      def acts_as_sessions
+      def acts_as_sessions(user_model = nil)        
+        cattr_accessor :user_model
+        self.user_model = user_model || Authentasaurus::Configuration.instance.user_model.to_sym
+        
         include Authentasaurus::Ac::Controllers::SessionsController
       end
       

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

@@ -1,80 +1,75 @@
 module Authentasaurus::Ac::Controllers
   module AreasController
-    def self.included(base) # :nodoc:
-      base.send :extend, ClassMethods
-      base.send :include, InstanceMethods
-    end
+    extend ActiveSupport::Concern    
     
     module ClassMethods
     end
-    
-    module InstanceMethods
-      def index
-        @areas= Area.find :all
         
-    		respond_to do |format|
-          format.html
-        end
+    def index
+      @areas= Area.find :all
+      
+      respond_to do |format|
+        format.html
       end
+    end
+    
+    def show
+      @area = Area.find params[:id]
       
-    	def show
-        @area = Area.find params[:id]
-        
-    		respond_to do |format|
-          format.html
-        end
+      respond_to do |format|
+        format.html
       end
+    end
+    
+    def new
+      @area = Area.new
       
-    	def new
-        @area = Area.new
-        
-    		respond_to do |format|
-          format.html
-        end
+      respond_to do |format|
+        format.html
       end
+    end
+    
+    def create
+      @area = Area.new params[:area]
       
-    	def create
-        @area = Area.new params[:area]
-        
-    		respond_to do |format|
-    			if @area.save
-            format.html { redirect_to :action=>:index, :notice => "Area Created" }
-          else
-            flash.now[:alert] = I18n.t(:create_failed, :scope => [:authentasaurus, :messages, :areas])
-            format.html { render :new }
-          end
+      respond_to do |format|
+        if @area.save
+          format.html { redirect_to :action=>:index, :notice => "Area Created" }
+        else
+          flash.now[:alert] = I18n.t(:create_failed, :scope => [:authentasaurus, :messages, :areas])
+          format.html { render :new }
         end
       end
+    end
+    
+    def edit
+      @area = Area.find params[:id]
       
-    	def edit
-        @area = Area.find params[:id]
-        
-    		respond_to do |format|
-          format.html
-        end
+      respond_to do |format|
+        format.html
       end
+    end
+    
+    def update
+      @area = Area.find params[:id]
       
-    	def update
-        @area = Area.find params[:id]
-        
-    		respond_to do |format|
-    			if @area.update_attributes(params[:area])
-            format.html { redirect_to :action => :index, :notice => "Area updated" }
-          else
-            flash.now[:alert] = I18n.t(:update_failed, :scope => [:authentasaurus, :messages, :areas])
-            format.html { render :edit }
-          end
+      respond_to do |format|
+        if @area.update_attributes(params[:area])
+          format.html { redirect_to :action => :index, :notice => "Area updated" }
+        else
+          flash.now[:alert] = I18n.t(:update_failed, :scope => [:authentasaurus, :messages, :areas])
+          format.html { render :edit }
         end
       end
+    end
+    
+    def destroy
+      @area = Area.find params[:id]
+      @area.destroy
       
-    	def destroy
-        @area = Area.find params[:id]
-        @area.destroy
-        
-    		respond_to do |format|
-          format.html { redirect_to :action=>:index }
-        end
+      respond_to do |format|
+        format.html { redirect_to :action=>:index }
       end
     end
-  end
+  end    
 end

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

@@ -1,81 +1,77 @@
 module Authentasaurus::Ac::Controllers
   module GroupsController
-    def self.included(base) # :nodoc:
-      base.send :extend, ClassMethods
-      base.send :include, InstanceMethods
-    end
+    extend ActiveSupport::Concern
     
     module ClassMethods
     end
     
-    module InstanceMethods
-      def index
-        @groups = Group.find :all
-        
-    		respond_to do |format|
-          format.html
-        end
+    
+    def index
+      @groups = Group.find :all
+      
+      respond_to do |format|
+        format.html
       end
+    end
+    
+    def show
+      @group = Group.find params[:id]
       
-    	def show
-        @group = Group.find params[:id]
-        
-    		respond_to do |format|
-          format.html
-        end
+      respond_to do |format|
+        format.html
       end
+    end
+    
+    def new
+      @group = Group.new
       
-    	def new
-        @group = Group.new
-        
-    		respond_to do |format|
-          format.html
-        end
+      respond_to do |format|
+        format.html
       end
+    end
+    
+    def create
+      @group = Group.new params[:group]
       
-    	def create
-        @group = Group.new params[:group]
-        
-    		respond_to do |format|
-    			if @group.save
-            format.html { redirect_to :action=>:index, :notice => "Group created" }
-          else
-            flash.now[:alert] = I18n.t(:create_failed, :scope => [:authentasaurus, :messages, :groups])
-            format.html { render :new }
-          end
+      respond_to do |format|
+        if @group.save
+          format.html { redirect_to :action=>:index, :notice => "Group created" }
+        else
+          flash.now[:alert] = I18n.t(:create_failed, :scope => [:authentasaurus, :messages, :groups])
+          format.html { render :new }
         end
       end
+    end
+    
+    def edit
+      @group = Group.find params[:id]
       
-    	def edit
-        @group = Group.find params[:id]
-        
-    		respond_to do |format|
-          format.html
-        end
+      respond_to do |format|
+        format.html
       end
+    end
+    
+    def update
+      @group = Group.find params[:id]
       
-    	def update
-        @group = Group.find params[:id]
-        
-    		respond_to do |format|
-    			if @group.update_attributes(params[:group])
-            format.html { redirect_to :action => :index, :notice => "Group updated" }
-          else
-            flash.now[:alert] = I18n.t(:update_failed, :scope => [:authentasaurus, :messages, :groups])
-            format.html { render :edit }
-          end
+      respond_to do |format|
+        if @group.update_attributes(params[:group])
+          format.html { redirect_to :action => :index, :notice => "Group updated" }
+        else
+          flash.now[:alert] = I18n.t(:update_failed, :scope => [:authentasaurus, :messages, :groups])
+          format.html { render :edit }
         end
-        
       end
       
-    	def destroy
-        @group = Group.find params[:id]
-        @group.destroy
-        
-    		respond_to do |format|
-          format.html { redirect_to :action=>:index }
-        end	
-      end
     end
-  end
+    
+    def destroy
+      @group = Group.find params[:id]
+      @group.destroy
+      
+      respond_to do |format|
+        format.html { redirect_to :action=>:index }
+      end	
+    end
+  end    
 end

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

@@ -1,80 +1,75 @@
 module Authentasaurus::Ac::Controllers
   module PermissionsController
-    def self.included(base) # :nodoc:
-      base.send :extend, ClassMethods
-      base.send :include, InstanceMethods
-    end
+    extend ActiveSupport::Concern
     
     module ClassMethods
     end
-    
-    module InstanceMethods
-      def index
-    		@permissions = Permission.find :all
         
-        respond_to do |format|
-    			format.html
-        end
+    def index
+      @permissions = Permission.find :all
+      
+      respond_to do |format|
+  			format.html
       end
+    end
+    
+    def show
+  		@permission = Permission.find params[:id]
       
-      def show
-    		@permission = Permission.find params[:id]
-        
-        respond_to do |format|
-    			format.html
-        end
+      respond_to do |format|
+  			format.html
       end
+    end
+    
+    def new
+  		@permission = Permission.new
       
-      def new
-    		@permission = Permission.new
-        
-        respond_to do |format|
-    			format.html
-        end
+      respond_to do |format|
+  			format.html
       end
+    end
+    
+    def create
+  		@permission = Permission.new params[:permission]
       
-      def create
-    		@permission = Permission.new params[:permission]
-        
-        respond_to do |format|
-          if @permission.save
-    				format.html { redirect_to :action=>:index, :notice => "Permission created" }
-          else
-    				flash.now[:alert] = I18n.t(:create_failed, :scope => [:authentasaurus, :messages, :permissions])
-    				format.html { render :new }
-          end
+      respond_to do |format|
+        if @permission.save
+  				format.html { redirect_to :action=>:index, :notice => "Permission created" }
+        else
+  				flash.now[:alert] = I18n.t(:create_failed, :scope => [:authentasaurus, :messages, :permissions])
+  				format.html { render :new }
         end
       end
+    end
+    
+    def edit
+  		@permission = Permission.find params[:id]
       
-      def edit
-    		@permission = Permission.find params[:id]
-        
-        respond_to do |format|
-    			format.html
-        end
+      respond_to do |format|
+  			format.html
       end
+    end
+    
+    def update
+  		@permission = Permission.find params[:id]
       
-      def update
-    		@permission = Permission.find params[:id]
-        
-        respond_to do |format|
-          if @permission.update_attributes(params[:permission])
-    				flash.now[:notice] = "Permission updated"
-    				format.html { redirect_to :action => :index }
-          else
-    				flash.now[:alert] = I18n.t(:update_failed, :scope => [:authentasaurus, :messages, :permissions])
-    				format.html { render :edit }
-          end
+      respond_to do |format|
+        if @permission.update_attributes(params[:permission])
+  				flash.now[:notice] = "Permission updated"
+  				format.html { redirect_to :action => :index }
+        else
+  				flash.now[:alert] = I18n.t(:update_failed, :scope => [:authentasaurus, :messages, :permissions])
+  				format.html { render :edit }
         end
       end
+    end
+    
+    def destroy
+  		@permission = Permission.find params[:id]
+  		@permission.destroy
       
-      def destroy
-    		@permission = Permission.find params[:id]
-    		@permission.destroy
-        
-        respond_to do |format|
-    			format.html { redirect_to :action=>:index }
-        end
+      respond_to do |format|
+  			format.html { redirect_to :action=>:index }
       end
     end
   end