From 9615d6ae13d5d7bdeaa71be2615aa405e345fbce Mon Sep 17 00:00:00 2001
From: Tom Stuart <tom@obsess.com>
Date: Fri, 29 Aug 2008 15:11:25 +0100
Subject: [PATCH] Make named scope #size behave identically to association proxy #size (#length if already loaded, #count if not)

---
 activerecord/lib/active_record/named_scope.rb |    6 +++++-
 activerecord/test/cases/named_scope_test.rb   |   15 +++++++++++++++
 2 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/activerecord/lib/active_record/named_scope.rb b/activerecord/lib/active_record/named_scope.rb
index b9b7eb5..827cd90 100644
--- a/activerecord/lib/active_record/named_scope.rb
+++ b/activerecord/lib/active_record/named_scope.rb
@@ -103,7 +103,7 @@ module ActiveRecord
       attr_reader :proxy_scope, :proxy_options
 
       [].methods.each do |m|
-        unless m =~ /(^__|^nil\?|^send|^object_id$|class|extend|^find$|count|sum|average|maximum|minimum|paginate|first|last|empty\?|any\?|respond_to\?)/
+        unless m =~ /(^__|^nil\?|^send|^object_id$|class|extend|^find$|size|count|sum|average|maximum|minimum|paginate|first|last|empty\?|any\?|respond_to\?)/
           delegate m, :to => :proxy_found
         end
       end
@@ -136,6 +136,10 @@ module ActiveRecord
         end
       end
 
+      def size
+        @found ? @found.length : count
+      end
+
       def empty?
         @found ? @found.empty? : count.zero?
       end
diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index acc3b30..5c124e0 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -256,4 +256,19 @@ class NamedScopeTest < ActiveRecord::TestCase
   def test_should_use_where_in_query_for_named_scope
     assert_equal Developer.find_all_by_name('Jamis'), Developer.find_all_by_id(Developer.jamises)
   end
+
+  def test_size_should_use_count_when_results_are_not_loaded
+    topics = Topic.base
+    assert_queries(1) do
+      topics.size # use count query
+    end
+  end
+
+  def test_size_should_use_length_when_results_are_loaded
+    topics = Topic.base
+    topics.reload # force load
+    assert_no_queries do
+      topics.size # use loaded (no query)
+    end
+  end
 end
-- 
1.5.4.5