Merge branch 'v1.0'

pejuko · pejuko · commit dd49a98a04a5 · 2011-10-04T12:47:24.000+02:00
diff --git a/lib/coderay/scanners/bash.rb b/lib/coderay/scanners/bash.rb
@@ -1,7 +1,8 @@
 # Scanner for Bash
 # Author: Petr Kovar <pejuko@gmail.com>
-module CodeRay
-module Scanners
+
+module CodeRay module Scanners
+
   class Bash < Scanner
 
     register_for :bash
@@ -84,11 +85,15 @@ def scan_tokens tokens, options
           elsif match = scan(/"/)
             @state = :quote
             @quote = match
-            tokens << [:open, :string]
+            tokens.begin_group :string
             tokens << [match, :delimiter]
             next
           elsif match = scan(/`/)
-            tokens << [@shell ? :close : :open, :shell]
+            if @shell
+              tokens.end_group :shell
+            else
+              tokens.begin_group :shell
+            end
             @shell = (not @shell)
             tokens << [match, :delimiter]
             next
@@ -165,7 +170,7 @@ def scan_tokens tokens, options
             kind = :content
           elsif match = scan(/#{@quote}/)
             tokens << [match, :delimiter]
-            tokens << [:close, :string] if @quote == '"'
+            tokens.end_group :string
             @quote = nil
             @state = :initial
             next
diff --git a/lib/coderay/scanners/erb_bash.rb b/lib/coderay/scanners/erb_bash.rb
@@ -1,10 +1,10 @@
 # Scanner for Bash
 # Author: spam+github@codez.ch
-require 'coderay/scanners/rhtml'
+require 'coderay/scanners/erb'
 
 module CodeRay
   module Scanners
-    class ErbBash < RHTML
+    class ErbBash < ERB
       register_for :erb_bash
 
       protected
