authentasaurus 0.4.14 → 0.5.6

data/lib/authentasaurus/recoveries_controller.rb

@@ -1,60 +1,70 @@
-class Authentasaurus::RecoveriesController < Authentasaurus::AuthentasaurusController
-  def new
-    @recovery = Recovery.new
-    
-    respond_to do |format|
-      format.html
-    end
+module Authentasaurus::RecoveriesController
+  def self.included(base) # :nodoc:
+    base.send :extend, ClassMethods
+    base.send :include, InstanceMethods
   end
   
-  def create
-    @recovery = Recovery.find_or_initialize_by_email :email => params[:email]
-    
-    if @recovery.new_record?
-      @recovery.user = User.find_by_email @recovery.email
+  module ClassMethods
+  end
+  
+  module InstanceMethods
+    def new
+      @recovery = Recovery.new
+      
+      respond_to do |format|
+        format.html
+      end
     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}
+    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
-    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_session_path, :alert => t(:recovery_failed, :scope => [:authentasaurus, :messages, :recoveries], :email => params[:email]) }
-	  	end
-  	end
-  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  
+    end
   
-  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 }
-			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_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
+  		
+  		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 }
+  			end
+  		end
+    end
   end
 end

data/lib/authentasaurus/registrations_controller.rb

@@ -1,32 +1,42 @@
-class Authentasaurus::RegistrationsController < Authentasaurus::AuthentasaurusController
-  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
+module Authentasaurus::RegistrationsController
+  def self.included(base) # :nodoc:
+    base.send :extend, ClassMethods
+    base.send :include, InstanceMethods
+  end
+  
+  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
       end
     end
-  end
-
-  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}
+  
+    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
         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/sessions_controller.rb

@@ -1,45 +1,54 @@
-class Authentasaurus::SessionsController < Authentasaurus::AuthentasaurusController
-  before_filter :check_is_logged_in, :except => [:destroy, :no_access]
-
-  def new
-    @session = Session.new
+module Authentasaurus::SessionsController
+  def self.included(base) # :nodoc:
+    base.send :extend, ClassMethods
+    base.send :include, InstanceMethods
     
-    respond_to do |format|
-      format.html
-    end
+    base.send :before_filter, :check_is_logged_in, :except => [:destroy, :no_access]
+  end
+  
+  module ClassMethods
   end
   
-  def create
-    @session = Session.new params[:session]
+  module InstanceMethods
+    def new
+      @session = Session.new
+      
+      respond_to do |format|
+        format.html
+      end
+    end
     
-    respond_to do |format|
-      if @session.save
-        if @session.remember == "1"
-          cookies.signed.permanent[:remember_me_token] = @session.user.remember_me_token
+    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
+          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] || root_url }
+        else
+          format.html { render :action => :new }
         end
-        session[:user_id] = @session.user.id
-        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] || root_url }
-      else
-        format.html { render :action => :new }
       end
+      
     end
     
-  end
-  
-  def destroy
-    session[:user_id] = nil
-    session[:user_permissions] = nil
-    cookies.delete :remember_me_token
+    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
     
-    respond_to do |format|
-      format.html { redirect_to :action => :new }
+    private
+    def check_is_logged_in
+      redirect_to root_path if session[:user_id]
     end
   end
-  
-  private
-  def check_is_logged_in
-    redirect_to root_path if session[:user_id]
-  end
-
 end

data/lib/authentasaurus/user_invitations_controller.rb

@@ -1,39 +1,48 @@
-class Authentasaurus::UserInvitationsController < Authentasaurus::AuthentasaurusController
+module Authentasaurus::UserInvitationsController
+  def self.included(base) # :nodoc:
+    base.send :extend, ClassMethods
+    base.send :include, InstanceMethods
+  end
   
-  def index
-    @invitations = UserInvitation.find :all
-    
-    respond_to do |format|
-      format.html
-    end
+  module ClassMethods
   end
   
-  def new
-    @invitation = UserInvitation.new
+  module InstanceMethods
+    def index
+      @invitations = UserInvitation.find :all
+      
+      respond_to do |format|
+        format.html
+      end
+    end
     
-    respond_to do |format|
-      format.html
+    def new
+      @invitation = UserInvitation.new
+      
+      respond_to do |format|
+        format.html
+      end
     end
-  end
-  
-  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}
+    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
     end
-  end
-  
-  def destroy
-    invitation = UserInvitation.find params[:id]
-    invitation.destroy
     
-    respond_to do |format|
-      format.html { redirect_to :action => :index }
+    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/users_controller.rb

@@ -1,69 +1,78 @@
-class Authentasaurus::UsersController < Authentasaurus::AuthentasaurusController
-		
-	def index
-		@users = User.all
-		
-		respond_to do |format|
-			format.html
-		end
-	end
-	
-	def show
-		@user = User.find(params[:id])
-		
-		respond_to do |format|
-			format.html
-		end
-	end
-	
-	def new
-		@user = User.new
-		
-		respond_to do |format|
-			format.html
-		end
-	end
-	
-	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
-		end
-	end
-	
-	def edit
-		@user = User.find params[:id]
-		
-		respond_to do |format|
-			format.html
-		end
-	end
-	
-	def update
-		@user = User.find params[:id]
-		
-		respond_to do |format|
-			if @user.update_attributes(params[:user])
-				format.html { redirect_to @user, :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
-		
-		respond_to do |format|
-			format.html { redirect_to :action=>:index }
-		end
-	end
+module Authentasaurus::UsersController
+  def self.included(base) # :nodoc:
+    base.send :extend, ClassMethods
+    base.send :include, InstanceMethods
+  end
+  
+  module ClassMethods
+  end
+  
+  module InstanceMethods
+    def index
+  		@users = User.all
+  		
+  		respond_to do |format|
+  			format.html
+  		end
+  	end
+  	
+  	def show
+  		@user = User.find(params[:id])
+  		
+  		respond_to do |format|
+  			format.html
+  		end
+  	end
+  	
+  	def new
+  		@user = User.new
+  		
+  		respond_to do |format|
+  			format.html
+  		end
+  	end
+  	
+  	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
+  		end
+  	end
+  	
+  	def edit
+  		@user = User.find params[:id]
+  		
+  		respond_to do |format|
+  			format.html
+  		end
+  	end
+  	
+  	def update
+  		@user = User.find params[:id]
+  		
+  		respond_to do |format|
+  			if @user.update_attributes(params[:user])
+  				format.html { redirect_to @user, :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
+  		
+  		respond_to do |format|
+  			format.html { redirect_to :action=>:index }
+  		end
+  	end
+  end
 end