Direct Streaming! See #142 and Changes.textile.

1 files changed, 26 insertions, 26 deletions

diff --git a/lib/coderay/scanners/rhtml.rb b/lib/coderay/scanners/rhtml.rb
index 01fda8e..064a92c 100644
--- a/lib/coderay/scanners/rhtml.rb
+++ b/lib/coderay/scanners/rhtml.rb
@@ -1,18 +1,18 @@
 module CodeRay
 module Scanners
-
+  
   load :html
   load :ruby
-
+  
   # Scanner for HTML ERB templates.
   class RHTML < Scanner
-
+    
     include Streamable
     register_for :rhtml
     title 'HTML ERB Template'
     
     KINDS_NOT_LOC = HTML::KINDS_NOT_LOC
-
+    
     ERB_RUBY_BLOCK = /
       <%(?!%)[=-]?
       (?>
@@ -24,51 +24,51 @@ module Scanners
       )
       (?: -?%> )?
     /x  # :nodoc:
-
+    
     START_OF_ERB = /
       <%(?!%)
     /x  # :nodoc:
-
+    
   protected
-
+    
     def setup
       @ruby_scanner = CodeRay.scanner :ruby, :tokens => @tokens, :keep_tokens => true
       @html_scanner = CodeRay.scanner :html, :tokens => @tokens, :keep_tokens => true, :keep_state => true
     end
-
+    
     def reset_instance
       super
       @html_scanner.reset
     end
-
-    def scan_tokens tokens, options
-
+    
+    def scan_tokens encoder, options
+      
       until eos?
-
+        
         if (match = scan_until(/(?=#{START_OF_ERB})/o) || scan_until(/\z/)) and not match.empty?
-          @html_scanner.tokenize match
-
+          @html_scanner.tokenize match, :tokens => encoder
+          
         elsif match = scan(/#{ERB_RUBY_BLOCK}/o)
           start_tag = match[/\A<%[-=]?/]
           end_tag = match[/-?%?>?\z/]
-          tokens << [:open, :inline]
-          tokens << [start_tag, :inline_delimiter]
+          encoder.begin_group :inline
+          encoder.text_token start_tag, :inline_delimiter
           code = match[start_tag.size .. -1 - end_tag.size]
           @ruby_scanner.tokenize code
-          tokens << [end_tag, :inline_delimiter] unless end_tag.empty?
-          tokens << [:close, :inline]
-
+          encoder.text_token end_tag, :inline_delimiter unless end_tag.empty?
+          encoder.end_group :inline
+          
         else
-          raise_inspect 'else-case reached!', tokens
+          raise_inspect 'else-case reached!', encoder
         end
-
+        
       end
-
-      tokens
-
+      
+      encoder
+      
     end
-
+    
   end
-
+  
 end
 end