From a78547a9c66eeaa3dbf5e2612483ca172fb137e9 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Wed, 21 Jul 2010 16:59:23 -0700 Subject: testing loaded? method and reducing funcalls --- activerecord/lib/active_record/session_store.rb | 2 +- activerecord/test/cases/session_store/sql_bypass.rb | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/session_store.rb b/activerecord/lib/active_record/session_store.rb index 17f09d64b0..b352f9529d 100644 --- a/activerecord/lib/active_record/session_store.rb +++ b/activerecord/lib/active_record/session_store.rb @@ -259,7 +259,7 @@ module ActiveRecord end def loaded? - !!@data + @data end def save diff --git a/activerecord/test/cases/session_store/sql_bypass.rb b/activerecord/test/cases/session_store/sql_bypass.rb index cea5e4eabe..6c4a70b9fe 100644 --- a/activerecord/test/cases/session_store/sql_bypass.rb +++ b/activerecord/test/cases/session_store/sql_bypass.rb @@ -22,6 +22,16 @@ module ActiveRecord s = SqlBypass.new :data => 'foo', :session_id => 10 assert s.new_record?, 'this is a new record!' end + + def test_not_loaded? + s = SqlBypass.new({}) + assert !s.loaded?, 'it is not loaded' + end + + def test_loaded? + s = SqlBypass.new :data => 'hello' + assert s.loaded?, 'it is loaded' + end end end end -- cgit v1.2.3