Permalink
Browse files

Revert "Revert "Name compiled render methods". This caused several fa…

…ilures on AP test suite for 1.9.2."

This reverts commit 9013227.

minitest was 'running' compiled templates beginning with test!
  • Loading branch information...
1 parent caab176 commit 7ea85ff516df142b60126e2dcc1174fd0b8f85a9 @jeremy jeremy committed Jun 29, 2010
Showing with 11 additions and 8 deletions.
  1. +11 −8 actionpack/lib/action_view/template.rb
@@ -156,11 +156,12 @@ def counter_name
end
def inspect
- if defined?(Rails.root)
- identifier.sub("#{Rails.root}/", '')
- else
- identifier
- end
+ @inspect ||=
+ if defined?(Rails.root)
+ identifier.sub("#{Rails.root}/", '')
+ else
+ identifier
+ end
end
private
@@ -267,9 +268,11 @@ def #{method_name}(local_assigns)
end
def build_method_name(locals)
- # TODO: is locals.keys.hash reliably the same?
- @method_names[locals.keys.hash] ||=
- "_render_template_#{@identifier.hash}_#{__id__}_#{locals.keys.hash}".gsub('-', "_")
+ @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_]/, '_')
end
end
end

0 comments on commit 7ea85ff

Please sign in to comment.