Browse files

Make collection rendering faster.

  • Loading branch information...
1 parent b2600bf commit 8f9e9118e402ea2fe1eec6fcb9a2d3f0c84b3b46 @josevalim josevalim committed Oct 7, 2010
View
2 actionpack/lib/abstract_controller/rendering.rb
@@ -50,7 +50,7 @@ def view_context_class
if controller.respond_to?(:_helpers)
include controller._helpers
- if controller.respond_to?(:_routes)
+ if controller.respond_to?(:_routes) && controller._routes
include controller._routes.url_helpers
include controller._routes.mounted_helpers
end
View
4 actionpack/lib/action_view/render/partials.rb
@@ -307,12 +307,12 @@ def collection_with_template
def collection_without_template
segments, locals, collection_data = [], @locals, @collection_data
- index, template = -1, nil
+ index, template, cache = -1, nil, {}
keys = @locals.keys
@collection.each_with_index do |object, i|
path, *data = collection_data[i]
- template = find_template(path, keys + data)
+ template = (cache[path] ||= find_template(path, keys + data))
locals[data[0]] = object
locals[data[1]] = (index += 1)
segments << template.render(@view, locals)

0 comments on commit 8f9e911

Please sign in to comment.