update to albino v1.3.2

This commit is contained in:
rick
2011-03-10 10:33:35 -08:00
parent ecb44b50e1
commit 32a33e0c15
3 changed files with 3 additions and 15 deletions
+1 -1
View File
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
s.add_dependency('grit', "~> 2.4.1") s.add_dependency('grit', "~> 2.4.1")
s.add_dependency('github-markup', [">= 0.4.0", "< 1.0.0"]) s.add_dependency('github-markup', [">= 0.4.0", "< 1.0.0"])
s.add_dependency('albino', "~> 1.3.0") s.add_dependency('albino', "~> 1.3.2")
s.add_dependency('sinatra', "~> 1.0") s.add_dependency('sinatra', "~> 1.0")
s.add_dependency('mustache', [">= 0.11.2", "< 1.0.0"]) s.add_dependency('mustache', [">= 0.11.2", "< 1.0.0"])
s.add_dependency('sanitize', "~> 2.0.0") s.add_dependency('sanitize', "~> 2.0.0")
-12
View File
@@ -2,16 +2,4 @@ require 'albino/multi'
class Gollum::Albino < Albino::Multi class Gollum::Albino < Albino::Multi
self.bin = ::Albino::Multi.bin self.bin = ::Albino::Multi.bin
def colorize(options = {})
case out = super
when Array then out.each { |s| fix_html(s) }
else fix_html(out)
end
end
def fix_html(html)
html.sub!(%r{</pre></div>\Z}, "</pre>\n</div>")
html
end
end end
+2 -2
View File
@@ -396,8 +396,8 @@ module Gollum
highlighted = begin highlighted = begin
blocks.size.zero? ? [] : Gollum::Albino.colorize(blocks) blocks.size.zero? ? [] : Gollum::Albino.colorize(blocks)
rescue ::Albino::ShellArgumentError, ::POSIX::Spawn::TimeoutExceeded, rescue ::Albino::ShellArgumentError, ::Albino::TimeoutExceeded,
::POSIX::Spawn::MaximumOutputExceeded ::Albino::MaximumOutputExceeded
[] []
end end