lib/rack/codehighlighter.rb in rack-codehighlighter-0.5.0 vs lib/rack/codehighlighter.rb in rack-codehighlighter-0.5.1

- old
+ new

@@ -42,12 +42,13 @@ node.swap(send(@highlighter, s)) end end body = doc.to_html - headers['content-length'] = bytesize(body).to_s + headers['Content-Length'] = bytesize(body).to_s + log(env, status, headers, began_at) if @opts[:logging] [status, headers, [body]] else [status, headers, response] end @@ -133,10 +134,21 @@ def pygments(string) refs = @opts[:pattern].match(string) if refs lang = refs[1] str = unescape_html(string.sub(@opts[:pattern], "")) - #Pygments.highlight(str, :lexer => lang, :formatter => 'html') + options = @opts[:options] + Pygments.highlight(str, :lexer => lang, :formatter => 'html', :options => options) + else + "<pre>#{string}</pre>" + end + end + + def rygments(string) + refs = @opts[:pattern].match(string) + if refs + lang = refs[1] + str = unescape_html(string.sub(@opts[:pattern], "")) Rygments.highlight_string(str, lang, 'html') else "<pre>#{string}</pre>" end end