From 99098dd8c7bd5465ac97e18f35d6fcbb0ce241a2 Mon Sep 17 00:00:00 2001
From: Nick Quaranto <nick@quaran.to>
Date: Mon, 18 May 2009 17:52:05 -0400
Subject: [PATCH] Removing the extremely brittle generated_site test and moving
 the tags check into post.rb so pages don't break

---
 lib/jekyll/convertible.rb   |  8 --------
 lib/jekyll/post.rb          |  8 ++++++++
 test/test_generated_site.rb | 38 -------------------------------------
 3 files changed, 8 insertions(+), 46 deletions(-)
 delete mode 100644 test/test_generated_site.rb

diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 3b8d08b1..4d2ec17f 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -22,14 +22,6 @@ module Jekyll
         self.content = self.content[($1.size + 5)..-1]
 
         self.data = YAML.load($1)
-
-        if self.data.has_key?("tag")
-          self.tags = [self.data["tag"]]
-        elsif self.data.has_key?("tags")
-          self.tags = self.data['tags']
-        else
-          self.tags = []
-        end
       end
     end
 
diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
index b8595146..d164fb5e 100644
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -47,6 +47,14 @@ module Jekyll
         self.published = true
       end
 
+      if self.data.has_key?("tag")
+        self.tags = [self.data["tag"]]
+      elsif self.data.has_key?("tags")
+        self.tags = self.data['tags']
+      else
+        self.tags = []
+      end
+
       if self.categories.empty?
         if self.data.has_key?('category')
           self.categories << self.data['category']
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
deleted file mode 100644
index 9b5dd6f0..00000000
--- a/test/test_generated_site.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-
-class TestGeneratedSite < Test::Unit::TestCase
-  context "generated sites" do
-    setup do
-      clear_dest
-      stub(Jekyll).configuration do
-        Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
-      end
-
-      @site = Site.new(Jekyll.configuration)
-      @site.process
-      @index = File.read(dest_dir('index.html'))
-    end
-
-    should "insert site.posts into the index" do
-      assert @index.include?("#{@site.posts.size} Posts")
-    end
-
-    should "render post.content" do
-      latest_post = Dir[source_dir('_posts', '*')].sort.last
-      post = Post.new(@site, source_dir, '', File.basename(latest_post))
-      post.transform
-      assert @index.include?(post.content)
-    end
-
-    should "hide unpublished posts" do
-      published = Dir[dest_dir('publish_test/2008/02/02/*.html')].map {|f| File.basename(f)}
-
-      assert_equal 1, published.size
-      assert_equal "published.html", published.first
-    end
-
-    should "not copy _posts directory" do
-      assert !File.exist?(dest_dir('_posts'))
-    end
-  end
-end