authlogic 4.0.1 → 4.1.0

data/lib/authlogic/session/perishable_token.rb

@@ -14,7 +14,8 @@ module Authlogic
       private
 
         def 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

data/lib/authlogic/session/persistence.rb

@@ -28,7 +28,8 @@ module Authlogic
         #     @current_user = current_user_session && current_user_session.user
         #   end
         #
-        # Also, this method accepts a single parameter as the id, to find session that you marked with an id:
+        # Also, this method accepts a single parameter as the id, to find
+        # session that you marked with an id:
         #
         #   UserSession.find(:secure)
         #

data/lib/authlogic/session/scopes.rb

@@ -1,4 +1,4 @@
-require 'request_store'
+require "request_store"
 
 module Authlogic
   module Session
@@ -25,10 +25,10 @@ module Authlogic
           RequestStore.store[:authlogic_scope]
         end
 
-        # What with_scopes focuses on is scoping the query when finding the object and the
-        # name of the cookie / session. It works very similar to
-        # ActiveRecord::Base#with_scopes. It accepts a hash with any of the following
-        # options:
+        # What with_scopes focuses on is scoping the query when finding the
+        # object and the name of the cookie / session. It works very similar to
+        # ActiveRecord::Base#with_scopes. It accepts a hash with any of the
+        # following options:
         #
         # * <tt>find_options:</tt> any options you can pass into ActiveRecord::Base.find.
         #   This is used when trying to find the record.
@@ -37,21 +37,27 @@ module Authlogic
         #
         # Here is how you use it:
         #
-        #   UserSession.with_scope(:find_options => {:conditions => "account_id = 2"}, :id => "account_2") do
-        #     UserSession.find
-        #   end
+        # ```
+        # UserSession.with_scope(find_options: {conditions: "account_id = 2"}, id: "account_2") do
+        #   UserSession.find
+        # end
+        # ```
         #
-        # Essentially what the above does is scope the searching of the object with the
-        # sql you provided. So instead of:
+        # Essentially what the above does is scope the searching of the object
+        # with the sql you provided. So instead of:
         #
-        #   User.where("login = 'ben'").first
+        # ```
+        # User.where("login = 'ben'").first
+        # ```
         #
         # it would be:
         #
-        #   User.where("login = 'ben' and account_id = 2").first
+        # ```
+        # User.where("login = 'ben' and account_id = 2").first
+        # ```
         #
-        # You will also notice the :id option. This works just like the id method. It
-        # scopes your cookies. So the name of your cookie will be:
+        # You will also notice the :id option. This works just like the id
+        # method. It scopes your cookies. So the name of your cookie will be:
         #
         #   account_2_user_credentials
         #
@@ -59,9 +65,13 @@ module Authlogic
         #
         #   user_credentials
         #
-        # What is also nifty about scoping with an :id is that it merges your id's. So if you do:
+        # What is also nifty about scoping with an :id is that it merges your
+        # id's. So if you do:
         #
-        #   UserSession.with_scope(:find_options => {:conditions => "account_id = 2"}, :id => "account_2") do
+        #   UserSession.with_scope(
+        #     find_options: { conditions: "account_id = 2"},
+        #     id: "account_2"
+        #   ) do
         #     session = UserSession.new
         #     session.id = :secure
         #   end

data/lib/authlogic/session/unauthorized_record.rb

@@ -4,18 +4,23 @@ module Authlogic
     #
     #   UserSession.create(my_user_object)
     #
-    # Be careful with this, because Authlogic is assuming that you have already confirmed that the
-    # user is who he says he is.
+    # Be careful with this, because Authlogic is assuming that you have already
+    # confirmed that the user is who he says he is.
     #
-    # For example, this is the method used to persist the session internally. Authlogic finds the user with
-    # the persistence token. At this point we know the user is who he says he is, so Authlogic just creates a
-    # session with the record. This is particularly useful for 3rd party authentication methods, such as
-    # OpenID. Let that method verify the identity, once it's verified, pass the object and create a session.
+    # For example, this is the method used to persist the session internally.
+    # Authlogic finds the user with the persistence token. At this point we know
+    # the user is who he says he is, so Authlogic just creates a session with
+    # the record. This is particularly useful for 3rd party authentication
+    # methods, such as OpenID. Let that method verify the identity, once it's
+    # verified, pass the object and create a session.
     module UnauthorizedRecord
       def self.included(klass)
         klass.class_eval do
           attr_accessor :unauthorized_record
-          validate :validate_by_unauthorized_record, if: :authenticating_with_unauthorized_record?
+          validate(
+            :validate_by_unauthorized_record,
+            if: :authenticating_with_unauthorized_record?
+          )
         end
       end
 

data/lib/authlogic/session/validation.rb

@@ -82,7 +82,7 @@ module Authlogic
             errors.add(
               :base,
               I18n.t(
-                'error_messages.no_authentication_details',
+                "error_messages.no_authentication_details",
                 default: "You did not provide any details for authentication."
               )
             )

data/lib/authlogic/test_case/mock_controller.rb

@@ -14,7 +14,7 @@ module Authlogic
         yield http_user, http_password
       end
 
-      def authenticate_or_request_with_http_basic(realm = 'DefaultRealm')
+      def authenticate_or_request_with_http_basic(realm = "DefaultRealm")
         self.realm = realm
         @http_auth_requested = true
         yield http_user, http_password

data/lib/authlogic/test_case/mock_cookie_jar.rb

@@ -33,7 +33,7 @@ module Authlogic
       def [](val)
         signed_message = @parent_jar[val]
         if signed_message
-          payload, signature = signed_message.split('--')
+          payload, signature = signed_message.split("--")
           raise "Invalid signature" unless Digest::SHA1.hexdigest(payload) == signature
           payload
         end

data/lib/authlogic/test_case/mock_request.rb

@@ -11,7 +11,7 @@ module Authlogic
         controller &&
           controller.respond_to?(:env) &&
           controller.env.is_a?(Hash) &&
-          controller.env['REMOTE_ADDR'] ||
+          controller.env["REMOTE_ADDR"] ||
           "1.1.1.1"
       end
 

data/lib/authlogic/version.rb

@@ -15,6 +15,6 @@ module Authlogic
   #
   # @api public
   def self.gem_version
-    ::Gem::Version.new('4.0.1')
+    ::Gem::Version.new("4.1.0")
   end
 end

data/test/acts_as_authentic_test/base_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 module ActsAsAuthenticTest
   class BaseTest < ActiveSupport::TestCase

data/test/acts_as_authentic_test/email_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 module ActsAsAuthenticTest
   class EmailTest < ActiveSupport::TestCase
@@ -46,7 +46,7 @@ module ActsAsAuthenticTest
     BAD_UTF8_EMAILS = [
       "",
       ".みんな", #  https://github.com/binarylogic/authlogic/issues/176#issuecomment-55829320
-      'δκιμή@παράδεγμα.δ',          # short TLD
+      "δκιμή@παράδεγμα.δ",          # short TLD
       "öm(@ava.fi",                 # L paren
       "é)@domain.com",              # R paren
       "é[@example.com",             # L bracket
@@ -94,10 +94,10 @@ module ActsAsAuthenticTest
 
     def test_validates_format_of_email_field_options_config
       default = {
-        with: Authlogic::Regex.email,
+        with: Authlogic::Regex::EMAIL,
         message: proc do
           I18n.t(
-            'error_messages.email_invalid',
+            "error_messages.email_invalid",
             default: "should look like an email address."
           )
         end
@@ -122,10 +122,10 @@ module ActsAsAuthenticTest
       assert_equal default, User.validates_format_of_email_field_options
 
       with_email_nonascii = {
-        with: Authlogic::Regex.email_nonascii,
-        message: Proc.new do
+        with: Authlogic::Regex::EMAIL_NONASCII,
+        message: proc do
           I18n.t(
-            'error_messages.email_invalid_international',
+            "error_messages.email_invalid_international",
             default: "should look like an international email address."
           )
         end
@@ -140,11 +140,11 @@ module ActsAsAuthenticTest
       # ensure we successfully loaded the test locale
       assert I18n.available_locales.include?(:lol), "Test locale failed to load"
 
-      I18n.with_locale('lol') do
+      I18n.with_locale("lol") do
         message = I18n.t("authlogic.error_messages.email_invalid")
 
         cat = User.new
-        cat.email = 'meow'
+        cat.email = "meow"
         cat.valid?
 
         # filter duplicate error messages
@@ -213,11 +213,11 @@ module ActsAsAuthenticTest
 
     def test_validates_format_of_nonascii_email_field
       (GOOD_ASCII_EMAILS + GOOD_ISO88591_EMAILS + GOOD_UTF8_EMAILS).each do |e|
-        assert e =~  Authlogic::Regex.email_nonascii, "Good email should validate: #{e}"
+        assert e =~ Authlogic::Regex::EMAIL_NONASCII, "Good email should validate: #{e}"
       end
 
       (BAD_ASCII_EMAILS + BAD_ISO88591_EMAILS + BAD_UTF8_EMAILS).each do |e|
-        assert e !~  Authlogic::Regex.email_nonascii, "Bad email should not validate: #{e}"
+        assert e !~ Authlogic::Regex::EMAIL_NONASCII, "Bad email should not validate: #{e}"
       end
     end
 

data/test/acts_as_authentic_test/logged_in_status_test.rb

@@ -1,8 +1,8 @@
-require 'test_helper'
+require "test_helper"
 
 module ActsAsAuthenticTest
   class LoggedInStatusTest < ActiveSupport::TestCase
-    ERROR_MSG = 'Multiple calls to %s should result in different relations'.freeze
+    ERROR_MSG = "Multiple calls to %s should result in different relations".freeze
 
     def test_logged_in_timeout_config
       assert_equal 10.minutes.to_i, User.logged_in_timeout
@@ -25,7 +25,7 @@ module ActsAsAuthenticTest
       query1 = User.logged_in.to_sql
       sleep 0.1
       query2 = User.logged_in.to_sql
-      assert query1 != query2, ERROR_MSG % '#logged_in'
+      assert query1 != query2, ERROR_MSG % "#logged_in"
 
       assert_equal 0, User.logged_in.count
       user = User.first
@@ -43,7 +43,7 @@ module ActsAsAuthenticTest
 
       # for rails 5 I've changed the where_values to to_sql to compare
 
-      assert User.logged_in.to_sql != User.logged_out.to_sql, ERROR_MSG % '#logged_out'
+      assert User.logged_in.to_sql != User.logged_out.to_sql, ERROR_MSG % "#logged_out"
 
       assert_equal 3, User.logged_out.count
       User.first.update_attribute(:last_request_at, Time.now)

data/test/acts_as_authentic_test/login_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 module ActsAsAuthenticTest
   # Tests for configuration option: `validates_format_of_login_field_options`
@@ -36,7 +36,7 @@ module ActsAsAuthenticTest
         with: /\A[a-zA-Z0-9_][a-zA-Z0-9\.+\-_@ ]+\z/,
         message: proc do
           I18n.t(
-            'error_messages.login_invalid',
+            "error_messages.login_invalid",
             default: "should use only letters, numbers, spaces, and .-_@+ please."
           )
         end

data/test/acts_as_authentic_test/magic_columns_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 module ActsAsAuthenticTest
   class MagicColumnsTest < ActiveSupport::TestCase

data/test/acts_as_authentic_test/password_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 module ActsAsAuthenticTest
   class PasswordTest < ActiveSupport::TestCase

data/test/acts_as_authentic_test/perishable_token_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 module ActsAsAuthenticTest
   class PerishableTokenTest < ActiveSupport::TestCase
@@ -89,7 +89,7 @@ module ActsAsAuthenticTest
 
     def test_find_perishable_token_with_bang
       assert_raises ActiveRecord::RecordNotFound do
-        User.find_using_perishable_token!('some_bad_value')
+        User.find_using_perishable_token!("some_bad_value")
       end
     end
   end

data/test/acts_as_authentic_test/persistence_token_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 module ActsAsAuthenticTest
   class PersistenceTokenTest < ActiveSupport::TestCase

data/test/acts_as_authentic_test/restful_authentication_test.rb

@@ -1,7 +1,16 @@
-require 'test_helper'
+require "test_helper"
 
 module ActsAsAuthenticTest
   class RestfulAuthenticationTest < ActiveSupport::TestCase
+    def setup
+      @old_deprecation_behavior = ::ActiveSupport::Deprecation.behavior
+      ::ActiveSupport::Deprecation.behavior = :silence
+    end
+
+    def teardown
+      ::ActiveSupport::Deprecation.behavior = @old_deprecation_behavior
+    end
+
     def test_act_like_restful_authentication_config
       refute User.act_like_restful_authentication
       refute Employee.act_like_restful_authentication
@@ -10,7 +19,7 @@ module ActsAsAuthenticTest
       assert User.act_like_restful_authentication
       assert_equal Authlogic::CryptoProviders::Sha1, User.crypto_provider
       assert defined?(::REST_AUTH_SITE_KEY)
-      assert_equal '', ::REST_AUTH_SITE_KEY
+      assert_equal "", ::REST_AUTH_SITE_KEY
       assert_equal 1, Authlogic::CryptoProviders::Sha1.stretches
 
       User.act_like_restful_authentication false
@@ -27,7 +36,7 @@ module ActsAsAuthenticTest
       User.transition_from_restful_authentication = true
       assert User.transition_from_restful_authentication
       assert defined?(::REST_AUTH_SITE_KEY)
-      assert_equal '', ::REST_AUTH_SITE_KEY
+      assert_equal "", ::REST_AUTH_SITE_KEY
       assert_equal 1, Authlogic::CryptoProviders::Sha1.stretches
 
       User.transition_from_restful_authentication false

data/test/acts_as_authentic_test/session_maintenance_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 module ActsAsAuthenticTest
   class SessionMaintenanceTest < ActiveSupport::TestCase

data/test/acts_as_authentic_test/single_access_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 module ActsAsAuthenticTest
   class SingleAccessTest < ActiveSupport::TestCase

data/test/adapter_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 module Authlogic
   module ControllerAdapters
@@ -6,7 +6,7 @@ module Authlogic
       def test_controller
         controller = Class.new(MockController) do
           def controller.an_arbitrary_method
-            'bar'
+            "bar"
           end
         end.new
         adapter = Authlogic::ControllerAdapters::AbstractAdapter.new(controller)
@@ -14,7 +14,7 @@ module Authlogic
         assert_equal controller, adapter.controller
         assert controller.params.equal?(adapter.params)
         assert adapter.respond_to?(:an_arbitrary_method)
-        assert_equal 'bar', adapter.an_arbitrary_method
+        assert_equal "bar", adapter.an_arbitrary_method
       end
     end
   end

data/test/authenticates_many_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class AuthenticatesManyTest < ActiveSupport::TestCase
   def test_employee_sessions

data/test/config_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class ConfigTest < ActiveSupport::TestCase
   def setup
@@ -6,7 +6,7 @@ class ConfigTest < ActiveSupport::TestCase
       extend Authlogic::Config
 
       def self.foobar(value = nil)
-        rw_config(:foobar_field, value, 'default_foobar')
+        rw_config(:foobar_field, value, "default_foobar")
       end
     }
 
@@ -18,19 +18,19 @@ class ConfigTest < ActiveSupport::TestCase
   end
 
   def test_rw_config_read_with_default
-    assert 'default_foobar', @klass.foobar
+    assert "default_foobar", @klass.foobar
   end
 
   def test_rw_config_write
-    assert_equal 'my_foobar', @klass.foobar('my_foobar')
-    assert_equal 'my_foobar', @klass.foobar
+    assert_equal "my_foobar", @klass.foobar("my_foobar")
+    assert_equal "my_foobar", @klass.foobar
 
-    assert_equal 'my_new_foobar', @klass.foobar('my_new_foobar')
-    assert_equal 'my_new_foobar', @klass.foobar
+    assert_equal "my_new_foobar", @klass.foobar("my_new_foobar")
+    assert_equal "my_new_foobar", @klass.foobar
   end
 
   def test_subclass_rw_config_write
-    assert_equal 'subklass_foobar', @subklass.foobar('subklass_foobar')
-    assert_equal 'default_foobar', @klass.foobar
+    assert_equal "subklass_foobar", @subklass.foobar("subklass_foobar")
+    assert_equal "default_foobar", @klass.foobar
   end
 end