authlogic 3.0.1 → 3.0.2

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 3
 :minor: 0
-:patch: 1
+:patch: 2
 :build: 

data/authlogic.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{authlogic}
-  s.version = "3.0.1"
+  s.version = "3.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Johnson of Binary Logic"]

data/lib/authlogic/acts_as_authentic/logged_in_status.rb

@@ -11,7 +11,7 @@ module Authlogic
           add_acts_as_authentic_module(Methods)
         end
       end
-      
+
       # All configuration for the logged in status feature set.
       module Config
         # The timeout to determine when a user is logged in or not.
@@ -23,30 +23,31 @@ module Authlogic
         end
         alias_method :logged_in_timeout=, :logged_in_timeout
       end
-      
+
       # All methods for the logged in status feature seat.
       module Methods
         def self.included(klass)
           return if !klass.column_names.include?("last_request_at")
-          
+
           klass.class_eval do
             include InstanceMethods
             scope :logged_in, where("last_request_at > ?", logged_in_timeout.seconds.ago)
             scope :logged_out, where("last_request_at is NULL or last_request_at <= ?", logged_in_timeout.seconds.ago)
           end
-        
+        end
+
         module InstanceMethods
           # Returns true if the last_request_at > logged_in_timeout.
           def logged_in?
             raise "Can not determine the records login state because there is no last_request_at column" if !respond_to?(:last_request_at)
             !last_request_at.nil? && last_request_at > logged_in_timeout.seconds.ago
           end
-        
+
           # Opposite of logged_in?
           def logged_out?
             !logged_in?
           end
-        
+
           private
             def logged_in_timeout
               self.class.logged_in_timeout

data/lib/authlogic/acts_as_authentic/perishable_token.rb

@@ -11,7 +11,7 @@ module Authlogic
           add_acts_as_authentic_module(Methods)
         end
       end
-      
+
       # Change how the perishable token works.
       module Config
         # When using the find_using_perishable_token method the token can expire. If the token is expired, no
@@ -23,7 +23,7 @@ module Authlogic
           rw_config(:perishable_token_valid_for, (!value.nil? && value.to_i) || value, 10.minutes.to_i)
         end
         alias_method :perishable_token_valid_for=, :perishable_token_valid_for
-        
+
         # Authlogic tries to expire and change the perishable token as much as possible, without comprising
         # it's purpose. This is for security reasons. If you want to manage it yourself, you can stop
         # Authlogic from getting your in way by setting this to true.
@@ -35,21 +35,21 @@ module Authlogic
         end
         alias_method :disable_perishable_token_maintenance=, :disable_perishable_token_maintenance
       end
-      
+
       # All methods relating to the perishable token.
       module Methods
         def self.included(klass)
           return if !klass.column_names.include?("perishable_token")
-          
+
           klass.class_eval do
             extend ClassMethods
             include InstanceMethods
-            
+
             validates_uniqueness_of :perishable_token, :if => :perishable_token_changed?
             before_save :reset_perishable_token, :unless => :disable_perishable_token_maintenance?
           end
         end
-        
+
         # Class level methods for the perishable token
         module ClassMethods
           # Use this methdo to find a record with a perishable token. This method does 2 things for you:
@@ -63,37 +63,37 @@ module Authlogic
           def find_using_perishable_token(token, age = self.perishable_token_valid_for)
             return if token.blank?
             age = age.to_i
-            
+
             conditions_sql = "perishable_token = ?"
             conditions_subs = [token]
-            
+
             if column_names.include?("updated_at") && age > 0
               conditions_sql += " and updated_at > ?"
               conditions_subs << age.seconds.ago
             end
-            
-            find(:first, :conditions => [conditions_sql, *conditions_subs])
+
+            where(conditions_sql, *conditions_subs).first
           end
-          
+
           # This method will raise ActiveRecord::NotFound if no record is found.
           def find_using_perishable_token!(token, age = perishable_token_valid_for)
             find_using_perishable_token(token, age) || raise(ActiveRecord::RecordNotFound)
           end
         end
-        
+
         # Instance level methods for the perishable token.
         module InstanceMethods
           # Resets the perishable token to a random friendly token.
           def reset_perishable_token
             self.perishable_token = Random.friendly_token
           end
-          
+
           # Same as reset_perishable_token, but then saves the record afterwards.
           def reset_perishable_token!
             reset_perishable_token
             save_without_session_maintenance(:validate => false)
           end
-          
+
           # A convenience method based on the disable_perishable_token_maintenance configuration option.
           def disable_perishable_token_maintenance?
             self.class.disable_perishable_token_maintenance == true

data/lib/authlogic/session/scopes.rb

@@ -12,14 +12,14 @@ module Authlogic
           attr_writer :scope
         end
       end
-      
+
       # = Scopes
       module ClassMethods
         # The current scope set, should be used in the block passed to with_scope.
         def scope
           Thread.current[: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:
         #
@@ -34,11 +34,11 @@ module Authlogic
         #
         # Eseentially what the above does is scope the searching of the object with the sql you provided. So instead of:
         #
-        #   User.find(:first, :conditions => "login = 'ben'")
+        #   User.where("login = 'ben'").first
         #
         # it would be:
         #
-        #   User.find(:first, :conditions => "login = 'ben' and account_id = 2")
+        #   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:
         #
@@ -65,31 +65,31 @@ module Authlogic
           self.scope = nil
           result
         end
-        
+
         private
           def scope=(value)
             Thread.current[:authlogic_scope] = value
           end
       end
-      
+
       module InstanceMethods
         # Setting the scope if it exists upon instantiation.
         def initialize(*args)
           self.scope = self.class.scope
           super
         end
-        
+
         # The scope of the current object
         def scope
           @scope ||= {}
         end
-        
+
         private
           # Used for things like cookie_key, session_key, etc.
           def build_key(last_part)
             [scope[:id], super].compact.join("_")
           end
-          
+
           def search_for_record(*args)
             klass.send(:with_scope, :find => (scope[:find_options] || {})) do
               klass.send(*args)

data/test/session_test/scopes_test.rb

@@ -4,16 +4,16 @@ module SessionTest
   class ScopesTest < ActiveSupport::TestCase
     def test_scope_method
       assert_nil Authlogic::Session::Base.scope
-      
+
       thread1 = Thread.new do
         scope = {:id => :scope1}
         Authlogic::Session::Base.send(:scope=, scope)
         assert_equal scope, Authlogic::Session::Base.scope
       end
       thread1.join
-      
+
       assert_nil Authlogic::Session::Base.scope
-      
+
       thread2 = Thread.new do
         scope = {:id => :scope2}
         Authlogic::Session::Base.send(:scope=, scope)
@@ -23,17 +23,17 @@ module SessionTest
 
       assert_nil Authlogic::Session::Base.scope
     end
-  
+
     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)
       end
-      
+
       assert_nil UserSession.scope
     end
-  
+
     def test_initialize
       UserSession.with_scope(:find_options => {:conditions => "awesome = 1"}, :id => "some_id") do
         session = UserSession.new
@@ -42,18 +42,18 @@ module SessionTest
         assert_equal "another_id_some_id_test", session.send(:build_key, "test")
       end
     end
-    
+
     def test_search_for_record_with_scopes
       binary_logic = companies(:binary_logic)
       ben = users(:ben)
       zack = users(:zack)
-      
+
       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]}}
       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

metadata

@@ -2,7 +2,7 @@
 name: authlogic
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -187,7 +187,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3373969756034763681
+      hash: 4144864465011850466
       segments: 
       - 0
       version: "0"