From 9013227e00895ac95f29077229ec2fb156f450b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Tue, 29 Jun 2010 10:54:07 +0200 Subject: Revert "Name compiled render methods". This caused several failures on AP test suite for 1.9.2. This reverts commit 2c4f8aae5ca8489bb3e47712f50b3f57015811d9. --- actionpack/lib/action_view/template.rb | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'actionpack/lib/action_view/template.rb') diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb index 103b625a99..c00557209b 100644 --- a/actionpack/lib/action_view/template.rb +++ b/actionpack/lib/action_view/template.rb @@ -156,12 +156,11 @@ module ActionView end def inspect - @inspect ||= - if defined?(Rails.root) - identifier.sub("#{Rails.root}/", '') - else - identifier - end + if defined?(Rails.root) + identifier.sub("#{Rails.root}/", '') + else + identifier + end end private @@ -268,11 +267,9 @@ module ActionView end def build_method_name(locals) - @method_names[locals.keys.hash] ||= "#{identifier_method_name}__#{@identifier.hash}_#{__id__}_#{locals.keys.hash}".gsub('-', "_") - end - - def identifier_method_name - @identifier_method_name ||= inspect.gsub(/[^a-z_]/, '_') + # TODO: is locals.keys.hash reliably the same? + @method_names[locals.keys.hash] ||= + "_render_template_#{@identifier.hash}_#{__id__}_#{locals.keys.hash}".gsub('-', "_") end end end -- cgit v1.2.3