Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

update to albino v1.3.2

  • Loading branch information...
commit 32a33e0c156ea1c0df7e1612c8bcdd94edc473e6 1 parent ecb44b5
@technoweenie technoweenie authored
Showing with 3 additions and 15 deletions.
  1. +1 −1  gollum.gemspec
  2. +0 −12 lib/gollum/albino.rb
  3. +2 −2 lib/gollum/markup.rb
View
2  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")
View
12 lib/gollum/albino.rb
@@ -2,16 +2,4 @@
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{</pre></div>\Z}, "</pre>\n</div>")
- html
- end
end
View
4 lib/gollum/markup.rb
@@ -396,8 +396,8 @@ def process_code(data)
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
Please sign in to comment.
Something went wrong with that request. Please try again.