authlogic 3.4.6 → 3.5.0

data/test/session_test/password_test.rb

@@ -34,13 +34,12 @@ module SessionTest
       end
 
       def test_generalize_credentials_error_messages_set_to_string
-        UserSession.generalize_credentials_error_messages= "Custom Error Message"
+        UserSession.generalize_credentials_error_messages = "Custom Error Message"
         assert UserSession.generalize_credentials_error_messages
         session = UserSession.create(:login => users(:ben).login, :password => "invalud-password")
         assert_equal ["Custom Error Message"], session.errors.full_messages
       end
 
-
       def test_login_field
         UserSession.configured_password_methods = false
         UserSession.login_field = :saweet
@@ -80,16 +79,16 @@ module SessionTest
 
       def test_credentials
         session = UserSession.new
-        session.credentials = {:login => "login", :password => "pass"}
+        session.credentials = { :login => "login", :password => "pass" }
         assert_equal "login", session.login
         assert_nil session.password
         assert_equal "pass", session.send(:protected_password)
-        assert_equal({:password => "<protected>", :login => "login"}, session.credentials)
+        assert_equal({ :password => "<protected>", :login => "login" }, session.credentials)
       end
 
       def test_credentials_are_params_safe
         session = UserSession.new
-        assert_nothing_raised { session.credentials = {:hacker_method => "error!"} }
+        assert_nothing_raised { session.credentials = { :hacker_method => "error!" } }
       end
 
       def test_save_with_credentials

data/test/session_test/perishability_test.rb

@@ -5,11 +5,11 @@ module SessionTest
     def test_after_save
       ben = users(:ben)
       old_perishable_token = ben.perishable_token
-      session = UserSession.create(ben)
+      UserSession.create(ben)
       assert_not_equal old_perishable_token, ben.perishable_token
-      
+
       drew = employees(:drew)
       assert UserSession.create(drew)
     end
   end
-end
+end

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,10 +51,10 @@ 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)
     end
   end
-end
+end

data/test/session_test/session_test.rb

@@ -24,14 +24,15 @@ module SessionTest
       def test_persist_persist_by_session_with_session_fixation_attack
         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 -- "}
+        controller.session["user_credentials_id"] = {
+          :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
-        ben = users(:ben)
-        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
@@ -74,4 +75,4 @@ module SessionTest
       end
     end
   end
-end
+end

data/test/session_test/timeout_test.rb

@@ -6,12 +6,12 @@ module SessionTest
       def test_logout_on_timeout
         UserSession.logout_on_timeout = true
         assert UserSession.logout_on_timeout
-    
+
         UserSession.logout_on_timeout false
         assert !UserSession.logout_on_timeout
       end
     end
-    
+
     class InstanceMethods < ActiveSupport::TestCase
       def test_stale_state
         UserSession.logout_on_timeout = true
@@ -19,23 +19,23 @@ module SessionTest
         ben.last_request_at = 3.years.ago
         ben.save
         set_session_for(ben)
-      
+
         session = UserSession.new
         assert session.persisting?
         assert session.stale?
         assert_equal ben, session.stale_record
         assert_nil session.record
         assert_nil controller.session["user_credentials_id"]
-      
+
         set_session_for(ben)
-      
+
         ben.last_request_at = Time.now
         ben.save
-      
+
         assert session.persisting?
         assert !session.stale?
         assert_nil session.stale_record
-      
+
         UserSession.logout_on_timeout = false
       end
 
@@ -66,7 +66,7 @@ module SessionTest
         assert !session.stale?
         UserSession.remember_me = false
       end
-      
+
       def test_successful_login
         UserSession.logout_on_timeout = true
         ben = users(:ben)

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
+end

data/test/session_test/validation_test.rb

@@ -6,13 +6,13 @@ module SessionTest
       session = UserSession.new
       assert session.errors.is_a?(Authlogic::Session::Validation::Errors)
     end
-    
+
     def test_valid
       session = UserSession.new
       assert !session.valid?
       assert_nil session.record
       assert session.errors.count > 0
-      
+
       ben = users(:ben)
       session.unauthorized_record = ben
       assert session.valid?
@@ -20,4 +20,4 @@ module SessionTest
       assert session.errors.empty?
     end
   end
-end
+end

data/test/test_helper.rb

@@ -5,18 +5,22 @@ require "active_record/fixtures"
 require "timecop"
 require "i18n"
 
-
 I18n.load_path << File.dirname(__FILE__) + '/i18n/lol.yml'
 
-#ActiveRecord::Schema.verbose = false
+# ActiveRecord::Schema.verbose = false
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 logger = Logger.new(STDOUT)
-logger.level= Logger::FATAL
+logger.level = Logger::FATAL
 ActiveRecord::Base.logger = logger
 
 if (ActiveRecord::VERSION::STRING < '4.1')
   ActiveRecord::Base.configurations = true
 end
+
+if ActiveSupport.respond_to?(:test_order)
+  ActiveSupport.test_order = :sorted
+end
+
 ActiveRecord::Base.default_timezone = :local
 ActiveRecord::Schema.define(:version => 1) do
   create_table :companies do |t|
@@ -124,8 +128,8 @@ class ActiveSupport::TestCase
   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
@@ -164,7 +168,7 @@ class ActiveSupport::TestCase
     end
 
     def set_cookie_for(user)
-      controller.cookies["user_credentials"] = {:value => "#{user.persistence_token}::#{user.id}", :expires => nil}
+      controller.cookies["user_credentials"] = { :value => "#{user.persistence_token}::#{user.id}", :expires => nil }
     end
 
     def unset_cookie

metadata

@@ -1,105 +1,131 @@
 --- !ruby/object:Gem::Specification
 name: authlogic
 version: !ruby/object:Gem::Version
-  version: 3.4.6
+  version: 3.5.0
 platform: ruby
 authors:
 - Ben Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: scrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.41.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.41.2
 description: A clean, simple, and unobtrusive ruby authentication solution.
 email:
 - bjohnson@binarylogic.com
@@ -107,13 +133,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - authlogic.gemspec
 - lib/authlogic.rb
@@ -205,6 +233,7 @@ files:
 - 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/i18n/lol.yml
 - test/i18n_test.rb
 - test/libs/affiliate.rb
@@ -249,17 +278,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A clean, simple, and unobtrusive ruby authentication solution.
@@ -291,6 +320,7 @@ test_files:
 - 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/i18n/lol.yml
 - test/i18n_test.rb
 - test/libs/affiliate.rb