fix raw tag parser to allow multi-line HTML

foundation · May 6, 2019 · 3a99db2 · 3a99db2
1 parent 2f4e079
commit 3a99db2
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 1 deletion.
diff --git a/lib/inky.rb b/lib/inky.rb
@@ -58,7 +58,7 @@ def transform_doc(elem)
     def self.extract_raws(string)
       raws = []
       i = 0
-      regex = %r(< *raw *>(.*?)</ *raw *>)
+      regex = %r((?:\n *)?< *raw *>([\s\S]*?)</ *raw *>(?: *\n)?)i
       str = string
       while raw = str.match(regex)
         raws[i] = raw[1]

diff --git a/spec/cases/raw/raw_multiple_lines_and_tags.inky b/spec/cases/raw/raw_multiple_lines_and_tags.inky
@@ -0,0 +1,9 @@
+<div>
+  <raw>
+    <<LCG ProgramTG LCG Coupon Code Default='246996'>>
+  </raw>
+  <button href="#">Test</button>
+  <raw>
+    <asdf>more raw content</asdf>
+  </raw>
+</div>
diff --git a/spec/cases/raw/raw_multiple_lines_invalid_closing_tag.inky b/spec/cases/raw/raw_multiple_lines_invalid_closing_tag.inky
@@ -0,0 +1,7 @@
+<div>
+  <raw>
+    <<LCG ProgramTG LCG Coupon Code Default='246996'>>
+  </raw>
+  <button href="#">Test</button>
+  </raw>
+</div>
diff --git a/spec/cases/raw/raw_multiple_lines_single_tag.inky b/spec/cases/raw/raw_multiple_lines_single_tag.inky
@@ -0,0 +1,6 @@
+<div>
+  <raw>
+    <<LCG ProgramTG LCG Coupon Code Default='246996'>>\
+    <button href="#">Test</button>
+  </raw>
+</div>
diff --git a/spec/cases/raw/raw_single_line_multiple_tags.inky b/spec/cases/raw/raw_single_line_multiple_tags.inky
@@ -0,0 +1 @@
+<div><raw><<LCG ProgramTG LCG Coupon Code Default='246996'>></raw><button href="#">Test</button><raw><asdf>more raw content</asdf></raw></div>
diff --git a/spec/cases/raw/raw_single_line_single_tag.inky b/spec/cases/raw/raw_single_line_single_tag.inky
@@ -0,0 +1 @@
+<raw><<LCG ProgramTG LCG Coupon Code Default='246996'>></raw>