authentasaurus 0.8.4 → 0.8.6

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

@@ -1,72 +1,67 @@
 module Authentasaurus::Ac::Controllers
   module RecoveriesController
-    def self.included(base) # :nodoc:
-      base.send :extend, ClassMethods
-      base.send :include, InstanceMethods
-    end
+    extend ActiveSupport::Concern
     
     module ClassMethods
     end
-    
-    module InstanceMethods
-      def new
-        @recovery = Recovery.new
         
-        respond_to do |format|
-          format.html
-        end
+    def new
+      @recovery = Recovery.new
+      
+      respond_to do |format|
+        format.html
       end
+    end
+    
+    def create
+      @recovery = Recovery.find_or_initialize_by_email :email => params[:email]
       
-      def create
-        @recovery = Recovery.find_or_initialize_by_email :email => params[:email]
-        
-        if @recovery.new_record?
-          @recovery.user = User.find_by_email @recovery.email
-        end
-        
-        respond_to do |format|
-          if @recovery.save
-            @recovery.touch
-            format.html { redirect_to new_session_path, :notice => t(:recovery_email_sent, :scope => [:authentasaurus, :messages, :recoveries], :email => @recovery.email) }
-          else
-            format.html {render :new}
-          end
-        end  
+      if @recovery.new_record?
+        @recovery.user = User.find_by_email @recovery.email
       end
       
-      def edit
-        @recovery = Recovery.valid.find_by_token(params[:token])
-        
-        respond_to do |format|
-          unless @recovery.nil?
-    	    	@user = @recovery.user
-    	    	format.html
-          else
-    	    	format.html { redirect_to new_session_path, :alert => t(:recovery_failed, :scope => [:authentasaurus, :messages, :recoveries], :email => params[:email]) }
-          end
+      respond_to do |format|
+        if @recovery.save
+          @recovery.touch
+          format.html { redirect_to new_authentasaurus_session_path, :notice => t(:recovery_email_sent, :scope => [:authentasaurus, :messages, :recoveries], :email => @recovery.email) }
+        else
+          format.html {render :new}
+        end
+      end  
+    end
+    
+    def edit
+      @recovery = Recovery.valid.find_by_token(params[:token])
+      
+      respond_to do |format|
+        unless @recovery.nil?
+  	    	@user = @recovery.user
+  	    	format.html
+        else
+  	    	format.html { redirect_to new_authentasaurus_session_path, :alert => t(:recovery_failed, :scope => [:authentasaurus, :messages, :recoveries], :email => params[:email]) }
         end
       end
+    end
+    
+    def destroy
+      @recovery = Recovery.find_by_token params[:token]
+      @user = @recovery.user
       
-      def destroy
-        @recovery = Recovery.find_by_token params[:token]
-        @user = @recovery.user
-        
-        respond_to do |format|
-    			empty_fields = params[:user].select { |key, value| value.blank? }
-          if !empty_fields.empty?
-            empty_fields.each do |f|
-    					@user.errors.add_to_base t(:recovery_field_blank, :scope => [:authentasaurus, :messages, :recoveries], :field => f.first.humanize)
-            end
-    				format.html { render :edit }
-          elsif @user.update_attributes params[:user]
-    				@recovery.destroy
-    				format.html { redirect_to new_session_path, :notice => t(:recovery_successful, :scope => [:authentasaurus, :messages, :recoveries], :email => params[:email]) }
-          else
-    			  flash.now[:alert] = t(:recovery_failed, :scope => [:authentasaurus, :messages, :recoveries],  :email => params[:email])
-    				format.html { render :edit }
+      respond_to do |format|
+  			empty_fields = params[:user].select { |key, value| value.blank? }
+        if !empty_fields.empty?
+          empty_fields.each do |f|
+  					@user.errors.add_to_base t(:recovery_field_blank, :scope => [:authentasaurus, :messages, :recoveries], :field => f.first.humanize)
           end
+  				format.html { render :edit }
+        elsif @user.update_attributes params[:user]
+  				@recovery.destroy
+  				format.html { redirect_to new_authentasaurus_session_path, :notice => t(:recovery_successful, :scope => [:authentasaurus, :messages, :recoveries], :email => params[:email]) }
+        else
+  			  flash.now[:alert] = t(:recovery_failed, :scope => [:authentasaurus, :messages, :recoveries],  :email => params[:email])
+  				format.html { render :edit }
         end
       end
     end
-  end
+  end  
 end

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

@@ -1,43 +1,38 @@
 module Authentasaurus::Ac::Controllers
   module RegistrationsController
-    def self.included(base) # :nodoc:
-      base.send :extend, ClassMethods
-      base.send :include, InstanceMethods
-    end
+    extend ActiveSupport::Concern
     
     module ClassMethods
     end
-    
-    module InstanceMethods
-      def new
-        @user = User.new
-        @user_invitation = UserInvitation.find_by_token params[:token]
         
-        respond_to do |format|
-          if @user_invitation.nil?
-            format.html {redirect_to new_session_path, :alert => t(:invalid_invitation_token, :scope => [:authentasaurus, :messages, :user_invitations])}
-          else
-            @user.email = @user_invitation.email
-            format.html
-          end
+    def new
+      @user = User.new
+      @user_invitation = UserInvitation.find_by_token params[:token]
+      
+      respond_to do |format|
+        if @user_invitation.nil?
+          format.html {redirect_to new_authentasaurus_session_path, :alert => t(:invalid_invitation_token, :scope => [:authentasaurus, :messages, :user_invitations])}
+        else
+          @user.email = @user_invitation.email
+          format.html
         end
       end
+    end
+    
+    def create
+      @user = User.new params[:user]
+      user_invitation = UserInvitation.find_by_token params[:token]
       
-      def create
-        @user = User.new params[:user]
-        user_invitation = UserInvitation.find_by_token params[:token]
-        
-        respond_to do |format|
-          unless user_invitation.nil?
-            if @user.save
-              format.html {redirect_to new_session_path}
-            else
-              format.html {render :new}
-            end
+      respond_to do |format|
+        unless user_invitation.nil?
+          if @user.save
+            format.html {redirect_to new_authentasaurus_session_path}
           else
-            flash.now[:alert] = t(:invalid_invitation_token, :scope => [:authentasaurus, :messages, :user_invitations])
             format.html {render :new}
           end
+        else
+          flash.now[:alert] = t(:invalid_invitation_token, :scope => [:authentasaurus, :messages, :user_invitations])
+          format.html {render :new}
         end
       end
     end

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

@@ -1,58 +1,57 @@
 module Authentasaurus::Ac::Controllers
   module SessionsController
-    def self.included(base) # :nodoc:
-      base.send :extend, ClassMethods
-      base.send :include, InstanceMethods
-      
-      base.send :before_filter, :check_is_logged_in, :except => [:destroy, :no_access]
+    extend ActiveSupport::Concern
+    
+    included do      
+      before_filter :check_is_logged_in, :except => [:destroy, :no_access]      
     end
     
     module ClassMethods
     end
-    
-    module InstanceMethods
-      def new
-        @session = Session.new
         
-        respond_to do |format|
-          format.html
-        end
+    def new
+      @session = AuthentasaurusSession.new
+      
+      respond_to do |format|
+        format.html
       end
+    end
+    
+    def create
+      @session = AuthentasaurusSession.new params[:authentasaurus_session]
       
-      def create
-        @session = Session.new params[:session]
-        
-        respond_to do |format|
-          if @session.save
-            if @session.remember == "1"
-              cookies.signed.permanent[:remember_me_token] = @session.user.remember_me_token
-            end
-            session[:user_id] = @session.user.id
+      respond_to do |format|
+        if @session.save(self.class.user_model)
+          if @session.remember == "1"
+            cookies.signed.permanent[:remember_me_token] = @session.user.remember_me_token
+          end
+          session[:user_id] = @session.user.id
+          if @session.user.respond_to?(:permissions)
             session[:user_permissions] =   {:read => @session.user.permissions.collect{|per| per.area.name if per.read}, :write => @session.user.permissions.collect{|per| per.area.name if per.write}}
-            format.html { redirect_to session[:original_url] || (defined?(signin_redirect_path).nil? ?  root_path : signin_redirect_path) }
-          else
-            format.html { render :action => :new }
           end
+          format.html { redirect_to session[:original_url] || (defined?(authentasaurus_signin_redirect_path).nil? ?  root_path : authentasaurus_signin_redirect_path) }
+        else
+          format.html { render :action => :new }
         end
-        
       end
       
-      def destroy
-        session[:user_id] = nil
-        session[:user_permissions] = nil
-        cookies.delete :remember_me_token
-        
-        respond_to do |format|
-          format.html { redirect_to :action => :new }
-        end
-      end
+    end
+    
+    def destroy
+      session[:user_id] = nil
+      session[:user_permissions] = nil
+      cookies.delete :remember_me_token
       
-      private
-      def check_is_logged_in
-        if is_logged_in?
-          redirect_to defined?(signin_redirect_path).nil? ?  root_path : signin_redirect_path
-        end
+      respond_to do |format|
+        format.html { redirect_to :action => :new }
+      end
+    end
+    
+    private
+    def check_is_logged_in
+      if is_logged_in?
+        redirect_to defined?(authentasaurus_signin_redirect_path).nil? ?  root_path : authentasaurus_signin_redirect_path
       end
     end
-  end
+  end  
 end

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

@@ -1,50 +1,45 @@
 module Authentasaurus::Ac::Controllers
   module UserInvitationsController
-    def self.included(base) # :nodoc:
-      base.send :extend, ClassMethods
-      base.send :include, InstanceMethods
-    end
+    extend ActiveSupport::Concern
     
     module ClassMethods
     end
-    
-    module InstanceMethods
-      def index
-        @invitations = UserInvitation.find :all
         
-        respond_to do |format|
-          format.html
-        end
-      end
+    def index
+      @invitations = UserInvitation.find :all
       
-      def new
-        @invitation = UserInvitation.new
-        
-        respond_to do |format|
-          format.html
-        end
+      respond_to do |format|
+        format.html
       end
+    end
+    
+    def new
+      @invitation = UserInvitation.new
       
-      def create
-        @invitation = UserInvitation.new params[:user_invitation]
-        
-        respond_to do |format|
-          if @invitation.save
-            format.html { redirect_to :action => :index }
-          else
-            format.html {render :new}
-          end
-        end
+      respond_to do |format|
+        format.html
       end
+    end
+    
+    def create
+      @invitation = UserInvitation.new params[:user_invitation]
       
-      def destroy
-        invitation = UserInvitation.find params[:id]
-        invitation.destroy
-        
-        respond_to do |format|
+      respond_to do |format|
+        if @invitation.save
           format.html { redirect_to :action => :index }
+        else
+          format.html {render :new}
         end
       end
     end
-  end
+    
+    def destroy
+      invitation = UserInvitation.find params[:id]
+      invitation.destroy
+      
+      respond_to do |format|
+        format.html { redirect_to :action => :index }
+      end
+    end
+  end  
 end

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

@@ -1,79 +1,74 @@
 module Authentasaurus::Ac::Controllers
   module UsersController
-    def self.included(base) # :nodoc:
-      base.send :extend, ClassMethods
-      base.send :include, InstanceMethods
-    end
+    extend ActiveSupport::Concern
     
     module ClassMethods
     end
-    
-    module InstanceMethods
-      def index
-        @users = User.all
         
-    		respond_to do |format|
-          format.html
-        end
+    def index
+      @users = User.all
+      
+      respond_to do |format|
+        format.html
       end
+    end
+    
+    def show
+      @user = User.find(params[:id])
       
-    	def show
-        @user = User.find(params[:id])
-        
-    		respond_to do |format|
-          format.html
-        end
+      respond_to do |format|
+        format.html
       end
+    end
+    
+    def new
+      @user = User.new
       
-    	def new
-        @user = User.new
-        
-    		respond_to do |format|
-          format.html
-        end
+      respond_to do |format|
+        format.html
       end
+    end
+    
+    def create
+      @user = User.new params[:user]
       
-    	def create
-        @user = User.new params[:user]
-        
-    		respond_to do |format|
-    			if @user.save
-            format.html { redirect_to :action=>:index, :notice => "User saved successfully" }
-          else
-            flash.now[:alert] = I18n.t(:create_failed, :scope => [:authentasaurus, :messages, :users])
-            format.html { render :new }
-          end
+      respond_to do |format|
+        if @user.save
+          format.html { redirect_to :action=>:index, :notice => "User saved successfully" }
+        else
+          flash.now[:alert] = I18n.t(:create_failed, :scope => [:authentasaurus, :messages, :users])
+          format.html { render :new }
         end
       end
+    end
+    
+    def edit
+      @user = User.find params[:id]
       
-    	def edit
-        @user = User.find params[:id]
-        
-    		respond_to do |format|
-          format.html
-        end
+      respond_to do |format|
+        format.html
       end
+    end
+    
+    def update
+      @user = User.find params[:id]
       
-    	def update
-        @user = User.find params[:id]
-        
-    		respond_to do |format|
-    			if @user.update_attributes(params[:user])
-            format.html { redirect_to :action => :index, :notice => "User updated" }
-          else
-            flash.now[:alert] = I18n.t(:update_failed, :scope => [:authentasaurus, :messages, :users])
-            format.html { render :edit }
-          end
+      respond_to do |format|
+        if @user.update_attributes(params[:user])
+          format.html { redirect_to :action => :index, :notice => "User updated" }
+        else
+          flash.now[:alert] = I18n.t(:update_failed, :scope => [:authentasaurus, :messages, :users])
+          format.html { render :edit }
         end
       end
+    end
+    
+    def destroy
+      @user = User.find params[:id]
+      @user.destroy
       
-    	def destroy
-        @user = User.find params[:id]
-        @user.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