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

Merge pull request #1444 from joost/patch-2

Browse source 
Add :overwrite option to gzip
This commit is contained in:
Thomas Reynolds 2015-02-10 14:02:48 -08:00
parent 04da75a2eb 28199950e9
commit 986b9fcf51
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
middleman-core/lib/middleman-core/extensions/gzip.rb
View file

@ -12,6 +12,7 @@
class Middleman::Extensions::Gzip < ::Middleman::Extension class Middleman::Extensions::Gzip < ::Middleman::Extension
option :exts, %w(.js .css .html .htm), 'File extensions to Gzip when building.' option :exts, %w(.js .css .html .htm), 'File extensions to Gzip when building.'
option :ignore, [], 'Patterns to avoid gzipping' option :ignore, [], 'Patterns to avoid gzipping'
option :overwrite, false, 'Overwrite original files instead of adding .gz extension.'
class NumberHelpers class NumberHelpers
include ::Padrino::Helpers::NumberHelpers include ::Padrino::Helpers::NumberHelpers
@ -73,11 +74,11 @@ class Middleman::Extensions::Gzip < ::Middleman::Extension
Contract String => [Maybe[String], Maybe[Num], Maybe[Num]] Contract String => [Maybe[String], Maybe[Num], Maybe[Num]]
def gzip_file(path) def gzip_file(path)
input_file = File.open(path, 'rb').read input_file = File.open(path, 'rb').read
output_filename = path + '.gz' output_filename = options.overwrite ? path : path + '.gz'
input_file_time = File.mtime(path) input_file_time = File.mtime(path)
# Check if the right file's already there # Check if the right file's already there
if File.exist?(output_filename) && File.mtime(output_filename) == input_file_time if !options.overwrite && File.exist?(output_filename) && File.mtime(output_filename) == input_file_time
return [nil, nil, nil] return [nil, nil, nil]
end end