@@ -15,10 +15,8 @@ module Simplabs f << code f << "\n" } - pygments = IO::popen("pygmentize -f html -l #{language} #{filename}") - result = pygments.read - pygments.close - clean_result(result) + result = `pygmentize -f html -O nowrap=true -l #{language} #{filename}` + result.chomp end protected @@ -30,13 +28,6 @@ module Simplabs return false end - def clean_result(result) - result.strip! - result.sub!(/\A<div class=\"highlight\"><pre>/, '') - result.sub!(/<\/pre><\/div>\Z/, '') - result - end - end end lib/simplabs/highlight/pygments_wrapper.rb @@ -3,7 +3,12 @@ require File.dirname(__FILE__) + '/../spec_helper' describe Simplabs::Highlight do before do - @ruby_code = 'class Test; end' + @ruby_code = <<-EOC +class Test + def method test + end +end +EOC end describe '#highlight' do @@ -35,7 +40,7 @@ describe Simplabs::Highlight do end it 'should correctly highlight source code passed as parameter' do - Simplabs::Highlight.highlight(:ruby, @ruby_code).should == "<span class=\"k\">class</span> <span class=\"nc\">Test</span><span class=\"p\">;</span> <span class=\"k\">end</span>\n" + Simplabs::Highlight.highlight(:ruby, @ruby_code).should == "<span class=\"k\">class</span> <span class=\"nc\">Test</span>\n <span class=\"k\">def</span> <span class=\"nf\">method</span> <span class=\"nb\">test</span>\n <span class=\"k\">end</span>\n<span class=\"k\">end</span>" end end spec/lib/highlight_spec.rb @@ -18,18 +18,6 @@ describe Simplabs::Highlight::PygmentsWrapper do end - describe '#clean_result' do - - it 'should strip the specified text' do - Simplabs::Highlight::PygmentsWrapper.send(:clean_result, ' result ').should == 'result' - end - - it 'should remove the surrounding <div class="highlight"><pre></pre></div> as added by pygments' do - Simplabs::Highlight::PygmentsWrapper.send(:clean_result, '<div class="highlight"><pre>formatted code</pre></div>').should == 'formatted code' - end - - end - describe '#highlight' do before do @@ -58,12 +46,6 @@ describe Simplabs::Highlight::PygmentsWrapper do file_contents.strip.should == @code end - it 'should clean the result' do - Simplabs::Highlight::PygmentsWrapper.should_receive(:clean_result).once.with("<div class=\"highlight\"><pre><span class=\"k\">class</span> <span class=\"nc\">Test</span><span class=\"p\">;</span> <span class=\"k\">end</span>\n</pre></div>\n") - - Simplabs::Highlight::PygmentsWrapper.highlight(@code, :ruby) - end - end end spec/lib/pygments_wrapper_spec.rb 56a40a2b731d0cbd47beab533f4726a4728aa2da Marco Otte-Witte marco.otte-witte@simplabs.com http://github.com/marcoow/highlight/commit/720066d59b464b407b5a1de3155fb59fb912ea5b 720066d59b464b407b5a1de3155fb59fb912ea5b 2009-03-15T10:10:45-07:00 2009-03-15T10:10:45-07:00 more tweaks for the highlighting 0ce9ca4f507826f1ab608aa1bb94cd5dbb2d0491 Marco Otte-Witte marco.otte-witte@simplabs.com