Merge pull request #29 from jekyll/do-not-mangle-layouts

jekyllbot · jekyllbot · commit 1ed2d33c6e8b · 2016-03-19T10:19:23.000-07:00
Merge pull request 29
diff --git a/lib/jekyll-mentions.rb b/lib/jekyll-mentions.rb
@@ -4,13 +4,23 @@
 module Jekyll
   class Mentions
     GITHUB_DOT_COM = "https://github.com".freeze
+    BODY_START_TAG = "<body".freeze
+
 
     InvalidJekyllMentionConfig = Class.new(Jekyll::Errors::FatalException)
 
     class << self
       def mentionify(doc)
+        return unless doc.output.include?("@")
         src = mention_base(doc.site.config)
-        doc.output = filter_with_mention(src).call(doc.output)[:output].to_s
+        if doc.output.include? BODY_START_TAG
+          parsed_doc    = Nokogiri::HTML::Document.parse(doc.output)
+          body          = parsed_doc.at_css('body')
+          body.children = filter_with_mention(src).call(body.inner_html)[:output].to_s
+          doc.output    = parsed_doc.to_html
+        else
+          doc.output = filter_with_mention(src).call(doc.output)[:output].to_s
+        end
       end
 
       # Public: Create or fetch the filter for the given {{src}} base URL.
diff --git a/spec/fixtures/_layouts/default.html b/spec/fixtures/_layouts/default.html
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<html lang="en-US">
+  <head>
+    <meta charset="UTF-8">
+    <title>{{ page.title }}</title>
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <link rel="stylesheet" href="/css/screen.css">
+  </head>
+  <body class="wrap">
+    {{ content }}
+  </body>
+</html>
diff --git a/spec/fixtures/index.md b/spec/fixtures/index.md
@@ -1,5 +1,6 @@
 ---
+layout: default
 title: I'm a page
 ---
 
-test @test test
+test @test test
diff --git a/spec/mentions_spec.rb b/spec/mentions_spec.rb
@@ -56,11 +56,16 @@ def para(content)
     expect(complex_post.output).to include(result)
   end
 
-  it "correctly replaces the mentions with the img in pages" do
-    expect(site.pages.first.output).to start_with(para(result))
+  it "correctly replaces the mentions with the link in pages" do
+    expect(site.pages.first.output).to include(para(result))
   end
 
-  it "correctly replaces the mentions with the img in collection documents" do
+  it "doesn't mangle layouts" do
+    expect(site.pages.first.output).to include("<html lang=\"en-US\">")
+    expect(site.pages.first.output).to include("<body class=\"wrap\">\n")
+  end
+
+  it "correctly replaces the mentions with the link in collection documents" do
     expect(basic_doc.output).to start_with(para(result))
   end
 
