From 4f951b9b5d10a61016d4bb7490eb23fd96c0a638 Mon Sep 17 00:00:00 2001
From: Tom Preston-Werner <tom@mojombo.com>
Date: Fri, 21 Nov 2008 18:37:08 -0800
Subject: [PATCH] send introspection data to posts

---
 lib/jekyll/post.rb |  2 +-
 test/test_post.rb  | 16 ++++++++++++----
 test/test_site.rb  |  4 +---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
index 2261635f..3fa989dd 100644
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -88,7 +88,7 @@ module Jekyll
     def add_layout(layouts, site_payload)
       # construct post payload
       related = related_posts(site_payload["site"]["posts"])
-      payload = {"page" => self.data, "related_posts" => related}
+      payload = {"page" => self.to_liquid.merge(self.data), "related_posts" => related}
       do_layout(payload, layouts, site_payload)
     end
     
diff --git a/test/test_post.rb b/test/test_post.rb
index 89f32f4f..76c8e649 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -28,7 +28,7 @@ class TestPost < Test::Unit::TestCase
   
   def test_read_yaml
     p = Post.allocate
-    p.read_yaml(File.join(File.dirname(__FILE__), *%w[source posts]), "2008-10-18-foo-bar.textile")
+    p.read_yaml(File.join(File.dirname(__FILE__), *%w[source _posts]), "2008-10-18-foo-bar.textile")
     
     assert_equal({"title" => "Foo Bar", "layout" => "default"}, p.data)
     assert_equal "\nh1. {{ page.title }}\n\nBest *post* ever", p.content
@@ -37,14 +37,14 @@ class TestPost < Test::Unit::TestCase
   def test_transform
     p = Post.allocate
     p.process("2008-10-18-foo-bar.textile")
-    p.read_yaml(File.join(File.dirname(__FILE__), *%w[source posts]), "2008-10-18-foo-bar.textile")
+    p.read_yaml(File.join(File.dirname(__FILE__), *%w[source _posts]), "2008-10-18-foo-bar.textile")
     p.transform
     
     assert_equal "<h1>{{ page.title }}</h1>\n\n\n\t<p>Best <strong>post</strong> ever</p>", p.content
   end
   
   def test_add_layout
-    p = Post.new(File.join(File.dirname(__FILE__), *%w[source posts]), "2008-10-18-foo-bar.textile")
+    p = Post.new(File.join(File.dirname(__FILE__), *%w[source _posts]), "2008-10-18-foo-bar.textile")
     layouts = {"default" => Layout.new(File.join(File.dirname(__FILE__), *%w[source _layouts]), "simple.html")}
     p.add_layout(layouts, {"site" => {"posts" => []}})
     
@@ -54,9 +54,17 @@ class TestPost < Test::Unit::TestCase
   def test_write
     clear_dest
     
-    p = Post.new(File.join(File.dirname(__FILE__), *%w[source posts]), "2008-10-18-foo-bar.textile")
+    p = Post.new(File.join(File.dirname(__FILE__), *%w[source _posts]), "2008-10-18-foo-bar.textile")
     layouts = {"default" => Layout.new(File.join(File.dirname(__FILE__), *%w[source _layouts]), "simple.html")}
     p.add_layout(layouts, {"site" => {"posts" => []}})
     p.write(dest_dir)
   end
+  
+  def test_data
+    p = Post.new(File.join(File.dirname(__FILE__), *%w[source _posts]), "2008-11-21-complex.textile")
+    layouts = {"default" => Layout.new(File.join(File.dirname(__FILE__), *%w[source _layouts]), "simple.html")}
+    p.add_layout(layouts, {"site" => {"posts" => []}})
+    
+    assert_equal "<<< <p>url: /2008/11/21/complex.html\ndate: Fri Nov 21 00:00:00 -0800 2008\nid: /2008/11/21/complex</p> >>>", p.output
+  end
 end
\ No newline at end of file
diff --git a/test/test_site.rb b/test/test_site.rb
index 432f1b5c..48ec8f48 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -19,14 +19,12 @@ class TestSite < Test::Unit::TestCase
   def test_read_posts
     @s.read_posts
     
-    assert_equal 1, @s.posts.size
+    assert_equal 2, @s.posts.size
   end
   
   def test_write_posts
     clear_dest
     
     @s.process
-    
-    
   end
 end
\ No newline at end of file