Debug scanner supports line tokens; more cleanups.

3 files changed, 64 insertions, 10 deletions

diff --git a/test/scanners/debug/class.expected.raydebug b/test/scanners/debug/class.expected.raydebug
index c0df683..501c99f 100644
--- a/test/scanners/debug/class.expected.raydebug
+++ b/test/scanners/debug/class.expected.raydebug
@@ -1,14 +1,14 @@
-error(3)error(7)error(,)error(3)error(8)error(c)error(3)error(7)error(,)error(3)error(8)
-error(<) 			reserved(for) ident(input) reserved(in) constant(Dir)operator([)string<delimiter(")content(*.)inline<delimiter(#{)ident(extension)delimiter(})>delimiter(")>operator(])
-error(<) 				ident(name) operator(=) constant(File)operator(.)ident(basename)operator(()ident(input)operator(,) string<delimiter(")content(.)inline<delimiter(#{)ident(extension)delimiter(})>delimiter(")>operator(\))
-error(-)error(-)error(-)
+37,38c37,38
+< 			reserved(for) ident(input) reserved(in) constant(Dir)operator([)string<delimiter(")content(*.)inline<delimiter(#{)ident(extension)delimiter(})>delimiter(")>operator(])
+< 				ident(name) operator(=) constant(File)operator(.)ident(basename)operator(()ident(input)operator(,) string<delimiter(")content(.)inline<delimiter(#{)ident(extension)delimiter(})>delimiter(")>operator(\))
+---
 > 			reserved(for) ident(input) reserved(in) constant(Dir)operator([)string<delimiter(")content(*.)inline<inline_delimiter(#{)ident(extension)inline_delimiter(})>delimiter(")>operator(])
 > 				ident(name) operator(=) constant(File)operator(.)ident(basename)operator(()ident(input)operator(,) string<delimiter(")content(.)inline<inline_delimiter(#{)ident(extension)inline_delimiter(})>delimiter(")>operator(\))
-error(4)error(9)error(c)error(4)error(9)
-error(<) 					ident(puts) string<delimiter(")content(New test: )inline<delimiter(#{)ident(output)delimiter(})>delimiter(")>
-error(-)error(-)error(-)
+49c49
+< 					ident(puts) string<delimiter(")content(New test: )inline<delimiter(#{)ident(output)delimiter(})>delimiter(")>
+---
 > 					ident(puts) string<delimiter(")content(New test: )inline<inline_delimiter(#{)ident(output)inline_delimiter(})>delimiter(")>
-error(6)error(9)error(c)error(6)error(9)
-error(<) error(!)error(!) error(F)error(o)error(l)error(d)error(e)error(r) error(\))inline<delimiter(#{)constant(File)operator(.)ident(split)operator(()pre_constant(__FILE__)operator(\))operator(.)ident(first) operator(+) string<delimiter(')content(/)delimiter(')> operator(+) ident(name)delimiter(})>content( not found
+69c69
+< !! Folder )inline<delimiter(#{)constant(File)operator(.)ident(split)operator(()pre_constant(__FILE__)operator(\))operator(.)ident(first) operator(+) string<delimiter(')content(/)delimiter(')> operator(+) ident(name)delimiter(})>content( not found
 ---
-> !! Folder )inline<inline_delimiter(#{)constant(File)operator(.)ident(split)operator(()pre_constant(__FILE__)operator(\))operator(.)ident(first) operator(+) string<delimiter(')content(/)delimiter(')> operator(+) ident(name)inline_delimiter(})>error(c)error(o)error(n)error(t)error(e)error(n)error(t)error(() error(n)error(o)error(t) error(f)error(o)error(u)error(n)error(d)
+> !! Folder )inline<inline_delimiter(#{)constant(File)operator(.)ident(split)operator(()pre_constant(__FILE__)operator(\))operator(.)ident(first) operator(+) string<delimiter(')content(/)delimiter(')> operator(+) ident(name)inline_delimiter(})>content( not found
diff --git a/test/scanners/debug/lines.expected.raydebug b/test/scanners/debug/lines.expected.raydebug
new file mode 100644
index 0000000..3e836fa
--- /dev/null
+++ b/test/scanners/debug/lines.expected.raydebug
@@ -0,0 +1,27 @@
+head[head(===================================================================)]
+head[head(--- )plain(/Users/jgoebel/rails/pastie/app/controllers/pastes_controller.rb  (revision 1431\))]
+head[head(+++ )plain(/Users/jgoebel/rails/pastie/app/controllers/pastes_controller.rb  (revision 1437\))]
+change[change(@@)plain( -1,6 +1,10 )change(@@)]
+insert[insert(+)plain(require 'login_system')]
+comment( require 'coderay')
+comment( )
+comment( class PastesController < ApplicationController)
+insert[insert(+)plain(  include LoginSystem)]
+insert[insert(+)]
+insert[insert(+)plain(  before_filter :attempt_cookie_login)]
+comment( )
+comment( #  caches_action :recent)
+comment( )
+change[change(@@)plain( -10,11 +14,7 )change(@@)]
+comment( )
+comment(   def show)
+comment(     @paste = Paste.find(params[:id]\))
+delete[delete(-)plain(    if params[:key] and params[:key]==User.new(@paste.nick\).magic_mojo)]
+delete[delete(-)plain(        session[:login]=@paste.nick)]
+delete[delete(-)plain(        return redirect_to(:action => 'show', :id => @paste.id\))]
+delete[delete(-)plain(    end)]
+delete[delete(-)plain(    )]
+insert[insert(+)plain(    attempt_key_login if not logged_in?)]
+comment(     unless @paste.asset or not @paste.body.blank?)
+comment(       render :action => "edit")
+comment(     end)
\ No newline at end of file
diff --git a/test/scanners/debug/lines.in.raydebug b/test/scanners/debug/lines.in.raydebug
new file mode 100644
index 0000000..3e836fa
--- /dev/null
+++ b/test/scanners/debug/lines.in.raydebug
@@ -0,0 +1,27 @@
+head[head(===================================================================)]
+head[head(--- )plain(/Users/jgoebel/rails/pastie/app/controllers/pastes_controller.rb  (revision 1431\))]
+head[head(+++ )plain(/Users/jgoebel/rails/pastie/app/controllers/pastes_controller.rb  (revision 1437\))]
+change[change(@@)plain( -1,6 +1,10 )change(@@)]
+insert[insert(+)plain(require 'login_system')]
+comment( require 'coderay')
+comment( )
+comment( class PastesController < ApplicationController)
+insert[insert(+)plain(  include LoginSystem)]
+insert[insert(+)]
+insert[insert(+)plain(  before_filter :attempt_cookie_login)]
+comment( )
+comment( #  caches_action :recent)
+comment( )
+change[change(@@)plain( -10,11 +14,7 )change(@@)]
+comment( )
+comment(   def show)
+comment(     @paste = Paste.find(params[:id]\))
+delete[delete(-)plain(    if params[:key] and params[:key]==User.new(@paste.nick\).magic_mojo)]
+delete[delete(-)plain(        session[:login]=@paste.nick)]
+delete[delete(-)plain(        return redirect_to(:action => 'show', :id => @paste.id\))]
+delete[delete(-)plain(    end)]
+delete[delete(-)plain(    )]
+insert[insert(+)plain(    attempt_key_login if not logged_in?)]
+comment(     unless @paste.asset or not @paste.body.blank?)
+comment(       render :action => "edit")
+comment(     end)
\ No newline at end of file