From 004f923644f16dba949143e92d0c74149d6140f5 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 18 Oct 2014 13:17:12 -0700
Subject: [PATCH] Revert "Revert "Make permalink parsing consistent with
 pages""

---
 features/permalinks.feature | 4 ++--
 lib/jekyll/post.rb          | 2 +-
 test/test_post.rb           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/features/permalinks.feature b/features/permalinks.feature
index 67dfbb47..c4494b4e 100644
--- a/features/permalinks.feature
+++ b/features/permalinks.feature
@@ -39,7 +39,7 @@ Feature: Fancy permalinks
     And I have the following post:
       | title                   | category | date       | content         |
       | Custom Permalink Schema | stuff    | 2009-03-27 | Totally custom. |
-    And I have a configuration file with "permalink" set to "/blog/:year/:month/:day/:title"
+    And I have a configuration file with "permalink" set to "/blog/:year/:month/:day/:title/"
     When I run jekyll build
     Then the _site directory should exist
     And I should see "Totally custom." in "_site/blog/2009/03/27/custom-permalink-schema/index.html"
@@ -68,7 +68,7 @@ Feature: Fancy permalinks
     Given I have a _posts directory
     And I have the following post:
       | title     | date       | permalink       | content |
-      | Some post | 2013-04-14 | /custom/posts/1 | bla bla |
+      | Some post | 2013-04-14 | /custom/posts/1/ | bla bla |
     When I run jekyll build
     Then the _site directory should exist
     And the _site/custom/posts/1 directory should exist
diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
index c377e376..7d11b0bf 100644
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -269,7 +269,7 @@ module Jekyll
     def destination(dest)
       # The url needs to be unescaped in order to preserve the correct filename
       path = site.in_dest_dir(dest, URL.unescape_path(url))
-      path = File.join(path, "index.html") if path[/\.html?$/].nil?
+      path = File.join(path, "index.html") if self.url =~ /\/$/
       path
     end
 
diff --git a/test/test_post.rb b/test/test_post.rb
index 2592b918..e6ecdaf3 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -592,7 +592,7 @@ class TestPost < Test::Unit::TestCase
 
         should "write properly without html extension" do
           post = setup_post("2008-10-18-foo-bar.textile")
-          post.site.permalink_style = ":title"
+          post.site.permalink_style = ":title/"
           do_render(post)
           post.write(dest_dir)