0
@@ -1,5 +1,7 @@
0
 *SVN*
0
 
0
+* Add much-needed html-scanner tests.  Fixed CDATA parsing bug. [Rick]
0
+
0
 * improve error message for Routing for named routes. [Rob Sanheim]
0
 
0
 * Added enhanced docs to routing assertions. [Rob Sanheim]

0
@@ -92,7 +92,6 @@
0
     # returns non +nil+. Returns the result of the #find call that succeeded.
0
     def find(conditions)
0
       conditions = validate_conditions(conditions)
0
-
0
       @children.each do |child|        
0
         node = child.find(conditions)
0
         return node if node
0
@@ -152,7 +151,7 @@
0
 
0
           if scanner.skip(/!\[CDATA\[/)
0
             scanner.scan_until(/\]\]>/)
0
-            return CDATA.new(parent, line, pos, scanner.pre_match)
0
+            return CDATA.new(parent, line, pos, scanner.pre_match.gsub(/<!\[CDATA\[/, ''))
0
           end
0
           
0
           closing = ( scanner.scan(/\//) ? :close : nil )
0
@@ -410,7 +409,6 @@
0
     #                               :child => /hello world/ }
0
     def match(conditions)
0
       conditions = validate_conditions(conditions)
0
-
0
       # check content of child nodes
0
       if conditions[:content]
0
         if children.empty?