X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..dc2a2c8ebd1a11e4a64555fda22c6859a51defff:/lib/output_compression/output_compression.rb diff --git a/lib/output_compression/output_compression.rb b/lib/output_compression/output_compression.rb index 2c5dd6ca5..fc80d68ad 100644 --- a/lib/output_compression/output_compression.rb +++ b/lib/output_compression/output_compression.rb @@ -13,8 +13,8 @@ # end begin - require 'zlib' - require 'stringio' + require "zlib" + require "stringio" GZIP_SUPPORTED = true rescue GZIP_SUPPORTED = false @@ -34,13 +34,13 @@ module CompressionSystem if output.length < response.body.length @old_response_body = response.body response.body = output.string - response.headers['Content-encoding'] = @compression_encoding + response.headers["Content-encoding"] = @compression_encoding end end def accepts_gzip? return false unless GZIP_SUPPORTED - accepts = request.env['HTTP_ACCEPT_ENCODING'] + accepts = request.env["HTTP_ACCEPT_ENCODING"] return false unless accepts && accepts =~ /(x-gzip|gzip)/ @compression_encoding = $1 true @@ -49,18 +49,20 @@ module CompressionSystem def strip_whitespace response.body.gsub!(/()|(.*?<\/script>)|()|()|\s+/m) do |m| if m =~ /^()(.*?)<\/script>$/m - $1 + $2.strip.gsub(/\s+/, ' ').gsub('', "\n-->") + '' + $1 + $2.strip.gsub(/\s+/, " ").gsub("", "\n-->") + "" elsif m =~ /^$/m - '' + "" elsif m =~ /^<(textarea|pre)/ m - else ' ' + else " " end end - response.body.gsub! /\s+\s+/, '>' + response.body.gsub! /\s+\s+/, ">" end end -class ActionController::Base - include CompressionSystem +module ActionController + class Base + include CompressionSystem + end end