kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Improve named scope lambda

Browse source
This commit is contained in:
Pratik Naik 2010-04-03 01:35:10 +01:00
parent 684e4d39d6
commit 41a2ba652a
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
activerecord/lib/active_record/named_scope.rb
View file

@ -99,7 +99,7 @@ module ActiveRecord
#
# expected_options = { :conditions => { :colored => 'red' } }
# assert_equal expected_options, Shirt.colored('red').proxy_options
def scope(name, options = {}, &block)
def scope(name, scope_options = {}, &block)
name = name.to_sym
if !scopes[name] && respond_to?(name, true)
@ -108,19 +108,10 @@ module ActiveRecord
end
scopes[name] = lambda do |*args|
scope_options = case options
when Hash, Relation
options
when Proc
options.call(*args)
end
relation = if scope_options.is_a?(Hash)
scoped.apply_finder_options(scope_options)
else
scope_options ? scoped.merge(scope_options) : scoped
end
options = scope_options.is_a?(Proc) ? scope_options.call(*args) : scope_options
relation = scoped
relation = options.is_a?(Hash) ? relation.apply_finder_options(options) : scoped.merge(options) if options
block_given? ? relation.extending(Module.new(&block)) : relation
end