central_authentication 0.0.3 → 0.0.4

data/central_authentication.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = CentralAuthentication::VERSION
   s.authors     = ["Hannes Benson"]
   s.email       = ["hannes@mpowered.co.za"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/HannesBenson/CentralAuthentication"
   s.summary     = %q{Central Authentication using Authlogic}
   s.description = %q{This gem allows you to share a central database and using authlogic stores and retrieves passwords}
 

data/lib/central_authentication/acts_as_central_authentication_user.rb

@@ -22,27 +22,33 @@ module ActiveRecord
             config.validate_login_field = false
           end
 
-          validates_presence_of :password
-          validates_presence_of :password_confirmation
+          validates_presence_of :password, :if => Proc.new {|user| user.new_record? && user.central_auth_user_id.nil?}
+          validates_presence_of :password_confirmation, :if => Proc.new {|user| user.new_record? && user.central_auth_user_id.nil?}
           validates_format_of :password, :with => /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?!.*\s).{9,15}$/,
-                              :message => 'must contain at least one uppercase and one lowercase letter as well as at least one numerical character.'
+                              :message => 'must be between 9 and 15 characters long, contain at least one uppercase and one lowercase letter as well as at least one numerical character.',
+                              :if => Proc.new {|user| (user.password.present? || user.password_confirmation.present?)}
           validates_format_of :password_confirmation, :with => /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?!.*\s).{9,15}$/,
-                              :message => 'must contain at least one uppercase and one lowercase letter as well as at least one numerical character.'
+                              :message => 'must be between 9 and 15 characters long, contain at least one uppercase and one lowercase letter as well as at least one numerical character.',
+                              :if => Proc.new {|user| (user.password.present? || user.password_confirmation.present?)}
           validates_confirmation_of :password
 
-          before_save :create_or_set_cauth_user
+          before_validation :create_or_set_cauth_user
+
+          def self.find_by_persistence_token(persistence_token)
+            CentralAuthentication::User.find_by_persistence_token(persistence_token)
+          end
         end
       end
       module InstanceMethods
         def create_cauth_user
-          CentralAuthentication::User.create(:email => self.email, :password => self.password, :password_confirmation => self.password_confirmation, :password_expires_on => Date.today + 30.days, :persistence_token => self.persistence_token)
+          CentralAuthentication::User.create(:email => self.email, :password => self.password, :password_expires_on => Date.today + 30.days, :persistence_token => self.persistence_token)
         end
 
         def update_cauth_user(cauth_user)
           if self.password.blank?
             cauth_user.update_attributes(:email => self.email)
           else
-            cauth_user.update_attributes(:password => self.password, :password_confirmation => self.password_confirmation, :email => self.email)
+            cauth_user.update_attributes(:password => self.password, :email => self.email)
           end
         end
 
@@ -52,6 +58,7 @@ module ActiveRecord
             cauth_user = create_cauth_user
             self.central_auth_user_id = cauth_user.id
           else
+            self.central_authentication_user = cauth_user if self.central_auth_user_id.nil?
             update_cauth_user(cauth_user)
           end
         end

data/lib/central_authentication/railtie.rb

@@ -3,7 +3,7 @@ require 'rails'
 
 module CentralAuthentication
   class Railtie < Rails::Railtie
-    config.after_initialize do
+    initializer "central_authentication.configure_rails_initialization" do
       require 'central_authentication/version'
       require 'central_authentication/connection'
       require 'central_authentication/migration'

data/lib/central_authentication/user.rb

@@ -1,9 +1,8 @@
 class CentralAuthentication::User < CentralAuthentication::Connection
   acts_as_authentic do |config|
-    #config.merge_validates_length_of_password_field_options({:minimum => 9})
-    #config.merge_validates_length_of_password_confirmation_field_options({:minimum => 9})
     config.login_field = :email
     config.validate_password_field = false
+    config.session_class = UserSession
   end
 
   def self.valid?(email, password)

data/lib/central_authentication/version.rb

@@ -1,3 +1,3 @@
 module CentralAuthentication
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/generators/templates/remove_password_related_fields_from_user.rb

@@ -1,15 +1,31 @@
 class RemovePasswordRelatedFieldsFromUser < ActiveRecord::Migration
   def self.up
-    remove_column :users, :password_salt
-    remove_column :users, :crypted_password
-    remove_column :users, :persistence_token
-    remove_column :users, :perishable_token
+    if column_exists? :users, :password_salt
+      remove_column :users, :password_salt
+    end
+    if column_exists? :users, :crypted_password
+      remove_column :users, :crypted_password
+    end
+    if column_exists? :users, :persistence_token
+      remove_column :users, :persistence_token
+    end
+    if column_exists? :users, :perishable_token
+      remove_column :users, :perishable_token
+    end
   end
 
   def self.down
-    add_column :users, :password_salt, :string
-    add_column :users, :crypted_password, :string
-    add_column :users, :persistence_token, :string
-    add_column :users, :perishable_token, :string
+    unless column_exists? :users, :password_salt
+      add_column :users, :password_salt, :string
+    end
+    unless column_exists? :users, :crypted_password
+      add_column :users, :crypted_password, :string
+    end
+    unless column_exists? :users, :persistence_token
+      add_column :users, :persistence_token, :string
+    end
+    unless column_exists? :users, :perishable_token
+      add_column :users, :perishable_token, :string
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: central_authentication
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-27 00:00:00.000000000 +02:00
-default_executable: 
+date: 2012-03-17 00:00:00.000000000 Z
 dependencies: []
 description: This gem allows you to share a central database and using authlogic stores
   and retrieves passwords
@@ -37,8 +36,7 @@ files:
 - lib/generators/templates/add_users_table_to_cauth_db.rb
 - lib/generators/templates/create_central_authentication_users.rb
 - lib/generators/templates/remove_password_related_fields_from_user.rb
-has_rdoc: true
-homepage: ''
+homepage: https://github.com/HannesBenson/CentralAuthentication
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -58,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: central_authentication
-rubygems_version: 1.6.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Central Authentication using Authlogic