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

delegate method should treat :prefix => false same as :prefix => nil

Browse source 
[#5375 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
This commit is contained in:
Neeraj Singh 2010-08-18 13:43:07 -04:00 committed by José Valim
parent 9a6e3ae763
commit cacb44874f
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -113,7 +113,7 @@ class Module
raise ArgumentError, "Can only automatically set the delegation prefix when delegating to a method."
end
prefix = options[:prefix] && "#{options[:prefix] == true ? to : options[:prefix]}_"
prefix = options[:prefix] && "#{options[:prefix] == true ? to : options[:prefix]}_" || ''
file, line = caller.first.split(':', 2)
line = line.to_i

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

@ -47,6 +47,14 @@ Project = Struct.new(:description, :person) do
delegate :to_f, :to => :description, :allow_nil => true
end
Developer = Struct.new(:client) do
delegate :name, :to => :client, :prefix => nil
end
Tester = Struct.new(:client) do
delegate :name, :to => :client, :prefix => false
end
class Name
delegate :upcase, :to => :@full_name
@ -97,6 +105,11 @@ class ModuleTest < Test::Unit::TestCase
assert_equal invoice.customer_city, "Chicago"
end
def test_delegation_prefix_with_nil_or_false
assert_equal Developer.new(@david).name, "David"
assert_equal Tester.new(@david).name, "David"
end
def test_delegation_prefix_with_instance_variable
assert_raise ArgumentError do
Class.new do