authlogic 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0699061fb6cde9b757291441d3cf7a6621c8f9db98904d98b2864f93297fd0ea
-  data.tar.gz: c95d14549fa390d839b165a223c887562f7a48bd06f545e93faff8e2617207f4
+  metadata.gz: c0ca1b9d96dbb4d00cf0cad78c6a10bfbc8f893c931834eb560e2fa1a2db10b5
+  data.tar.gz: 274d571aafec37f865edd29222343e88545877ef79caade6f87bfca9b27f50da
 SHA512:
-  metadata.gz: 0cf20428fcff91acadf3724ce63cc30e526019a8cc12d59d7d16e00c9c9e8e15cd3a62208f1ad641bcec0da54456809e98f2594df151826fca85de59aae1f651
-  data.tar.gz: b5d8d535a6633ed8b33805f54e70200e406d9a39061cc87f50852c74df99f3ac33bfb25fbcd47c16eda4467cd02a7f159efb5c35b1ef51f5520b93352b6c2b1d
+  metadata.gz: 96c6ea47f5a5b6f98e4fadc427d0e1bbfa6b86f2d4a250757270fa375e0cda5a22a5e4fb7704a14e74a63ba87ef617a2adc489ea7ced107864635f98fa736c35
+  data.tar.gz: 7c3905f05ebb0c4e2694a57ef5e5c04a8cb2c2de97f8b4af965bbf5b41f71aba63646c9fcedc44d3e2916b178855ff56296ca97ecdd151a24d1abb72cc3133df

data/.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 .swp
+*.gem
 *.log
 *.sqlite3
 pkg/*

data/.rubocop.yml

@@ -28,10 +28,6 @@ AllCops:
 Layout/AlignParameters:
   EnforcedStyle: with_fixed_indentation
 
-# This project uses rails-style method indentation, ie. indent after `private`.
-Layout/IndentationConsistency:
-  EnforcedStyle: rails
-
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 

data/.rubocop_todo.yml

@@ -1,25 +1,18 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-11-08 17:51:32 -0500 using RuboCop version 0.51.0.
+# on 2018-05-22 23:50:03 -0400 using RuboCop version 0.56.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 58
+# Offense count: 10
 Metrics/AbcSize:
-  Max: 28
+  Max: 18.5
 
-# Offense count: 3
-Metrics/PerceivedComplexity:
-  Max: 8
-
-Naming/MemoizedInstanceVariableName:
-  Enabled: false
-
-# Offense count: 60
+# Offense count: 59
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: prefer_alias, prefer_alias_method
 Style/Alias:
   Enabled: false
@@ -29,38 +22,44 @@ Style/ClassVars:
   Exclude:
     - 'lib/authlogic/i18n.rb'
 
-# Offense count: 31
+# Offense count: 22
 Style/Documentation:
   Exclude:
-    # Permanent exclusion
-    - test/**/*
+    # Permanent
+    - 'test/**/*'
 
-    # Temporary exclustions
-    - lib/authlogic/config.rb
-    - lib/authlogic/controller_adapters/sinatra_adapter.rb
-    - lib/authlogic/crypto_providers.rb
-    - lib/authlogic/i18n/translator.rb
-    - lib/authlogic/session/activation.rb
-    - lib/authlogic/session/active_record_trickery.rb
-    - lib/authlogic/session/existence.rb
-    - lib/authlogic/session/foundation.rb
-    - lib/authlogic/session/klass.rb
-    - lib/authlogic/session/persistence.rb
-    - lib/authlogic/session/scopes.rb
-    - lib/authlogic/test_case.rb
-    - lib/authlogic/test_case/mock_cookie_jar.rb
-    - lib/authlogic/version.rb
+    # TODO
+    - 'lib/authlogic/config.rb'
+    - 'lib/authlogic/controller_adapters/sinatra_adapter.rb'
+    - 'lib/authlogic/crypto_providers.rb'
+    - 'lib/authlogic/i18n/translator.rb'
+    - 'lib/authlogic/session/activation.rb'
+    - 'lib/authlogic/session/active_record_trickery.rb'
+    - 'lib/authlogic/session/existence.rb'
+    - 'lib/authlogic/session/foundation.rb'
+    - 'lib/authlogic/session/klass.rb'
+    - 'lib/authlogic/session/persistence.rb'
+    - 'lib/authlogic/session/scopes.rb'
+    - 'lib/authlogic/test_case.rb'
+    - 'lib/authlogic/test_case/mock_cookie_jar.rb'
+    - 'lib/authlogic/version.rb'
 
 # Offense count: 4
-Style/MethodMissing:
+Style/MethodMissingSuper:
   Exclude:
     - 'lib/authlogic/controller_adapters/abstract_adapter.rb'
     - 'lib/authlogic/controller_adapters/sinatra_adapter.rb'
     - 'lib/authlogic/test_case/mock_request.rb'
 
-# Offense count: 7
+# Offense count: 3
+Style/MissingRespondToMissing:
+  Exclude:
+    - 'lib/authlogic/controller_adapters/sinatra_adapter.rb'
+    - 'lib/authlogic/test_case/mock_request.rb'
+
+# Offense count: 10
 # Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles.
+# Configuration parameters: .
 # SupportedStyles: compact, exploded
 Style/RaiseArgs:
   EnforcedStyle: compact

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
 ## Unreleased
 
 * Breaking Changes
@@ -9,6 +14,16 @@
 * Fixed
   * None
 
+## 4.1.1 (2018-05-23)
+
+* Breaking Changes
+  * None
+* Added
+  * None
+* Fixed
+  * [#606](https://github.com/binarylogic/authlogic/pull/606) - Interpreter
+    warnings about undefined instance variables
+
 ## 4.1.0 (2018-04-24)
 
 * Breaking Changes

data/Rakefile

@@ -9,10 +9,8 @@ Rake::TestTask.new(:test) do |test|
   test.pattern = "test/**/*_test.rb"
   test.verbose = false
 
-  # Set interpreter warning level to 1 (medium). Level 2 produces hundreds of warnings
-  # about uninitialized instance variables.
-  # TODO: Find a good way to deal with the level 2 warnings.
-  test.ruby_opts += ["-W1"]
+  # Set interpreter warning level to 2 (verbose)
+  test.ruby_opts += ["-W2"]
 end
 
 require "rubocop/rake_task"

data/authlogic.gemspec

@@ -27,7 +27,8 @@ require "authlogic/version"
   s.add_dependency "scrypt", ">= 1.2", "< 4.0"
   s.add_development_dependency "bcrypt", "~> 3.1"
   s.add_development_dependency "byebug", "~> 10.0"
-  s.add_development_dependency "rubocop", "~> 0.54.0"
+  s.add_development_dependency "minitest-reporters", "~> 1.2"
+  s.add_development_dependency "rubocop", "~> 0.56.0"
   s.add_development_dependency "timecop", "~> 0.7"
 
   s.files = `git ls-files`.split("\n")

data/lib/authlogic/acts_as_authentic/base.rb

@@ -76,23 +76,23 @@ module Authlogic
 
         private
 
-          def db_setup?
-            column_names
-            true
-          rescue StandardError
-            false
-          end
+        def db_setup?
+          column_names
+          true
+        rescue StandardError
+          false
+        end
 
-          def first_column_to_exist(*columns_to_check)
-            if db_setup?
-              columns_to_check.each do |column_name|
-                if column_names.include?(column_name.to_s)
-                  return column_name.to_sym
-                end
+        def first_column_to_exist(*columns_to_check)
+          if db_setup?
+            columns_to_check.each do |column_name|
+              if column_names.include?(column_name.to_s)
+                return column_name.to_sym
               end
             end
-            columns_to_check.first && columns_to_check.first.to_sym
           end
+          columns_to_check.first && columns_to_check.first.to_sym
+        end
       end
     end
   end

data/lib/authlogic/acts_as_authentic/logged_in_status.rb

@@ -73,9 +73,9 @@ module Authlogic
 
           private
 
-            def logged_in_timeout
-              self.class.logged_in_timeout
-            end
+          def logged_in_timeout
+            self.class.logged_in_timeout
+          end
         end
       end
     end

data/lib/authlogic/acts_as_authentic/login.rb

@@ -186,10 +186,10 @@ module Authlogic
 
         private
 
-          # @api private
-          def find_with_case(field, value, sensitive)
-            Queries::FindWithCase.new(self, field, value, sensitive).execute
-          end
+        # @api private
+        def find_with_case(field, value, sensitive)
+          Queries::FindWithCase.new(self, field, value, sensitive).execute
+        end
       end
 
       # All methods relating to the login field

data/lib/authlogic/acts_as_authentic/password.rb

@@ -303,6 +303,7 @@ module Authlogic
         module InstanceMethods
           # The password
           def password
+            return nil unless defined?(@password)
             @password
           end
 
@@ -376,124 +377,124 @@ module Authlogic
 
           private
 
-            def crypted_password_to_validate_against(check_against_database)
-              if check_against_database && send("#{crypted_password_field}_changed?")
-                send("#{crypted_password_field}_was")
-              else
-                send(crypted_password_field)
-              end
+          def crypted_password_to_validate_against(check_against_database)
+            if check_against_database && send("#{crypted_password_field}_changed?")
+              send("#{crypted_password_field}_was")
+            else
+              send(crypted_password_field)
             end
+          end
 
-            def check_passwords_against_database?
-              self.class.check_passwords_against_database == true
-            end
+          def check_passwords_against_database?
+            self.class.check_passwords_against_database == true
+          end
 
-            def crypto_providers
-              [crypto_provider] + transition_from_crypto_providers
-            end
+          def crypto_providers
+            [crypto_provider] + transition_from_crypto_providers
+          end
 
-            # Returns an array of arguments to be passed to a crypto provider, either its
-            # `matches?` or its `encrypt` method.
-            def encrypt_arguments(raw_password, check_against_database, arguments_type = nil)
-              salt = nil
-              if password_salt_field
-                salt =
-                  if check_against_database && send("#{password_salt_field}_changed?")
-                    send("#{password_salt_field}_was")
-                  else
-                    send(password_salt_field)
-                  end
-              end
+          # Returns an array of arguments to be passed to a crypto provider, either its
+          # `matches?` or its `encrypt` method.
+          def encrypt_arguments(raw_password, check_against_database, arguments_type = nil)
+            salt = nil
+            if password_salt_field
+              salt =
+                if check_against_database && send("#{password_salt_field}_changed?")
+                  send("#{password_salt_field}_was")
+                else
+                  send(password_salt_field)
+                end
+            end
 
-              case arguments_type
-              when :restful_authentication
-                [REST_AUTH_SITE_KEY, salt, raw_password, REST_AUTH_SITE_KEY].compact
-              when nil
-                [raw_password, salt].compact
-              else
-                raise "Invalid encryptor arguments_type: #{arguments_type}"
-              end
+            case arguments_type
+            when :restful_authentication
+              [REST_AUTH_SITE_KEY, salt, raw_password, REST_AUTH_SITE_KEY].compact
+            when nil
+              [raw_password, salt].compact
+            else
+              raise "Invalid encryptor arguments_type: #{arguments_type}"
             end
+          end
 
-            # Given `encryptor`, does `attempted_password` match the `crypted` password?
-            def encryptor_matches?(
-              crypted,
-              encryptor,
-              index,
+          # Given `encryptor`, does `attempted_password` match the `crypted` password?
+          def encryptor_matches?(
+            crypted,
+            encryptor,
+            index,
+            attempted_password,
+            check_against_database
+          )
+            # The arguments_type for the transitioning from restful_authentication
+            acting_restful = act_like_restful_authentication? && index.zero?
+            transitioning = transition_from_restful_authentication? &&
+              index > 0 &&
+              encryptor == Authlogic::CryptoProviders::Sha1
+            restful = acting_restful || transitioning
+            arguments_type = restful ? :restful_authentication : nil
+            encryptor_args = encrypt_arguments(
               attempted_password,
-              check_against_database
+              check_against_database,
+              arguments_type
             )
-              # The arguments_type for the transitioning from restful_authentication
-              acting_restful = act_like_restful_authentication? && index.zero?
-              transitioning = transition_from_restful_authentication? &&
-                index > 0 &&
-                encryptor == Authlogic::CryptoProviders::Sha1
-              restful = acting_restful || transitioning
-              arguments_type = restful ? :restful_authentication : nil
-              encryptor_args = encrypt_arguments(
-                attempted_password,
-                check_against_database,
-                arguments_type
-              )
-              encryptor.matches?(crypted, *encryptor_args)
-            end
+            encryptor.matches?(crypted, *encryptor_args)
+          end
 
-            # Determines if we need to transition the password.
-            #
-            # - If the index > 0 then we are using an "transition from" crypto
-            #   provider.
-            # - If the encryptor has a cost and the cost it outdated.
-            # - If we aren't using database values
-            # - If we are using database values, only if the password hasn't
-            #   changed so we don't overwrite any changes
-            def transition_password?(index, encryptor, check_against_database)
+          # Determines if we need to transition the password.
+          #
+          # - If the index > 0 then we are using an "transition from" crypto
+          #   provider.
+          # - If the encryptor has a cost and the cost it outdated.
+          # - If we aren't using database values
+          # - If we are using database values, only if the password hasn't
+          #   changed so we don't overwrite any changes
+          def transition_password?(index, encryptor, check_against_database)
+            (
+              index > 0 ||
+              (encryptor.respond_to?(:cost_matches?) &&
+              !encryptor.cost_matches?(send(crypted_password_field)))
+            ) &&
               (
-                index > 0 ||
-                (encryptor.respond_to?(:cost_matches?) &&
-                !encryptor.cost_matches?(send(crypted_password_field)))
-              ) &&
-                (
-                  !check_against_database ||
-                  !send("#{crypted_password_field}_changed?")
-                )
-            end
+                !check_against_database ||
+                !send("#{crypted_password_field}_changed?")
+              )
+          end
 
-            def transition_password(attempted_password)
-              self.password = attempted_password
-              save(validate: false)
-            end
+          def transition_password(attempted_password)
+            self.password = attempted_password
+            save(validate: false)
+          end
 
-            def require_password?
-              new_record? || password_changed? || send(crypted_password_field).blank?
-            end
+          def require_password?
+            new_record? || password_changed? || send(crypted_password_field).blank?
+          end
 
-            def ignore_blank_passwords?
-              self.class.ignore_blank_passwords == true
-            end
+          def ignore_blank_passwords?
+            self.class.ignore_blank_passwords == true
+          end
 
-            def password_changed?
-              @password_changed == true
-            end
+          def password_changed?
+            defined?(@password_changed) && @password_changed == true
+          end
 
-            def reset_password_changed
-              @password_changed = nil
-            end
+          def reset_password_changed
+            @password_changed = nil
+          end
 
-            def crypted_password_field
-              self.class.crypted_password_field
-            end
+          def crypted_password_field
+            self.class.crypted_password_field
+          end
 
-            def password_salt_field
-              self.class.password_salt_field
-            end
+          def password_salt_field
+            self.class.password_salt_field
+          end
 
-            def crypto_provider
-              self.class.crypto_provider
-            end
+          def crypto_provider
+            self.class.crypto_provider
+          end
 
-            def transition_from_crypto_providers
-              self.class.transition_from_crypto_providers
-            end
+          def transition_from_crypto_providers
+            self.class.transition_from_crypto_providers
+          end
         end
       end
     end