Support handling body tag across multiple lines (#96)

ashmaroli · jekyllbot · commit 9a4ffc7bd6e0 · 2019-08-08T15:18:05.000-04:00
Merge pull request 96
diff --git a/lib/jemoji.rb b/lib/jemoji.rb
@@ -9,7 +9,7 @@ class Emoji
     GITHUB_DOT_COM_ASSET_HOST_URL = "https://assets-git.f3mw1.com"
     ASSET_PATH = "/images/icons/"
     BODY_START_TAG = "<body"
-    OPENING_BODY_TAG_REGEX = %r!<body(.*?)>\s*!.freeze
+    OPENING_BODY_TAG_REGEX = %r!<body(.*?)>\s*!m.freeze
 
     class << self
       def emojify(doc)
diff --git a/spec/fixture_site/_layouts/multiline_body_tag.html b/spec/fixture_site/_layouts/multiline_body_tag.html
@@ -0,0 +1,9 @@
+---
+layout: base
+---
+
+<body
+  class="wrap"
+>
+  {{ content }}
+</body>
diff --git a/spec/fixture_site/multiline.md b/spec/fixture_site/multiline.md
@@ -0,0 +1,5 @@
+---
+layout: multiline_body_tag
+title: Multi-line Body Tag
+---
+:+1:
diff --git a/spec/fixtures/multiline_body_tag.html b/spec/fixtures/multiline_body_tag.html
@@ -0,0 +1,16 @@
+<!DOCTYPE HTML>
+<html lang="en-US">
+  <head>
+    <meta charset="UTF-8">
+    <title>Multi-line Body Tag</title>
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <link rel="stylesheet" href="/css/screen.css">
+  </head>
+  <body
+  class="wrap"
+>
+  <p><img class="emoji" title=":+1:" alt=":+1:" src="https://assets-git.f3mw1.com/images/icons/emoji/unicode/1f44d.png" height="20" width="20"></p>
+
+</body>
+
+</html>
diff --git a/spec/jemoji_spec.rb b/spec/jemoji_spec.rb
@@ -36,6 +36,8 @@
   let(:plain_index) { site.pages.find { |page| page["title"] == "Plain Jemoji" } }
   let(:plain_minified) { site.pages.find { |page| page["title"] == "Plain Jemoji Minified" } }
 
+  let(:multiline_body_tag) { site.pages.find { |page| page["title"] == "Multi-line Body Tag" } }
+
   let(:basic_doc) { find_by_title(site.collections["docs"].docs, "File") }
   let(:doc_with_liquid) { find_by_title(site.collections["docs"].docs, "With Liquid") }
   let(:txt_doc) { find_by_title(site.collections["docs"].docs, "Don't Touch Me") }
@@ -102,6 +104,10 @@ def para(content)
     expect(plain_minified.output).to eql(fixture("minified_index_without_body_attributes.html"))
   end
 
+  it "works with HTML body tag markup across multiple lines" do
+    expect(multiline_body_tag.output).to eql(fixture("multiline_body_tag.html"))
+  end
+
   context "with a different base for jemoji" do
     let(:emoji_src) { "http://mine.club/" }
     let(:config_overrides) do

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +layout: multiline_body_tag
 +title: Multi-line Body Tag
 +---
 +:+1: