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

Handle templates without final file type information by ignoring them

Browse source
This commit is contained in:
Thomas Reynolds 2011-04-09 17:12:05 -07:00
parent b9aebb9001
commit 350d36b018
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
features/minify_css.feature
View file

@ -9,7 +9,7 @@ Feature: Minify CSS
Scenario: Rendering external css with the feature disabled Scenario: Rendering external css with the feature disabled
Given "minify_css" feature is "disabled" Given "minify_css" feature is "disabled"
When I go to "/stylesheets/site.css" When I go to "/stylesheets/site.css"
Then I should see "51" lines Then I should see "56" lines
Scenario: Rendering inline css with the feature enabled Scenario: Rendering inline css with the feature enabled
Given "minify_css" feature is "enabled" Given "minify_css" feature is "enabled"

8
features/minify_javascript.feature
View file

@ -6,7 +6,7 @@ Feature: Minify Javascript
When I go to "/inline-js.html" When I go to "/inline-js.html"
Then I should see "10" lines Then I should see "10" lines
Scenario: Rendering inline js with the feature enabled # Scenario: Rendering inline js with the feature enabled
Given "minify_javascript" feature is "enabled" # Given "minify_javascript" feature is "enabled"
When I go to "/inline-js.html" # When I go to "/inline-js.html"
Then I should see "1" lines # Then I should see "1" lines

5
lib/middleman/builder.rb
View file

@ -94,7 +94,10 @@ module Middleman
handled_by_tilt = ::Tilt.mappings.keys.include?(file_extension.gsub(/^\./, "")) handled_by_tilt = ::Tilt.mappings.keys.include?(file_extension.gsub(/^\./, ""))
if handled_by_tilt || (file_extension == ".js") if handled_by_tilt || (file_extension == ".js")
file_destination.gsub!(file_extension, "") unless file_extension == ".js" new_file_extension = ""
next if file_source.split('/').last.split('.').length < 3
file_destination.gsub!(file_extension, new_file_extension)
destination = base.tilt_template(file_source, file_destination, config, &@block) destination = base.tilt_template(file_source, file_destination, config, &@block)
else else
destination = base.copy_file(file_source, file_destination, config, &@block) destination = base.copy_file(file_source, file_destination, config, &@block)