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

Add in the metadata rack app early so it is there whenever middleware grabs the app

Browse source
This commit is contained in:
Ben Hollis 2013-04-12 22:48:56 -07:00
parent ee11ccb184
commit 2d4668f524
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
middleman-core/lib/middleman-core/preview_server.rb
View file

@ -77,7 +77,15 @@ module Middleman
private private
def new_app def new_app
opts = @options opts = @options
@app =::Middleman::Application.server.inst do server = ::Middleman::Application.server
# Add in the meta pages application
meta_app = Middleman::MetaPages::Application.new(server)
server.map '/__middleman' do
run meta_app
end
@app = server.inst do
if opts[:environment] if opts[:environment]
config[:environment] = opts[:environment].to_sym config[:environment] = opts[:environment].to_sym
end end
@ -166,13 +174,6 @@ module Middleman
start_file_watcher start_file_watcher
rack_app = app.class.to_rack_app rack_app = app.class.to_rack_app
# Add in the meta pages application
meta_app = Middleman::MetaPages::Application.new(app.class.inst)
rack_app.map '/__middleman' do
run meta_app
end
@webrick.mount "/", ::Rack::Handler::WEBrick, rack_app @webrick.mount "/", ::Rack::Handler::WEBrick, rack_app
end end