authlogic 3.0.3 → 3.1.0

data/Gemfile

@@ -5,6 +5,7 @@ gem 'activerecord', '>= 3.0.7'
 group :test do
   gem 'bcrypt-ruby'
   gem 'jeweler'
+  gem 'rake'
   gem 'ruby-debug19'
   gem 'sqlite3'
 end

data/Gemfile.lock

@@ -1,30 +1,32 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    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)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
     archive-tar-minitar (0.5.2)
-    arel (2.0.9)
-    bcrypt-ruby (2.1.4)
-    builder (2.1.2)
-    columnize (0.3.2)
+    arel (2.2.1)
+    bcrypt-ruby (3.0.1)
+    builder (3.0.0)
+    columnize (0.3.4)
     git (1.2.5)
-    i18n (0.5.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    i18n (0.6.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
-    rake (0.8.7)
+    multi_json (1.0.3)
+    rake (0.9.2)
     ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -35,8 +37,8 @@ GEM
       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)
+    sqlite3 (1.3.4)
+    tzinfo (0.3.30)
 
 PLATFORMS
   ruby
@@ -45,5 +47,6 @@ DEPENDENCIES
   activerecord (>= 3.0.7)
   bcrypt-ruby
   jeweler
+  rake
   ruby-debug19
   sqlite3

data/VERSION.yml

@@ -1,5 +1,5 @@
---- 
+---
 :major: 3
-:minor: 0
-:patch: 3
-:build: 
+:minor: 1
+:patch: 0
+:build: !!null 

data/authlogic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{authlogic}
-  s.version = "3.0.3"
+  s.version = "3.1.0"
 
   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-05-17}
+  s.authors = [%q{Ben Johnson of Binary Logic}]
+  s.date = %q{2011-10-19}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -146,61 +146,9 @@ Gem::Specification.new do |s|
     "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/binarylogic/authlogic}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   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

data/lib/authlogic/acts_as_authentic/password.rb

@@ -243,7 +243,7 @@ module Authlogic
           end
         
           # Accepts a raw password to determine if it is the correct password or not. Notice the second argument. That defaults to the value of
-          # check_passwords_against_database. See that method for mor information, but basically it just tells Authlogic to check the password
+          # check_passwords_against_database. See that method for more information, but basically it just tells Authlogic to check the password
           # against the value in the database or the value in the object.
           def valid_password?(attempted_password, check_against_database = check_passwords_against_database?)
             crypted = check_against_database && send("#{crypted_password_field}_changed?") ? send("#{crypted_password_field}_was") : send(crypted_password_field)
@@ -352,4 +352,4 @@ module Authlogic
       end
     end
   end
-end
+end

data/lib/authlogic/i18n.rb

@@ -40,6 +40,7 @@ module Authlogic
   #       not_confirmed: Your account is not confirmed
   #       not_approved: Your account is not approved
   #       no_authentication_details: You did not provide any details for authentication.
+  #       general_credentials_error: Login/Password combination is not valid
   #     models:
   #       user_session: UserSession (or whatever name you are using)
   #     attributes:

data/lib/authlogic/session/callbacks.rb

@@ -63,10 +63,11 @@ module Authlogic
       
       def self.included(base) #:nodoc:
         base.send :include, ActiveSupport::Callbacks
-        base.define_callbacks *METHODS
-        
+        base.define_callbacks *METHODS + [{:terminator => 'result == false'}]
+        base.define_callbacks *['persist', {:terminator => 'result == true'}]
+
         # If Rails 3, support the new callback syntax
-        if base.send(base.respond_to?(:singleton_class) ? :singleton_class : :metaclass).method_defined?(:set_callback)
+        if base.singleton_class.method_defined?(:set_callback)
           METHODS.each do |method|
             base.class_eval <<-"end_eval", __FILE__, __LINE__
               def self.#{method}(*methods, &block)
@@ -81,14 +82,10 @@ module Authlogic
         METHODS.each do |method|
           class_eval <<-"end_eval", __FILE__, __LINE__
             def #{method}
-              run_callbacks(:#{method}) { |result, object| result == false }
+              run_callbacks(:#{method})
             end
           end_eval
         end
-      
-        def persist
-          run_callbacks(:persist) { |result, object| result == true }
-        end
         
         def save_record(alternate_record = nil)
           r = alternate_record || record

data/lib/authlogic/session/cookies.rb

@@ -23,10 +23,10 @@ module Authlogic
         #   session = UserSession.new(:super_high_secret)
         #   session.cookie_key => "super_high_secret_user_credentials"
         #
-        # * <tt>Default:</tt> "#{guessed_klass_name.underscore}_credentials"
+        # * <tt>Default:</tt> "#{klass_name.underscore}_credentials"
         # * <tt>Accepts:</tt> String
         def cookie_key(value = nil)
-          rw_config(:cookie_key, value, "#{guessed_klass_name.underscore}_credentials")
+          rw_config(:cookie_key, value, "#{klass_name.underscore}_credentials")
         end
         alias_method :cookie_key=, :cookie_key
         

data/lib/authlogic/session/http_auth.rb

@@ -77,7 +77,7 @@ module Authlogic
               if !login.blank? && !password.blank?
                 send("#{login_field}=", login)
                 send("#{password_field}=", password)
-                return valid?
+                valid?
               end
             end
 

data/lib/authlogic/session/klass.rb

@@ -6,13 +6,13 @@ module Authlogic
         klass.class_eval do
           extend Config
           include InstanceMethods
-          
+
           class << self
             attr_accessor :configured_klass_methods
           end
         end
       end
-      
+
       module Config
         # Lets you change which model to use for authentication.
         #
@@ -23,31 +23,22 @@ module Authlogic
           @klass = klass
         end
         alias_method :authenticate_with=, :authenticate_with
-        
+
         # The name of the class that this session is authenticating with. For example, the UserSession class will
         # authenticate with the User class unless you specify otherwise in your configuration. See authenticate_with
         # for information on how to change this value.
         def klass
-          @klass ||=
-            if klass_name
-              klass_name.constantize
-            else
-              nil
-            end
-        end
-        
-        # Same as klass, just returns a string instead of the actual constant.
-        def klass_name
-          @klass_name ||= guessed_klass_name
+          @klass ||= klass_name ? klass_name.constantize : nil
         end
-        
+
         # The string of the model name class guessed from the actual session class name.
-        def guessed_klass_name
-          guessed_name = name.scan(/(.*)Session/)[0]
-          guessed_name[0] if guessed_name
+        def klass_name
+          return @klass_name if defined?(@klass_name)
+          @klass_name = name.scan(/(.*)Session/)[0]
+          @klass_name = klass_name ? klass_name[0] : nil
         end
       end
-      
+
       module InstanceMethods
         # Creating an alias method for the "record" method based on the klass name, so that we can do:
         #
@@ -63,7 +54,7 @@ module Authlogic
           end
           super
         end
-        
+
         private
           def klass
             self.class.klass

data/test/libs/user_session.rb

@@ -2,5 +2,4 @@ class UserSession < Authlogic::Session::Base
 end
 
 class BackOfficeUserSession < Authlogic::Session::Base
-  authenticate_with User
 end

data/test/session_test/callbacks_test.rb

@@ -1,6 +1,54 @@
 require 'test_helper'
 
+class WackyUserSession < Authlogic::Session::Base
+  attr_accessor :counter
+  authenticate_with User
+
+  def initialize
+    @counter = 0
+    super
+  end
+
+  def persist_by_false
+    self.counter += 1
+    return false
+  end
+
+  def persist_by_true
+    self.counter += 1
+    return true
+  end
+end
+
 module SessionTest
   class CallbacksTest < ActiveSupport::TestCase
+    def setup
+     WackyUserSession.reset_callbacks(:persist)
+    end
+    
+    def test_no_callbacks
+      assert_equal [], WackyUserSession._persist_callbacks.map(&:filter)
+      session = WackyUserSession.new
+      session.send(:persist)
+      assert_equal 0, session.counter
+    end
+
+    def test_true_callback_cancelling_later_callbacks
+      WackyUserSession.persist :persist_by_true, :persist_by_false
+      assert_equal [:persist_by_true, :persist_by_false], WackyUserSession._persist_callbacks.map(&:filter)
+  
+      session = WackyUserSession.new
+      session.send(:persist)
+      assert_equal 1, session.counter
+    end
+  
+    def test_false_callback_continuing_to_later_callbacks
+      WackyUserSession.persist :persist_by_false, :persist_by_true
+      assert_equal [:persist_by_false, :persist_by_true], WackyUserSession._persist_callbacks.map(&:filter)
+  
+      session = WackyUserSession.new
+      session.send(:persist)
+      assert_equal 2, session.counter
+    end
   end
 end

data/test/session_test/cookies_test.rb

@@ -6,35 +6,35 @@ module SessionTest
       def test_cookie_key
         UserSession.cookie_key = "my_cookie_key"
         assert_equal "my_cookie_key", UserSession.cookie_key
-    
+
         UserSession.cookie_key "user_credentials"
         assert_equal "user_credentials", UserSession.cookie_key
       end
-    
+
       def test_default_cookie_key
         assert_equal "user_credentials", UserSession.cookie_key
         assert_equal "back_office_user_credentials", BackOfficeUserSession.cookie_key
       end
-    
+
       def test_remember_me
         UserSession.remember_me = true
         assert_equal true, UserSession.remember_me
         session = UserSession.new
         assert_equal true, session.remember_me
-    
+
         UserSession.remember_me false
         assert_equal false, UserSession.remember_me
         session = UserSession.new
         assert_equal false, session.remember_me
       end
-  
+
       def test_remember_me_for
         UserSession.remember_me_for = 3.years
         assert_equal 3.years, UserSession.remember_me_for
         session = UserSession.new
         session.remember_me = true
         assert_equal 3.years, session.remember_me_for
-    
+
         UserSession.remember_me_for 3.months
         assert_equal 3.months, UserSession.remember_me_for
         session = UserSession.new
@@ -66,48 +66,48 @@ module SessionTest
         assert_equal false, session.httponly
       end
     end
-    
+
     class InstanceMethodsTest < ActiveSupport::TestCase
       def test_credentials
         session = UserSession.new
         session.credentials = {:remember_me => true}
         assert_equal true, session.remember_me
       end
-    
+
       def test_remember_me
         session = UserSession.new
         assert_equal false, session.remember_me
         assert !session.remember_me?
-      
+
         session.remember_me = false
         assert_equal false, session.remember_me
         assert !session.remember_me?
-      
+
         session.remember_me = true
         assert_equal true, session.remember_me
         assert session.remember_me?
-      
+
         session.remember_me = nil
         assert_nil session.remember_me
         assert !session.remember_me?
-      
+
         session.remember_me = "1"
         assert_equal "1", session.remember_me
         assert session.remember_me?
-      
+
         session.remember_me = "true"
         assert_equal "true", session.remember_me
         assert session.remember_me?
       end
-    
+
       def test_remember_me_until
         session = UserSession.new
         assert_nil session.remember_me_until
-      
+
         session.remember_me = true
         assert 3.months.from_now <= session.remember_me_until
       end
-    
+
       def test_persist_persist_by_cookie
         ben = users(:ben)
         assert !UserSession.find
@@ -115,14 +115,14 @@ module SessionTest
         assert session = UserSession.find
         assert_equal ben, session.record
       end
-    
+
       def test_after_save_save_cookie
         ben = users(:ben)
         session = UserSession.new(ben)
         assert session.save
         assert_equal "#{ben.persistence_token}::#{ben.id}", controller.cookies["user_credentials"]
       end
-    
+
       def test_after_destroy_destroy_cookie
         ben = users(:ben)
         set_cookie_for(ben)

data/test/session_test/http_auth_test.rb

@@ -40,6 +40,7 @@ module SessionTest
           assert_equal "benrocks", session.send(:protected_password)
           assert !controller.http_auth_requested?
         end
+        unset_session
         UserSession.request_http_basic_auth = true
         UserSession.http_basic_auth_realm = 'PersistTestRealm'
         http_basic_auth_for(ben) do

data/test/session_test/klass_test.rb

@@ -7,12 +7,12 @@ module SessionTest
         UserSession.authenticate_with = Employee
         assert_equal "Employee", UserSession.klass_name
         assert_equal Employee, UserSession.klass
-    
+
         UserSession.authenticate_with User
         assert_equal "User", UserSession.klass_name
         assert_equal User, UserSession.klass
       end
-    
+
       def test_klass
         assert_equal User, UserSession.klass
       end
@@ -20,13 +20,13 @@ module SessionTest
       def test_klass_name
         assert_equal "User", UserSession.klass_name
       end
-      
-      def test_guessed_klass_name
-        assert_equal "User", UserSession.guessed_klass_name
-        assert_equal "BackOfficeUser", BackOfficeUserSession.guessed_klass_name
+
+      def test_klass_name_uses_custom_name
+        assert_equal "User", UserSession.klass_name
+        assert_equal "BackOfficeUser", BackOfficeUserSession.klass_name
       end
     end
-    
+
     class InstanceMethodsTest < ActiveSupport::TestCase
       def test_record_method
         ben = users(:ben)

metadata

@@ -1,50 +1,46 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: authlogic
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 3.1.0
   prerelease: 
-  version: 3.0.3
 platform: ruby
-authors: 
+authors:
 - Ben Johnson of Binary Logic
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-17 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-19 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70092428968260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70092428968260
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70092428967600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *id002
+  version_requirements: *70092428967600
 description: 
 email: bjohnson@binarylogic.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -173,85 +169,31 @@ files:
 - test/session_test/unauthorized_record_test.rb
 - test/session_test/validation_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/binarylogic/authlogic
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3531025750012429530
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3222304498311125982
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A clean, simple, and unobtrusive ruby authentication solution.
-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
+test_files: []