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

Remove Tilt mappings for missing libraries. Fixes #713

Browse source
This commit is contained in:
Thomas Reynolds 2013-01-08 10:22:52 -08:00
parent 84239f04a2
commit eccda125e5
7 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
middleman-core/features/missing-tilt-lib.feature Normal file
View file

@ -0,0 +1,20 @@
Feature: Tilt missing support libraries
Scenario: Rendering Textile and Wiki files
Given the Server is running at "missing-tilt-library-app"
When I go to "/danger-zone/more-wiki.html.wiki"
Then I should see "File Not Found"
When I go to "/danger-zone/more-wiki.html"
Then I should see "File Not Found"
When I go to "/safe-zone/my-wiki.html.wiki"
Then I should see "Safe"
When I go to "/safe-zone/my-wiki.html"
Then I should see "File Not Found"
When I go to "/textile-source.html.textile"
Then I should see "File Not Found"
When I go to "/textile-source.html"
Then I should see "File Not Found"
When I go to "/wiki-source.html.wiki"
Then I should see "Hola"
When I go to "/wiki-source.html"
Then I should see "File Not Found"

2
middleman-core/fixtures/missing-tilt-library-app/config.rb Normal file
View file

@ -0,0 +1,2 @@
ignore "danger-zone/*"
ignore "*.textile"

1
middleman-core/fixtures/missing-tilt-library-app/source/danger-zone/more-wiki.html.wiki Normal file
View file

@ -0,0 +1 @@
More

1
middleman-core/fixtures/missing-tilt-library-app/source/safe-zone/my-wiki.html.wiki Normal file
View file

@ -0,0 +1 @@
Safe

1
middleman-core/fixtures/missing-tilt-library-app/source/textile-source.html.textile Normal file
View file

@ -0,0 +1 @@
Textx

1
middleman-core/fixtures/missing-tilt-library-app/source/wiki-source.html.wiki Normal file
View file

@ -0,0 +1 @@
Hola

13
middleman-core/lib/middleman-core/core_extensions/rendering.rb
View file

@ -75,6 +75,19 @@ module Middleman
app.register Middleman::Renderers::Stylus app.register Middleman::Renderers::Stylus
rescue LoadError rescue LoadError
end end
# Clean up missing Tilt exts
app.after_configuration do
Tilt.mappings.each do |key, klasses|
begin
Tilt[".#{key}"]
rescue LoadError
Tilt.mappings.delete(key)
rescue NameError
Tilt.mappings.delete(key)
end
end
end
end end
alias :included :registered alias :included :registered