Updated use of named_scopes to scopes when Rails 3

arunagw · Jan 7, 2011 · 35455c9 · 35455c9
1 parent 846b92e
commit 35455c9
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/authlogic/acts_as_authentic/logged_in_status.rb b/lib/authlogic/acts_as_authentic/logged_in_status.rb
@@ -31,9 +31,13 @@ def self.included(klass)
 
           klass.class_eval do
             include InstanceMethods
-
-            named_scope :logged_in, lambda { {:conditions => ["last_request_at > ?", logged_in_timeout.seconds.ago]} }
-            named_scope :logged_out, lambda { {:conditions => ["last_request_at is NULL or last_request_at <= ?", logged_in_timeout.seconds.ago]} }
+            if Rails::VERSION::MAJOR >= 3
+              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)
+            else
+              named_scope :logged_in, lambda { {:conditions => ["last_request_at > ?", logged_in_timeout.seconds.ago]} }
+              named_scope :logged_out, lambda { {:conditions => ["last_request_at is NULL or last_request_at <= ?", logged_in_timeout.seconds.ago]} }
+            end
           end
         end