Merge pull request #8 from thenoseman/master

 * Make it work with rspec2 and rspec1
 * Allow lines in output to be ignored
 * Automatically find which window has the spec file

Author: Yan Pritzker

plugin/lib/context_renderer.rb

@@ -1,10 +1,11 @@
+# -*- encoding : utf-8 -*-
 class RSpecContextRenderer
   # context: an html representation of an rspec context from rspec output
   # counts: a hash with :passed, :failed, :not_implemented counters
   def initialize(context, counts)
     @context=context
     @counts=counts
-
+    @classes = {"passed"=>"+","failed"=>"-","not_implemented"=>"#"}
     render_context_header
     render_specs
     puts " "
@@ -18,15 +19,15 @@ def render_context_header
   def render_specs
     (@context/"dd").each do |dd|
       render_spec_descriptor(dd)
-      FailureRenderer.new(dd/"div[@class='failure']") if dd[:class]=="spec failed"
+      FailureRenderer.new(dd/"div[@class~='failure']") if dd[:class] =~ /failed/
     end
   end
 
   def render_spec_descriptor(dd)
-    classes = {"spec passed"=>"+","spec failed"=>"-","spec not_implemented"=>"#"}
     txt = (dd/"span:first").inner_html
-    puts "#{classes[dd[:class]]} #{txt}"
-    outcome = dd[:class].gsub(/\s*spec\s*/,'').to_sym
+    clazz = dd[:class].gsub(/(?:example|spec) /,'')
+    puts "#{@classes[clazz]} #{txt}"
+    outcome = clazz.to_sym
     @counts[outcome] += 1
   end
 end

plugin/lib/failure_renderer.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class FailureRenderer
   include StringUtil
 
@@ -21,7 +22,7 @@ def failure_location
   end
 
   def failure_message
-    indent(unescape((@failure/"div[@class='message']/pre").inner_html.gsub(/\n/,'').gsub(/\s+/,' ')))
+    indent(unescape((@failure/"div[@class~='message']/pre").inner_html.gsub(/\n/,'').gsub(/\s+/,' ')))
   end
 
   def backtrace_details
@@ -36,7 +37,11 @@ def backtrace_details
   end
 
   def backtrace_lines
-    (@failure/"pre[@class='ruby']/code").inner_html.scan(/(<span class="linenum">)(\d+)(<\/span>)(.*)/)
+    (@failure/"pre[@class='ruby']/code").inner_html.scan(/(<span class="linenum">)(\d+)(<\/span>)(.*)/).reject { |line| line[3] =~ ignore_line_if_matches }
+  end
+
+  def ignore_line_if_matches
+    /install syntax to get syntax highlighting/
   end
 
 end

plugin/vim-rspec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require "rubygems"
 require "hpricot"
 require 'cgi'
@@ -25,6 +26,7 @@ def render_header
     stats.map! do |script|
       script.inner_html.scan(/".*"/).first.gsub(/<\/?strong>/,"").gsub(/\"/,'')
     end
+    # results in ["Finished in 0.00482 seconds", "2 examples, 1 failure"]
     failure_success_messages,other_stats = stats.partition {|stat| stat =~ /failure/}
     render_red_green_header(failure_success_messages.first)
     other_stats.each do |stat|
@@ -51,7 +53,7 @@ def render_red_green_header(failure_success_messages)
   end
 
   def render_examples
-    (@doc/"div[@class='example_group']").each do |context|
+    (@doc/"div[@class~='example_group']").each do |context|
       RSpecContextRenderer.new(context, @counts)
     end
   end

plugin/vim-rspec.vim

@@ -182,9 +182,11 @@ function! s:SwitchToWindowByName(buffername)
 endfunction
 
 function! s:TryToOpen()
+  " Search up to find '*_spec.rb'
+  call search("_spec","bcW")
   let l:line = getline(".")
-  if match(l:line,'^  [\/\.]')<0
-    call s:error_msg("No file found.")
+  if match(l:line,'^  .*_spec.rb')<0
+    call s:error_msg("No spec file found.")
     return
   end
   let l:tokens = split(l:line,":")

test/test_spec.rb

@@ -0,0 +1,17 @@
+# -*- encoding : utf-8 -*-
+class TestVimRspec
+  def testme
+    true
+  end
+end
+describe "vim-rspec" do
+  it "shows failures in red" do
+    false.should == TestVimRspec.new.testme
+  end
+
+  it "shows successes in green" do
+    true.should be_true
+  end
+
+  xit "shows pending specs in yellow"
+end