From 6eed91871f24d081e5d9a7013dc1e8cf37e4e408 Mon Sep 17 00:00:00 2001
From: edeustace <ed.eustace@gmail.com>
Date: Tue, 8 Jan 2013 23:17:06 +0100
Subject: [PATCH] Changes based on @mojombo's feedback

---
 jekyll.gemspec     |  7 ++-----
 lib/jekyll/site.rb | 10 +++++++---
 test/test_site.rb  |  1 -
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 1c181122..55201ae8 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
 
   s.name              = 'jekyll'
   s.version           = '0.11.2'
-  s.date              = '2012-08-23'
+  s.date              = '2011-12-27'
   s.rubyforge_project = 'jekyll'
 
   s.summary     = "A simple, blog aware, static site generator."
@@ -74,12 +74,10 @@ Gem::Specification.new do |s|
     lib/jekyll/migrators/csv.rb
     lib/jekyll/migrators/drupal.rb
     lib/jekyll/migrators/enki.rb
-    lib/jekyll/migrators/joomla.rb
     lib/jekyll/migrators/marley.rb
     lib/jekyll/migrators/mephisto.rb
     lib/jekyll/migrators/mt.rb
     lib/jekyll/migrators/posterous.rb
-    lib/jekyll/migrators/rss.rb
     lib/jekyll/migrators/textpattern.rb
     lib/jekyll/migrators/tumblr.rb
     lib/jekyll/migrators/typo.rb
@@ -92,7 +90,6 @@ Gem::Specification.new do |s|
     lib/jekyll/static_file.rb
     lib/jekyll/tags/highlight.rb
     lib/jekyll/tags/include.rb
-    lib/jekyll/tags/post_url.rb
     test/helper.rb
     test/source/.htaccess
     test/source/_includes/sig.markdown
@@ -144,9 +141,9 @@ Gem::Specification.new do |s|
     test/test_post.rb
     test/test_rdiscount.rb
     test/test_redcarpet.rb
-    test/test_redcloth.rb
     test/test_site.rb
     test/test_tags.rb
+    test/test_redcloth.rb
   ]
   # = MANIFEST =
 
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 058e6e11..d8b729f9 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -220,7 +220,7 @@ module Jekyll
       dest_files = Set.new
       Dir.glob(File.join(self.dest, "**", "*"), File::FNM_DOTMATCH) do |file|
         if self.keep_files.length > 0
-          dest_files << file unless file =~ /\/\.{1,2}$/ or file =~ keep_file_regex
+          dest_files << file unless file =~ /\/\.{1,2}$/ || file =~ keep_file_regex
         else
           dest_files << file unless file =~ /\/\.{1,2}$/
         end
@@ -248,8 +248,12 @@ module Jekyll
       FileUtils.rm_rf(obsolete_files.to_a)
     end
 
-    # create a regex from the keep_files array
-    # ['.git','.svn'] => /\/(\.git|\/.svn)/
+    # Private: creates a regular expression from the keep_files array
+    # 
+    # Examples
+    #   ['.git','.svn'] creates the following regex: /\/(\.git|\/.svn)/
+    #
+    # Returns the regular expression
     def keep_file_regex
       or_list = self.keep_files.join("|")
       pattern = "\/(#{or_list.gsub(".", "\.")})"
diff --git a/test/test_site.rb b/test/test_site.rb
index 26bfaa52..833d7979 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -210,7 +210,6 @@ class TestSite < Test::Unit::TestCase
       end
 
       should 'remove orphaned files in destination - keep_files .svn' do
-
         config = Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'keep_files' => ['.svn']})
         @site = Site.new(config)
         @site.process