authlogic 3.8.0 → 4.0.0

data/test/session_test/persistence_test.rb

@@ -5,6 +5,7 @@ module SessionTest
     def test_find
       aaron = users(:aaron)
       refute UserSession.find
+      UserSession.allow_http_basic_auth = true
       http_basic_auth_for(aaron) { assert UserSession.find }
       set_cookie_for(aaron)
       assert UserSession.find

data/test/session_test/scopes_test.rb

@@ -6,7 +6,7 @@ module SessionTest
       assert_nil Authlogic::Session::Base.scope
 
       thread1 = Thread.new do
-        scope = { :id => :scope1 }
+        scope = { id: :scope1 }
         Authlogic::Session::Base.send(:scope=, scope)
         assert_equal scope, Authlogic::Session::Base.scope
       end
@@ -15,7 +15,7 @@ module SessionTest
       assert_nil Authlogic::Session::Base.scope
 
       thread2 = Thread.new do
-        scope = { :id => :scope2 }
+        scope = { id: :scope2 }
         Authlogic::Session::Base.send(:scope=, scope)
         assert_equal scope, Authlogic::Session::Base.scope
       end
@@ -27,17 +27,17 @@ module SessionTest
     def test_with_scope_method
       assert_raise(ArgumentError) { UserSession.with_scope }
 
-      UserSession.with_scope(:find_options => { :conditions => "awesome = 1" }, :id => "some_id") do
-        assert_equal({ :find_options => { :conditions => "awesome = 1" }, :id => "some_id" }, UserSession.scope)
+      UserSession.with_scope(find_options: { conditions: "awesome = 1" }, id: "some_id") do
+        assert_equal({ find_options: { conditions: "awesome = 1" }, id: "some_id" }, UserSession.scope)
       end
 
       assert_nil UserSession.scope
     end
 
     def test_initialize
-      UserSession.with_scope(:find_options => { :conditions => "awesome = 1" }, :id => "some_id") do
+      UserSession.with_scope(find_options: { conditions: "awesome = 1" }, id: "some_id") do
         session = UserSession.new
-        assert_equal({ :find_options => { :conditions => "awesome = 1" }, :id => "some_id" }, session.scope)
+        assert_equal({ find_options: { conditions: "awesome = 1" }, id: "some_id" }, session.scope)
         session.id = :another_id
         assert_equal "another_id_some_id_test", session.send(:build_key, "test")
       end
@@ -51,7 +51,7 @@ module SessionTest
       session = UserSession.new
       assert_equal zack, session.send(:search_for_record, "find_by_login", zack.login)
 
-      session.scope = { :find_options => { :conditions => ["company_id = ?", binary_logic.id] } }
+      session.scope = { find_options: { conditions: ["company_id = ?", binary_logic.id] } }
       assert_nil session.send(:search_for_record, "find_by_login", zack.login)
 
       assert_equal ben, session.send(:search_for_record, "find_by_login", ben.login)

data/test/session_test/session_test.rb

@@ -25,14 +25,14 @@ module SessionTest
         ben = users(:ben)
         controller.session["user_credentials"] = 'neo'
         controller.session["user_credentials_id"] = {
-          :select => " *,'neo' AS persistence_token FROM users WHERE id = #{ben.id} limit 1 -- "
+          select: " *,'neo' AS persistence_token FROM users WHERE id = #{ben.id} limit 1 -- "
         }
         @user_session = UserSession.find
         assert @user_session.blank?
       end
 
       def test_persist_persist_by_session_with_sql_injection_attack
-        controller.session["user_credentials"] = { :select => "ABRA CADABRA" }
+        controller.session["user_credentials"] = { select: "ABRA CADABRA" }
         controller.session["user_credentials_id"] = nil
         assert_nothing_raised do
           @user_session = UserSession.find

data/test/session_test/timeout_test.rb

@@ -70,7 +70,7 @@ module SessionTest
       def test_successful_login
         UserSession.logout_on_timeout = true
         ben = users(:ben)
-        session = UserSession.create(:login => ben.login, :password => "benrocks")
+        session = UserSession.create(login: ben.login, password: "benrocks")
         refute session.new_session?
         session = UserSession.find
         assert session

data/test/session_test/unauthorized_record_test.rb

@@ -7,7 +7,7 @@ module SessionTest
       session = UserSession.new
       session.credentials = [ben]
       assert_equal ben, session.unauthorized_record
-      assert_equal({ :unauthorized_record => "<protected>" }, session.credentials)
+      assert_equal({ unauthorized_record: "<protected>" }, session.credentials)
     end
   end
 end

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+require "byebug"
 require "rubygems"
 require "minitest/autorun"
 require "active_record"
@@ -8,7 +9,7 @@ require "i18n"
 I18n.load_path << File.dirname(__FILE__) + '/i18n/lol.yml'
 
 # ActiveRecord::Schema.verbose = false
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
 logger = Logger.new(STDOUT)
 logger.level = Logger::FATAL
 ActiveRecord::Base.logger = logger
@@ -22,7 +23,7 @@ if ActiveSupport.respond_to?(:test_order)
 end
 
 ActiveRecord::Base.default_timezone = :local
-ActiveRecord::Schema.define(:version => 1) do
+ActiveRecord::Schema.define(version: 1) do
   create_table :companies do |t|
     t.datetime  :created_at
     t.datetime  :updated_at
@@ -36,7 +37,7 @@ ActiveRecord::Schema.define(:version => 1) do
     t.string    :name
   end
 
-  create_table :projects_users, :id => false do |t|
+  create_table :projects_users, id: false do |t|
     t.integer :project_id
     t.integer :user_id
   end
@@ -44,7 +45,7 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table :users do |t|
     t.datetime  :created_at
     t.datetime  :updated_at
-    t.integer   :lock_version, :default => 0
+    t.integer   :lock_version, default: 0
     t.integer   :company_id
     t.string    :login
     t.string    :crypted_password
@@ -55,16 +56,16 @@ ActiveRecord::Schema.define(:version => 1) do
     t.string    :email
     t.string    :first_name
     t.string    :last_name
-    t.integer   :login_count, :default => 0, :null => false
-    t.integer   :failed_login_count, :default => 0, :null => false
+    t.integer   :login_count, default: 0, null: false
+    t.integer   :failed_login_count, default: 0, null: false
     t.datetime  :last_request_at
     t.datetime  :current_login_at
     t.datetime  :last_login_at
     t.string    :current_login_ip
     t.string    :last_login_ip
-    t.boolean   :active, :default => true
-    t.boolean   :approved, :default => true
-    t.boolean   :confirmed, :default => true
+    t.boolean   :active, default: true
+    t.boolean   :approved, default: true
+    t.boolean   :confirmed, default: true
   end
 
   create_table :employees do |t|
@@ -77,7 +78,7 @@ ActiveRecord::Schema.define(:version => 1) do
     t.string    :persistence_token
     t.string    :first_name
     t.string    :last_name
-    t.integer   :login_count, :default => 0, :null => false
+    t.integer   :login_count, default: 0, null: false
     t.datetime  :last_request_at
     t.datetime  :current_login_at
     t.datetime  :last_login_at
@@ -103,7 +104,7 @@ ActiveRecord::Schema.define(:version => 1) do
   end
 end
 
-require_relative '../lib/authlogic' unless defined?(Authlogic)
+require_relative '../lib/authlogic'
 require_relative '../lib/authlogic/test_case'
 require_relative 'libs/project'
 require_relative 'libs/affiliate'
@@ -120,114 +121,121 @@ require_relative 'libs/company'
 # thus openssl gem 2.0), it is more strict, and must be exactly 32 bytes.
 Authlogic::CryptoProviders::AES256.key = ::OpenSSL::Random.random_bytes(32)
 
-class ActiveSupport::TestCase
-  include ActiveRecord::TestFixtures
-  self.fixture_path = File.dirname(__FILE__) + "/fixtures"
-
-  # use_transactional_fixtures= is deprecated and will be removed from Rails 5.1
-  # (use use_transactional_tests= instead)
-  if respond_to?(:use_transactional_tests=)
-    self.use_transactional_tests = false
-  else
-    self.use_transactional_fixtures = false
-  end
+module ActiveSupport
+  class TestCase
+    include ActiveRecord::TestFixtures
+    self.fixture_path = File.dirname(__FILE__) + "/fixtures"
+
+    # use_transactional_fixtures= is deprecated and will be removed from Rails 5.1
+    # (use use_transactional_tests= instead)
+    if respond_to?(:use_transactional_tests=)
+      self.use_transactional_tests = false
+    else
+      self.use_transactional_fixtures = false
+    end
 
-  self.use_instantiated_fixtures = false
-  self.pre_loaded_fixtures = false
-  fixtures :all
-  setup :activate_authlogic
-  setup :config_setup
-  teardown :config_teardown
-  teardown { Timecop.return } # for tests that need to freeze the time
-
-  private
-
-    # Many of the tests change Authlogic config for the test models. Some tests
-    # were not resetting the config after tests, which didn't surface as broken
-    # tests until Rails 4.1 was added for testing. This ensures that all the
-    # models start tests with their original config.
-    def config_setup
-      [Project, Affiliate, Employee, EmployeeSession, Ldaper, User, UserSession, Company].each do |model|
-        model.class_attribute :original_acts_as_authentic_config unless model.respond_to?(:original_acts_as_authentic_config)
-        model.original_acts_as_authentic_config = model.acts_as_authentic_config
+    self.use_instantiated_fixtures = false
+    self.pre_loaded_fixtures = false
+    fixtures :all
+    setup :activate_authlogic
+    setup :config_setup
+    teardown :config_teardown
+    teardown { Timecop.return } # for tests that need to freeze the time
+
+    private
+
+      # Many of the tests change Authlogic config for the test models. Some tests
+      # were not resetting the config after tests, which didn't surface as broken
+      # tests until Rails 4.1 was added for testing. This ensures that all the
+      # models start tests with their original config.
+      def config_setup
+        [Project, Affiliate, Employee, EmployeeSession, Ldaper, User, UserSession, Company].each do |model|
+          unless model.respond_to?(:original_acts_as_authentic_config)
+            model.class_attribute :original_acts_as_authentic_config
+          end
+          model.original_acts_as_authentic_config = model.acts_as_authentic_config
+        end
       end
-    end
 
-    def config_teardown
-      [Project, Affiliate, Employee, EmployeeSession, Ldaper, User, UserSession, Company].each do |model|
-        model.acts_as_authentic_config = model.original_acts_as_authentic_config
+      def config_teardown
+        [Project, Affiliate, Employee, EmployeeSession, Ldaper, User, UserSession, Company].each do |model|
+          model.acts_as_authentic_config = model.original_acts_as_authentic_config
+        end
       end
-    end
 
-    def password_for(user)
-      case user
-      when users(:ben)
-        "benrocks"
-      when users(:zack)
-        "zackrocks"
-      when users(:aaron)
-        "aaronrocks"
+      def password_for(user)
+        case user
+        when users(:ben)
+          "benrocks"
+        when users(:zack)
+          "zackrocks"
+        when users(:aaron)
+          "aaronrocks"
+        end
       end
-    end
 
-    def http_basic_auth_for(user = nil, &block)
-      unless user.blank?
-        controller.http_user = user.login
-        controller.http_password = password_for(user)
+      def http_basic_auth_for(user = nil)
+        unless user.blank?
+          controller.http_user = user.login
+          controller.http_password = password_for(user)
+        end
+        yield
+        controller.http_user = controller.http_password = controller.realm = nil
       end
-      yield
-      controller.http_user = controller.http_password = controller.realm = nil
-    end
 
-    def set_cookie_for(user)
-      controller.cookies["user_credentials"] = { :value => "#{user.persistence_token}::#{user.id}", :expires => nil }
-    end
+      def set_cookie_for(user)
+        controller.cookies["user_credentials"] = {
+          value: "#{user.persistence_token}::#{user.id}",
+          expires: nil
+        }
+      end
 
-    def unset_cookie
-      controller.cookies["user_credentials"] = nil
-    end
+      def unset_cookie
+        controller.cookies["user_credentials"] = nil
+      end
 
-    def set_params_for(user)
-      controller.params["user_credentials"] = user.single_access_token
-    end
+      def set_params_for(user)
+        controller.params["user_credentials"] = user.single_access_token
+      end
 
-    def unset_params
-      controller.params["user_credentials"] = nil
-    end
+      def unset_params
+        controller.params["user_credentials"] = nil
+      end
 
-    def set_request_content_type(type)
-      controller.request_content_type = type
-    end
+      def set_request_content_type(type)
+        controller.request_content_type = type
+      end
 
-    def unset_request_content_type
-      controller.request_content_type = nil
-    end
+      def unset_request_content_type
+        controller.request_content_type = nil
+      end
 
-    def session_credentials_prefix(scope_record)
-      if scope_record.nil?
-        ""
-      else
-        format(
-          "%s_%d_",
-          scope_record.class.model_name.name.underscore,
-          scope_record.id
-        )
+      def session_credentials_prefix(scope_record)
+        if scope_record.nil?
+          ""
+        else
+          format(
+            "%s_%d_",
+            scope_record.class.model_name.name.underscore,
+            scope_record.id
+          )
+        end
       end
-    end
 
-    # Sets the session variables that `record` (eg. a `User`) would have after
-    # logging in.
-    #
-    # If `record` belongs to an `authenticates_many` association that uses the
-    # `scope_cookies` option, then a `scope_record` can be provided.
-    def set_session_for(record, scope_record = nil)
-      prefix = session_credentials_prefix(scope_record)
-      record_class_name = record.class.model_name.name.underscore
-      controller.session["#{prefix}#{record_class_name}_credentials"] = record.persistence_token
-      controller.session["#{prefix}#{record_class_name}_credentials_id"] = record.id
-    end
+      # Sets the session variables that `record` (eg. a `User`) would have after
+      # logging in.
+      #
+      # If `record` belongs to an `authenticates_many` association that uses the
+      # `scope_cookies` option, then a `scope_record` can be provided.
+      def set_session_for(record, scope_record = nil)
+        prefix = session_credentials_prefix(scope_record)
+        record_class_name = record.class.model_name.name.underscore
+        controller.session["#{prefix}#{record_class_name}_credentials"] = record.persistence_token
+        controller.session["#{prefix}#{record_class_name}_credentials_id"] = record.id
+      end
 
-    def unset_session
-      controller.session["user_credentials"] = controller.session["user_credentials_id"] = nil
-    end
+      def unset_session
+        controller.session["user_credentials"] = controller.session["user_credentials_id"] = nil
+      end
+  end
 end

metadata

@@ -1,164 +1,169 @@
 --- !ruby/object:Gem::Specification
 name: authlogic
 version: !ruby/object:Gem::Version
-  version: 3.8.0
-  prerelease: 
+  version: 4.0.0
 platform: ruby
 authors:
 - Ben Johnson
+- Tieg Zaharia
+- Jared Beck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-08 00:00:00.000000000 Z
+date: 2018-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - <
+        version: '4.2'
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - <
+        version: '4.2'
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - <
+        version: '4.2'
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - <
+        version: '4.2'
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.3'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: scrypt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.51.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.51.0
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.41.2
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.41.2
+        version: '0.7'
 description: 
 email:
 - bjohnson@binarylogic.com
+- tieg.zaharia@gmail.com
+- jared@jaredbeck.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .github/ISSUE_TEMPLATE.md
-- .gitignore
-- .rubocop.yml
-- .rubocop_todo.yml
-- .travis.yml
+- ".github/ISSUE_TEMPLATE.md"
+- ".github/triage.md"
+- ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- UPGRADING.md
 - authlogic.gemspec
 - lib/authlogic.rb
 - lib/authlogic/acts_as_authentic/base.rb
@@ -169,6 +174,7 @@ files:
 - 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/queries/find_with_case.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
@@ -222,6 +228,7 @@ files:
 - lib/authlogic/test_case/mock_logger.rb
 - lib/authlogic/test_case/mock_request.rb
 - lib/authlogic/test_case/rails_request_adapter.rb
+- lib/authlogic/version.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
@@ -233,6 +240,7 @@ files:
 - 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/adapter_test.rb
 - test/authenticates_many_test.rb
 - test/config_test.rb
 - test/crypto_provider_test/aes256_test.rb
@@ -245,13 +253,11 @@ files:
 - test/fixtures/employees.yml
 - test/fixtures/projects.yml
 - test/fixtures/users.yml
-- test/gemfiles/Gemfile.rails-3.2.x
-- test/gemfiles/Gemfile.rails-4.0.x
-- test/gemfiles/Gemfile.rails-4.1.x
 - test/gemfiles/Gemfile.rails-4.2.x
 - test/gemfiles/Gemfile.rails-5.0.x
 - test/gemfiles/Gemfile.rails-5.1.x
 - test/gemfiles/Gemfile.rails-5.2.x
+- test/gemfiles/Gemfile.rails-master
 - test/i18n/lol.yml
 - test/i18n_test.rb
 - test/libs/affiliate.rb
@@ -289,27 +295,26 @@ files:
 homepage: http://github.com/binarylogic/authlogic
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.7.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A clean, simple, and unobtrusive ruby authentication solution.
 test_files:
 - test/acts_as_authentic_test/base_test.rb
@@ -323,6 +328,7 @@ test_files:
 - 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/adapter_test.rb
 - test/authenticates_many_test.rb
 - test/config_test.rb
 - test/crypto_provider_test/aes256_test.rb
@@ -335,13 +341,11 @@ test_files:
 - test/fixtures/employees.yml
 - test/fixtures/projects.yml
 - test/fixtures/users.yml
-- test/gemfiles/Gemfile.rails-3.2.x
-- test/gemfiles/Gemfile.rails-4.0.x
-- test/gemfiles/Gemfile.rails-4.1.x
 - test/gemfiles/Gemfile.rails-4.2.x
 - test/gemfiles/Gemfile.rails-5.0.x
 - test/gemfiles/Gemfile.rails-5.1.x
 - test/gemfiles/Gemfile.rails-5.2.x
+- test/gemfiles/Gemfile.rails-master
 - test/i18n/lol.yml
 - test/i18n_test.rb
 - test/libs/affiliate.rb