public
Description: Ruby on Rails
Homepage: http://rubyonrails.org
Clone URL: git://github.com/rails/rails.git
Fix NamedScope regex so methods containing "an" get delegated to proxy_found

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#901 state:committed]

Conflicts:

  activerecord/lib/active_record/named_scope.rb
NZKoz (author)
Fri Aug 29 06:22:06 -0700 2008
commit  c37900138c565f7dacbbfbe20f9c397da7ec49c4
tree    962340b486f00136fd3513d29d70464998797d36
parent  e27e1f0308619795f766b2d2ef76aa80282cca01
...
103
104
105
106
 
107
108
109
...
103
104
105
 
106
107
108
109
0
@@ -103,7 +103,7 @@ module ActiveRecord
0
       attr_reader :proxy_scope, :proxy_options
0
 
0
       [].methods.each do |m|
0
-        unless m =~ /(^__|^nil\?|^send|^object_id$|class|extend|^find$|count|sum|average|maximum|minimum|paginate|first|last|empty?|respond_to?)/
0
+        unless m =~ /(^__|^nil\?|^send|^object_id$|class|extend|^find$|count|sum|average|maximum|minimum|paginate|first|last|empty\?|respond_to\?)/
0
           delegate m, :to => :proxy_found
0
         end
0
       end
...
196
197
198
 
 
 
 
199
200
201
...
196
197
198
199
200
201
202
203
204
205
0
@@ -196,6 +196,10 @@ class NamedScopeTest < ActiveRecord::TestCase
0
     assert_equal Topic.base.select(&:approved), Topic.base.find_all(&:approved)
0
   end
0
 
0
+  def test_rand_should_select_a_random_object_from_proxy
0
+    assert Topic.approved.rand.is_a? Topic
0
+  end
0
+
0
   def test_should_use_where_in_query_for_named_scope
0
     assert_equal Developer.find_all_by_name('Jamis'), Developer.find_all_by_id(Developer.jamises)
0
   end

Comments