authentasaurus 0.4.14 → 0.5.6

data/CHANGELIST

@@ -0,0 +1,3 @@
+=Version 0.4.14 > 0.5.4
+
+* Improved inheritance of models by adding _model to all models in the libs folder

data/TODO

@@ -1,4 +1,4 @@
-* Update views to use the new flash convention
-  * flash[:notice] for information messages
-  * flash[:alert] for error messages
-* Localize views
+* Update views to use the new flash convention [DONE]
+  * flash[:notice] for information messages [DONE]
+  * flash[:alert] for error messages [DONE]
+* Localize views [DONE]

data/app/controllers/areas_controller.rb

@@ -1,4 +1,5 @@
-class AreasController < Authentasaurus::AreasController
+class AreasController < ApplicationController
+  include Authentasaurus::AreasController
 	require_read :index, :show
 	require_write :new, :create, :edit, :update, :destroy
 end

data/app/controllers/groups_controller.rb

@@ -1,4 +1,5 @@
-class GroupsController < Authentasaurus::GroupsController
+class GroupsController < ApplicationController
+  include Authentasaurus::GroupsController
 	require_read :index, :show
 	require_write :new, :create, :edit, :update, :destroy
 end

data/app/controllers/permissions_controller.rb

@@ -1,4 +1,5 @@
-class PermissionsController < Authentasaurus::PermissionsController
+class PermissionsController < ApplicationController
+  include Authentasaurus::PermissionsController
   require_read :index, :show
 	require_write :new, :create, :edit, :update, :destroy
 end

data/app/controllers/recoveries_controller.rb

@@ -1,2 +1,3 @@
-class RecoveriesController < Authentasaurus::RecoveriesController
+class RecoveriesController < ApplicationController
+  include Authentasaurus::RecoveriesController
 end

data/app/controllers/registrations_controller.rb

@@ -1,2 +1,3 @@
-class RegistrationsController < Authentasaurus::RegistrationsController
+class RegistrationsController < ApplicationController
+  include Authentasaurus::RegistrationsController
 end

data/app/controllers/sessions_controller.rb

@@ -1,2 +1,3 @@
-class SessionsController < Authentasaurus::SessionsController
+class SessionsController < ApplicationController
+  include Authentasaurus::SessionsController
 end

data/app/controllers/user_invitations_controller.rb

@@ -1,4 +1,5 @@
-class UserInvitationsController < Authentasaurus::UserInvitationsController
+class UserInvitationsController < ApplicationController
+  include Authentasaurus::UserInvitationsController
   require_read :index
   require_write :new, :create, :destroy
 end

data/app/controllers/users_controller.rb

@@ -1,4 +1,5 @@
-class UsersController < Authentasaurus::UsersController
+class UsersController < ApplicationController
+  include Authentasaurus::UsersController
   require_read :index, :show
 	require_write :new, :create, :edit, :update, :destroy
 end

data/app/controllers/validations_controller.rb

@@ -1,2 +1,3 @@
-class ValidationsController < Authentasaurus::ValidationsController
+class ValidationsController < ApplicationController
+  include Authentasaurus::ValidationsController
 end

data/app/models/area.rb

@@ -1,2 +1,3 @@
-class Area < Authentasaurus::Models::Area
+class Area < ActiveRecord::Base
+  include Authentasaurus::Models::Area
 end

data/app/models/group.rb

@@ -1,2 +1,3 @@
-class Group < Authentasaurus::Models::Group
+class Group < ActiveRecord::Base
+  include Authentasaurus::Models::Group
 end

data/app/models/permission.rb

@@ -1,2 +1,3 @@
-class Permission < Authentasaurus::Models::Permission
+class Permission < ActiveRecord::Base
+  include Authentasaurus::Models::Permission
 end

data/app/models/recovery.rb

@@ -1,2 +1,3 @@
-class Recovery < Authentasaurus::Models::Recovery
+class Recovery < ActiveRecord::Base
+  include Authentasaurus::Models::Recovery
 end

data/app/models/session.rb

@@ -1,2 +1,3 @@
-class Session < Authentasaurus::Models::Session
+class Session
+  include Authentasaurus::Models::Session
 end

data/app/models/user_invitation.rb

@@ -1,2 +1,3 @@
-class UserInvitation < Authentasaurus::Models::UserInvitation
+class UserInvitation < ActiveRecord::Base
+  include Authentasaurus::Models::UserInvitation
 end

data/app/models/validation.rb

@@ -1,2 +1,3 @@
-class Validation < Authentasaurus::Models::Validation
+class Validation < ActiveRecord::Base
+  include Authentasaurus::Models::Validation
 end

data/lib/authentasaurus/areas_controller.rb

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

data/lib/authentasaurus/groups_controller.rb

@@ -1,71 +1,79 @@
-class Authentasaurus::GroupsController < Authentasaurus::AuthentasaurusController
-	
-	def index
-		@groups = Group.find :all
-		
-		respond_to do |format|
-			format.html
-		end
-	end
-	
-	def show
-		@group = Group.find params[:id]
-		
-		respond_to do |format|
-			format.html
-		end
-	end
-	
-	def new
-		@group = Group.new
-		
-		respond_to do |format|
-			format.html
-		end
-	end
-	
-	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
-		end
-	end
-	
-	def edit
-		@group = Group.find params[:id]
-		
-		respond_to do |format|
-			format.html
-		end
-	end
-	
-	def update
-		@group = Group.find params[:id]
-		
-		respond_to do |format|
-			if @group.update_attributes(params[:group])
-				format.html { redirect_to @group, :notice => "Group updated" }
-			else
-				flash.now[:alert] = I18n.t(:update_failed, :scope => [:authentasaurus, :messages, :groups])
-				format.html { render :edit }
-			end
-		end
-		
-	end
-	
-	def destroy
-		@group = Group.find params[:id]
-		@group.destroy
-		
-		respond_to do |format|
-			format.html { redirect_to :action=>:index }
-		end	
-	end
-	
+module Authentasaurus::GroupsController
+  def self.included(base) # :nodoc:
+    base.send :extend, ClassMethods
+    base.send :include, InstanceMethods
+  end
+  
+  module ClassMethods
+  end
+  
+  module InstanceMethods
+    def index
+  		@groups = Group.find :all
+  		
+  		respond_to do |format|
+  			format.html
+  		end
+  	end
+  	
+  	def show
+  		@group = Group.find params[:id]
+  		
+  		respond_to do |format|
+  			format.html
+  		end
+  	end
+  	
+  	def new
+  		@group = Group.new
+  		
+  		respond_to do |format|
+  			format.html
+  		end
+  	end
+  	
+  	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
+  		end
+  	end
+  	
+  	def edit
+  		@group = Group.find params[:id]
+  		
+  		respond_to do |format|
+  			format.html
+  		end
+  	end
+  	
+  	def update
+  		@group = Group.find params[:id]
+  		
+  		respond_to do |format|
+  			if @group.update_attributes(params[:group])
+  				format.html { redirect_to @group, :notice => "Group updated" }
+  			else
+  				flash.now[:alert] = I18n.t(:update_failed, :scope => [:authentasaurus, :messages, :groups])
+  				format.html { render :edit }
+  			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/models/area.rb

@@ -1,8 +1,17 @@
-class Authentasaurus::Models::Area < ActiveRecord::Base
-  has_many :permissions, :dependent => :destroy
-  has_many :groups, :through => :permissions
-
-  # Check that everything is there
-  validates_presence_of :name
+module Authentasaurus::Models::Area
+  def self.included(base) # :nodoc:
+    base.send :extend, ClassMethods
+    base.send :include, InstanceMethods
+    
+    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
+  end
 end