Fixed CDATA bug in new parser.

zena · Aug 20, 2012 · d374b5e · d374b5e
1 parent cc613a8
commit d374b5e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/lib/zafu/parsing_rules.rb b/lib/zafu/parsing_rules.rb
@@ -140,13 +140,14 @@ def scan
           if @text[2..3] == '--'
             store space
             scan_html_comment
+          elsif @text[2..8] == '[CDATA['
+            # We do not flush because space has been eaten
+            store space
+            flush '<![CDATA['
           elsif @text =~ /\A\s*<([^>]+)>/m
             # Doctype/xml
             flush $&
           end
-        elsif @text[0..8] == '<![CDATA['
-          store space
-          flush '<![CDATA['
         elsif $1.last == ' ' && @text[0..1] == '< '
           # solitary ' < '
           store space

diff --git a/test/integration/zafu_compiler/display.yml b/test/integration/zafu_compiler/display.yml
@@ -25,6 +25,20 @@ multiline_rtag:
       content='text/html; charset=utf-8' /><r:title/>
   tem: '!/r:title/'
 
+cdata:
+  src: |
+    <script type='text/javascript'>
+      <![CDATA[
+      var urls = [<r:images in='site limit 2' do='each' join=', '>'<r:url mode='med' format='data'/>'</r:images>];
+      //]]>
+    </script>
+  res: |
+    <script type='text/javascript'>
+      <![CDATA[
+      var urls = ['http://test.host/oo/image40_med.jpg?390663777446', 'http://test.host/en/image30_med.jpg?390663777446'];
+      //]]>
+    </script>
+
 multiline_tag:
   src: |
     <div id='extract'>