authlogic 4.1.0 → 4.1.1

data/lib/authlogic/acts_as_authentic/persistence_token.rb

@@ -54,9 +54,9 @@ module Authlogic
 
           private
 
-            def reset_persistence_token?
-              persistence_token.blank?
-            end
+          def reset_persistence_token?
+            persistence_token.blank?
+          end
         end
       end
     end

data/lib/authlogic/acts_as_authentic/queries/find_with_case.rb

@@ -26,41 +26,41 @@ module Authlogic
 
         private
 
-          # @api private
-          def bind(relation)
-            if AR_GEM_VERSION >= Gem::Version.new("5")
-              bind = ActiveRecord::Relation::QueryAttribute.new(
-                @field,
-                @value,
-                ActiveRecord::Type::Value.new
-              )
-              @model_class.where(relation, bind)
-            else
-              @model_class.where(relation)
-            end
+        # @api private
+        def bind(relation)
+          if AR_GEM_VERSION >= Gem::Version.new("5")
+            bind = ActiveRecord::Relation::QueryAttribute.new(
+              @field,
+              @value,
+              ActiveRecord::Type::Value.new
+            )
+            @model_class.where(relation, bind)
+          else
+            @model_class.where(relation)
           end
+        end
 
-          # @api private
-          def relation
-            if !@sensitive
-              @model_class.connection.case_insensitive_comparison(
-                @model_class.arel_table,
-                @field,
-                @model_class.columns_hash[@field],
-                @value
-              )
-            elsif AR_GEM_VERSION >= Gem::Version.new("5.0")
-              @model_class.connection.case_sensitive_comparison(
-                @model_class.arel_table,
-                @field,
-                @model_class.columns_hash[@field],
-                @value
-              )
-            else
-              value = @model_class.connection.case_sensitive_modifier(@value, @field)
-              @model_class.arel_table[@field].eq(value)
-            end
+        # @api private
+        def relation
+          if !@sensitive
+            @model_class.connection.case_insensitive_comparison(
+              @model_class.arel_table,
+              @field,
+              @model_class.columns_hash[@field],
+              @value
+            )
+          elsif AR_GEM_VERSION >= Gem::Version.new("5.0")
+            @model_class.connection.case_sensitive_comparison(
+              @model_class.arel_table,
+              @field,
+              @model_class.columns_hash[@field],
+              @value
+            )
+          else
+            value = @model_class.connection.case_sensitive_modifier(@value, @field)
+            @model_class.arel_table[@field].eq(value)
           end
+        end
       end
     end
   end

data/lib/authlogic/acts_as_authentic/restful_authentication.rb

@@ -69,24 +69,24 @@ module Authlogic
 
         private
 
-          def set_restful_authentication_config
-            self.restful_auth_crypto_provider = CryptoProviders::Sha1
-            if !defined?(::REST_AUTH_SITE_KEY) || ::REST_AUTH_SITE_KEY.nil?
-              unless defined?(::REST_AUTH_SITE_KEY)
-                class_eval("::REST_AUTH_SITE_KEY = ''", __FILE__, __LINE__)
-              end
-              CryptoProviders::Sha1.stretches = 1
+        def set_restful_authentication_config
+          self.restful_auth_crypto_provider = CryptoProviders::Sha1
+          if !defined?(::REST_AUTH_SITE_KEY) || ::REST_AUTH_SITE_KEY.nil?
+            unless defined?(::REST_AUTH_SITE_KEY)
+              class_eval("::REST_AUTH_SITE_KEY = ''", __FILE__, __LINE__)
             end
+            CryptoProviders::Sha1.stretches = 1
           end
+        end
 
-          # @api private
-          def restful_auth_crypto_provider=(provider)
-            if act_like_restful_authentication
-              self.crypto_provider = provider
-            else
-              self.transition_from_crypto_providers = provider
-            end
+        # @api private
+        def restful_auth_crypto_provider=(provider)
+          if act_like_restful_authentication
+            self.crypto_provider = provider
+          else
+            self.transition_from_crypto_providers = provider
           end
+        end
       end
 
       # :nodoc:

data/lib/authlogic/acts_as_authentic/session_maintenance.rb

@@ -100,82 +100,82 @@ module Authlogic
 
         private
 
-          def skip_session_maintenance=(value)
-            @skip_session_maintenance = value
-          end
+        def skip_session_maintenance=(value)
+          @skip_session_maintenance = value
+        end
 
-          def skip_session_maintenance
-            @skip_session_maintenance ||= false
-          end
+        def skip_session_maintenance
+          @skip_session_maintenance ||= false
+        end
 
-          def update_sessions?
-            !skip_session_maintenance &&
-              session_class &&
-              session_class.activated? &&
-              maintain_session? &&
-              !session_ids.blank? &&
-              persistence_token_changed?
-          end
+        def update_sessions?
+          !skip_session_maintenance &&
+            session_class &&
+            session_class.activated? &&
+            maintain_session? &&
+            !session_ids.blank? &&
+            persistence_token_changed?
+        end
 
-          def maintain_session?
-            log_in_after_create? || log_in_after_password_change?
-          end
+        def maintain_session?
+          log_in_after_create? || log_in_after_password_change?
+        end
 
-          def get_session_information
-            # Need to determine if we are completely logged out, or logged in as
-            # another user.
-            @_sessions = []
+        def get_session_information
+          # Need to determine if we are completely logged out, or logged in as
+          # another user.
+          @_sessions = []
 
-            session_ids.each do |session_id|
-              session = session_class.find(session_id, self)
-              @_sessions << session if session && session.record
-            end
+          session_ids.each do |session_id|
+            session = session_class.find(session_id, self)
+            @_sessions << session if session && session.record
           end
+        end
 
-          def maintain_sessions
-            if @_sessions.empty?
-              create_session
-            else
-              update_sessions
-            end
+        def maintain_sessions
+          if @_sessions.empty?
+            create_session
+          else
+            update_sessions
           end
+        end
 
-          def create_session
-            # We only want to automatically login into the first session, since
-            # this is the main session. The other sessions are sessions that
-            # need to be created after logging into the main session.
-            session_id = session_ids.first
-            session_class.create(*[self, self, session_id].compact)
-
-            true
-          end
+        def create_session
+          # We only want to automatically login into the first session, since
+          # this is the main session. The other sessions are sessions that
+          # need to be created after logging into the main session.
+          session_id = session_ids.first
+          session_class.create(*[self, self, session_id].compact)
 
-          def update_sessions
-            # We found sessions above, let's update them with the new info
-            @_sessions.each do |stale_session|
-              next if stale_session.record != self
-              stale_session.unauthorized_record = self
-              stale_session.save
-            end
+          true
+        end
 
-            true
+        def update_sessions
+          # We found sessions above, let's update them with the new info
+          @_sessions.each do |stale_session|
+            next if stale_session.record != self
+            stale_session.unauthorized_record = self
+            stale_session.save
           end
 
-          def session_ids
-            self.class.session_ids
-          end
+          true
+        end
 
-          def session_class
-            self.class.session_class
-          end
+        def session_ids
+          self.class.session_ids
+        end
 
-          def log_in_after_create?
-            new_record? && self.class.log_in_after_create
-          end
+        def session_class
+          self.class.session_class
+        end
 
-          def log_in_after_password_change?
-            persistence_token_changed? && self.class.log_in_after_password_change
-          end
+        def log_in_after_create?
+          new_record? && self.class.log_in_after_create
+        end
+
+        def log_in_after_password_change?
+          persistence_token_changed? && self.class.log_in_after_password_change
+        end
       end
     end
   end

data/lib/authlogic/acts_as_authentic/single_access_token.rb

@@ -67,13 +67,13 @@ module Authlogic
 
           protected
 
-            def reset_single_access_token?
-              single_access_token.blank?
-            end
+          def reset_single_access_token?
+            single_access_token.blank?
+          end
 
-            def change_single_access_token_with_password?
-              self.class.change_single_access_token_with_password == true
-            end
+          def change_single_access_token_with_password?
+            self.class.change_single_access_token_with_password == true
+          end
         end
       end
     end

data/lib/authlogic/authenticates_many/association.rb

@@ -42,9 +42,9 @@ module Authlogic
 
       private
 
-        def scope_options
-          { find_options: find_options, id: id }
-        end
+      def scope_options
+        { find_options: find_options, id: id }
+      end
     end
   end
 end

data/lib/authlogic/config.rb

@@ -9,15 +9,15 @@ module Authlogic
 
     private
 
-      # This is a one-liner method to write a config setting, read the config
-      # setting, and also set a default value for the setting.
-      def rw_config(key, value, default_value = nil)
-        if value.nil?
-          acts_as_authentic_config.include?(key) ? acts_as_authentic_config[key] : default_value
-        else
-          self.acts_as_authentic_config = acts_as_authentic_config.merge(key => value)
-          value
-        end
+    # This is a one-liner method to write a config setting, read the config
+    # setting, and also set a default value for the setting.
+    def rw_config(key, value, default_value = nil)
+      if value.nil?
+        acts_as_authentic_config.include?(key) ? acts_as_authentic_config[key] : default_value
+      else
+        self.acts_as_authentic_config = acts_as_authentic_config.merge(key => value)
+        value
       end
+    end
   end
 end

data/lib/authlogic/controller_adapters/abstract_adapter.rb

@@ -53,12 +53,32 @@ module Authlogic
         controller.send(:single_access_allowed?)
       end
 
-      def responds_to_last_request_update_allowed?
-        controller.respond_to?(:last_request_update_allowed?, true)
-      end
-
+      # You can disable the updating of `last_request_at`
+      # on a per-controller basis.
+      #
+      #   # in your controller
+      #   def last_request_update_allowed?
+      #     false
+      #   end
+      #
+      # For example, what if you had a javascript function that polled the
+      # server updating how much time is left in their session before it
+      # times out. Obviously you would want to ignore this request, because
+      # then the user would never time out. So you can do something like
+      # this in your controller:
+      #
+      #   def last_request_update_allowed?
+      #     action_name != "update_session_time_left"
+      #   end
+      #
+      # See `authlogic/session/magic_columns.rb` to learn more about the
+      # `last_request_at` column itself.
       def last_request_update_allowed?
-        controller.send(:last_request_update_allowed?)
+        if controller.respond_to?(:last_request_update_allowed?, true)
+          controller.send(:last_request_update_allowed?)
+        else
+          true
+        end
       end
 
       def respond_to_missing?(*args)
@@ -67,9 +87,9 @@ module Authlogic
 
       private
 
-        def method_missing(id, *args, &block)
-          controller.send(id, *args, &block)
-        end
+      def method_missing(id, *args, &block)
+        controller.send(id, *args, &block)
+      end
     end
   end
 end

data/lib/authlogic/controller_adapters/rails_adapter.rb

@@ -56,9 +56,9 @@ module Authlogic
 
         private
 
-          def activate_authlogic
-            Authlogic::Session::Base.controller = RailsAdapter.new(self)
-          end
+        def activate_authlogic
+          Authlogic::Session::Base.controller = RailsAdapter.new(self)
+        end
       end
     end
   end

data/lib/authlogic/crypto_providers/aes256.rb

@@ -37,29 +37,29 @@ module Authlogic
 
         private
 
-          def aes
-            if @key.blank?
-              raise ArgumentError.new(
-                "You must provide a key like #{name}.key = my_key before using the #{name}"
-              )
-            end
-
-            @aes ||= openssl_cipher_class.new("AES-256-ECB")
+        def aes
+          if @key.blank?
+            raise ArgumentError.new(
+              "You must provide a key like #{name}.key = my_key before using the #{name}"
+            )
           end
 
-          # `::OpenSSL::Cipher::Cipher` has been deprecated since at least 2014,
-          # in favor of `::OpenSSL::Cipher`, but a deprecation warning was not
-          # printed until 2016
-          # (https://github.com/ruby/openssl/commit/5c20a4c014) when openssl
-          # became a gem. Its first release as a gem was 2.0.0, in ruby 2.4.
-          # (See https://github.com/ruby/ruby/blob/v2_4_0/NEWS)
-          def openssl_cipher_class
-            if ::Gem::Version.new(::OpenSSL::VERSION) < ::Gem::Version.new("2.0.0")
-              ::OpenSSL::Cipher::Cipher
-            else
-              ::OpenSSL::Cipher
-            end
+          @aes ||= openssl_cipher_class.new("AES-256-ECB")
+        end
+
+        # `::OpenSSL::Cipher::Cipher` has been deprecated since at least 2014,
+        # in favor of `::OpenSSL::Cipher`, but a deprecation warning was not
+        # printed until 2016
+        # (https://github.com/ruby/openssl/commit/5c20a4c014) when openssl
+        # became a gem. Its first release as a gem was 2.0.0, in ruby 2.4.
+        # (See https://github.com/ruby/ruby/blob/v2_4_0/NEWS)
+        def openssl_cipher_class
+          if ::Gem::Version.new(::OpenSSL::VERSION) < ::Gem::Version.new("2.0.0")
+            ::OpenSSL::Cipher::Cipher
+          else
+            ::OpenSSL::Cipher
           end
+        end
       end
     end
   end

data/lib/authlogic/crypto_providers/bcrypt.rb

@@ -98,15 +98,15 @@ module Authlogic
 
         private
 
-          def join_tokens(tokens)
-            tokens.flatten.join
-          end
+        def join_tokens(tokens)
+          tokens.flatten.join
+        end
 
-          def new_from_hash(hash)
-            ::BCrypt::Password.new(hash)
-          rescue ::BCrypt::Errors::InvalidHash
-            nil
-          end
+        def new_from_hash(hash)
+          ::BCrypt::Password.new(hash)
+        rescue ::BCrypt::Errors::InvalidHash
+          nil
+        end
       end
     end
   end