authlogic 3.5.0 → 3.6.0

data/lib/authlogic/session/perishable_token.rb

@@ -1,7 +1,9 @@
 module Authlogic
   module Session
-    # Maintains the perishable token, which is helpful for confirming records or authorizing records to reset their password. All that this
-    # module does is reset it after a session have been saved, just keep it changing. The more it changes, the tighter the security.
+    # Maintains the perishable token, which is helpful for confirming records or
+    # authorizing records to reset their password. All that this module does is
+    # reset it after a session have been saved, just keep it changing. The more
+    # it changes, the tighter the security.
     #
     # See Authlogic::ActsAsAuthentic::PerishableToken for more information.
     module PerishableToken
@@ -12,7 +14,9 @@ module Authlogic
       private
 
         def reset_perishable_token!
-          record.reset_perishable_token if record.respond_to?(:reset_perishable_token) && !record.disable_perishable_token_maintenance?
+          if record.respond_to?(:reset_perishable_token) && !record.disable_perishable_token_maintenance?
+            record.reset_perishable_token
+          end
         end
     end
   end

data/lib/authlogic/session/validation.rb

@@ -2,7 +2,8 @@ module Authlogic
   module Session
     # Responsible for session validation
     module Validation
-      # The errors in Authlogic work JUST LIKE ActiveRecord. In fact, it uses the exact same ActiveRecord errors class. Use it the same way:
+      # The errors in Authlogic work JUST LIKE ActiveRecord. In fact, it uses
+      # the exact same ActiveRecord errors class. Use it the same way:
       #
       #   class UserSession
       #     validate :check_if_awesome
@@ -22,9 +23,10 @@ module Authlogic
         end
       end
 
-      # You should use this as a place holder for any records that you find during validation. The main reason for this is to
-      # allow other modules to use it if needed. Take the failed_login_count feature, it needs this in order to increase
-      # the failed login count.
+      # You should use this as a place holder for any records that you find
+      # during validation. The main reason for this is to allow other modules to
+      # use it if needed. Take the failed_login_count feature, it needs this in
+      # order to increase the failed login count.
       def attempted_record
         @attempted_record
       end
@@ -34,8 +36,8 @@ module Authlogic
         @attempted_record = value
       end
 
-      # The errors in Authlogic work JUST LIKE ActiveRecord. In fact, it uses the exact same ActiveRecord errors class.
-      # Use it the same way:
+      # The errors in Authlogic work JUST LIKE ActiveRecord. In fact, it uses
+      # the exact same ActiveRecord errors class. Use it the same way:
       #
       # === Example
       #
@@ -52,9 +54,9 @@ module Authlogic
         @errors ||= Errors.new(self)
       end
 
-      # Determines if the information you provided for authentication is valid or not. If there is
-      # a problem with the information provided errors will be added to the errors object and this
-      # method will return false.
+      # Determines if the information you provided for authentication is valid
+      # or not. If there is a problem with the information provided errors will
+      # be added to the errors object and this method will return false.
       def valid?
         errors.clear
         self.attempted_record = nil
@@ -64,13 +66,13 @@ module Authlogic
         validate
         ensure_authentication_attempted
 
-        if errors.size == 0
+        if errors.empty?
           new_session? ? after_validation_on_create : after_validation_on_update
           after_validation
         end
 
         save_record(attempted_record)
-        errors.size == 0
+        errors.empty?
       end
 
       private

data/lib/authlogic/test_case.rb

@@ -5,8 +5,9 @@ require File.dirname(__FILE__) + "/test_case/mock_logger"
 require File.dirname(__FILE__) + "/test_case/mock_request"
 
 module Authlogic
-  # This module is a collection of methods and classes that help you easily test Authlogic. In fact,
-  # I use these same tools to test the internals of Authlogic.
+  # This module is a collection of methods and classes that help you easily test
+  # Authlogic. In fact, I use these same tools to test the internals of
+  # Authlogic.
   #
   # === The quick and dirty
   #
@@ -18,26 +19,33 @@ module Authlogic
   #
   # === Setting up
   #
-  # Authlogic comes with some simple testing tools. To get these, you need to first require Authlogic's TestCase. If
-  # you are doing this in a rails app, you would require this file at the top of your test_helper.rb file:
+  # Authlogic comes with some simple testing tools. To get these, you need to
+  # first require Authlogic's TestCase. If you are doing this in a rails app,
+  # you would require this file at the top of your test_helper.rb file:
   #
   #   require "authlogic/test_case"
   #
-  # If you are using Test::Unit::TestCase, the standard testing library that comes with ruby, then you can skip this next part.
-  # If you are not, you need to include the Authlogic::TestCase into your testing suite as follows:
+  # If you are using Test::Unit::TestCase, the standard testing library that
+  # comes with ruby, then you can skip this next part. If you are not, you need
+  # to include the Authlogic::TestCase into your testing suite as follows:
   #
   #   include Authlogic::TestCase
   #
-  # Now that everything is ready to go, let's move onto actually testing. Here is the basic idea behind testing:
+  # Now that everything is ready to go, let's move onto actually testing. Here
+  # is the basic idea behind testing:
   #
-  # Authlogic requires a "connection" to your controller to activate it. In the same manner that ActiveRecord requires a connection to
-  # your database. It can't do anything until it gets connected. That being said, Authlogic will raise an
-  # Authlogic::Session::Activation::NotActivatedError any time you try to instantiate an object without a "connection".
-  # So before you do anything with Authlogic, you need to activate / connect Authlogic. Let's walk through how to do this in tests:
+  # Authlogic requires a "connection" to your controller to activate it. In the
+  # same manner that ActiveRecord requires a connection to your database. It
+  # can't do anything until it gets connected. That being said, Authlogic will
+  # raise an Authlogic::Session::Activation::NotActivatedError any time you try
+  # to instantiate an object without a "connection". So before you do anything
+  # with Authlogic, you need to activate / connect Authlogic. Let's walk through
+  # how to do this in tests:
   #
   # === Fixtures / Factories
   #
-  # Creating users via fixtures / factories is easy. Here's an example of a fixture:
+  # Creating users via fixtures / factories is easy. Here's an example of a
+  # fixture:
   #
   #   ben:
   #     email: whatever@whatever.com
@@ -47,43 +55,52 @@ module Authlogic
   #     single_access_token: <%= Authlogic::Random.friendly_token %>
   #     perishable_token: <%= Authlogic::Random.friendly_token %>
   #
-  # Notice the crypted_password value. Just supplement that with whatever crypto provider you are using, if you are not using the default.
+  # Notice the crypted_password value. Just supplement that with whatever crypto
+  # provider you are using, if you are not using the default.
   #
   # === Functional tests
   #
-  # Activating Authlogic isn't a problem here, because making a request will activate Authlogic for you. The problem is
-  # logging users in so they can access restricted areas. Solving this is simple, just do this:
+  # Activating Authlogic isn't a problem here, because making a request will
+  # activate Authlogic for you. The problem is logging users in so they can
+  # access restricted areas. Solving this is simple, just do this:
   #
   #   setup :activate_authlogic
   #
-  # For those of you unfamiliar with TestUnit, the setup method basically just executes a method before any test is ran.
-  # It is essentially "setting up" your tests.
+  # For those of you unfamiliar with TestUnit, the setup method basically just
+  # executes a method before any test is ran. It is essentially "setting up"
+  # your tests.
   #
   # Once you have done this, just log users in like usual:
   #
   #   UserSession.create(users(:whomever))
   #   # access my restricted area here
   #
-  # Do this before you make your request and it will act as if that user is logged in.
+  # Do this before you make your request and it will act as if that user is
+  # logged in.
   #
   # === Integration tests
   #
-  # Again, just like functional tests, you don't have to do anything. As soon as you make a request, Authlogic will be
-  # connected. If you want to activate Authlogic before making a request follow the same steps described in the
+  # Again, just like functional tests, you don't have to do anything. As soon as
+  # you make a request, Authlogic will be connected. If you want to activate
+  # Authlogic before making a request follow the same steps described in the
   # "functional tests" section above. It works in the same manner.
   #
   # === Unit tests
   #
-  # The only time you need to do any trickiness here is if you want to test Authlogic models. Maybe you added some custom
-  # code or methods in your Authlogic models. Maybe you are writing a plugin or a library that extends Authlogic.
+  # The only time you need to do any trickiness here is if you want to test
+  # Authlogic models. Maybe you added some custom code or methods in your
+  # Authlogic models. Maybe you are writing a plugin or a library that extends
+  # Authlogic.
   #
-  # That being said, in this environment there is no controller. So you need to use a "mock" controller. Something
-  # that looks like a controller, acts like a controller, but isn't a "real" controller. You are essentially connecting
-  # Authlogic to your "mock" controller, then you can test off of the mock controller to make sure everything is functioning
-  # properly.
+  # That being said, in this environment there is no controller. So you need to
+  # use a "mock" controller. Something that looks like a controller, acts like a
+  # controller, but isn't a "real" controller. You are essentially connecting
+  # Authlogic to your "mock" controller, then you can test off of the mock
+  # controller to make sure everything is functioning properly.
   #
-  # I use a mock controller to test Authlogic myself. It's part of the Authlogic library that you can easily use. It's as simple
-  # as functional and integration tests. Just do the following:
+  # I use a mock controller to test Authlogic myself. It's part of the Authlogic
+  # library that you can easily use. It's as simple as functional and
+  # integration tests. Just do the following:
   #
   #   setup :activate_authlogic
   #
@@ -94,9 +111,11 @@ module Authlogic
   #   assert UserSession.create(ben)
   #   assert_equal controller.session["user_credentials"], ben.persistence_token
   #
-  # See how I am checking that Authlogic is interacting with the controller properly? That's the idea here.
+  # See how I am checking that Authlogic is interacting with the controller
+  # properly? That's the idea here.
   module TestCase
-    # Activates authlogic so that you can use it in your tests. You should call this method in your test's setup. Ex:
+    # Activates authlogic so that you can use it in your tests. You should call
+    # this method in your test's setup. Ex:
     #
     #   setup :activate_authlogic
     def activate_authlogic
@@ -109,8 +128,9 @@ module Authlogic
       Authlogic::Session::Base.controller = (@request && Authlogic::TestCase::RailsRequestAdapter.new(@request)) || controller
     end
 
-    # The Authlogic::TestCase::MockController object passed to Authlogic to activate it. You can access this in your test.
-    # See the module description for an example.
+    # The Authlogic::TestCase::MockController object passed to Authlogic to
+    # activate it. You can access this in your test. See the module description
+    # for an example.
     def controller
       @controller ||= Authlogic::TestCase::MockController.new
     end

data/test/acts_as_authentic_test/email_test.rb

@@ -8,7 +8,7 @@ module ActsAsAuthenticTest
       "damien+test1...etc..@mydomain.com",
       "dakota.dux+1@gmail.com",
       "dakota.d'ux@gmail.com",
-      "a&b@c.com",
+      "a&b@c.com"
     ]
 
     BAD_ASCII_EMAILS = [
@@ -16,7 +16,7 @@ module ActsAsAuthenticTest
       "aaaaaaaaaaaaa",
       "question?mark@gmail.com",
       "backslash@g\\mail.com",
-      "<script>alert(123);</script>\nnobody@example.com",
+      "<script>alert(123);</script>\nnobody@example.com"
     ]
 
     # http://en.wikipedia.org/wiki/ISO/IEC_8859-1#Codepage_layout
@@ -58,7 +58,7 @@ module ActsAsAuthenticTest
       "我>.香港",                    # greater than
       "我?本@屋企.香港",              # question mark
       "чебурша@ьн\\ами.рф",         # backslash
-      "user@domain.com%0A<script>alert('hello')</script>",
+      "user@domain.com%0A<script>alert('hello')</script>"
     ]
 
     def test_email_field_config
@@ -76,7 +76,7 @@ module ActsAsAuthenticTest
       assert Employee.validate_email_field
 
       User.validate_email_field = false
-      assert !User.validate_email_field
+      refute User.validate_email_field
       User.validate_email_field true
       assert User.validate_email_field
     end
@@ -94,25 +94,25 @@ module ActsAsAuthenticTest
     def test_validates_format_of_email_field_options_config
       default = {
         :with => Authlogic::Regex.email,
-        :message => Proc.new do
+        :message => proc do
           I18n.t(
             'error_messages.email_invalid',
             :default => "should look like an email address."
           )
         end
       }
-      dmessage = default.delete(:message).call
+      default_message = default.delete(:message).call
 
       options = User.validates_format_of_email_field_options
       message = options.delete(:message)
-      assert message.kind_of?(Proc)
-      assert_equal dmessage, message.call
+      assert message.is_a?(Proc)
+      assert_equal default_message, message.call
       assert_equal default, options
 
       options = Employee.validates_format_of_email_field_options
       message = options.delete(:message)
-      assert message.kind_of?(Proc)
-      assert_equal dmessage, message.call
+      assert message.is_a?(Proc)
+      assert_equal default_message, message.call
       assert_equal default, options
 
       User.validates_format_of_email_field_options = { :yes => "no" }
@@ -155,7 +155,11 @@ module ActsAsAuthenticTest
     end
 
     def test_validates_uniqueness_of_email_field_options_config
-      default = { :case_sensitive => false, :scope => Employee.validations_scope, :if => "#{Employee.email_field}_changed?".to_sym }
+      default = {
+        :case_sensitive => false,
+        :scope => Employee.validations_scope,
+        :if => "#{Employee.email_field}_changed?".to_sym
+      }
       assert_equal default, Employee.validates_uniqueness_of_email_field_options
 
       Employee.validates_uniqueness_of_email_field_options = { :yes => "no" }
@@ -167,43 +171,43 @@ module ActsAsAuthenticTest
     def test_validates_length_of_email_field
       u = User.new
       u.email = "a@a.a"
-      assert !u.valid?
-      assert u.errors[:email].size > 0
+      refute u.valid?
+      refute u.errors[:email].empty?
 
       u.email = "a@a.com"
-      assert !u.valid?
-      assert u.errors[:email].size == 0
+      refute u.valid?
+      assert u.errors[:email].empty?
     end
 
     def test_validates_format_of_email_field
       u = User.new
       u.email = "aaaaaaaaaaaaa"
       u.valid?
-      assert u.errors[:email].size > 0
+      refute u.errors[:email].empty?
 
       u.email = "a@a.com"
       u.valid?
-      assert u.errors[:email].size == 0
+      assert u.errors[:email].empty?
 
       u.email = "damien+test1...etc..@mydomain.com"
       u.valid?
-      assert u.errors[:email].size == 0
+      assert u.errors[:email].empty?
 
       u.email = "dakota.dux+1@gmail.com"
       u.valid?
-      assert u.errors[:email].size == 0
+      assert u.errors[:email].empty?
 
       u.email = "dakota.d'ux@gmail.com"
       u.valid?
-      assert u.errors[:email].size == 0
+      assert u.errors[:email].empty?
 
       u.email = "<script>alert(123);</script>\nnobody@example.com"
-      assert !u.valid?
-      assert u.errors[:email].size > 0
+      refute u.valid?
+      refute u.errors[:email].empty?
 
       u.email = "a&b@c.com"
       u.valid?
-      assert u.errors[:email].size == 0
+      assert u.errors[:email].empty?
     end
 
     def test_validates_format_of_nonascii_email_field
@@ -219,16 +223,16 @@ module ActsAsAuthenticTest
     def test_validates_uniqueness_of_email_field
       u = User.new
       u.email = "bjohnson@binarylogic.com"
-      assert !u.valid?
-      assert u.errors[:email].size > 0
+      refute u.valid?
+      refute u.errors[:email].empty?
 
       u.email = "BJOHNSON@binarylogic.com"
-      assert !u.valid?
-      assert u.errors[:email].size > 0
+      refute u.valid?
+      refute u.errors[:email].empty?
 
       u.email = "a@a.com"
-      assert !u.valid?
-      assert u.errors[:email].size == 0
+      refute u.valid?
+      assert u.errors[:email].empty?
     end
   end
 end

data/test/acts_as_authentic_test/logged_in_status_test.rb

@@ -52,11 +52,11 @@ module ActsAsAuthenticTest
 
     def test_logged_in_logged_out
       u = User.first
-      assert !u.logged_in?
+      refute u.logged_in?
       assert u.logged_out?
       u.last_request_at = Time.now
       assert u.logged_in?
-      assert !u.logged_out?
+      refute u.logged_out?
     end
   end
 end

data/test/acts_as_authentic_test/login_test.rb

@@ -17,7 +17,7 @@ module ActsAsAuthenticTest
       assert Employee.validate_login_field
 
       User.validate_login_field = false
-      assert !User.validate_login_field
+      refute User.validate_login_field
       User.validate_login_field true
       assert User.validate_login_field
     end
@@ -35,13 +35,26 @@ module ActsAsAuthenticTest
     def test_validates_format_of_login_field_options_config
       default = {
         :with => /\A[a-zA-Z0-9_][a-zA-Z0-9\.+\-_@ ]+\z/,
-        :message => I18n.t(
-          'error_messages.login_invalid',
-          :default => "should use only letters, numbers, spaces, and .-_@+ please."
-        )
+        :message => proc do
+          I18n.t(
+            'error_messages.login_invalid',
+            :default => "should use only letters, numbers, spaces, and .-_@+ please."
+          )
+        end
       }
-      assert_equal default, User.validates_format_of_login_field_options
-      assert_equal default, Employee.validates_format_of_login_field_options
+      default_message = default.delete(:message).call
+
+      options = User.validates_format_of_login_field_options
+      message = options.delete(:message)
+      assert message.is_a?(Proc)
+      assert_equal default_message, message.call
+      assert_equal default, options
+
+      options = Employee.validates_format_of_login_field_options
+      message = options.delete(:message)
+      assert message.is_a?(Proc)
+      assert_equal default_message, message.call
+      assert_equal default, options
 
       User.validates_format_of_login_field_options = { :yes => "no" }
       assert_equal({ :yes => "no" }, User.validates_format_of_login_field_options)
@@ -62,70 +75,70 @@ module ActsAsAuthenticTest
     def test_validates_length_of_login_field
       u = User.new
       u.login = "a"
-      assert !u.valid?
-      assert u.errors[:login].size > 0
+      refute u.valid?
+      refute u.errors[:login].empty?
 
       u.login = "aaaaaaaaaa"
-      assert !u.valid?
-      assert u.errors[:login].size == 0
+      refute u.valid?
+      assert u.errors[:login].empty?
     end
 
     def test_validates_format_of_login_field
       u = User.new
       u.login = "fdsf@^&*"
-      assert !u.valid?
-      assert u.errors[:login].size > 0
+      refute u.valid?
+      refute u.errors[:login].empty?
 
       u.login = "fdsfdsfdsfdsfs"
-      assert !u.valid?
-      assert u.errors[:login].size == 0
+      refute u.valid?
+      assert u.errors[:login].empty?
 
       u.login = "dakota.dux+1@gmail.com"
-      assert !u.valid?
-      assert u.errors[:login].size == 0
+      refute u.valid?
+      assert u.errors[:login].empty?
 
       u.login = "marks .-_@+"
-      assert !u.valid?
-      assert u.errors[:login].size == 0
+      refute u.valid?
+      assert u.errors[:login].empty?
 
       u.login = " space"
-      assert !u.valid?
-      assert u.errors[:login].size > 0
+      refute u.valid?
+      refute u.errors[:login].empty?
 
       u.login = ".dot"
-      assert !u.valid?
-      assert u.errors[:login].size > 0
+      refute u.valid?
+      refute u.errors[:login].empty?
 
       u.login = "-hyphen"
-      assert !u.valid?
-      assert u.errors[:login].size > 0
+      refute u.valid?
+      refute u.errors[:login].empty?
 
       u.login = "_underscore"
-      assert !u.valid?
-      assert u.errors[:login].size == 0
+      refute u.valid?
+      assert u.errors[:login].empty?
 
       u.login = "@atmark"
-      assert !u.valid?
-      assert u.errors[:login].size > 0
+      refute u.valid?
+      refute u.errors[:login].empty?
 
       u.login = "+plus"
-      assert !u.valid?
-      assert u.errors[:login].size > 0
+      refute u.valid?
+      refute u.errors[:login].empty?
     end
 
     def test_validates_uniqueness_of_login_field
       u = User.new
       u.login = "bjohnson"
-      assert !u.valid?
-      assert u.errors[:login].size > 0
+      refute u.valid?
+      refute u.errors[:login].empty?
 
       u.login = "BJOHNSON"
-      assert !u.valid?
-      assert u.errors[:login].size > 0
+      refute u.valid?
+      refute u.errors[:login].empty?
 
       u.login = "fdsfdsf"
-      assert !u.valid?
-      assert u.errors[:login].size == 0
+      refute u.valid?
+      assert u.errors[:login].empty?
     end
 
     def test_find_by_smart_case_login_field