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

directory index auto-ignores files already named index

Browse source
This commit is contained in:
Thomas Reynolds 2011-08-02 09:32:03 -07:00
parent ca2666cbab
commit 12a00e3811
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
features/directory_index.feature
View file

@ -6,6 +6,8 @@ Feature: Directory Index
Then "needs_index/index.html" should exist at "indexable-app" and include "Indexable" Then "needs_index/index.html" should exist at "indexable-app" and include "Indexable"
Then "a_folder/needs_index/index.html" should exist at "indexable-app" and include "Indexable" Then "a_folder/needs_index/index.html" should exist at "indexable-app" and include "Indexable"
Then "leave_me_alone.html" should exist at "indexable-app" and include "Stay away" Then "leave_me_alone.html" should exist at "indexable-app" and include "Stay away"
Then "regular/index.html" should exist at "indexable-app" and include "Regular"
Then "regular/index/index.html" should not exist at "indexable-app"
Then "needs_index.html" should not exist at "indexable-app" Then "needs_index.html" should not exist at "indexable-app"
Then "a_folder/needs_index.html" should not exist at "indexable-app" Then "a_folder/needs_index.html" should not exist at "indexable-app"
Then "leave_me_alone/index.html" should not exist at "indexable-app" Then "leave_me_alone/index.html" should not exist at "indexable-app"

1
fixtures/indexable-app/source/regular/index.html Normal file
View file

@ -0,0 +1 @@
Regular

12
lib/middleman/features/directory_indexes.rb
View file

@ -12,6 +12,8 @@ module Middleman::Features::DirectoryIndexes
if app.settings.ignored_directory_indexes.include?(request_path) if app.settings.ignored_directory_indexes.include?(request_path)
false false
elsif request_path =~ /#{new_index_path}$/
false
else else
[ [
destination.gsub(/#{index_ext.gsub(".", "\\.")}$/, new_index_path), destination.gsub(/#{index_ext.gsub(".", "\\.")}$/, new_index_path),
@ -21,16 +23,20 @@ module Middleman::Features::DirectoryIndexes
end end
app.before do app.before do
indexed_path = request.path_info.gsub(/\/$/, "") + File.extname(app.settings.index_file) indexed_path = request.path_info.gsub(/\/$/, "") + "/" + app.settings.index_file
indexed_exists = resolve_template(indexed_path, :raise_exceptions => false)
if !settings.ignored_directory_indexes.include?(indexed_path) extensioned_path = request.path_info.gsub(/\/$/, "") + File.extname(app.settings.index_file)
is_ingored = settings.ignored_directory_indexes.include?(extensioned_path)
if !indexed_exists && !is_ingored
parts = request.path_info.split("/") parts = request.path_info.split("/")
last_part = parts.last last_part = parts.last
last_part_ext = File.extname(last_part) last_part_ext = File.extname(last_part)
if last_part_ext.blank? if last_part_ext.blank?
# This is a folder, redirect to index # This is a folder, redirect to index
request.path_info = indexed_path request.path_info = extensioned_path
end end
end end
end end