From 9daebe8dd253156893829cec335a18f8a2849bbb Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 27 Jan 2016 08:28:47 -0800
Subject: [PATCH] Use improved Page#dir

---
 lib/jekyll/page.rb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index 6bdfb6bc..6c402ee3 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -9,6 +9,8 @@ module Jekyll
 
     alias_method :extname, :ext
 
+    FORWARD_SLASH = '/'.freeze
+
     # Attributes for Liquid templates
     ATTRIBUTES_FOR_LIQUID = %w(
       content
@@ -55,9 +57,12 @@ module Jekyll
     #
     # Returns the String destination directory.
     def dir
-      dest_dir = url[-1, 1] == '/' ? url : File.dirname(url)
-      dest_dir << '/' unless dest_dir.end_with?('/')
-      dest_dir
+      if url.end_with?(FORWARD_SLASH)
+        url
+      else
+        url_dir = File.dirname(url)
+        url_dir.end_with?(FORWARD_SLASH) ? url_dir : "#{url_dir}/"
+      end
     end
 
     # The full path and filename of the post. Defined in the YAML of the post