From 23e9b8ae2169181ec3beff1ac07956647dca4df5 Mon Sep 17 00:00:00 2001
From: Pat Hawks <pat@pathawks.com>
Date: Tue, 5 Jan 2016 15:52:40 -0800
Subject: [PATCH] Replace '/index.html' with '/'

---
 lib/template.html           | 8 ++++----
 spec/jekyll_seo_tag_spec.rb | 9 +++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/template.html b/lib/template.html
index 1366740..8da25cd 100644
--- a/lib/template.html
+++ b/lib/template.html
@@ -41,8 +41,8 @@
 {% endif %}
 
 {% if seo_url %}
-  <link rel="canonical" href="{{ seo_url }}{{ page.url }}" itemprop="url" />
-  <meta property='og:url' content='{{ seo_url }}{{ page.url }}' />
+  <link rel="canonical" href="{{ seo_url }}{{ page.url | replace:'/index.html','/' }}" itemprop="url" />
+  <meta property='og:url' content='{{ seo_url }}{{ page.url | replace:'/index.html','/' }}' />
 {% endif %}
 
 {% if site.title %}
@@ -64,10 +64,10 @@
 {% if page.date %}
   <meta property="og:type" content="article" />
   {% if page.next.url %}
-    <link rel="next" href="{{ seo_url }}{{ page.next.url }}" title="{{ page.next.title | escape }}" />
+    <link rel="next" href="{{ seo_url }}{{ page.next.url | replace:'/index.html','/' }}" title="{{ page.next.title | escape }}" />
   {% endif %}
   {% if page.previous.url %}
-    <link rel="prev" href="{{ seo_url }}{{ page.previous.url }}" title="{{ page.previous.title | escape }}" />
+    <link rel="prev" href="{{ seo_url }}{{ page.previous.url | replace:'/index.html','/' }}" title="{{ page.previous.title | escape }}" />
   {% endif %}
   <script type="application/ld+json">
     {
diff --git a/spec/jekyll_seo_tag_spec.rb b/spec/jekyll_seo_tag_spec.rb
index 6b6fbba..ad871c7 100644
--- a/spec/jekyll_seo_tag_spec.rb
+++ b/spec/jekyll_seo_tag_spec.rb
@@ -77,6 +77,15 @@ describe Jekyll::SeoTag do
     expect(subject.render(context)).to match(expected)
   end
 
+  it "uses replaces '/index.html' with '/'" do
+    page = page({ "permalink" => "/page/index.html" })
+    site = site({ "url" => "http://example.invalid" })
+    context = context({ :page => page, :site => site })
+    expected = %r!<link rel="canonical" href="http://example.invalid/page/" itemprop="url" />!
+    expected = %r!<meta property='og:url' content='http://example.invalid/page/' />!
+    expect(subject.render(context)).to match(expected)
+  end
+
   it "outputs the site title meta" do
     site = site({"title" => "Foo", "url" => "http://example.invalid"})
     context = context({ :site => site })