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

fix builder error

Browse source
This commit is contained in:
Thomas Reynolds 2011-09-17 16:49:14 -07:00
parent 4fe75da020
commit dc30ea27b3
6 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fixtures/indexable-app/build/a_folder/needs_index.html
View file

@ -1 +0,0 @@
Indexable

1
fixtures/indexable-app/build/leave_me_alone.html
View file

@ -1 +0,0 @@
Stay away

1
fixtures/indexable-app/build/needs_index/index.html
View file

@ -1 +0,0 @@
Indexable

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

@ -1 +0,0 @@
Regular

4
lib/middleman/builder.rb
View file

@ -35,10 +35,10 @@ module Middleman
include Middleman::ThorActions include Middleman::ThorActions
def self.shared_rack def self.shared_rack
@shared_rack ||= begin @shared_rack ||= begin
mock = ::Rack::MockSession.new(SHARED_SERVER) mock = ::Rack::MockSession.new(SHARED_SERVER)
sess = ::Rack::Test::Session.new(mock) sess = ::Rack::Test::Session.new(mock)
# sess.get("/") response = sess.get("__middleman__")
sess sess
end end
end end

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

@ -5,16 +5,21 @@ module Middleman::Features::DirectoryIndexes
app.extend ClassMethods app.extend ClassMethods
app.build_reroute do |destination, request_path| app.build_reroute do |destination, request_path|
$stderr.puts "_: " + request_path
index_ext = File.extname(app.settings.index_file) index_ext = File.extname(app.settings.index_file)
new_index_path = "/#{app.settings.index_file}" new_index_path = "/#{app.settings.index_file}"
indexed_path = request_path.gsub(/\/$/, "") + index_ext indexed_path = request_path.gsub(/\/$/, "") + index_ext
$stderr.puts "*: " + request_path
if app.settings.ignored_directory_indexes.include?(request_path) if app.settings.ignored_directory_indexes.include?(request_path)
$stderr.puts "1: " + request_path
false false
elsif request_path =~ /#{new_index_path}$/ elsif request_path =~ /#{new_index_path}$/
$stderr.puts "2: " + request_path
false false
else else
$stderr.puts "3: " + request_path
[ [
destination.gsub(/#{index_ext.gsub(".", "\\.")}$/, new_index_path), destination.gsub(/#{index_ext.gsub(".", "\\.")}$/, new_index_path),
request_path request_path