deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Minor performance fix to not double-compute metadata in directory_indexes.

Browse source
This commit is contained in:
Ben Hollis 2013-04-06 12:15:05 -07:00
parent 044b49d83b
commit 14a39e5e87
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
middleman-more/features/helpers_link_to.feature
View file

@ -36,15 +36,15 @@ Feature: link_to helper
And a file named "source/link_to.html.erb" with: And a file named "source/link_to.html.erb" with:
""" """
<% menu_items.each do |item| %> <% menu_items.each do |item| %>
<%= link_to(item.metadata[:page]['title'], item.url) %> <%= link_to(item.data['title'], item.url) %>
<%= link_to(item.metadata[:page]['title'], item) %> <%= link_to(item.data['title'], item) %>
<% end %> <% end %>
""" """
And a file named "source/link_to/sub.html.erb" with: And a file named "source/link_to/sub.html.erb" with:
""" """
<% menu_items.each do |item| %> <% menu_items.each do |item| %>
<%= link_to(item.metadata[:page]['title'], item.url) %> <%= link_to(item.data['title'], item.url) %>
<%= link_to(item.metadata[:page]['title'], item) %> <%= link_to(item.data['title'], item) %>
<% end %> <% end %>
""" """
And the Server is running at "indexable-app" And the Server is running at "indexable-app"

7
middleman-more/lib/middleman-more/extensions/directory_indexes.rb
View file

@ -40,13 +40,10 @@ module Middleman
File.extname(index_file) != resource.ext File.extname(index_file) != resource.ext
# Check if frontmatter turns directory_index off # Check if frontmatter turns directory_index off
d = resource.raw_data next if resource.data[:directory_index] == false
next if d && d[:directory_index] == false
# Check if file metadata (options set by "page" in config.rb) turns directory_index off # Check if file metadata (options set by "page" in config.rb) turns directory_index off
if resource.metadata[:options] && resource.metadata[:options][:directory_index] == false next if resource.metadata[:options][:directory_index] == false
next
end
resource.destination_path = resource.destination_path.chomp(File.extname(index_file)) + new_index_path resource.destination_path = resource.destination_path.chomp(File.extname(index_file)) + new_index_path
end end