authentasaurus 0.8.4 → 0.8.6

data/lib/authentasaurus/ar/models/user_invitation.rb

@@ -1,33 +1,30 @@
 module Authentasaurus::Ar::Models
   module UserInvitation
-    def self.included(base) # :nodoc:
-      base.send :extend, ClassMethods
-      base.send :include, InstanceMethods
-      
-      base.send :require, 'digest/sha2'
-      base.send :validates_presence_of, :email
-      base.send :validates_uniqueness_of, :email, :scope => :token
-      base.send :validates_format_of, :email, :with => %r{[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}}
+    extend ActiveSupport::Concern
+    
+    included do
+      require 'digest/sha2'
+      validates_presence_of :email
+      validates_uniqueness_of :email, :scope => :token
+      validates_format_of :email, :with => %r{[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}}
       
-      base.send :before_validation, :create_token
+      before_validation :create_token
       #send email
-      base.send :after_create, :send_invitation
+      after_create :send_invitation
     end
     
     module ClassMethods
     end
+        
+    def send_invitation
+      AuthentasaurusEmailer.deliver_invitation_mail(self.email, self.token) if Authentasaurus::Configuration.instance.configuration[:modules][:invitable][:send_email]
+    end
     
-    module InstanceMethods
-      def send_invitation
-        AuthentasaurusEmailer.deliver_invitation_mail(self.email, self.token) if Rails.application.config.authentasaurus[:modules][:invitable][:send_email]
-      end
-      
-      private
-      def create_token
-        return if self.email.nil? || self.email.blank?
-        string_to_hash=self.email + "invitable.olation" + self.email.hash.to_s
-    		self.token = Digest::SHA2.hexdigest(string_to_hash)
-      end
+    private
+    def create_token
+      return if self.email.nil? || self.email.blank?
+      string_to_hash=self.email + "invitable.olation" + self.email.hash.to_s
+  		self.token = Digest::SHA2.hexdigest(string_to_hash)
     end
-  end
+  end  
 end

data/lib/authentasaurus/ar/models/validation.rb

@@ -1,30 +1,27 @@
 module Authentasaurus::Ar::Models
   module Validation
-    def self.included(base) # :nodoc:
-      base.send :extend, ClassMethods
-      base.send :include, InstanceMethods
-      
-      base.send :belongs_to, :user, :polymorphic => true
+    extend ActiveSupport::Concern
+    
+    included do
+      belongs_to :user, :polymorphic => true
       
       # Check that everything is there
-      base.send :validates_presence_of, :user_id, :validation_code, :user_type, :email
+      validates_presence_of :user_id, :validation_code, :user_type, :email
       # Check foreign keys
-      base.send :validates_associated, :user
+      validates_associated :user
       # Check unique user
-      base.send :validates_uniqueness_of, :user_id, :scope => [:user_type, :email]
-      base.send :validates_uniqueness_of, :validation_code
+      validates_uniqueness_of :user_id, :scope => [:user_type, :email]
+      validates_uniqueness_of :validation_code
       
       #send email
-      base.send :after_create, :send_validation
+      after_create :send_validation
     end
     
     module ClassMethods
     end
-    
-    module InstanceMethods
-      def send_validation
-        AuthentasaurusEmailer.deliver_validation_mail(self.user.name, self.email, self.validation_code) if Rails.application.config.authentasaurus[:modules][:validatable][:send_email]
-      end
+        
+    def send_validation
+      AuthentasaurusEmailer.deliver_validation_mail(self.user.name, self.email, self.validation_code) if Authentasaurus::Configuration.instance.configuration[:modules][:validatable][:send_email]
     end
   end
 end

data/lib/authentasaurus/arel/acts_as_authenticatable.rb

@@ -1,9 +1,6 @@
 module Authentasaurus::Arel
   module ActsAsAuthenticatable
-    def self.included(base)
-      base.send :extend, ClassMethods
-      base.send :include, InstanceMethods
-    end
+    extend ActiveSupport::Concern
     
     module ClassMethods
       ## Authenticates the username and password
@@ -46,27 +43,25 @@ module Authentasaurus::Arel
         return user
       end
     end
-    
-    module InstanceMethods
-      def sync
-        if self.class.sync && !self.class.sync_to.nil?
-          user = self.dup
-          last_update = user.attributes.delete "updated_at"
-          local_user = self.class.sync_to.find_or_initialize_by_username user.username, user.attributes
-          
-          unless local_user.new_record?
-            local_user.update_attributes user.attributes            
-          else
-            self.sync_to.default_data.each do |key,value|
-              local_user.send(key.to_s + '=', value)
-            end          
-            
-            local_user.save
-          end
+        
+    def sync
+      if self.class.sync && !self.class.sync_to.nil?
+        user = self.dup
+        last_update = user.attributes.delete "updated_at"
+        local_user = self.class.sync_to.find_or_initialize_by_username user.username, user.attributes
+        
+        unless local_user.new_record?
+          local_user.update_attributes user.attributes            
         else
-          false
+          self.sync_to.default_data.each do |key,value|
+            local_user.send(key.to_s + '=', value)
+          end          
+          
+          local_user.save
         end
+      else
+        false
       end
     end
-  end
+  end  
 end

data/lib/authentasaurus/arel/authenticatable.rb

@@ -1,20 +1,16 @@
 module Authentasaurus::Arel
   module Authenticatable
-    def self.included(base)
-      base.send :extend, ClassMethods
-      
-    end
+    extend ActiveSupport::Concern
     
     module ClassMethods
-      
       def authenticatable(*args)
         self.unloadable
         options = args.extract_options!
         
-        self.site = options[:site] || Rails.application.config.authentasaurus[:modules][:remote][self.name.underscore.gsub(/_sync/, "").to_sym][:site]
-        self.element_name = options[:session_element].try(:to_s) || Rails.application.config.authentasaurus[:modules][:remote][self.name.underscore.gsub(/_sync/, "").to_sym][:session_element]
-        self.sync = options[:sync] || Rails.application.config.authentasaurus[:modules][:remote][self.name.underscore.gsub(/_sync/, "").to_sym][:sync]
-        self.sync_to = options[:sync_to].try(:to_s).try(:camelize).try(:constantize) || Rails.application.config.authentasaurus[:modules][:remote][self.name.underscore.gsub(/_sync/, "").to_sym][:sync_to].camelize.constantize
+        self.site = options[:site] || Authentasaurus::Configuration.instance.configuration[:modules][:remote][self.name.underscore.gsub(/_sync/, "").to_sym][:site]
+        self.element_name = options[:session_element].try(:to_s) || Authentasaurus::Configuration.instance.configuration[:modules][:remote][self.name.underscore.gsub(/_sync/, "").to_sym][:session_element]
+        self.sync = options[:sync] || Authentasaurus::Configuration.instance.configuration[:modules][:remote][self.name.underscore.gsub(/_sync/, "").to_sym][:sync]
+        self.sync_to = options[:sync_to].try(:to_s).try(:camelize).try(:constantize) || Authentasaurus::Configuration.instance.configuration[:modules][:remote][self.name.underscore.gsub(/_sync/, "").to_sym][:sync_to].camelize.constantize
         
         
         # include authentication methods

data/lib/authentasaurus/authorization.rb

@@ -108,7 +108,7 @@ module Authentasaurus::Authorization
     #   
     #   user_model  - The model class representing a user (User by default)
     def current_user(user_model = nil)#:doc:
-      user_model = User if user_model.nil?
+      user_model = Authentasaurus::Configuration.instance.user_model.camelize.constantize if user_model.nil?
       return user_model.find session[:user_id] if session[:user_id]
     end
     
@@ -151,7 +151,7 @@ module Authentasaurus::Authorization
     #   
     #   user_model  - The model class representing a user (User by default)
     def is_logged_in?(user_model = nil) #:doc:
-      user_model = User if user_model.nil?
+      user_model = Authentasaurus::Configuration.instance.user_model.camelize.constantize if user_model.nil?
       unless user_model.find_by_id(session[:user_id])
         return cookie_login?(user_model)
       end
@@ -260,6 +260,7 @@ module Authentasaurus::Authorization
       # 
       # If skip_request is set to true, the user won't be redirected to the original url after he/she logs in.
       def check_logged_in(skip_request = false, user_model = nil) #:nodoc:
+        user_model = Authentasaurus::Configuration.instance.user_model.camelize.constantize if user_model.nil?
         unless is_logged_in?(user_model)
           login_required skip_request
         end
@@ -270,11 +271,12 @@ module Authentasaurus::Authorization
       #
       # If skip_request is set to true, the user won't be redirected to the original url after he/she logs in.
       def check_write_permissions(skip_request = false, user_model = nil) #:nodoc:
-        if is_logged_in?(user_model)
+        user_model = Authentasaurus::Configuration.instance.user_model.camelize.constantize if user_model.nil?
+        if is_logged_in?(user_model) && user_model.new.respond_to?(:permissions)          
           user_permissions = session[:user_permissions]
           check = user_permissions[:write].find { |perm| perm==self.controller_name || perm=="all" }
           unless check
-            redirect_to no_access_sessions_path
+            redirect_to no_access_authentasaurus_sessions_path
           end
         else
           login_required skip_request
@@ -286,11 +288,12 @@ module Authentasaurus::Authorization
       #
       # If skip_request is set to true, the user won't be redirected to the original url after he/she logs in.    
       def check_read_permissions(skip_request = false, user_model = nil) #:nodoc:
-        if is_logged_in?(user_model)
+        user_model = Authentasaurus::Configuration.instance.user_model.camelize.constantize if user_model.nil?
+        if is_logged_in?(user_model) && user_model.new.respond_to?(:permissions)
           user_permissions = session[:user_permissions]
           check = user_permissions[:read].find { |perm| perm==self.controller_name || perm=="all" }
           unless check
-            redirect_to no_access_sessions_path
+            redirect_to no_access_authentasaurus_sessions_path
           end
         else
           login_required skip_request
@@ -299,7 +302,7 @@ module Authentasaurus::Authorization
       
       # Logs in the user through a remember me cookie    
       def cookie_login?(user_model = nil) #:nodoc:
-        user_model = User if user_model.nil?
+        user_model = Authentasaurus::Configuration.instance.user_model.camelize.constantize if user_model.nil?
         
         if cookies[:remember_me_token]
           user = user_model.find_by_remember_me_token cookies[:remember_me_token]
@@ -324,7 +327,7 @@ module Authentasaurus::Authorization
           session[:original_url]=request.url
         end
         flash.now[:alert] = t(:login_required, :scope => [:authentasaurus, :action_controller, :errors, :messages])
-        redirect_to new_session_path
+        redirect_to new_authentasaurus_session_path
       end
       
       def controller_instance #:nodoc:

data/lib/authentasaurus/configuration.rb

@@ -0,0 +1,30 @@
+require 'erb'
+require 'singleton'
+
+module Authentasaurus
+  class Configuration
+    include Singleton
+    
+    attr_accessor :hashing, :user_model, :default_namespace, :configuration
+    
+    def load
+      @configuration ||= parse_config      
+    end
+    
+    private
+    
+    # Parse the config/sphinx.yml file - if it exists
+    #
+    def parse_config
+      path = "#{Rails.root}/config/authentasaurus.yml"
+      return unless File.exists?(path)
+      
+      conf = YAML::load(ERB.new(IO.read(path)).result)[Rails.env]
+      
+      conf.each do |key,value|
+        self.send("#{key}=", value) if self.respond_to?("#{key}=")
+      end
+    end
+    
+  end
+end

data/lib/authentasaurus/railtie.rb

@@ -2,12 +2,9 @@ require 'authentasaurus'
 require 'rails'
 
 module Authentasaurus #:nodoc:
-  class Railtie < Rails::Engine   
-    ActiveSupport.on_load(:before_initialize) do
-      Rails.application.config.authentasaurus = {}
-      require 'authentasaurus/ar/acts_as_authenticatable'
-      require 'authentasaurus/ar/acts_as_authenticatable_validatable'
-      require 'authentasaurus/arel/acts_as_authenticatable'
+  class Railtie < Rails::Engine
+    initializer "authentasaurus.initialize" do |app|
+      Authentasaurus::Configuration.instance.load
     end
   end
 end

data/lib/generators/authentasaurus/install/install_generator.rb

@@ -4,8 +4,7 @@ module Authentasaurus
     
     def install
       copy_file "defaults.yml", "config/authentasaurus.yml"
-      copy_file "authentasaurus_tasks.rake", "lib/tasks/authentasaurus_tasks.rake"
-      copy_file "initializer.rb", "config/initializers/authentasaurus.rb"
+      copy_file "authentasaurus_tasks.rake", "lib/tasks/authentasaurus_tasks.rake"      
     end
   end
 end

data/lib/generators/authentasaurus/install/templates/authentasaurus_tasks.rake

@@ -12,11 +12,11 @@ namespace :authentasaurus do
       Permission.create! :area_id => area.id, :group_id => group.id, :write => true, :read => true
       puts "- Creating default user"
       User.create! :username=> "admin" ,:password => "Pass@123",:password_confirmation => "Pass@123",:name=> "admin",
-      :email=> Rails.application.config.authentasaurus[:mail][:email], :active => true, :group_id => group.id
+      :email=> Authentasaurus::Configuration.instance.configuration[:mail][:email], :active => true, :group_id => group.id
     else
       puts "- Creating default user"
       User.create! :username=> "admin" ,:password => "Pass@123",:password_confirmation => "Pass@123",:name=> "admin",
-      :email=> Rails.application.config.authentasaurus[:mail][:email], :active => true
+      :email=> Authentasaurus::Configuration.instance.configuration[:mail][:email], :active => true
     end
     
     puts "Created admin user, you can now login with the following credentials:"

data/lib/generators/authentasaurus/install/templates/defaults.yml

@@ -1,6 +1,7 @@
 ## Authentasaurus configuration
 development: &non_production_settings
   :hashing: "SHA2" # MD5 - SHA1 - SHA2
+  :user_model: &user_model "user"
   :mail:
     :email: &development_email "foo_bar@your-domain.com"
     :host: "http://localhost:3000/"
@@ -10,7 +11,7 @@ development: &non_production_settings
         :site: "http://localhost:3000/api_key/auth"
         :session_element: "remote_sync"
         :sync: true
-        :sync_to: "user"
+        :sync_to: *user_model
     :recoverable:
       :token_expires_after: 10 # days
       :send_email: true
@@ -30,6 +31,7 @@ test:
 
 production:
   :hashing: "SHA2" # MD5 - SHA1 - SHA2
+  :user_model: &user_model "user"
   :mail:
     :email: &production_email "foo_bar@your-domain.com"
     :host: "http://your_website.com/"
@@ -39,7 +41,7 @@ production:
         :site: "http://localhost:3000/api_key/auth"
         :session_element: "remote_sync"
         :sync: true
-        :sync_to: "user"
+        :sync_to: *user_model
     :recoverable:
       :token_expires_after: 10 # days
       :send_email: true

data/lib/generators/authentasaurus/views/templates/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/lib/generators/authentasaurus/views/templates/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/lib/generators/authentasaurus/views/templates/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/generators/authentasaurus/views/views_generator.rb

@@ -1,6 +1,6 @@
 module Authentasaurus
   class ViewsGenerator < Rails::Generators::NamedBase
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('../../../../../app/views', __FILE__)
     class_option  :authorization, :type => :boolean, :default => true, :desc => "Generates views for authorization"
     class_option  :validation, :type => :boolean, :default => true, :desc => "Generates views for user validation"
     class_option  :invitation, :type => :boolean, :default => true, :desc => "Generates views for user invitation"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: authentasaurus
 version: !ruby/object:Gem::Version 
-  hash: 55
-  prerelease: false
+  hash: 51
+  prerelease: 
   segments: 
   - 0
   - 8
-  - 4
-  version: 0.8.4
+  - 6
+  version: 0.8.6
 platform: ruby
 authors: 
 - Omar Mekky
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-20 00:00:00 +02:00
+date: 2011-01-11 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -45,10 +45,10 @@ 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
-- app/models/session.rb
 - app/models/user.rb
 - app/models/user_invitation.rb
 - app/models/user_sync.rb
@@ -106,12 +106,12 @@ files:
 - 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/install/templates/initializer.rb
 - lib/generators/authentasaurus/views/USAGE
 - lib/generators/authentasaurus/views/templates/areas/edit.html.erb
 - lib/generators/authentasaurus/views/templates/areas/index.html.erb
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Restful dynamic group/permission based authentication and authorization for Rails