Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change from named_scope to scope #221

Closed
wants to merge 1 commit into from
Closed

Change from named_scope to scope #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/authlogic/acts_as_authentic/logged_in_status.rb
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ def self.included(klass)
klass.class_eval do klass.class_eval do
include InstanceMethods include InstanceMethods


named_scope :logged_in, lambda { {:conditions => ["last_request_at > ?", logged_in_timeout.seconds.ago]} } scope :logged_in, lambda { {:conditions => ["last_request_at > ?", logged_in_timeout.seconds.ago]} }
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this break Rails 2?

named_scope :logged_out, lambda { {:conditions => ["last_request_at is NULL or last_request_at <= ?", logged_in_timeout.seconds.ago]} } scope :logged_out, lambda { {:conditions => ["last_request_at is NULL or last_request_at <= ?", logged_in_timeout.seconds.ago]} }
end end
end end


Expand Down
4 changes: 2 additions & 2 deletions test/acts_as_authentic_test/logged_in_status_test.rb
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ def test_logged_in_timeout_config
assert_equal 10.minutes.to_i, User.logged_in_timeout assert_equal 10.minutes.to_i, User.logged_in_timeout
end end


def test_named_scope_logged_in def test_scope_logged_in
assert_equal 0, User.logged_in.count assert_equal 0, User.logged_in.count
User.first.update_attribute(:last_request_at, Time.now) User.first.update_attribute(:last_request_at, Time.now)
assert_equal 1, User.logged_in.count assert_equal 1, User.logged_in.count
end end


def test_named_scope_logged_out def test_scope_logged_out
assert_equal 2, User.logged_out.count assert_equal 2, User.logged_out.count
User.first.update_attribute(:last_request_at, Time.now) User.first.update_attribute(:last_request_at, Time.now)
assert_equal 1, User.logged_out.count assert_equal 1, User.logged_out.count
Expand Down