TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Refactor the code a bit to reduce the duplication

Browse Source
This commit is contained in:
Prem Sichanugrist 2011-07-17 18:53:15 -04:00
parent 6e6994994d
commit 1ccca1b9cb
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
activerecord/lib/active_record/base.rb
View File

@ -1052,7 +1052,7 @@ def compute_table_name
# Each dynamic finder using <tt>scoped_by_*</tt> is also defined in the class after it # Each dynamic finder using <tt>scoped_by_*</tt> is also defined in the class after it
# is first invoked, so that future attempts to use it do not run through method_missing. # is first invoked, so that future attempts to use it do not run through method_missing.
def method_missing(method_id, *arguments, &block) def method_missing(method_id, *arguments, &block)
if match = DynamicFinderMatch.match(method_id) if match = (DynamicFinderMatch.match(method_id) || DynamicScopeMatch.match(method_id))
attribute_names = match.attribute_names attribute_names = match.attribute_names
super unless all_attributes_exists?(attribute_names) super unless all_attributes_exists?(attribute_names)
if arguments.size < attribute_names.size if arguments.size < attribute_names.size
@ -1060,22 +1060,7 @@ def method_missing(method_id, *arguments, &block)
backtrace = [method_trace] + caller backtrace = [method_trace] + caller
raise ArgumentError, "wrong number of arguments (#{arguments.size} for #{attribute_names.size})", backtrace raise ArgumentError, "wrong number of arguments (#{arguments.size} for #{attribute_names.size})", backtrace
end end
if match.finder? if match.respond_to?(:scope?) && match.scope?
options = arguments.extract_options!
relation = options.any? ? scoped(options) : scoped
relation.send :find_by_attributes, match, attribute_names, *arguments, &block
elsif match.instantiator?
scoped.send :find_or_instantiator_by_attributes, match, attribute_names, *arguments, &block
end
elsif match = DynamicScopeMatch.match(method_id)
attribute_names = match.attribute_names
super unless all_attributes_exists?(attribute_names)
if arguments.size < attribute_names.size
method_trace = "#{__FILE__}:#{__LINE__}:in `#{method_id}'"
backtrace = [method_trace] + caller
raise ArgumentError, "wrong number of arguments (#{arguments.size} for #{attribute_names.size})", backtrace
end
if match.scope?
self.class_eval <<-METHOD, __FILE__, __LINE__ + 1 self.class_eval <<-METHOD, __FILE__, __LINE__ + 1
def self.#{method_id}(*args) # def self.scoped_by_user_name_and_password(*args) def self.#{method_id}(*args) # def self.scoped_by_user_name_and_password(*args)
attributes = Hash[[:#{attribute_names.join(',:')}].zip(args)] # attributes = Hash[[:user_name, :password].zip(args)] attributes = Hash[[:#{attribute_names.join(',:')}].zip(args)] # attributes = Hash[[:user_name, :password].zip(args)]
@ -1084,6 +1069,12 @@ def self.#{method_id}(*args) # def self.scope
end # end end # end
METHOD METHOD
send(method_id, *arguments) send(method_id, *arguments)
elsif match.finder?
options = arguments.extract_options!
relation = options.any? ? scoped(options) : scoped
relation.send :find_by_attributes, match, attribute_names, *arguments, &block
elsif match.instantiator?
scoped.send :find_or_instantiator_by_attributes, match, attribute_names, *arguments, &block
end end
else else
super super