@@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#! /usr/bin/ruby18 require 'htmlbeautifier/beautifier' HtmlBeautifier::Beautifier.new($stdout).scan($stdin.read) $stdout << "\n" bin/htmlbeautifier @@ -54,21 +54,25 @@ module HtmlBeautifier def foreign_block(opening, code, closing) emit opening - unless code.empty? - indent + begin + unless code.empty? + indent - lines = code.split(/\n/) - lines.shift while lines.first.strip.empty? - lines.pop while lines.last.strip.empty? - indentation = lines.first[/^ +/] + lines = code.split(/\n/) + lines.shift while lines.first.strip.empty? + lines.pop while lines.last.strip.empty? + indentation = lines.first[/^ +/] - whitespace - lines.each do |line| - emit line.rstrip.sub(/^#{indentation}/, '') whitespace - end + lines.each do |line| + emit line.rstrip.sub(/^#{indentation}/, '') + whitespace + end - outdent + outdent + end + rescue + # Ignore empty script blocks end emit closing end @@ -112,4 +116,4 @@ module HtmlBeautifier end end -end \ No newline at end of file +end lib/htmlbeautifier/beautifier.rb e8124f1190172bbbf61595f98ad848a56fcfb11d Ho-Sheng Hsiao hosh@isshen.com http://github.com/hosh/htmlbeautifier/commit/f3aa982704803d315db63da7beabaff5d5144fcb f3aa982704803d315db63da7beabaff5d5144fcb 2008-11-19T14:46:46-08:00 2008-11-19T14:46:46-08:00 [PATCH] Wrapped foreign_block into a begin rescue (ignore empty or broken javascript/css) c1806e8fbe9fe1cc44537ebf3765c82bc67a43fc Ho-Sheng Hsiao hosh@isshen.com