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

Allow delegating to nil, because the method might actually exist on it

Browse source
This commit is contained in:
Bryan Helmkamp 2009-08-10 18:34:24 -04:00 committed by Jeremy Kemper
parent d0f891ae02
commit d15ddf04ec
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
activesupport/lib/active_support/core_ext/module/delegation.rb
View file

@ -121,8 +121,13 @@ class Module
module_eval(<<-EOS, file, line) module_eval(<<-EOS, file, line)
def #{prefix}#{method}(*args, &block) # def customer_name(*args, &block) def #{prefix}#{method}(*args, &block) # def customer_name(*args, &block)
#{on_nil} if #{to}.nil? #{to}.__send__(#{method.inspect}, *args, &block) # client.__send__(:name, *args, &block)
#{to}.__send__(#{method.inspect}, *args, &block) # client && client.__send__(:name, *args, &block) rescue NoMethodError # rescue NoMethodError
if #{to}.nil? # if client.nil?
#{on_nil}
else # else
raise # raise
end # end
end # end end # end
EOS EOS
end end

13
activesupport/test/core_ext/module_test.rb
View file

@ -32,7 +32,7 @@ end
Somewhere = Struct.new(:street, :city) Somewhere = Struct.new(:street, :city)
Someone = Struct.new(:name, :place) do Someone = Struct.new(:name, :place) do
delegate :street, :city, :to => :place delegate :street, :city, :to_f, :to => :place
delegate :state, :to => :@place delegate :state, :to => :@place
delegate :upcase, :to => "place.city" delegate :upcase, :to => "place.city"
end end
@ -44,6 +44,7 @@ end
Project = Struct.new(:description, :person) do Project = Struct.new(:description, :person) do
delegate :name, :to => :person, :allow_nil => true delegate :name, :to => :person, :allow_nil => true
delegate :to_f, :to => :description, :allow_nil => true
end end
class Name class Name
@ -145,6 +146,16 @@ class ModuleTest < Test::Unit::TestCase
assert_raise(RuntimeError) { david.street } assert_raise(RuntimeError) { david.street }
end end
def test_delegation_to_method_that_exists_on_nil
nil_person = Someone.new(nil)
assert_equal 0.0, nil_person.to_f
end
def test_delegation_to_method_that_exists_on_nil_when_allowing_nil
nil_project = Project.new(nil)
assert_equal 0.0, nil_project.to_f
end
def test_parent def test_parent
assert_equal Yz::Zy, Yz::Zy::Cd.parent assert_equal Yz::Zy, Yz::Zy::Cd.parent
assert_equal Yz, Yz::Zy.parent assert_equal Yz, Yz::Zy.parent