authentasaurus 0.8.8 → 0.8.9

data/CHANGELIST

@@ -1,7 +1,3 @@
-=Version 0.8.4 > 0.8.5
+=Version 0.4.14 > 0.5.4
 
-* 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
+* Improved inheritance of models by adding _model to all models in the libs folder

data/TODO

@@ -1,8 +1,3 @@
-* 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/areas_controller.rb

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

data/app/controllers/groups_controller.rb

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

data/app/controllers/permissions_controller.rb

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

data/app/controllers/recoveries_controller.rb

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

data/app/controllers/registrations_controller.rb

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

data/app/controllers/sessions_controller.rb

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

data/app/controllers/user_invitations_controller.rb

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

data/app/controllers/users_controller.rb

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

data/app/controllers/validations_controller.rb

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

data/app/models/area.rb

@@ -1,3 +1,3 @@
 class Area < ActiveRecord::Base
-  acts_as_area
+  include Authentasaurus::Models::Area
 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    Authentasaurus::Configuration.instance.configuration[:modules][:validatable][:mail_subject]
+    subject    AUTHENTASAURUS[:modules][:validatable][:mail_subject]
     recipients email
-    from       Authentasaurus::Configuration.instance.configuration[:modules][:validatable][:mail_from]
+    from       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::Configuration.instance.configuration[:modules][:recoverable][:mail_subject]
+    subject    AUTHENTASAURUS[:modules][:recoverable][:mail_subject]
     recipients user.email
-    from       Authentasaurus::Configuration.instance.configuration[:modules][:recoverable][:mail_from] # dont forget to change me
+    from       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::Configuration.instance.configuration[:modules][:invitable][:mail_subject]
+    subject   AUTHENTASAURUS[:modules][:invitable][:mail_subject]
     recipients email
-    from       Authentasaurus::Configuration.instance.configuration[:modules][:invitable][:mail_from]
+    from       AUTHENTASAURUS[:modules][:invitable][:mail_from]
     sent_on    sent_at
     
     body       :token => token

data/app/models/group.rb

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

data/app/models/permission.rb

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

data/app/models/recovery.rb

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

data/app/models/user_invitation.rb

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

data/app/models/validation.rb

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

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

@@ -1,4 +1,4 @@
-<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>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>Best Regards,</p>
-<p><%= Authentasaurus::Configuration.instance.configuration[:mail][:host] %> Team</p>
+<p><%= 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::Configuration.instance.configuration[:mail][:host], :token => @token) %> and follow the instructions.</p>
+<p>Please visit this <%= link_to "link", recover_password_url(:host => AUTHENTASAURUS[:mail][:host], :token => @token) %> and follow the instructions.</p>
 
 <p>Best Regards,</p>
-<p><%= Authentasaurus::Configuration.instance.configuration[:mail][:host] %> Team</p>
+<p><%= 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::Configuration.instance.configuration[:mail][:host] %> by visiting this <%= link_to "link", activate_url(:host => Authentasaurus::Configuration.instance.configuration[:mail][:host] , :code => @vcode) %>.</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>Best Regards,</p>
-<p><%= Authentasaurus::Configuration.instance.configuration[:mail][:host] %> Team</p>
+<p><%= AUTHENTASAURUS[:mail][:host] %> Team</p>

data/lib/authentasaurus.rb

@@ -1,55 +1,21 @@
-module Authentasaurus  
-  require 'authentasaurus/configuration'
-  require 'authentasaurus/railtie' #if defined?(Rails) # NEVER EVER REMOVE THIS LINE !!!  
-  # Authorization Helpers
-  require 'authentasaurus/authorization'
-  # Controllers, Views and Routes helpers
-  require 'authentasaurus/ac/acts_as_overrider'
-  require 'authentasaurus/ac/routing'
-  # ActiveRecord And Migrations Helpers  
-  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'
-  
-  if defined?(ActionController)
-    class ActionController::Base
-      include Authentasaurus::Authorization::ActionController
-      include Authentasaurus::Ac::ActsAsOverrider
-    end
-    
-    class ActionView::Base
-      include Authentasaurus::Authorization::ActionView
-    end
-    
-    class ActionDispatch::Routing::Mapper
-      include Authentasaurus::Ac::Routing
-    end
-  end
-  
-  if defined?(ActiveRecord)
-    class ActiveRecord::Base
-      include Authentasaurus::Ar::Authenticatable
-      include Authentasaurus::Ar::ActsAsOverrider
-    end
-    
-    class ActiveRecord::ConnectionAdapters::AbstractAdapter
-      include Authentasaurus::Ar::Migrations::Tables
-    end
-    
-    class ActiveRecord::ConnectionAdapters::TableDefinition
-      include Authentasaurus::Ar::Migrations::Columns
-    end
-  end
-  
-  if defined?(ActiveResource)
-    class ActiveResource::Base
-      class_inheritable_accessor :sync, :sync_to
-      include Authentasaurus::Arel::Authenticatable
+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
     end
   end
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: authentasaurus
 version: !ruby/object:Gem::Version 
-  hash: 47
   prerelease: 
-  segments: 
-  - 0
-  - 8
-  - 8
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors: 
 - Omar Mekky
@@ -18,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-11 00:00:00 +02:00
+date: 2011-04-10 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -45,7 +40,6 @@ files:
 - app/controllers/validations_controller.rb
 - app/models/area.rb
 - app/models/authentasaurus_emailer.rb
-- app/models/authentasaurus_session.rb
 - app/models/group.rb
 - app/models/permission.rb
 - app/models/recovery.rb
@@ -83,128 +77,6 @@ files:
 - app/views/validations/validate.html.erb
 - config/locales/en.yml
 - lib/authentasaurus.rb
-- lib/authentasaurus/ac/acts_as_overrider.rb
-- lib/authentasaurus/ac/controllers/areas_controller.rb
-- lib/authentasaurus/ac/controllers/groups_controller.rb
-- lib/authentasaurus/ac/controllers/permissions_controller.rb
-- lib/authentasaurus/ac/controllers/recoveries_controller.rb
-- lib/authentasaurus/ac/controllers/registrations_controller.rb
-- lib/authentasaurus/ac/controllers/sessions_controller.rb
-- lib/authentasaurus/ac/controllers/user_invitations_controller.rb
-- lib/authentasaurus/ac/controllers/users_controller.rb
-- lib/authentasaurus/ac/controllers/validations_controller.rb
-- lib/authentasaurus/ac/routing.rb
-- lib/authentasaurus/ar/acts_as_authenticatable.rb
-- lib/authentasaurus/ar/acts_as_authenticatable_validatable.rb
-- lib/authentasaurus/ar/acts_as_overrider.rb
-- lib/authentasaurus/ar/authenticatable.rb
-- lib/authentasaurus/ar/migrations.rb
-- lib/authentasaurus/ar/models/recovery.rb
-- lib/authentasaurus/ar/models/session.rb
-- lib/authentasaurus/ar/models/user_invitation.rb
-- lib/authentasaurus/ar/models/validation.rb
-- lib/authentasaurus/arel/acts_as_authenticatable.rb
-- lib/authentasaurus/arel/authenticatable.rb
-- lib/authentasaurus/authorization.rb
-- lib/authentasaurus/configuration.rb
-- lib/authentasaurus/railtie.rb
-- lib/generators/authentasaurus/install/USAGE
-- lib/generators/authentasaurus/install/install_generator.rb
-- lib/generators/authentasaurus/install/templates/authentasaurus_tasks.rake
-- lib/generators/authentasaurus/install/templates/defaults.yml
-- lib/generators/authentasaurus/views/USAGE
-- lib/generators/authentasaurus/views/templates/areas/edit.html.erb
-- lib/generators/authentasaurus/views/templates/areas/index.html.erb
-- lib/generators/authentasaurus/views/templates/areas/new.html.erb
-- lib/generators/authentasaurus/views/templates/areas/show.html.erb
-- lib/generators/authentasaurus/views/templates/authentasaurus_emailer/invitation_mail.html.erb
-- lib/generators/authentasaurus/views/templates/authentasaurus_emailer/recovery_mail.html.erb
-- lib/generators/authentasaurus/views/templates/authentasaurus_emailer/validation_mail.html.erb
-- lib/generators/authentasaurus/views/templates/groups/edit.html.erb
-- lib/generators/authentasaurus/views/templates/groups/index.html.erb
-- lib/generators/authentasaurus/views/templates/groups/new.html.erb
-- lib/generators/authentasaurus/views/templates/groups/show.html.erb
-- lib/generators/authentasaurus/views/templates/permissions/edit.html.erb
-- lib/generators/authentasaurus/views/templates/permissions/index.html.erb
-- lib/generators/authentasaurus/views/templates/permissions/new.html.erb
-- lib/generators/authentasaurus/views/templates/permissions/show.html.erb
-- lib/generators/authentasaurus/views/templates/recoveries/edit.html.erb
-- lib/generators/authentasaurus/views/templates/recoveries/new.html.erb
-- lib/generators/authentasaurus/views/templates/registrations/new.html.erb
-- lib/generators/authentasaurus/views/templates/sessions/new.html.erb
-- lib/generators/authentasaurus/views/templates/sessions/no_access.html.erb
-- lib/generators/authentasaurus/views/templates/user_invitations/index.html.erb
-- lib/generators/authentasaurus/views/templates/user_invitations/new.html.erb
-- lib/generators/authentasaurus/views/templates/users/edit.html.erb
-- lib/generators/authentasaurus/views/templates/users/index.html.erb
-- lib/generators/authentasaurus/views/templates/users/new.html.erb
-- lib/generators/authentasaurus/views/templates/users/show.html.erb
-- lib/generators/authentasaurus/views/templates/validations/resend_validation_email.html.erb
-- lib/generators/authentasaurus/views/templates/validations/validate.html.erb
-- lib/generators/authentasaurus/views/views_generator.rb
-- rdoc/apple-touch-icon.png
-- rdoc/classes/Authentasaurus.html
-- rdoc/classes/Authentasaurus/Ac.html
-- rdoc/classes/Authentasaurus/Ac/ActsAsOverrider.html
-- rdoc/classes/Authentasaurus/Ac/ActsAsOverrider/ClassMethods.html
-- rdoc/classes/Authentasaurus/Ac/Routing.html
-- rdoc/classes/Authentasaurus/Ac/Routing/InstanceMethods.html
-- rdoc/classes/Authentasaurus/Ar.html
-- rdoc/classes/Authentasaurus/Ar/ActsAsAuthenticatable.html
-- rdoc/classes/Authentasaurus/Ar/ActsAsAuthenticatable/ClassMethods.html
-- rdoc/classes/Authentasaurus/Ar/ActsAsAuthenticatable/InstanceMethods.html
-- rdoc/classes/Authentasaurus/Ar/ActsAsAuthenticatableValidatable.html
-- rdoc/classes/Authentasaurus/Ar/ActsAsAuthenticatableValidatable/ClassMethods.html
-- rdoc/classes/Authentasaurus/Ar/ActsAsAuthenticatableValidatable/InstanceMethods.html
-- rdoc/classes/Authentasaurus/Ar/ActsAsOverrider.html
-- rdoc/classes/Authentasaurus/Ar/ActsAsOverrider/ClassMethods.html
-- rdoc/classes/Authentasaurus/Ar/Authenticatable.html
-- rdoc/classes/Authentasaurus/Ar/Authenticatable/ClassMethods.html
-- rdoc/classes/Authentasaurus/Ar/Migrations.html
-- rdoc/classes/Authentasaurus/Ar/Migrations/Columns.html
-- rdoc/classes/Authentasaurus/Ar/Migrations/Columns/InstanceMethods.html
-- rdoc/classes/Authentasaurus/Ar/Migrations/Tables.html
-- rdoc/classes/Authentasaurus/Ar/Migrations/Tables/InstanceMethods.html
-- rdoc/classes/Authentasaurus/Arel.html
-- rdoc/classes/Authentasaurus/Arel/ActsAsAuthenticatable.html
-- rdoc/classes/Authentasaurus/Arel/ActsAsAuthenticatable/ClassMethods.html
-- rdoc/classes/Authentasaurus/Arel/ActsAsAuthenticatable/InstanceMethods.html
-- rdoc/classes/Authentasaurus/Arel/Authenticatable.html
-- rdoc/classes/Authentasaurus/Arel/Authenticatable/ClassMethods.html
-- rdoc/classes/Authentasaurus/Authorization.html
-- rdoc/classes/Authentasaurus/Authorization/ActionController.html
-- rdoc/classes/Authentasaurus/Authorization/ActionController/ClassMethods.html
-- rdoc/classes/Authentasaurus/Authorization/ActionController/InstanceMethods.html
-- rdoc/classes/Authentasaurus/Authorization/ActionView.html
-- rdoc/classes/Authentasaurus/Authorization/CommonInstanceMethods.html
-- rdoc/created.rid
-- rdoc/css/main.css
-- rdoc/css/panel.css
-- rdoc/css/reset.css
-- rdoc/favicon.ico
-- rdoc/files/README_rdoc.html
-- rdoc/files/TODO.html
-- rdoc/files/lib/authentasaurus/ac/acts_as_overrider_rb.html
-- rdoc/files/lib/authentasaurus/ac/routing_rb.html
-- rdoc/files/lib/authentasaurus/ar/acts_as_authenticatable_rb.html
-- rdoc/files/lib/authentasaurus/ar/acts_as_authenticatable_validatable_rb.html
-- rdoc/files/lib/authentasaurus/ar/acts_as_overrider_rb.html
-- rdoc/files/lib/authentasaurus/ar/authenticatable_rb.html
-- rdoc/files/lib/authentasaurus/ar/migrations_rb.html
-- rdoc/files/lib/authentasaurus/arel/acts_as_authenticatable_rb.html
-- rdoc/files/lib/authentasaurus/arel/authenticatable_rb.html
-- rdoc/files/lib/authentasaurus/authorization_rb.html
-- rdoc/i/arrows.png
-- rdoc/i/results_bg.png
-- rdoc/i/tree_bg.png
-- rdoc/index.html
-- rdoc/js/jquery-1.3.2.min.js
-- rdoc/js/jquery-effect.js
-- rdoc/js/main.js
-- rdoc/js/searchdoc.js
-- rdoc/panel/index.html
-- rdoc/panel/search_index.js
-- rdoc/panel/tree.js
 - CHANGELIST
 - MIT-LICENSE
 - README.rdoc
@@ -223,18 +95,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 

data/app/models/authentasaurus_session.rb

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

data/lib/authentasaurus/ac/acts_as_overrider.rb

@@ -1,48 +0,0 @@
-module Authentasaurus::Ac  
-  Dir[File.dirname(__FILE__) + '/controllers/*.rb'].each {|file| require file }
-  
-  module ActsAsOverrider
-    extend ActiveSupport::Concern    
-    
-    module ClassMethods      
-      def acts_as_areas
-        include Authentasaurus::Ac::Controllers::AreasController
-      end
-      
-      def acts_as_groups
-        include Authentasaurus::Ac::Controllers::GroupsController
-      end
-      
-      def acts_as_permissions
-        include Authentasaurus::Ac::Controllers::PermissionsController
-      end
-      
-      def acts_as_recoveries
-        include Authentasaurus::Ac::Controllers::RecoveriesController
-      end
-      
-      def acts_as_registrations
-        include Authentasaurus::Ac::Controllers::RegistrationsController
-      end
-      
-      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
-      
-      def acts_as_user_invitations
-        include Authentasaurus::Ac::Controllers::UserInvitationsController
-      end
-      
-      def acts_as_users
-        include Authentasaurus::Ac::Controllers::UsersController
-      end
-      
-      def acts_as_validations
-        include Authentasaurus::Ac::Controllers::ValidationsController
-      end
-    end
-  end
-end