Fixing permalink support

muratmeran · Jan 4, 2009 · 15c5a78 · 15c5a78
1 parent 94c06d0
commit 15c5a78
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
@@ -66,7 +66,7 @@ def process(name)
     # Returns <String>
     def dir
       if permalink
-        permalink.to_s.split("/")[0..-2].join("/")
+        permalink.to_s.split("/")[0..-2].join("/") + '/'
       else
         prefix = self.categories.empty? ? '' : '/' + self.categories.join('/')
         prefix + date.strftime("/%Y/%m/%d/")
@@ -87,7 +87,7 @@ def permalink
     #
     # Returns <String>
     def url
-      self.dir + self.slug + ".html"
+      permalink || self.dir + self.slug + ".html"
     end
 
     # The UID for this post (useful in feeds)

diff --git a/test/test_post.rb b/test/test_post.rb
@@ -43,7 +43,15 @@ def test_dir_respects_permalink
     p.process("2008-12-03-permalinked-post.textile")
     p.read_yaml(File.join(File.dirname(__FILE__), *%w[source _posts]), "2008-12-03-permalinked-post.textile")
 
-    assert_equal "my_category", p.dir
+    assert_equal "my_category/", p.dir
+  end
+
+  def test_url_respects_permalink
+    p = Post.allocate
+    p.process("2008-12-03-permalinked-post.textile")
+    p.read_yaml(File.join(File.dirname(__FILE__), *%w[source _posts]), "2008-12-03-permalinked-post.textile")
+
+    assert_equal "my_category/permalinked-post", p.url
   end
 
   def test_read_yaml