@@ -82,6 +82,7 @@ module ActiveRecord # expected_options = { :conditions => { :colored => 'red' } } # assert_equal expected_options, Shirt.colored('red').proxy_options def named_scope(name, options = {}, &block) + name = name.to_sym scopes[name] = lambda do |parent_scope, *args| Scope.new(parent_scope, case options when Hash activerecord/lib/active_record/named_scope.rb @@ -59,6 +59,12 @@ class NamedScopeTest < ActiveRecord::TestCase assert_equal Topic.count(:conditions => {:approved => true}), Topic.approved.count end + def test_scopes_with_string_name_can_be_composed + # NOTE that scopes defined with a string as a name worked on their own + # but when called on another scope the other scope was completely replaced + assert_equal Topic.replied.approved, Topic.replied.approved_as_string + end + def test_scopes_are_composable assert_equal (approved = Topic.find(:all, :conditions => {:approved => true})), Topic.approved assert_equal (replied = Topic.find(:all, :conditions => 'replies_count > 0')), Topic.replied activerecord/test/cases/named_scope_test.rb @@ -4,6 +4,7 @@ class Topic < ActiveRecord::Base { :conditions => ['written_on < ?', time] } } named_scope :approved, :conditions => {:approved => true} + named_scope 'approved_as_string', :conditions => {:approved => true} named_scope :replied, :conditions => ['replies_count > 0'] named_scope :anonymous_extension do def one activerecord/test/models/topic.rb 43cbcb10ae85adc4403e950e69ee14123a20d8ae Tarmo Tänav tarmo@itech.ee http://github.com/rails/rails/commit/1afae84ab2656cd58a861ab4a4b1745d80088d0f 1afae84ab2656cd58a861ab4a4b1745d80088d0f 2008-06-22T17:26:00-07:00 2008-06-13T13:39:10-07:00 Fixed that scopes defined with a string name could not be composed 29544057e3738abdc680d795aa8fe49ebdf1176b Jeremy Kemper jeremy@bitsweat.net