refactor check functionality to DebugLint encoder

3 files changed, 56 insertions, 15 deletions

diff --git a/Changes.textile b/Changes.textile
index ff9e6a9..15b0cc6 100644
--- a/Changes.textile
+++ b/Changes.textile
@@ -20,6 +20,7 @@ h2. Changes in 1.1
 * Override Bootstrap's pre word-break setting for line numbers [#102, thanks to lightswitch05]
 * Fixed @:docstring@ token type style
 * @Plugin@ does not warn about fallback when default is defined
+* @Debug@ encoder refactored; use @DebugLint@ if you want strict checking now
 
 h2. Changes in 1.0.9
 
diff --git a/lib/coderay/encoders/debug.rb b/lib/coderay/encoders/debug.rb
index 94d52af..61520a1 100644
--- a/lib/coderay/encoders/debug.rb
+++ b/lib/coderay/encoders/debug.rb
@@ -18,14 +18,7 @@ module Encoders
     
     FILE_EXTENSION = 'raydebug'
     
-    def initialize options = {}
-      super
-      @opened = []
-    end
-    
     def text_token text, kind
-      raise 'empty token' if $CODERAY_DEBUG && text.empty?
-      
       if kind == :space
         @out << text
       else
@@ -36,26 +29,18 @@ module Encoders
     end
     
     def begin_group kind
-      @opened << kind if $CODERAY_DEBUG
-      
       @out << "#{kind}<"
     end
     
     def end_group kind
-      raise "We are inside #{@opened.inspect}, not #{kind}" if $CODERAY_DEBUG && @opened.pop != kind
-      
       @out << '>'
     end
     
     def begin_line kind
-      @opened << kind if $CODERAY_DEBUG
-      
       @out << "#{kind}["
     end
     
     def end_line kind
-      raise "We are inside #{@opened.inspect}, not #{kind}" if $CODERAY_DEBUG && @opened.pop != kind
-      
       @out << ']'
     end
     
diff --git a/lib/coderay/encoders/debug_lint.rb b/lib/coderay/encoders/debug_lint.rb
new file mode 100644
index 0000000..eeb2a92
--- /dev/null
+++ b/lib/coderay/encoders/debug_lint.rb
@@ -0,0 +1,55 @@
+module CodeRay
+module Encoders
+  
+  # = Debug Lint Encoder
+  #
+  # Debug encoder with additional checks for:
+  # 
+  # - empty tokens
+  # - incorrect nesting
+  # 
+  # It will raise an InvalidTokenStream exception when any of the above occurs.
+  # 
+  # See also: Encoders::Debug
+  class DebugLint < Debug
+    
+    register_for :debug_lint
+    
+    InvalidTokenStream = Class.new StandardError
+    EmptyToken = Class.new InvalidTokenStream
+    IncorrectTokenGroupNesting = Class.new InvalidTokenStream
+    
+    def initialize options = {}
+      super
+      @opened = []
+    end
+    
+    def text_token text, kind
+      raise EmptyToken, 'empty token' if text.empty?
+      super
+    end
+    
+    def begin_group kind
+      @opened << kind
+      super
+    end
+    
+    def end_group kind
+      raise IncorrectTokenGroupNesting, "We are inside #{@opened.inspect}, not #{kind}" if @opened.pop != kind
+      super
+    end
+    
+    def begin_line kind
+      @opened << kind
+      super
+    end
+    
+    def end_line kind
+      raise IncorrectTokenGroupNesting, "We are inside #{@opened.inspect}, not #{kind}" if @opened.pop != kind
+      super
+    end
+    
+  end
+  
+end
+end