add :ignore_errors option

Pascal Zumkehr · Pascal Zumkehr · commit 1d3982aa9379 · 2011-03-30T17:42:03.000+02:00
diff --git a/lib/coderay/scanners/bash.rb b/lib/coderay/scanners/bash.rb
@@ -151,8 +151,7 @@ def scan_tokens tokens, options
             kind = :plain
           elsif match = scan(/.+/)
             # this shouldn't be :reserved for highlighting bad matches
-            kind = :error
-            match = ">>>>>#{match}<<<<<"
+            match, kind = handle_error(match, options)
           end
         elsif @state == :quote
           if (match = scan(/\\.?/))
@@ -179,9 +178,8 @@ def scan_tokens tokens, options
           else match = scan(/.+/)
             # this shouldn't be
             #kind = :reserved
-            #raise match
-            match = ">>>>>#{match}<<<<<"
-            kind = :error
+            #raise match 
+            match, kind = handle_error(match, options)
           end
         end
   
@@ -191,6 +189,15 @@ def scan_tokens tokens, options
 
       tokens
     end
+  
+  
+    def handle_error(match, options)
+      if options[:ignore_errors]
+        [match, :plain]
+      else
+        [">>>>>#{match}<<<<<", :error]        
+      end
+    end
 
   end
 end
diff --git a/lib/coderay/scanners/erb_bash.rb b/lib/coderay/scanners/erb_bash.rb
@@ -11,7 +11,7 @@ class ErbBash < RHTML
       def setup
         super
         # Scan Bash instead of HTML template
-        @html_scanner = CodeRay.scanner :bash, :tokens => @tokens, :keep_tokens => true
+        @html_scanner = CodeRay.scanner :bash, @options.merge(:tokens => @tokens, :keep_tokens => true)
       end
     end
   end
diff --git a/test/erb_bash.sh b/test/erb_bash.sh
@@ -2,3 +2,5 @@
 
 echo "Parsed at <%= Time.now %>"
 echo "Executed at `Date`"
+command 'open quote
+other_command
diff --git a/test/test.rb b/test/test.rb
@@ -16,35 +16,84 @@
 class TestErbBash < Test::Unit::TestCase
   def test_0010_ErbBash
     eb_file = File.join($current_dir, "erb_bash.sh")
-    assert_equal( CodeRay.scan(File.read(eb_file), :erb_bash),
-[["#!/bin/sh", :directive],
- ["\n", :end_line],
- ["\n", :end_line],
- ["echo", :method],
- [" ", :space],
- [:open, :string],
- ["\"", :delimiter],
- ["Parsed at ", :content],
- [:open, :inline],
- ["<%=", :inline_delimiter],
- [" ", :space],
- ["Time", :constant],
- [".", :operator],
- ["now", :ident],
- [" ", :space],
- ["%>", :inline_delimiter],
- [:close, :inline],
- ["\"", :delimiter],
- [:close, :string],
- ["\n", :end_line],
- ["echo", :method],
- [" ", :space],
- [:open, :string],
- ["\"", :delimiter],
- ["Executed at `Date`", :content],
- ["\"", :delimiter],
- [:close, :string],
- ["\n", :end_line]]
-    )
+    assert_equal(
+        [["#!/bin/sh", :directive],
+         ["\n", :end_line],
+         ["\n", :end_line],
+         ["echo", :method],
+         [" ", :space],
+         [:open, :string],
+         ["\"", :delimiter],
+         ["Parsed at ", :content],
+         [:open, :inline],
+         ["<%=", :inline_delimiter],
+         [" ", :space],
+         ["Time", :constant],
+         [".", :operator],
+         ["now", :ident],
+         [" ", :space],
+         ["%>", :inline_delimiter],
+         [:close, :inline],
+         ["\"", :delimiter],
+         [:close, :string],
+         ["\n", :end_line],
+         ["echo", :method],
+         [" ", :space],
+         [:open, :string],
+         ["\"", :delimiter],
+         ["Executed at `Date`", :content],
+         ["\"", :delimiter],
+         [:close, :string],
+         ["\n", :end_line],
+         ["command", :method],
+         [" ", :space],
+         [">>>>>'open quote<<<<<", :error],
+         ["\n", :end_line], 
+         ["other_command", :ident],
+         ["\n", :end_line]
+         ],
+         CodeRay.scan(File.read(eb_file), :erb_bash)  )
   end
+
+  def test_0011_ErbBash_Ignoring_Errors
+    eb_file = File.join($current_dir, "erb_bash.sh")
+    assert_equal( 
+        [["#!/bin/sh", :directive],
+         ["\n", :end_line],
+         ["\n", :end_line],
+         ["echo", :method],
+         [" ", :space],
+         [:open, :string],
+         ["\"", :delimiter],
+         ["Parsed at ", :content],
+         [:open, :inline],
+         ["<%=", :inline_delimiter],
+         [" ", :space],
+         ["Time", :constant],
+         [".", :operator],
+         ["now", :ident],
+         [" ", :space],
+         ["%>", :inline_delimiter],
+         [:close, :inline],
+         ["\"", :delimiter],
+         [:close, :string],
+         ["\n", :end_line],
+         ["echo", :method],
+         [" ", :space],
+         [:open, :string],
+         ["\"", :delimiter],
+         ["Executed at `Date`", :content],
+         ["\"", :delimiter],
+         [:close, :string],
+         ["\n", :end_line],
+         ["command", :method],
+         [" ", :space],
+         ["'open quote", :plain],
+         ["\n", :end_line],
+         ["other_command", :ident],
+         ["\n", :end_line]
+         ],
+        CodeRay.scan(File.read(eb_file), :erb_bash, :ignore_errors => true))
+  end
+
 end
