github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2444 from elight/master

Browse Source 
Minor refactor to delegate
This commit is contained in:
Santiago Pastorino
2011-08-06 05:27:40 -07:00
parent 43e581ef7f b642922496
commit 81eb5b38db
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
activesupport/lib/active_support/core_ext/module/delegation.rb
View File

@@ -106,26 +106,32 @@ class Module
unless options.is_a?(Hash) && to = options[:to]
raise ArgumentError, "Delegation needs a target. Supply an options hash with a :to key as the last argument (e.g. delegate :hello, :to => :greeter)."
end
prefix, to, allow_nil = options[:prefix], options[:to], options[:allow_nil]
if options[:prefix] == true && options[:to].to_s =~ /^[^a-z_]/
if prefix == true && to.to_s =~ /^[^a-z_]/
raise ArgumentError, "Can only automatically set the delegation prefix when delegating to a method."
end
prefix = options[:prefix] ? "#{options[:prefix] == true ? to : options[:prefix]}_" : ''
method_prefix =
if prefix
"#{prefix == true ? to : prefix}_"
else
''
end
file, line = caller.first.split(':', 2)
line = line.to_i
methods.each do |method|
on_nil =
if options[:allow_nil]
if allow_nil
'return'
else
%(raise "#{self}##{prefix}#{method} delegated to #{to}.#{method}, but #{to} is nil: \#{self.inspect}")
%(raise "#{self}##{method_prefix}#{method} delegated to #{to}.#{method}, but #{to} is nil: \#{self.inspect}")
end
module_eval(<<-EOS, file, line - 5)
def #{prefix}#{method}(*args, &block) # def customer_name(*args, &block)
def #{method_prefix}#{method}(*args, &block) # def customer_name(*args, &block)
#{to}.__send__(#{method.inspect}, *args, &block) # client.__send__(:name, *args, &block)
rescue NoMethodError # rescue NoMethodError
if #{to}.nil? # if client.nil?