diff --git a/gollum.gemspec b/gollum.gemspec index 450667b5..e1861f6e 100644 --- a/gollum.gemspec +++ b/gollum.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |s| s.add_dependency('grit', "~> 2.4.1") 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('mustache', [">= 0.11.2", "< 1.0.0"]) s.add_dependency('sanitize', "~> 2.0.0") diff --git a/lib/gollum/albino.rb b/lib/gollum/albino.rb index db7aa73a..fa9fbe4d 100644 --- a/lib/gollum/albino.rb +++ b/lib/gollum/albino.rb @@ -2,16 +2,4 @@ require 'albino/multi' class Gollum::Albino < Albino::Multi 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{\Z}, "\n") - html - end end diff --git a/lib/gollum/markup.rb b/lib/gollum/markup.rb index 3bd60ebf..e264f490 100644 --- a/lib/gollum/markup.rb +++ b/lib/gollum/markup.rb @@ -396,8 +396,8 @@ module Gollum highlighted = begin blocks.size.zero? ? [] : Gollum::Albino.colorize(blocks) - rescue ::Albino::ShellArgumentError, ::POSIX::Spawn::TimeoutExceeded, - ::POSIX::Spawn::MaximumOutputExceeded + rescue ::Albino::ShellArgumentError, ::Albino::TimeoutExceeded, + ::Albino::MaximumOutputExceeded [] end