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

Merge pull request #172 from bhollis/master

Browse source 
Build .htaccess files (and other things in the sitemap) directly even when directory-indexes are on
This commit is contained in:
Thomas Reynolds 2011-11-28 08:52:01 -08:00
parent e405a233c6 67fe8215e8
commit 0898ff6d42
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
features/directory_index.feature
View file

@ -11,6 +11,7 @@ Feature: Directory Index
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"
Then ".htaccess" should exist at "indexable-app"
Scenario: Preview normal file Scenario: Preview normal file
Given the Server is running at "indexable-app" Given the Server is running at "indexable-app"

1
fixtures/indexable-app/source/.htaccess Normal file
View file

@ -0,0 +1 @@
# I'm an htaccess file!

6
lib/middleman/extensions/directory_indexes.rb
View file

@ -4,6 +4,8 @@ module Middleman::Extensions
def registered(app) def registered(app)
app.send :include, InstanceMethods app.send :include, InstanceMethods
app.before do app.before do
next if sitemap.exists?(@original_path)
prefix = @original_path.sub(/\/$/, "") prefix = @original_path.sub(/\/$/, "")
indexed_path = prefix + "/" + index_file indexed_path = prefix + "/" + index_file
@ -25,9 +27,7 @@ module Middleman::Extensions
app.build_reroute do |destination, request_path| app.build_reroute do |destination, request_path|
index_ext = File.extname(index_file) index_ext = File.extname(index_file)
new_index_path = "/#{index_file}" new_index_path = "/#{index_file}"
indexed_path = request_path.sub(/\/$/, "") + index_ext
if ignored_directory_indexes.include?(request_path) if ignored_directory_indexes.include?(request_path)
false false
elsif request_path =~ /#{new_index_path}$/ elsif request_path =~ /#{new_index_path}$/