authlogic 2.1.11 → 3.0.0

data/Gemfile

@@ -1,2 +1,10 @@
 source :rubygems
-gemspec
+
+gem 'activerecord', '~> 3.0.7'
+
+group :test do
+  gem 'bcrypt-ruby'
+  gem 'jeweler'
+  gem 'ruby-debug19'
+  gem 'sqlite3'
+end

data/Gemfile.lock

@@ -1,25 +1,49 @@
-PATH
-  remote: .
-  specs:
-    authlogic (2.1.9)
-      activerecord (~> 2.3.0)
-      activesupport (~> 2.3.0)
-
 GEM
   remote: http://rubygems.org/
   specs:
-    activerecord (2.3.14)
-      activesupport (= 2.3.14)
-    activesupport (2.3.14)
-    bcrypt-ruby (3.0.1)
-    rake (0.9.2.2)
-    sqlite3 (1.3.6)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.7)
+    archive-tar-minitar (0.5.2)
+    arel (2.0.9)
+    bcrypt-ruby (2.1.4)
+    builder (2.1.2)
+    columnize (0.3.2)
+    git (1.2.5)
+    i18n (0.5.0)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
+    rake (0.8.7)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
+    sqlite3 (1.3.3)
+    tzinfo (0.3.27)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  authlogic!
+  activerecord (~> 3.0.7)
   bcrypt-ruby
-  rake
+  jeweler
+  ruby-debug19
   sqlite3

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Ben Johnson of Binary Logic
+Copyright (c) 2011 Ben Johnson of Binary Logic
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,7 +1,5 @@
 = Authlogic
 
-** This branch supports Rails 2 only! For Rails 3 go to the master branch **
-
 Authlogic is a clean, simple, and unobtrusive ruby authentication solution.
 
 A code example can replace a thousand words...
@@ -69,6 +67,7 @@ If you find a bug or a problem please post it in the issues section. If you need
 * <b>Authlogic OpenID addon:</b> http://github.com/binarylogic/authlogic_openid
 * <b>Authlogic LDAP addon:</b> http://github.com/binarylogic/authlogic_ldap
 * <b>Authlogic Facebook Connect:</b> http://github.com/kalasjocke/authlogic_facebook_connect
+* <b>Authlogic Facebook Connect (New JS API):</b> http://github.com/studybyte/authlogic_facebook_connect
 * <b>Authlogic OAuth (Twitter):</b> http://github.com/jrallison/authlogic_oauth
 * <b>Authlogic PAM:</b> http://github.com/nbudin/authlogic_pam
 
@@ -152,7 +151,7 @@ What if your user sessions controller could look just like your other controller
     def new
       @user_session = UserSession.new
     end
-
+    
     def create
       @user_session = UserSession.new(params[:user_session])
       if @user_session.save
@@ -161,7 +160,7 @@ What if your user sessions controller could look just like your other controller
         render :action => :new
       end
     end
-
+    
     def destroy
       current_user_session.destroy
       redirect_to new_user_session_url
@@ -185,13 +184,13 @@ Or how about persisting the session...
 
   class ApplicationController
     helper_method :current_user_session, :current_user
-
+    
     private
       def current_user_session
         return @current_user_session if defined?(@current_user_session)
         @current_user_session = UserSession.find
       end
-
+      
       def current_user
         return @current_user if defined?(@current_user)
         @current_user = current_user_session && current_user_session.user
@@ -200,9 +199,21 @@ Or how about persisting the session...
 
 == Install & Use
 
-Add to your Gemfile
+Install the gem / plugin (recommended)
+
+From rubyforge:
+
+  $ sudo gem install authlogic
+
+Or from github:
+
+  $ sudo gem install binarylogic-authlogic
+
+Now just add the gem dependency in your projects configuration.
+
+Or you can install this as a plugin:
 
-  $ gem 'authlogic', '~> 2.1.0'
+  script/plugin install git://github.com/binarylogic/authlogic.git
 
 == Detailed Setup Tutorial
 

data/Rakefile

@@ -1,5 +1,24 @@
 require 'rubygems'
 require 'rake'
+require 'bundler'
+
+Bundler.setup
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "authlogic"
+    gem.summary = "A clean, simple, and unobtrusive ruby authentication solution."
+    gem.email = "bjohnson@binarylogic.com"
+    gem.homepage = "http://github.com/binarylogic/authlogic"
+    gem.authors = ["Ben Johnson of Binary Logic"]
+    gem.add_bundler_dependencies
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+end
+
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'test'

data/VERSION.yml

@@ -1,5 +1,5 @@
----
-:major: 2
-:minor: 1
-:patch: 7
+--- 
+:major: 3
+:minor: 0
+:patch: 0
 :build: 

data/authlogic.gemspec

@@ -1,24 +1,220 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
-  s.name        = "authlogic"
-  s.version     = "2.1.11"
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Ben Johnson"]
-  s.email       = ["bjohnson@binarylogic.com"]
-  s.homepage    = "http://github.com/binarylogic/authlogic"
-  s.summary     = %q{A clean, simple, and unobtrusive ruby authentication solution.}
-  s.description = %q{A clean, simple, and unobtrusive ruby authentication solution.}
+  s.name = %q{authlogic}
+  s.version = "3.0.0"
 
-  s.add_dependency 'activerecord', '~> 2.3.0'
-  s.add_dependency 'activesupport', '~> 2.3.0'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'bcrypt-ruby'
-  s.add_development_dependency 'sqlite3'
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Ben Johnson of Binary Logic"]
+  s.date = %q{2011-04-30}
+  s.email = %q{bjohnson@binarylogic.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.rdoc"
+  ]
+  s.files = [
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION.yml",
+    "authlogic.gemspec",
+    "generators/session/session_generator.rb",
+    "generators/session/templates/session.rb",
+    "init.rb",
+    "lib/authlogic.rb",
+    "lib/authlogic/acts_as_authentic/base.rb",
+    "lib/authlogic/acts_as_authentic/email.rb",
+    "lib/authlogic/acts_as_authentic/logged_in_status.rb",
+    "lib/authlogic/acts_as_authentic/login.rb",
+    "lib/authlogic/acts_as_authentic/magic_columns.rb",
+    "lib/authlogic/acts_as_authentic/password.rb",
+    "lib/authlogic/acts_as_authentic/perishable_token.rb",
+    "lib/authlogic/acts_as_authentic/persistence_token.rb",
+    "lib/authlogic/acts_as_authentic/restful_authentication.rb",
+    "lib/authlogic/acts_as_authentic/session_maintenance.rb",
+    "lib/authlogic/acts_as_authentic/single_access_token.rb",
+    "lib/authlogic/acts_as_authentic/validations_scope.rb",
+    "lib/authlogic/authenticates_many/association.rb",
+    "lib/authlogic/authenticates_many/base.rb",
+    "lib/authlogic/controller_adapters/abstract_adapter.rb",
+    "lib/authlogic/controller_adapters/merb_adapter.rb",
+    "lib/authlogic/controller_adapters/rails_adapter.rb",
+    "lib/authlogic/controller_adapters/sinatra_adapter.rb",
+    "lib/authlogic/crypto_providers/aes256.rb",
+    "lib/authlogic/crypto_providers/bcrypt.rb",
+    "lib/authlogic/crypto_providers/md5.rb",
+    "lib/authlogic/crypto_providers/sha1.rb",
+    "lib/authlogic/crypto_providers/sha256.rb",
+    "lib/authlogic/crypto_providers/sha512.rb",
+    "lib/authlogic/crypto_providers/wordpress.rb",
+    "lib/authlogic/i18n.rb",
+    "lib/authlogic/i18n/translator.rb",
+    "lib/authlogic/random.rb",
+    "lib/authlogic/regex.rb",
+    "lib/authlogic/session/activation.rb",
+    "lib/authlogic/session/active_record_trickery.rb",
+    "lib/authlogic/session/base.rb",
+    "lib/authlogic/session/brute_force_protection.rb",
+    "lib/authlogic/session/callbacks.rb",
+    "lib/authlogic/session/cookies.rb",
+    "lib/authlogic/session/existence.rb",
+    "lib/authlogic/session/foundation.rb",
+    "lib/authlogic/session/http_auth.rb",
+    "lib/authlogic/session/id.rb",
+    "lib/authlogic/session/klass.rb",
+    "lib/authlogic/session/magic_columns.rb",
+    "lib/authlogic/session/magic_states.rb",
+    "lib/authlogic/session/params.rb",
+    "lib/authlogic/session/password.rb",
+    "lib/authlogic/session/perishable_token.rb",
+    "lib/authlogic/session/persistence.rb",
+    "lib/authlogic/session/priority_record.rb",
+    "lib/authlogic/session/scopes.rb",
+    "lib/authlogic/session/session.rb",
+    "lib/authlogic/session/timeout.rb",
+    "lib/authlogic/session/unauthorized_record.rb",
+    "lib/authlogic/session/validation.rb",
+    "lib/authlogic/test_case.rb",
+    "lib/authlogic/test_case/mock_controller.rb",
+    "lib/authlogic/test_case/mock_cookie_jar.rb",
+    "lib/authlogic/test_case/mock_logger.rb",
+    "lib/authlogic/test_case/mock_request.rb",
+    "lib/authlogic/test_case/rails_request_adapter.rb",
+    "lib/generators/authlogic/USAGE",
+    "lib/generators/authlogic/session_generator.rb",
+    "lib/generators/authlogic/templates/session.rb",
+    "rails/init.rb",
+    "shoulda_macros/authlogic.rb",
+    "test/acts_as_authentic_test/base_test.rb",
+    "test/acts_as_authentic_test/email_test.rb",
+    "test/acts_as_authentic_test/logged_in_status_test.rb",
+    "test/acts_as_authentic_test/login_test.rb",
+    "test/acts_as_authentic_test/magic_columns_test.rb",
+    "test/acts_as_authentic_test/password_test.rb",
+    "test/acts_as_authentic_test/perishable_token_test.rb",
+    "test/acts_as_authentic_test/persistence_token_test.rb",
+    "test/acts_as_authentic_test/restful_authentication_test.rb",
+    "test/acts_as_authentic_test/session_maintenance_test.rb",
+    "test/acts_as_authentic_test/single_access_test.rb",
+    "test/authenticates_many_test.rb",
+    "test/crypto_provider_test/aes256_test.rb",
+    "test/crypto_provider_test/bcrypt_test.rb",
+    "test/crypto_provider_test/sha1_test.rb",
+    "test/crypto_provider_test/sha256_test.rb",
+    "test/crypto_provider_test/sha512_test.rb",
+    "test/fixtures/companies.yml",
+    "test/fixtures/employees.yml",
+    "test/fixtures/projects.yml",
+    "test/fixtures/users.yml",
+    "test/i18n_test.rb",
+    "test/libs/affiliate.rb",
+    "test/libs/company.rb",
+    "test/libs/employee.rb",
+    "test/libs/employee_session.rb",
+    "test/libs/ldaper.rb",
+    "test/libs/ordered_hash.rb",
+    "test/libs/project.rb",
+    "test/libs/user.rb",
+    "test/libs/user_session.rb",
+    "test/random_test.rb",
+    "test/session_test/activation_test.rb",
+    "test/session_test/active_record_trickery_test.rb",
+    "test/session_test/brute_force_protection_test.rb",
+    "test/session_test/callbacks_test.rb",
+    "test/session_test/cookies_test.rb",
+    "test/session_test/credentials_test.rb",
+    "test/session_test/existence_test.rb",
+    "test/session_test/http_auth_test.rb",
+    "test/session_test/id_test.rb",
+    "test/session_test/klass_test.rb",
+    "test/session_test/magic_columns_test.rb",
+    "test/session_test/magic_states_test.rb",
+    "test/session_test/params_test.rb",
+    "test/session_test/password_test.rb",
+    "test/session_test/perishability_test.rb",
+    "test/session_test/persistence_test.rb",
+    "test/session_test/scopes_test.rb",
+    "test/session_test/session_test.rb",
+    "test/session_test/timeout_test.rb",
+    "test/session_test/unauthorized_record_test.rb",
+    "test/session_test/validation_test.rb",
+    "test/test_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/binarylogic/authlogic}
   s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.5.2}
+  s.summary = %q{A clean, simple, and unobtrusive ruby authentication solution.}
+  s.test_files = [
+    "test/acts_as_authentic_test/base_test.rb",
+    "test/acts_as_authentic_test/email_test.rb",
+    "test/acts_as_authentic_test/logged_in_status_test.rb",
+    "test/acts_as_authentic_test/login_test.rb",
+    "test/acts_as_authentic_test/magic_columns_test.rb",
+    "test/acts_as_authentic_test/password_test.rb",
+    "test/acts_as_authentic_test/perishable_token_test.rb",
+    "test/acts_as_authentic_test/persistence_token_test.rb",
+    "test/acts_as_authentic_test/restful_authentication_test.rb",
+    "test/acts_as_authentic_test/session_maintenance_test.rb",
+    "test/acts_as_authentic_test/single_access_test.rb",
+    "test/authenticates_many_test.rb",
+    "test/crypto_provider_test/aes256_test.rb",
+    "test/crypto_provider_test/bcrypt_test.rb",
+    "test/crypto_provider_test/sha1_test.rb",
+    "test/crypto_provider_test/sha256_test.rb",
+    "test/crypto_provider_test/sha512_test.rb",
+    "test/i18n_test.rb",
+    "test/libs/affiliate.rb",
+    "test/libs/company.rb",
+    "test/libs/employee.rb",
+    "test/libs/employee_session.rb",
+    "test/libs/ldaper.rb",
+    "test/libs/ordered_hash.rb",
+    "test/libs/project.rb",
+    "test/libs/user.rb",
+    "test/libs/user_session.rb",
+    "test/random_test.rb",
+    "test/session_test/activation_test.rb",
+    "test/session_test/active_record_trickery_test.rb",
+    "test/session_test/brute_force_protection_test.rb",
+    "test/session_test/callbacks_test.rb",
+    "test/session_test/cookies_test.rb",
+    "test/session_test/credentials_test.rb",
+    "test/session_test/existence_test.rb",
+    "test/session_test/http_auth_test.rb",
+    "test/session_test/id_test.rb",
+    "test/session_test/klass_test.rb",
+    "test/session_test/magic_columns_test.rb",
+    "test/session_test/magic_states_test.rb",
+    "test/session_test/params_test.rb",
+    "test/session_test/password_test.rb",
+    "test/session_test/perishability_test.rb",
+    "test/session_test/persistence_test.rb",
+    "test/session_test/scopes_test.rb",
+    "test/session_test/session_test.rb",
+    "test/session_test/timeout_test.rb",
+    "test/session_test/unauthorized_record_test.rb",
+    "test/session_test/validation_test.rb",
+    "test/test_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.7"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.7"])
+    else
+      s.add_dependency(%q<activerecord>, ["~> 3.0.7"])
+      s.add_dependency(%q<activerecord>, ["~> 3.0.7"])
+    end
+  else
+    s.add_dependency(%q<activerecord>, ["~> 3.0.7"])
+    s.add_dependency(%q<activerecord>, ["~> 3.0.7"])
+  end
 end
+

data/lib/authlogic/acts_as_authentic/email.rb

@@ -11,7 +11,7 @@ module Authlogic
           add_acts_as_authentic_module(Methods)
         end
       end
-      
+
       # Configuration to modify how Authlogic handles the email field.
       module Config
         # The name of the field that stores email addresses.
@@ -22,7 +22,7 @@ module Authlogic
           rw_config(:email_field, value, first_column_to_exist(nil, :email, :email_address))
         end
         alias_method :email_field=, :email_field
-        
+
         # Toggles validating the email field or not.
         #
         # * <tt>Default:</tt> true
@@ -31,20 +31,20 @@ module Authlogic
           rw_config(:validate_email_field, value, true)
         end
         alias_method :validate_email_field=, :validate_email_field
-        
+
         # A hash of options for the validates_length_of call for the email field. Allows you to change this however you want.
         #
         # <b>Keep in mind this is ruby. I wanted to keep this as flexible as possible, so you can completely replace the hash or
         # merge options into it. Checkout the convenience function merge_validates_length_of_email_field_options to merge
         # options.</b>
         #
-        # * <tt>Default:</tt> {:within => 6..100}
+        # * <tt>Default:</tt> {:maximum => 100}
         # * <tt>Accepts:</tt> Hash of options accepted by validates_length_of
         def validates_length_of_email_field_options(value = nil)
-          rw_config(:validates_length_of_email_field_options, value, {:within => 6..100})
+          rw_config(:validates_length_of_email_field_options, value, {:maximum => 100})
         end
         alias_method :validates_length_of_email_field_options=, :validates_length_of_email_field_options
-        
+
         # A convenience function to merge options into the validates_length_of_email_field_options. So intead of:
         #
         #   self.validates_length_of_email_field_options = validates_length_of_email_field_options.merge(:my_option => my_value)
@@ -55,25 +55,25 @@ module Authlogic
         def merge_validates_length_of_email_field_options(options = {})
           self.validates_length_of_email_field_options = validates_length_of_email_field_options.merge(options)
         end
-        
+
         # A hash of options for the validates_format_of call for the email field. Allows you to change this however you want.
         #
         # <b>Keep in mind this is ruby. I wanted to keep this as flexible as possible, so you can completely replace the hash or
         # merge options into it. Checkout the convenience function merge_validates_format_of_email_field_options to merge
         # options.</b>
         #
-        # * <tt>Default:</tt> {:with => Authlogic::Regex.email, :message => I18n.t('error_messages.email_invalid', :default => "should look like an email address.")}
+        # * <tt>Default:</tt> {:with => Authlogic::Regex.email, :message => lambda {I18n.t('error_messages.email_invalid', :default => "should look like an email address.")}}
         # * <tt>Accepts:</tt> Hash of options accepted by validates_format_of
         def validates_format_of_email_field_options(value = nil)
           rw_config(:validates_format_of_email_field_options, value, {:with => Authlogic::Regex.email, :message => I18n.t('error_messages.email_invalid', :default => "should look like an email address.")})
         end
         alias_method :validates_format_of_email_field_options=, :validates_format_of_email_field_options
-        
+
         # See merge_validates_length_of_email_field_options. The same thing except for validates_format_of_email_field_options.
         def merge_validates_format_of_email_field_options(options = {})
           self.validates_format_of_email_field_options = validates_format_of_email_field_options.merge(options)
         end
-        
+
         # A hash of options for the validates_uniqueness_of call for the email field. Allows you to change this however you want.
         #
         # <b>Keep in mind this is ruby. I wanted to keep this as flexible as possible, so you can completely replace the hash or
@@ -86,13 +86,13 @@ module Authlogic
           rw_config(:validates_uniqueness_of_email_field_options, value, {:case_sensitive => false, :scope => validations_scope, :if => "#{email_field}_changed?".to_sym})
         end
         alias_method :validates_uniqueness_of_email_field_options=, :validates_uniqueness_of_email_field_options
-        
+
         # See merge_validates_length_of_email_field_options. The same thing except for validates_uniqueness_of_email_field_options.
         def merge_validates_uniqueness_of_email_field_options(options = {})
           self.validates_uniqueness_of_email_field_options = validates_uniqueness_of_email_field_options.merge(options)
         end
       end
-      
+
       # All methods relating to the email field
       module Methods
         def self.included(klass)