Changeset 3153

Timestamp:

11/21/05 20:43:35 (4 years ago)

Author:

minam

Message:

Update html-scanner to handle CDATA sections better. Closes #2970. [Jamis Buck]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb (modified) (2 diffs)
• trunk/actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Update html-scanner to handle CDATA sections better. Closes #2970. [Jamis Buck]
-
-* Don't put flash in session if sessions are disabled.  [Jeremy Kemper]

trunk/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb

@@ -151 +151 @@
-          end
-
+          if scanner.skip(/!\[CDATA\[/)
+            scanner.scan_until(/\]\]>/)
+            return CDATA.new(parent, line, pos, scanner.pre_match)
+          end
+          
-          closing = ( scanner.scan(/\//) ? :close : nil )
-          return Text.new(parent, line, pos, content) unless name = scanner.scan(/[\w:]+/)
@@ -257 +262 @@
-    end
-  end
+  
+  # A CDATA node is simply a text node with a specialized way of displaying
+  # itself.
+  class CDATA < Text
+    def to_s
+      "<![CDATA[#{super}]>"
+    end
+  end
-
-  # A Tag is any node that represents markup. It may be an opening tag, a

trunk/actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb

@@ -53 +53 @@
-          tag << @scanner.matched
-          tag << (@scanner.scan_until(/--\s*>/) || @scanner.scan_until(/\Z/))
+        elsif @scanner.scan(/!\[CDATA\[/)
+          tag << @scanner.matched
+          tag << @scanner.scan_until(/\]\]>/)
-        elsif @scanner.scan(/!/) # doctype
-          tag << @scanner.matched