From bb9d43dff5add6be35b2d84ccdff1fb57e9d6716 Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Wed, 4 Mar 2015 19:16:03 +0100
Subject: [PATCH 01/24] Extracted `in_source_dir` from site.rb and into
 reader.rb.

Extracted `in_source_dir` from site.rb into reader.rb.
Updated all the references and tests.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll.rb                |  1 +
 lib/jekyll/collection.rb     |  4 ++--
 lib/jekyll/convertible.rb    |  6 +++---
 lib/jekyll/draft.rb          |  2 +-
 lib/jekyll/layout.rb         |  2 +-
 lib/jekyll/layout_reader.rb  |  2 +-
 lib/jekyll/plugin_manager.rb |  2 +-
 lib/jekyll/post.rb           |  2 +-
 lib/jekyll/reader.rb         | 38 ++++++++++++++++++++++++++++++++++++
 lib/jekyll/regenerator.rb    |  4 ++--
 lib/jekyll/renderer.rb       |  4 ++--
 lib/jekyll/site.rb           | 32 ++++++++++--------------------
 lib/jekyll/tags/include.rb   |  6 +++---
 test/test_regenerator.rb     |  2 +-
 14 files changed, 67 insertions(+), 40 deletions(-)
 create mode 100644 lib/jekyll/reader.rb

diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 02aa40b1..5beca7a5 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -55,6 +55,7 @@ module Jekyll
   autoload :PluginManager,       'jekyll/plugin_manager'
   autoload :Post,                'jekyll/post'
   autoload :Publisher,           'jekyll/publisher'
+  autoload :Reader,              'jekyll/reader'
   autoload :Regenerator,         'jekyll/regenerator'
   autoload :RelatedPosts,        'jekyll/related_posts'
   autoload :Renderer,            'jekyll/renderer'
diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index b09a7ed9..4b07b2af 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -89,7 +89,7 @@ module Jekyll
     # Returns a String containing th directory name where the collection
     #   is stored on the filesystem.
     def directory
-      @directory ||= site.in_source_dir(relative_directory)
+      @directory ||= site.reader.in_source_dir(relative_directory)
     end
 
     # The full path to the directory containing the collection, with
@@ -102,7 +102,7 @@ module Jekyll
     #   is stored on the filesystem.
     def collection_dir(*files)
       return directory if files.empty?
-      site.in_source_dir(relative_directory, *files)
+      site.reader.in_source_dir(relative_directory, *files)
     end
 
     # Checks whether the directory "exists" for this collection.
diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index d587f8f3..becc78ed 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -43,7 +43,7 @@ module Jekyll
     # Returns nothing.
     def read_yaml(base, name, opts = {})
       begin
-        self.content = File.read(site.in_source_dir(base, name),
+        self.content = File.read(site.reader.in_source_dir(base, name),
                                  merged_file_read_opts(opts))
         if content =~ /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
           self.content = $POSTMATCH
@@ -209,8 +209,8 @@ module Jekyll
 
         # Add layout to dependency tree
         site.regenerator.add_dependency(
-          site.in_source_dir(path),
-          site.in_source_dir(layout.path)
+          site.reader.in_source_dir(path),
+          site.reader.in_source_dir(layout.path)
         )
 
         if layout = layouts[layout.data["layout"]]
diff --git a/lib/jekyll/draft.rb b/lib/jekyll/draft.rb
index 16daefdf..4167f154 100644
--- a/lib/jekyll/draft.rb
+++ b/lib/jekyll/draft.rb
@@ -15,7 +15,7 @@ module Jekyll
 
     # Get the full path to the directory containing the draft files
     def containing_dir(dir)
-      site.in_source_dir(dir, '_drafts')
+      site.reader.in_source_dir(dir, '_drafts')
     end
 
     # The path to the draft source file, relative to the site source
diff --git a/lib/jekyll/layout.rb b/lib/jekyll/layout.rb
index c29f353f..81ba7f81 100644
--- a/lib/jekyll/layout.rb
+++ b/lib/jekyll/layout.rb
@@ -29,7 +29,7 @@ module Jekyll
       @site = site
       @base = base
       @name = name
-      @path = site.in_source_dir(base, name)
+      @path = site.reader.in_source_dir(base, name)
 
       self.data = {}
 
diff --git a/lib/jekyll/layout_reader.rb b/lib/jekyll/layout_reader.rb
index a8466beb..645d3cf8 100644
--- a/lib/jekyll/layout_reader.rb
+++ b/lib/jekyll/layout_reader.rb
@@ -38,7 +38,7 @@ module Jekyll
     end
 
     def layout_directory_inside_source
-      site.in_source_dir(site.config['layouts'])
+      site.reader.in_source_dir(site.config['layouts'])
     end
 
     def layout_directory_in_cwd
diff --git a/lib/jekyll/plugin_manager.rb b/lib/jekyll/plugin_manager.rb
index 64dea860..5abfd47c 100644
--- a/lib/jekyll/plugin_manager.rb
+++ b/lib/jekyll/plugin_manager.rb
@@ -82,7 +82,7 @@ module Jekyll
     # Returns an Array of plugin search paths
     def plugins_path
       if (site.config['plugins'] == Jekyll::Configuration::DEFAULTS['plugins'])
-        [site.in_source_dir(site.config['plugins'])]
+        [site.reader.in_source_dir(site.config['plugins'])]
       else
         Array(site.config['plugins']).map { |d| File.expand_path(d) }
       end
diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
index 780f40f7..5d48d180 100644
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -91,7 +91,7 @@ module Jekyll
 
     # Get the full path to the directory containing the post files
     def containing_dir(dir)
-      site.in_source_dir(dir, '_posts')
+      site.reader.in_source_dir(dir, '_posts')
     end
 
     # Read the YAML frontmatter.
diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
new file mode 100644
index 00000000..10748b04
--- /dev/null
+++ b/lib/jekyll/reader.rb
@@ -0,0 +1,38 @@
+# encoding: UTF-8
+require 'csv'
+
+module Jekyll
+  class Reader
+    # Public: Initialize a new Reader.
+
+    # @return [Object]
+    def initialize(source, dest)
+      @source = source
+      @dest = dest
+    end
+
+    # Public: Prefix a given path with the source directory.
+    #
+    # paths - (optional) path elements to a file or directory within the
+    #         source directory
+    #
+    # Returns a path which is prefixed with the source directory.
+    def in_source_dir(*paths)
+      paths.reduce(@source) do |base, path|
+        Jekyll.sanitized_path(base, path)
+      end
+    end
+
+    # Public: Prefix a given path with the destination directory.
+    #
+    # paths - (optional) path elements to a file or directory within the
+    #         destination directory
+    #
+    # Returns a path which is prefixed with the destination directory.
+    def in_dest_dir(*paths)
+      paths.reduce(@dest) do |base, path|
+        Jekyll.sanitized_path(base, path)
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/jekyll/regenerator.rb b/lib/jekyll/regenerator.rb
index 0616fdd9..07273db6 100644
--- a/lib/jekyll/regenerator.rb
+++ b/lib/jekyll/regenerator.rb
@@ -19,7 +19,7 @@ module Jekyll
       case document
       when Post, Page
         document.asset_file? || document.data['regenerate'] ||
-          modified?(site.in_source_dir(document.relative_path))
+          modified?(site.reader.in_source_dir(document.relative_path))
       when Document
         !document.write? || document.data['regenerate'] || modified?(document.path)
       else
@@ -113,7 +113,7 @@ module Jekyll
     #
     # Returns the String path of the file.
     def metadata_file
-      site.in_source_dir('.jekyll-metadata')
+      site.reader.in_source_dir('.jekyll-metadata')
     end
 
     # Check if metadata has been disabled
diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index f25ca343..fd58bff9 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -141,8 +141,8 @@ module Jekyll
 
         # Add layout to dependency tree
         site.regenerator.add_dependency(
-          site.in_source_dir(document.path),
-          site.in_source_dir(layout.path)
+          site.reader.in_source_dir(document.path),
+          site.reader.in_source_dir(layout.path)
         ) if document.write?
 
         if layout = site.layouts[layout.data["layout"]]
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index aadfb8d0..d8a1d7bf 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -10,7 +10,7 @@ module Jekyll
                   :show_drafts, :keep_files, :baseurl, :data, :file_read_opts,
                   :gems, :plugin_manager
 
-    attr_accessor :converters, :generators
+    attr_accessor :converters, :generators, :reader
     attr_reader   :regenerator
 
     # Public: Initialize a new Site.
@@ -28,6 +28,8 @@ module Jekyll
       @source              = File.expand_path(config['source']).freeze
       @dest                = File.expand_path(config['destination']).freeze
 
+      @reader = Reader.new(@source,@dest);
+
       # Initialize incremental regenerator
       @regenerator = Regenerator.new(self)
 
@@ -97,18 +99,6 @@ module Jekyll
       end
     end
 
-    # Public: Prefix a given path with the source directory.
-    #
-    # paths - (optional) path elements to a file or directory within the
-    #         source directory
-    #
-    # Returns a path which is prefixed with the source directory.
-    def in_source_dir(*paths)
-      paths.reduce(source) do |base, path|
-        Jekyll.sanitized_path(base, path)
-      end
-    end
-
     # Public: Prefix a given path with the destination directory.
     #
     # paths - (optional) path elements to a file or directory within the
@@ -116,9 +106,7 @@ module Jekyll
     #
     # Returns a path which is prefixed with the destination directory.
     def in_dest_dir(*paths)
-      paths.reduce(dest) do |base, path|
-        Jekyll.sanitized_path(base, path)
-      end
+      reader.in_dest_dir(*paths)
     end
 
     # The list of collections and their corresponding Jekyll::Collection instances.
@@ -165,7 +153,7 @@ module Jekyll
     #
     # Returns nothing.
     def read_directories(dir = '')
-      base = in_source_dir(dir)
+      base = reader.in_source_dir(dir)
       entries = Dir.chdir(base) { filter_entries(Dir.entries('.'), base) }
 
       read_posts(dir)
@@ -174,7 +162,7 @@ module Jekyll
       limit_posts! if limit_posts > 0 # limit the posts if :limit_posts option is set
 
       entries.each do |f|
-        f_abs = in_source_dir(base, f)
+        f_abs = reader.in_source_dir(base, f)
         if File.directory?(f_abs)
           f_rel = File.join(dir, f)
           read_directories(f_rel) unless dest.sub(/\/$/, '') == f_abs
@@ -232,7 +220,7 @@ module Jekyll
     #
     # Returns nothing
     def read_data(dir)
-      base = in_source_dir(dir)
+      base = reader.in_source_dir(dir)
       read_data_to(base, self.data)
     end
 
@@ -251,7 +239,7 @@ module Jekyll
       end
 
       entries.each do |entry|
-        path = in_source_dir(dir, entry)
+        path = reader.in_source_dir(dir, entry)
         next if File.symlink?(path) && safe
 
         key = sanitize_filename(File.basename(entry, '.*'))
@@ -454,10 +442,10 @@ module Jekyll
     #
     # Returns the list of entries to process
     def get_entries(dir, subfolder)
-      base = in_source_dir(dir, subfolder)
+      base = reader.in_source_dir(dir, subfolder)
       return [] unless File.exist?(base)
       entries = Dir.chdir(base) { filter_entries(Dir['**/*'], base) }
-      entries.delete_if { |e| File.directory?(in_source_dir(base, e)) }
+      entries.delete_if { |e| File.directory?(reader.in_source_dir(base, e)) }
     end
 
     # Aggregate post information
diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index b809ffe7..fcac41b2 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -117,7 +117,7 @@ eos
         # Add include to dependency tree
         if context.registers[:page] and context.registers[:page].has_key? "path"
           site.regenerator.add_dependency(
-            site.in_source_dir(context.registers[:page]["path"]),
+            site.reader.in_source_dir(context.registers[:page]["path"]),
             path
           )
         end
@@ -135,7 +135,7 @@ eos
       end
 
       def resolved_includes_dir(context)
-        context.registers[:site].in_source_dir(@includes_dir)
+        context.registers[:site].reader.in_source_dir(@includes_dir)
       end
 
       def validate_path(path, dir, safe)
@@ -170,7 +170,7 @@ eos
       end
 
       def resolved_includes_dir(context)
-        context.registers[:site].in_source_dir(page_path(context))
+        context.registers[:site].reader.in_source_dir(page_path(context))
       end
     end
   end
diff --git a/test/test_regenerator.rb b/test/test_regenerator.rb
index 15819487..cc505e39 100644
--- a/test/test_regenerator.rb
+++ b/test/test_regenerator.rb
@@ -63,7 +63,7 @@ class TestRegenerator < JekyllUnitTest
       }))
 
       @site.process
-      @path = @site.in_source_dir(@site.pages.first.path)
+      @path = @site.reader.in_source_dir(@site.pages.first.path)
       @regenerator = @site.regenerator
     end
 

From c836ec613d9be80e664b9b0abdcaf37c15f649fb Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Wed, 4 Mar 2015 19:21:24 +0100
Subject: [PATCH 02/24] Extracted `in_dest_dir` from site.rb into reader.rb

 - Extracted in_dest_dir from site.rb.
 - Updated References.
 - Ran Tests.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll/cleaner.rb     |  4 ++--
 lib/jekyll/document.rb    |  4 ++--
 lib/jekyll/page.rb        |  2 +-
 lib/jekyll/post.rb        |  2 +-
 lib/jekyll/site.rb        | 10 ----------
 lib/jekyll/static_file.rb |  2 +-
 6 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/lib/jekyll/cleaner.rb b/lib/jekyll/cleaner.rb
index a8b269f4..4c93411d 100644
--- a/lib/jekyll/cleaner.rb
+++ b/lib/jekyll/cleaner.rb
@@ -36,7 +36,7 @@ module Jekyll
     # Returns a Set with the file paths
     def existing_files
       files = Set.new
-      Dir.glob(site.in_dest_dir("**", "*"), File::FNM_DOTMATCH) do |file|
+      Dir.glob(site.reader.in_dest_dir("**", "*"), File::FNM_DOTMATCH) do |file|
         files << file unless file =~ /\/\.{1,2}$/ || file =~ keep_file_regex || keep_dirs.include?(file)
       end
       files
@@ -83,7 +83,7 @@ module Jekyll
     #
     # Returns a Set with the directory paths
     def keep_dirs
-      site.keep_files.map { |file| parent_dirs(site.in_dest_dir(file)) }.flatten.to_set
+      site.keep_files.map { |file| parent_dirs(site.reader.in_dest_dir(file)) }.flatten.to_set
     end
 
     # Private: Creates a regular expression from the config's keep_files array
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index cd407dfa..5419647c 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -162,8 +162,8 @@ module Jekyll
     #
     # Returns the full path to the output file of this document.
     def destination(base_directory)
-      dest = site.in_dest_dir(base_directory)
-      path = site.in_dest_dir(dest, URL.unescape_path(url))
+      dest = site.reader.in_dest_dir(base_directory)
+      path = site.reader.in_dest_dir(dest, URL.unescape_path(url))
       path = File.join(path, "index.html") if url.end_with?("/")
       path << output_ext unless path.end_with?(output_ext)
       path
diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index ca824245..75ca190c 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -140,7 +140,7 @@ module Jekyll
     #
     # Returns the destination file path String.
     def destination(dest)
-      path = site.in_dest_dir(dest, URL.unescape_path(url))
+      path = site.reader.in_dest_dir(dest, URL.unescape_path(url))
       path = File.join(path, "index.html") if url.end_with?("/")
       path << output_ext unless path.end_with?(output_ext)
       path
diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
index 5d48d180..c80a35e4 100644
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -278,7 +278,7 @@ module Jekyll
     # Returns destination file path String.
     def destination(dest)
       # The url needs to be unescaped in order to preserve the correct filename
-      path = site.in_dest_dir(dest, URL.unescape_path(url))
+      path = site.reader.in_dest_dir(dest, URL.unescape_path(url))
       path = File.join(path, "index.html") if self.url.end_with?("/")
       path << output_ext unless path.end_with?(output_ext)
       path
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index d8a1d7bf..9b71db3b 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -99,16 +99,6 @@ module Jekyll
       end
     end
 
-    # Public: Prefix a given path with the destination directory.
-    #
-    # paths - (optional) path elements to a file or directory within the
-    #         destination directory
-    #
-    # Returns a path which is prefixed with the destination directory.
-    def in_dest_dir(*paths)
-      reader.in_dest_dir(*paths)
-    end
-
     # The list of collections and their corresponding Jekyll::Collection instances.
     # If config['collections'] is set, a new instance is created for each item in the collection.
     # If config['collections'] is not set, a new hash is returned.
diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index b83f4fae..cb1b3079 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -35,7 +35,7 @@ module Jekyll
     #
     # Returns destination file path.
     def destination(dest)
-      @site.in_dest_dir(*[dest, destination_rel_dir, @name].compact)
+      @site.reader.in_dest_dir(*[dest, destination_rel_dir, @name].compact)
     end
 
     def destination_rel_dir

From 05bbcddb29885d8f1b19ec9f5d0874de63fc4c98 Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Wed, 4 Mar 2015 19:45:23 +0100
Subject: [PATCH 03/24] Extracted `filter_entries` from site.rb into reader.rb

 - Extracted
 - Updated References
 - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll/reader.rb      | 24 +++++++++++++++++-------
 lib/jekyll/site.rb        | 18 +++---------------
 test/test_entry_filter.rb | 12 ++++++------
 3 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index 10748b04..8e898388 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -3,12 +3,10 @@ require 'csv'
 
 module Jekyll
   class Reader
-    # Public: Initialize a new Reader.
+    attr_reader :site
 
-    # @return [Object]
-    def initialize(source, dest)
-      @source = source
-      @dest = dest
+    def initialize(site)
+      @site = site
     end
 
     # Public: Prefix a given path with the source directory.
@@ -18,7 +16,7 @@ module Jekyll
     #
     # Returns a path which is prefixed with the source directory.
     def in_source_dir(*paths)
-      paths.reduce(@source) do |base, path|
+      paths.reduce(site.source) do |base, path|
         Jekyll.sanitized_path(base, path)
       end
     end
@@ -30,9 +28,21 @@ module Jekyll
     #
     # Returns a path which is prefixed with the destination directory.
     def in_dest_dir(*paths)
-      paths.reduce(@dest) do |base, path|
+      paths.reduce(site.dest) do |base, path|
         Jekyll.sanitized_path(base, path)
       end
     end
+
+    # Filter out any files/directories that are hidden or backup files (start
+    # with "." or "#" or end with "~"), or contain site content (start with "_"),
+    # or are excluded in the site configuration, unless they are web server
+    # files such as '.htaccess'.
+    #
+    # entries - The Array of String file/directory entries to filter.
+    #
+    # Returns the Array of filtered entries.
+    def filter_entries(entries, base_directory = nil)
+      EntryFilter.new(site, base_directory).filter(entries)
+    end
   end
 end
\ No newline at end of file
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 9b71db3b..4936e177 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -28,7 +28,7 @@ module Jekyll
       @source              = File.expand_path(config['source']).freeze
       @dest                = File.expand_path(config['destination']).freeze
 
-      @reader = Reader.new(@source,@dest);
+      @reader = Jekyll::Reader.new(self)
 
       # Initialize incremental regenerator
       @regenerator = Regenerator.new(self)
@@ -144,7 +144,7 @@ module Jekyll
     # Returns nothing.
     def read_directories(dir = '')
       base = reader.in_source_dir(dir)
-      entries = Dir.chdir(base) { filter_entries(Dir.entries('.'), base) }
+      entries = Dir.chdir(base) { reader.filter_entries(Dir.entries('.'), base) }
 
       read_posts(dir)
       read_drafts(dir) if show_drafts
@@ -389,18 +389,6 @@ module Jekyll
       }
     end
 
-    # Filter out any files/directories that are hidden or backup files (start
-    # with "." or "#" or end with "~"), or contain site content (start with "_"),
-    # or are excluded in the site configuration, unless they are web server
-    # files such as '.htaccess'.
-    #
-    # entries - The Array of String file/directory entries to filter.
-    #
-    # Returns the Array of filtered entries.
-    def filter_entries(entries, base_directory = nil)
-      EntryFilter.new(self, base_directory).filter(entries)
-    end
-
     # Get the implementation class for the given Converter.
     #
     # klass - The Class of the Converter to fetch.
@@ -434,7 +422,7 @@ module Jekyll
     def get_entries(dir, subfolder)
       base = reader.in_source_dir(dir, subfolder)
       return [] unless File.exist?(base)
-      entries = Dir.chdir(base) { filter_entries(Dir['**/*'], base) }
+      entries = Dir.chdir(base) { reader.filter_entries(Dir['**/*'], base) }
       entries.delete_if { |e| File.directory?(reader.in_source_dir(base, e)) }
     end
 
diff --git a/test/test_entry_filter.rb b/test/test_entry_filter.rb
index e3a7e8c0..341828ba 100644
--- a/test/test_entry_filter.rb
+++ b/test/test_entry_filter.rb
@@ -19,7 +19,7 @@ class TestEntryFilter < JekyllUnitTest
       files = %w[index.html site.css .htaccess vendor]
 
       @site.exclude = excludes + ["exclude*"]
-      assert_equal files, @site.filter_entries(excludes + files + ["excludeA"])
+      assert_equal files, @site.reader.filter_entries(excludes + files + ["excludeA"])
     end
 
     should "filter entries with exclude relative to site source" do
@@ -27,7 +27,7 @@ class TestEntryFilter < JekyllUnitTest
       files = %w[index.html vendor/css .htaccess]
 
       @site.exclude = excludes
-      assert_equal files, @site.filter_entries(excludes + files + ["css"])
+      assert_equal files, @site.reader.filter_entries(excludes + files + ["css"])
     end
 
     should "filter excluded directory and contained files" do
@@ -35,7 +35,7 @@ class TestEntryFilter < JekyllUnitTest
       files = %w[index.html .htaccess]
 
       @site.exclude = excludes
-      assert_equal files, @site.filter_entries(excludes + files + ["css", "css/main.css", "css/vendor.css"])
+      assert_equal files, @site.reader.filter_entries(excludes + files + ["css", "css/main.css", "css/vendor.css"])
     end
 
     should "not filter entries within include" do
@@ -43,20 +43,20 @@ class TestEntryFilter < JekyllUnitTest
       files = %w[index.html _index.html .htaccess includeA]
 
       @site.include = includes
-      assert_equal files, @site.filter_entries(files)
+      assert_equal files, @site.reader.filter_entries(files)
     end
 
     should "filter symlink entries when safe mode enabled" do
       site = Site.new(site_configuration('safe' => true))
       stub(File).symlink?('symlink.js') {true}
       files = %w[symlink.js]
-      assert_equal [], site.filter_entries(files)
+      assert_equal [], site.reader.filter_entries(files)
     end
 
     should "not filter symlink entries when safe mode disabled" do
       stub(File).symlink?('symlink.js') {true}
       files = %w[symlink.js]
-      assert_equal files, @site.filter_entries(files)
+      assert_equal files, @site.reader.filter_entries(files)
     end
 
     should "not include symlinks in safe mode" do

From 6e06fd8734c4ea3f9a1858a382cb9cc80699eebe Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Wed, 4 Mar 2015 19:51:44 +0100
Subject: [PATCH 04/24] Extracted `get_entries` from site.rb into reader.rb

 - Extracted
 - Updated References
 - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll/reader.rb | 13 +++++++++++++
 lib/jekyll/site.rb   | 15 +--------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index 8e898388..9d9b2260 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -44,5 +44,18 @@ module Jekyll
     def filter_entries(entries, base_directory = nil)
       EntryFilter.new(site, base_directory).filter(entries)
     end
+
+    # Read the entries from a particular directory for processing
+    #
+    # dir - The String relative path of the directory to read
+    # subfolder - The String directory to read
+    #
+    # Returns the list of entries to process
+    def get_entries(dir, subfolder)
+      base = in_source_dir(dir, subfolder)
+      return [] unless File.exist?(base)
+      entries = Dir.chdir(base) { filter_entries(Dir['**/*'], base) }
+      entries.delete_if { |e| File.directory?(in_source_dir(base, e)) }
+    end
   end
 end
\ No newline at end of file
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 4936e177..40659d22 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -199,7 +199,7 @@ module Jekyll
     end
 
     def read_content(dir, magic_dir, klass)
-      get_entries(dir, magic_dir).map do |entry|
+      reader.get_entries(dir, magic_dir).map do |entry|
         klass.new(self, source, dir, entry) if klass.valid?(entry)
       end.reject do |entry|
         entry.nil?
@@ -413,19 +413,6 @@ module Jekyll
       end
     end
 
-    # Read the entries from a particular directory for processing
-    #
-    # dir - The String relative path of the directory to read
-    # subfolder - The String directory to read
-    #
-    # Returns the list of entries to process
-    def get_entries(dir, subfolder)
-      base = reader.in_source_dir(dir, subfolder)
-      return [] unless File.exist?(base)
-      entries = Dir.chdir(base) { reader.filter_entries(Dir['**/*'], base) }
-      entries.delete_if { |e| File.directory?(reader.in_source_dir(base, e)) }
-    end
-
     # Aggregate post information
     #
     # post - The Post object to aggregate information for

From ddfecb0f538adde02028c668caada8ae8bf9b14c Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Wed, 4 Mar 2015 19:55:54 +0100
Subject: [PATCH 05/24] Extracted `read_data_file` from site.rb into reader.rb

 - Extracted
 - Updated References
 - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll/reader.rb | 16 ++++++++++++++++
 lib/jekyll/site.rb   | 17 +----------------
 test/test_site.rb    |  2 +-
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index 9d9b2260..d8f6eac4 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -57,5 +57,21 @@ module Jekyll
       entries = Dir.chdir(base) { filter_entries(Dir['**/*'], base) }
       entries.delete_if { |e| File.directory?(in_source_dir(base, e)) }
     end
+
+
+    # Determines how to read a data file.
+    #
+    # Returns the contents of the data file.
+    def read_data_file(path)
+      case File.extname(path).downcase
+        when '.csv'
+          CSV.read(path, {
+                           :headers => true,
+                           :encoding => config['encoding']
+                       }).map(&:to_hash)
+        else
+          SafeYAML.load_file(path)
+      end
+    end
   end
 end
\ No newline at end of file
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 40659d22..ff964d7e 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -236,26 +236,11 @@ module Jekyll
         if File.directory?(path)
           read_data_to(path, data[key] = {})
         else
-          data[key] = read_data_file(path)
+          data[key] = reader.read_data_file(path)
         end
       end
     end
 
-    # Determines how to read a data file.
-    #
-    # Returns the contents of the data file.
-    def read_data_file(path)
-      case File.extname(path).downcase
-      when '.csv'
-        CSV.read(path, {
-          :headers => true,
-          :encoding => config['encoding']
-        }).map(&:to_hash)
-      else
-        SafeYAML.load_file(path)
-      end
-    end
-
     # Read in all collections specified in the configuration
     #
     # Returns nothing.
diff --git a/test/test_site.rb b/test/test_site.rb
index c460d873..2e0adbbf 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -369,7 +369,7 @@ class TestSite < JekyllUnitTest
         site = Site.new(site_configuration)
         site.process
 
-        file_content = site.read_data_file(source_dir('_data', 'members.yaml'))
+        file_content = site.reader.read_data_file(source_dir('_data', 'members.yaml'))
 
         assert_equal site.data['members'], file_content
         assert_equal site.site_payload['site']['data']['members'], file_content

From e586105b46a8c8369899660a316b00112466f654 Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Wed, 4 Mar 2015 20:01:27 +0100
Subject: [PATCH 06/24] Extracted `sanitize_filename` from site.rb into
 reader.rb

 - Extracted
 - Updated References
 - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll/reader.rb | 6 ++++++
 lib/jekyll/site.rb   | 8 +-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index d8f6eac4..86edde60 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -73,5 +73,11 @@ module Jekyll
           SafeYAML.load_file(path)
       end
     end
+
+    def sanitize_filename(name)
+      name.gsub!(/[^\w\s_-]+/, '')
+      name.gsub!(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2')
+      name.gsub(/\s+/, '_')
+    end
   end
 end
\ No newline at end of file
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index ff964d7e..f708f095 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -232,7 +232,7 @@ module Jekyll
         path = reader.in_source_dir(dir, entry)
         next if File.symlink?(path) && safe
 
-        key = sanitize_filename(File.basename(entry, '.*'))
+        key = reader.sanitize_filename(File.basename(entry, '.*'))
         if File.directory?(path)
           read_data_to(path, data[key] = {})
         else
@@ -464,11 +464,5 @@ module Jekyll
     def site_cleaner
       @site_cleaner ||= Cleaner.new(self)
     end
-
-    def sanitize_filename(name)
-      name.gsub!(/[^\w\s_-]+/, '')
-      name.gsub!(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2')
-      name.gsub(/\s+/, '_')
-    end
   end
 end

From 5b0e2a294df5ef01544a4849566c3234c2abf5d6 Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Wed, 4 Mar 2015 20:05:10 +0100
Subject: [PATCH 07/24] Extracted `read_data_to` from site.rb into reader.rb

 - Extracted
 - Updated References
 - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll/reader.rb | 27 +++++++++++++++++++++++++++
 lib/jekyll/site.rb   | 29 +----------------------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index 86edde60..1558197b 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -74,6 +74,33 @@ module Jekyll
       end
     end
 
+    # Read and parse all yaml files under <dir> and add them to the
+    # <data> variable.
+    #
+    # dir - The string absolute path of the directory to read.
+    # data - The variable to which data will be added.
+    #
+    # Returns nothing
+    def read_data_to(dir, data)
+      return unless File.directory?(dir) && (!site.safe || !File.symlink?(dir))
+
+      entries = Dir.chdir(dir) do
+        Dir['*.{yaml,yml,json,csv}'] + Dir['*'].select { |fn| File.directory?(fn) }
+      end
+
+      entries.each do |entry|
+        path = in_source_dir(dir, entry)
+        next if File.symlink?(path) && site.safe
+
+        key = sanitize_filename(File.basename(entry, '.*'))
+        if File.directory?(path)
+          read_data_to(path, data[key] = {})
+        else
+          data[key] = read_data_file(path)
+        end
+      end
+    end
+
     def sanitize_filename(name)
       name.gsub!(/[^\w\s_-]+/, '')
       name.gsub!(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2')
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index f708f095..d7186420 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -211,34 +211,7 @@ module Jekyll
     # Returns nothing
     def read_data(dir)
       base = reader.in_source_dir(dir)
-      read_data_to(base, self.data)
-    end
-
-    # Read and parse all yaml files under <dir> and add them to the
-    # <data> variable.
-    #
-    # dir - The string absolute path of the directory to read.
-    # data - The variable to which data will be added.
-    #
-    # Returns nothing
-    def read_data_to(dir, data)
-      return unless File.directory?(dir) && (!safe || !File.symlink?(dir))
-
-      entries = Dir.chdir(dir) do
-        Dir['*.{yaml,yml,json,csv}'] + Dir['*'].select { |fn| File.directory?(fn) }
-      end
-
-      entries.each do |entry|
-        path = reader.in_source_dir(dir, entry)
-        next if File.symlink?(path) && safe
-
-        key = reader.sanitize_filename(File.basename(entry, '.*'))
-        if File.directory?(path)
-          read_data_to(path, data[key] = {})
-        else
-          data[key] = reader.read_data_file(path)
-        end
-      end
+      reader.read_data_to(base, self.data)
     end
 
     # Read in all collections specified in the configuration

From 537235c38b52297741751a0d8951621b039dd5f4 Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Wed, 4 Mar 2015 20:07:53 +0100
Subject: [PATCH 08/24] Extracted `read_data` from site.rb into reader.rb

 - Extracted
 - Updated References
 - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll/reader.rb |  8 ++++++++
 lib/jekyll/site.rb   | 10 +---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index 1558197b..fa9bc239 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -74,6 +74,14 @@ module Jekyll
       end
     end
 
+    # Read and parse all yaml files under <source>/<dir>
+    #
+    # Returns nothing
+    def read_data(dir)
+      base = in_source_dir(dir)
+      read_data_to(base, site.data)
+    end
+
     # Read and parse all yaml files under <dir> and add them to the
     # <data> variable.
     #
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index d7186420..c19ba3b1 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -131,7 +131,7 @@ module Jekyll
     def read
       self.layouts = LayoutReader.new(self).read
       read_directories
-      read_data(config['data_source'])
+      reader.read_data(config['data_source'])
       read_collections
     end
 
@@ -206,14 +206,6 @@ module Jekyll
       end
     end
 
-    # Read and parse all yaml files under <source>/<dir>
-    #
-    # Returns nothing
-    def read_data(dir)
-      base = reader.in_source_dir(dir)
-      reader.read_data_to(base, self.data)
-    end
-
     # Read in all collections specified in the configuration
     #
     # Returns nothing.

From 67a2369854fb07b79a1ca5dcfb57b4bdef8ace74 Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Wed, 4 Mar 2015 20:11:27 +0100
Subject: [PATCH 09/24] Extracted `read_content` from site.rb into reader.rb

 - Extracted
 - Updated References
 - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll/reader.rb |  8 ++++++++
 lib/jekyll/site.rb   | 12 ++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index fa9bc239..a77b74ac 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -74,6 +74,14 @@ module Jekyll
       end
     end
 
+    def read_content(dir, magic_dir, klass)
+      get_entries(dir, magic_dir).map do |entry|
+        klass.new(site, site.source, dir, entry) if klass.valid?(entry)
+      end.reject do |entry|
+        entry.nil?
+      end
+    end
+
     # Read and parse all yaml files under <source>/<dir>
     #
     # Returns nothing
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index c19ba3b1..d95e5dcc 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -175,7 +175,7 @@ module Jekyll
     #
     # Returns nothing.
     def read_posts(dir)
-      posts = read_content(dir, '_posts', Post)
+      posts = reader.read_content(dir, '_posts', Post)
 
       posts.each do |post|
         aggregate_post_info(post) if publisher.publish?(post)
@@ -189,7 +189,7 @@ module Jekyll
     #
     # Returns nothing.
     def read_drafts(dir)
-      drafts = read_content(dir, '_drafts', Draft)
+      drafts = reader.read_content(dir, '_drafts', Draft)
 
       drafts.each do |draft|
         if draft.published?
@@ -198,14 +198,6 @@ module Jekyll
       end
     end
 
-    def read_content(dir, magic_dir, klass)
-      reader.get_entries(dir, magic_dir).map do |entry|
-        klass.new(self, source, dir, entry) if klass.valid?(entry)
-      end.reject do |entry|
-        entry.nil?
-      end
-    end
-
     # Read in all collections specified in the configuration
     #
     # Returns nothing.

From 29169aa8585e4b15f1d840b2f2c6026177ae9597 Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Wed, 4 Mar 2015 20:16:31 +0100
Subject: [PATCH 10/24] Extracted `aggregate_post_info` from site.rb into
 reader.rb

  - Extracted
  - Updated References
  - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll/reader.rb |  9 +++++++++
 lib/jekyll/site.rb   | 13 ++-----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index a77b74ac..7c34ac33 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -122,5 +122,14 @@ module Jekyll
       name.gsub!(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2')
       name.gsub(/\s+/, '_')
     end
+
+    # Aggregate post information
+    #
+    # post - The Post object to aggregate information for
+    #
+    # Returns nothing
+    def aggregate_post_info(post)
+      site.posts << post
+    end
   end
 end
\ No newline at end of file
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index d95e5dcc..6dae33f7 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -178,7 +178,7 @@ module Jekyll
       posts = reader.read_content(dir, '_posts', Post)
 
       posts.each do |post|
-        aggregate_post_info(post) if publisher.publish?(post)
+        reader.aggregate_post_info(post) if publisher.publish?(post)
       end
     end
 
@@ -193,7 +193,7 @@ module Jekyll
 
       drafts.each do |draft|
         if draft.published?
-          aggregate_post_info(draft)
+          reader.aggregate_post_info(draft)
         end
       end
     end
@@ -355,15 +355,6 @@ module Jekyll
       end
     end
 
-    # Aggregate post information
-    #
-    # post - The Post object to aggregate information for
-    #
-    # Returns nothing
-    def aggregate_post_info(post)
-      posts << post
-    end
-
     def relative_permalinks_deprecation_method
       if config['relative_permalinks'] && has_relative_page?
         Jekyll::Deprecator.deprecation_message "Since v2.0, permalinks for pages" +

From 504c9a34adb1c01a9645f65cc333c92e490f0268 Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Wed, 4 Mar 2015 20:19:39 +0100
Subject: [PATCH 11/24] Extracted `read_drafts` from site.rb into reader.rb

  - Extracted
  - Updated References
  - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll/reader.rb | 16 ++++++++++++++++
 lib/jekyll/site.rb   | 18 +-----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index 7c34ac33..96da74fa 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -74,6 +74,22 @@ module Jekyll
       end
     end
 
+    # Read all the files in <source>/<dir>/_drafts and create a new Post
+    # object with each one.
+    #
+    # dir - The String relative path of the directory to read.
+    #
+    # Returns nothing.
+    def read_drafts(dir)
+      drafts = read_content(dir, '_drafts', Draft)
+
+      drafts.each do |draft|
+        if draft.published?
+          aggregate_post_info(draft)
+        end
+      end
+    end
+
     def read_content(dir, magic_dir, klass)
       get_entries(dir, magic_dir).map do |entry|
         klass.new(site, site.source, dir, entry) if klass.valid?(entry)
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 6dae33f7..5b2854d7 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -147,7 +147,7 @@ module Jekyll
       entries = Dir.chdir(base) { reader.filter_entries(Dir.entries('.'), base) }
 
       read_posts(dir)
-      read_drafts(dir) if show_drafts
+      reader.read_drafts(dir) if show_drafts
       posts.sort!
       limit_posts! if limit_posts > 0 # limit the posts if :limit_posts option is set
 
@@ -182,22 +182,6 @@ module Jekyll
       end
     end
 
-    # Read all the files in <source>/<dir>/_drafts and create a new Post
-    # object with each one.
-    #
-    # dir - The String relative path of the directory to read.
-    #
-    # Returns nothing.
-    def read_drafts(dir)
-      drafts = reader.read_content(dir, '_drafts', Draft)
-
-      drafts.each do |draft|
-        if draft.published?
-          reader.aggregate_post_info(draft)
-        end
-      end
-    end
-
     # Read in all collections specified in the configuration
     #
     # Returns nothing.

From a4adeb446b2feb39e81d1999c68fff81c75f575b Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Wed, 4 Mar 2015 20:22:37 +0100
Subject: [PATCH 12/24] Extracted `read_posts` from site.rb into reader.rb

  - Extracted
  - Updated References
  - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll/reader.rb | 14 ++++++++++++++
 lib/jekyll/site.rb   | 16 +---------------
 test/test_site.rb    |  2 +-
 test/test_tags.rb    |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index 96da74fa..deff185b 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -74,6 +74,20 @@ module Jekyll
       end
     end
 
+    # Read all the files in <source>/<dir>/_posts and create a new Post
+    # object with each one.
+    #
+    # dir - The String relative path of the directory to read.
+    #
+    # Returns nothing.
+    def read_posts(dir)
+      posts = read_content(dir, '_posts', Post)
+
+      posts.each do |post|
+        aggregate_post_info(post) if site.publisher.publish?(post)
+      end
+    end
+
     # Read all the files in <source>/<dir>/_drafts and create a new Post
     # object with each one.
     #
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 5b2854d7..3dc5884f 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -146,7 +146,7 @@ module Jekyll
       base = reader.in_source_dir(dir)
       entries = Dir.chdir(base) { reader.filter_entries(Dir.entries('.'), base) }
 
-      read_posts(dir)
+      reader.read_posts(dir)
       reader.read_drafts(dir) if show_drafts
       posts.sort!
       limit_posts! if limit_posts > 0 # limit the posts if :limit_posts option is set
@@ -168,20 +168,6 @@ module Jekyll
       static_files.sort_by!(&:relative_path)
     end
 
-    # Read all the files in <source>/<dir>/_posts and create a new Post
-    # object with each one.
-    #
-    # dir - The String relative path of the directory to read.
-    #
-    # Returns nothing.
-    def read_posts(dir)
-      posts = reader.read_content(dir, '_posts', Post)
-
-      posts.each do |post|
-        reader.aggregate_post_info(post) if publisher.publish?(post)
-      end
-    end
-
     # Read in all collections specified in the configuration
     #
     # Returns nothing.
diff --git a/test/test_site.rb b/test/test_site.rb
index 2e0adbbf..c132bdda 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -189,7 +189,7 @@ class TestSite < JekyllUnitTest
     end
 
     should "read posts" do
-      @site.read_posts('')
+      @site.reader.read_posts('')
       posts = Dir[source_dir('_posts', '**', '*')]
       posts.delete_if { |post| File.directory?(post) && !Post.valid?(post) }
       assert_equal posts.size - @num_invalid_posts, @site.posts.size
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 4db4ab85..eb998423 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -13,7 +13,7 @@ class TestTags < JekyllUnitTest
     site = Site.new(Jekyll.configuration)
 
     if override['read_posts']
-      site.read_posts('')
+      site.reader.read_posts('')
     end
 
     info = { :filters => [Jekyll::Filters], :registers => { :site => site } }

From 9bcad08e3a3f2c3c0eb88f20dec2cf1d8c1c1de9 Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Wed, 4 Mar 2015 20:35:02 +0100
Subject: [PATCH 13/24] Extracted `limit_posts` from site.rb into reader.rb

  - Extracted
  - Updated References
  - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com
---
 lib/jekyll/reader.rb | 7 +++++++
 lib/jekyll/site.rb   | 7 +------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index deff185b..fa472be2 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -161,5 +161,12 @@ module Jekyll
     def aggregate_post_info(post)
       site.posts << post
     end
+
+
+    def limit_posts()
+      limit = site.posts.length < site.limit_posts ? site.posts.length : site.limit_posts
+      site.posts = site.posts[-limit, limit]
+    end
+
   end
 end
\ No newline at end of file
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 3dc5884f..ce2374d4 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -149,7 +149,7 @@ module Jekyll
       reader.read_posts(dir)
       reader.read_drafts(dir) if show_drafts
       posts.sort!
-      limit_posts! if limit_posts > 0 # limit the posts if :limit_posts option is set
+      reader.limit_posts() if limit_posts > 0 # limit the posts if :limit_posts option is set
 
       entries.each do |f|
         f_abs = reader.in_source_dir(base, f)
@@ -374,11 +374,6 @@ module Jekyll
       pages.any? { |page| page.uses_relative_permalinks }
     end
 
-    def limit_posts!
-      limit = posts.length < limit_posts ? posts.length : limit_posts
-      self.posts = posts[-limit, limit]
-    end
-
     def site_cleaner
       @site_cleaner ||= Cleaner.new(self)
     end

From 2857350df1e1f74d5e453f125074760e6ba211e8 Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Wed, 4 Mar 2015 20:51:26 +0100
Subject: [PATCH 14/24] Extracted `read_directories` from site.rb into
 reader.rb

  - Extracted
  - Updated References
  - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com
---
 lib/jekyll/reader.rb      | 33 +++++++++++++++++++++++++++++++++
 lib/jekyll/site.rb        | 35 +----------------------------------
 test/test_entry_filter.rb |  4 ++--
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index fa472be2..689d1f30 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -74,6 +74,39 @@ module Jekyll
       end
     end
 
+    # Recursively traverse directories to find posts, pages and static files
+    # that will become part of the site according to the rules in
+    # filter_entries.
+    #
+    # dir - The String relative path of the directory to read. Default: ''.
+    #
+    # Returns nothing.
+    def read_directories(dir = '')
+      base = in_source_dir(dir)
+      entries = Dir.chdir(base) { filter_entries(Dir.entries('.'), base) }
+
+      read_posts(dir)
+      read_drafts(dir) if site.show_drafts
+      site.posts.sort!
+      limit_posts() if site.limit_posts > 0 # limit the posts if :limit_posts option is set
+
+      entries.each do |f|
+        f_abs = in_source_dir(base, f)
+        if File.directory?(f_abs)
+          f_rel = File.join(dir, f)
+          read_directories(f_rel) unless site.dest.sub(/\/$/, '') == f_abs
+        elsif Utils.has_yaml_header?(f_abs)
+          page = Page.new(site, site.source, dir, f)
+          site.pages << page if site.publisher.publish?(page)
+        else
+          site.static_files << StaticFile.new(site, site.source, dir, f)
+        end
+      end
+
+      site.pages.sort_by!(&:name)
+      site.static_files.sort_by!(&:relative_path)
+    end
+
     # Read all the files in <source>/<dir>/_posts and create a new Post
     # object with each one.
     #
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index ce2374d4..59ffd5aa 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -130,44 +130,11 @@ module Jekyll
     # Returns nothing.
     def read
       self.layouts = LayoutReader.new(self).read
-      read_directories
+      reader.read_directories
       reader.read_data(config['data_source'])
       read_collections
     end
 
-    # Recursively traverse directories to find posts, pages and static files
-    # that will become part of the site according to the rules in
-    # filter_entries.
-    #
-    # dir - The String relative path of the directory to read. Default: ''.
-    #
-    # Returns nothing.
-    def read_directories(dir = '')
-      base = reader.in_source_dir(dir)
-      entries = Dir.chdir(base) { reader.filter_entries(Dir.entries('.'), base) }
-
-      reader.read_posts(dir)
-      reader.read_drafts(dir) if show_drafts
-      posts.sort!
-      reader.limit_posts() if limit_posts > 0 # limit the posts if :limit_posts option is set
-
-      entries.each do |f|
-        f_abs = reader.in_source_dir(base, f)
-        if File.directory?(f_abs)
-          f_rel = File.join(dir, f)
-          read_directories(f_rel) unless dest.sub(/\/$/, '') == f_abs
-        elsif Utils.has_yaml_header?(f_abs)
-          page = Page.new(self, source, dir, f)
-          pages << page if publisher.publish?(page)
-        else
-          static_files << StaticFile.new(self, source, dir, f)
-        end
-      end
-
-      pages.sort_by!(&:name)
-      static_files.sort_by!(&:relative_path)
-    end
-
     # Read in all collections specified in the configuration
     #
     # Returns nothing.
diff --git a/test/test_entry_filter.rb b/test/test_entry_filter.rb
index 341828ba..77fb81ce 100644
--- a/test/test_entry_filter.rb
+++ b/test/test_entry_filter.rb
@@ -62,7 +62,7 @@ class TestEntryFilter < JekyllUnitTest
     should "not include symlinks in safe mode" do
       site = Site.new(site_configuration('safe' => true))
 
-      site.read_directories("symlink-test")
+      site.reader.read_directories("symlink-test")
       assert_equal [], site.pages
       assert_equal [], site.static_files
     end
@@ -70,7 +70,7 @@ class TestEntryFilter < JekyllUnitTest
     should "include symlinks in unsafe mode" do
       site = Site.new(site_configuration)
 
-      site.read_directories("symlink-test")
+      site.reader.read_directories("symlink-test")
       refute_equal [], site.pages
       refute_equal [], site.static_files
     end

From 2f88a0c0a172504a6a03809239a6343153134737 Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Wed, 4 Mar 2015 20:55:53 +0100
Subject: [PATCH 15/24] Extracted `read_collections` from site.rb into
 reader.rb

  - Extracted
  - Updated References
  - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll/reader.rb |  9 +++++++++
 lib/jekyll/site.rb   | 11 +----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index 689d1f30..b0857521 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -180,6 +180,15 @@ module Jekyll
       end
     end
 
+    # Read in all collections specified in the configuration
+    #
+    # Returns nothing.
+    def read_collections
+      site.collections.each do |_, collection|
+        collection.read unless collection.label.eql?("data")
+      end
+    end
+
     def sanitize_filename(name)
       name.gsub!(/[^\w\s_-]+/, '')
       name.gsub!(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2')
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 59ffd5aa..b6904ef9 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -132,16 +132,7 @@ module Jekyll
       self.layouts = LayoutReader.new(self).read
       reader.read_directories
       reader.read_data(config['data_source'])
-      read_collections
-    end
-
-    # Read in all collections specified in the configuration
-    #
-    # Returns nothing.
-    def read_collections
-      collections.each do |_, collection|
-        collection.read unless collection.label.eql?("data")
-      end
+      reader.read_collections
     end
 
     # Run each of the Generators.

From f252a82afccadb0f67001fc1450d71174a478652 Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Wed, 4 Mar 2015 21:00:45 +0100
Subject: [PATCH 16/24] Made the Reader responsible for the actual Reading.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll/reader.rb | 10 ++++++++++
 lib/jekyll/site.rb   |  5 +----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index b0857521..98b2e8aa 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -9,6 +9,16 @@ module Jekyll
       @site = site
     end
 
+    # Read Site data from disk and load it into internal data structures.
+    #
+    # Returns nothing.
+    def read
+      site.layouts = LayoutReader.new(site).read
+      read_directories
+      read_data(site.config['data_source'])
+      read_collections
+    end
+
     # Public: Prefix a given path with the source directory.
     #
     # paths - (optional) path elements to a file or directory within the
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index b6904ef9..ff530834 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -129,10 +129,7 @@ module Jekyll
     #
     # Returns nothing.
     def read
-      self.layouts = LayoutReader.new(self).read
-      reader.read_directories
-      reader.read_data(config['data_source'])
-      reader.read_collections
+      reader.read
     end
 
     # Run each of the Generators.

From 1b796354fb5793b3956bdbe7bc8e47f4ca7c5549 Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Wed, 4 Mar 2015 21:10:26 +0100
Subject: [PATCH 17/24] Added documentation, made method private and fixed
 quotes.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll/reader.rb | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index 98b2e8aa..d66fe2a3 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -98,7 +98,7 @@ module Jekyll
       read_posts(dir)
       read_drafts(dir) if site.show_drafts
       site.posts.sort!
-      limit_posts() if site.limit_posts > 0 # limit the posts if :limit_posts option is set
+      limit_posts if site.limit_posts > 0 # limit the posts if :limit_posts option is set
 
       entries.each do |f|
         f_abs = in_source_dir(base, f)
@@ -147,6 +147,15 @@ module Jekyll
       end
     end
 
+    # Read all the content files from <source>/<dir>/magic_dir
+    #   and return them with the type klass.
+    #
+    # dir - The String relative path of the directory to read.
+    # magic_dir - The String relative directory to <dir>,
+    #   looks for content here.
+    # klass - The return type of the content.
+    #
+    # Returns klass type of content files
     def read_content(dir, magic_dir, klass)
       get_entries(dir, magic_dir).map do |entry|
         klass.new(site, site.source, dir, entry) if klass.valid?(entry)
@@ -195,7 +204,7 @@ module Jekyll
     # Returns nothing.
     def read_collections
       site.collections.each do |_, collection|
-        collection.read unless collection.label.eql?("data")
+        collection.read unless collection.label.eql?('data')
       end
     end
 
@@ -214,8 +223,12 @@ module Jekyll
       site.posts << post
     end
 
+    private
 
-    def limit_posts()
+    # Limits the current posts; removes the posts which exceed the limit_posts
+    #
+    # Returns nothing
+    def limit_posts
       limit = site.posts.length < site.limit_posts ? site.posts.length : site.limit_posts
       site.posts = site.posts[-limit, limit]
     end

From 7114380da7846dd99f3c456d5b1c7f6dea3faa78 Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Wed, 4 Mar 2015 21:37:25 +0100
Subject: [PATCH 18/24] Added and improved documentation, fixed long method
 name.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll/site.rb | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index ff530834..fd1b2661 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -145,7 +145,7 @@ module Jekyll
     #
     # Returns nothing.
     def render
-      relative_permalinks_deprecation_method
+      deprecated_rel_permalink
 
       payload = site_payload
       collections.each do |label, collection|
@@ -280,7 +280,11 @@ module Jekyll
       end
     end
 
-    def relative_permalinks_deprecation_method
+    # Warns the user if permanent links are relative tot the parent
+    # directory. As this is a deprecated function of Jekyll.
+    #
+    # Returns
+    def deprecated_rel_permalink
       if config['relative_permalinks'] && has_relative_page?
         Jekyll::Deprecator.deprecation_message "Since v2.0, permalinks for pages" +
                                             " in subfolders must be relative to the" +
@@ -290,16 +294,23 @@ module Jekyll
       end
     end
 
+    # Get the to be written documents
+    #
+    # Returns an Array of Documents which should be written
     def docs_to_write
       documents.select(&:write?)
     end
 
+    # Get all the documents
+    #
+    # Returns an Array of all Documents
     def documents
       collections.reduce(Set.new) do |docs, (_, collection)|
         docs + collection.docs + collection.files
       end.to_a
     end
 
+
     def each_site_file
       %w(posts pages static_files docs_to_write).each do |type|
         send(type).each do |item|
@@ -308,6 +319,10 @@ module Jekyll
       end
     end
 
+    # Returns the FrontmatterDefaults or creates a new FrontmatterDefaults
+    # if it doesn't already exist.
+    #
+    # Returns The FrontmatterDefaults
     def frontmatter_defaults
       @frontmatter_defaults ||= FrontmatterDefaults.new(self)
     end
@@ -319,16 +334,28 @@ module Jekyll
       override['full_rebuild'] || config['full_rebuild']
     end
 
+    # Returns the publisher or creates a new publisher if it doesn't
+    # already exist.
+    #
+    # Returns The Publisher
     def publisher
       @publisher ||= Publisher.new(self)
     end
 
     private
 
+    # Checks if the site has any pages containing relative links
+    #
+    # Returns a Boolean: true for usage of relateive permalinks, false
+    # if it doesn't
     def has_relative_page?
       pages.any? { |page| page.uses_relative_permalinks }
     end
 
+    # Returns the Cleaner or creates a new Cleaner if it doesn't
+    # already exist.
+    #
+    # Returns The Cleaner
     def site_cleaner
       @site_cleaner ||= Cleaner.new(self)
     end

From 9e1cb96a7e192cf7225591aeb3421e148695072f Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Wed, 4 Mar 2015 22:23:47 +0100
Subject: [PATCH 19/24] Added site reference for encoding configuration.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll/reader.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index d66fe2a3..731937ff 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -77,7 +77,7 @@ module Jekyll
         when '.csv'
           CSV.read(path, {
                            :headers => true,
-                           :encoding => config['encoding']
+                           :encoding => site.config['encoding']
                        }).map(&:to_hash)
         else
           SafeYAML.load_file(path)

From 4b8e3cfdbddeee2fb4634c7e0152780c4801f766 Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Thu, 5 Mar 2015 13:30:29 +0100
Subject: [PATCH 20/24] Moved the in_(source/dest)_dir back to site.rb.

After carefully looking at these two methods, as of right now they do not
belong in the reader, as they should also be used by the writer. Thus the
decision was made to move them back into the class containing the source
and dest fields, site.rb.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll/cleaner.rb        |  4 ++--
 lib/jekyll/collection.rb     |  4 ++--
 lib/jekyll/convertible.rb    |  6 +++---
 lib/jekyll/document.rb       |  4 ++--
 lib/jekyll/draft.rb          |  2 +-
 lib/jekyll/layout.rb         |  2 +-
 lib/jekyll/layout_reader.rb  |  2 +-
 lib/jekyll/page.rb           |  2 +-
 lib/jekyll/plugin_manager.rb |  2 +-
 lib/jekyll/post.rb           |  4 ++--
 lib/jekyll/reader.rb         | 36 ++++++------------------------------
 lib/jekyll/regenerator.rb    |  4 ++--
 lib/jekyll/renderer.rb       |  4 ++--
 lib/jekyll/site.rb           | 24 ++++++++++++++++++++++++
 lib/jekyll/static_file.rb    |  2 +-
 lib/jekyll/tags/include.rb   |  6 +++---
 test/test_regenerator.rb     |  2 +-
 17 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/lib/jekyll/cleaner.rb b/lib/jekyll/cleaner.rb
index 4c93411d..a8b269f4 100644
--- a/lib/jekyll/cleaner.rb
+++ b/lib/jekyll/cleaner.rb
@@ -36,7 +36,7 @@ module Jekyll
     # Returns a Set with the file paths
     def existing_files
       files = Set.new
-      Dir.glob(site.reader.in_dest_dir("**", "*"), File::FNM_DOTMATCH) do |file|
+      Dir.glob(site.in_dest_dir("**", "*"), File::FNM_DOTMATCH) do |file|
         files << file unless file =~ /\/\.{1,2}$/ || file =~ keep_file_regex || keep_dirs.include?(file)
       end
       files
@@ -83,7 +83,7 @@ module Jekyll
     #
     # Returns a Set with the directory paths
     def keep_dirs
-      site.keep_files.map { |file| parent_dirs(site.reader.in_dest_dir(file)) }.flatten.to_set
+      site.keep_files.map { |file| parent_dirs(site.in_dest_dir(file)) }.flatten.to_set
     end
 
     # Private: Creates a regular expression from the config's keep_files array
diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index 4b07b2af..b09a7ed9 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -89,7 +89,7 @@ module Jekyll
     # Returns a String containing th directory name where the collection
     #   is stored on the filesystem.
     def directory
-      @directory ||= site.reader.in_source_dir(relative_directory)
+      @directory ||= site.in_source_dir(relative_directory)
     end
 
     # The full path to the directory containing the collection, with
@@ -102,7 +102,7 @@ module Jekyll
     #   is stored on the filesystem.
     def collection_dir(*files)
       return directory if files.empty?
-      site.reader.in_source_dir(relative_directory, *files)
+      site.in_source_dir(relative_directory, *files)
     end
 
     # Checks whether the directory "exists" for this collection.
diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index becc78ed..d587f8f3 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -43,7 +43,7 @@ module Jekyll
     # Returns nothing.
     def read_yaml(base, name, opts = {})
       begin
-        self.content = File.read(site.reader.in_source_dir(base, name),
+        self.content = File.read(site.in_source_dir(base, name),
                                  merged_file_read_opts(opts))
         if content =~ /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
           self.content = $POSTMATCH
@@ -209,8 +209,8 @@ module Jekyll
 
         # Add layout to dependency tree
         site.regenerator.add_dependency(
-          site.reader.in_source_dir(path),
-          site.reader.in_source_dir(layout.path)
+          site.in_source_dir(path),
+          site.in_source_dir(layout.path)
         )
 
         if layout = layouts[layout.data["layout"]]
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 5419647c..cd407dfa 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -162,8 +162,8 @@ module Jekyll
     #
     # Returns the full path to the output file of this document.
     def destination(base_directory)
-      dest = site.reader.in_dest_dir(base_directory)
-      path = site.reader.in_dest_dir(dest, URL.unescape_path(url))
+      dest = site.in_dest_dir(base_directory)
+      path = site.in_dest_dir(dest, URL.unescape_path(url))
       path = File.join(path, "index.html") if url.end_with?("/")
       path << output_ext unless path.end_with?(output_ext)
       path
diff --git a/lib/jekyll/draft.rb b/lib/jekyll/draft.rb
index 4167f154..16daefdf 100644
--- a/lib/jekyll/draft.rb
+++ b/lib/jekyll/draft.rb
@@ -15,7 +15,7 @@ module Jekyll
 
     # Get the full path to the directory containing the draft files
     def containing_dir(dir)
-      site.reader.in_source_dir(dir, '_drafts')
+      site.in_source_dir(dir, '_drafts')
     end
 
     # The path to the draft source file, relative to the site source
diff --git a/lib/jekyll/layout.rb b/lib/jekyll/layout.rb
index 81ba7f81..c29f353f 100644
--- a/lib/jekyll/layout.rb
+++ b/lib/jekyll/layout.rb
@@ -29,7 +29,7 @@ module Jekyll
       @site = site
       @base = base
       @name = name
-      @path = site.reader.in_source_dir(base, name)
+      @path = site.in_source_dir(base, name)
 
       self.data = {}
 
diff --git a/lib/jekyll/layout_reader.rb b/lib/jekyll/layout_reader.rb
index 645d3cf8..a8466beb 100644
--- a/lib/jekyll/layout_reader.rb
+++ b/lib/jekyll/layout_reader.rb
@@ -38,7 +38,7 @@ module Jekyll
     end
 
     def layout_directory_inside_source
-      site.reader.in_source_dir(site.config['layouts'])
+      site.in_source_dir(site.config['layouts'])
     end
 
     def layout_directory_in_cwd
diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index 75ca190c..ca824245 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -140,7 +140,7 @@ module Jekyll
     #
     # Returns the destination file path String.
     def destination(dest)
-      path = site.reader.in_dest_dir(dest, URL.unescape_path(url))
+      path = site.in_dest_dir(dest, URL.unescape_path(url))
       path = File.join(path, "index.html") if url.end_with?("/")
       path << output_ext unless path.end_with?(output_ext)
       path
diff --git a/lib/jekyll/plugin_manager.rb b/lib/jekyll/plugin_manager.rb
index 5abfd47c..64dea860 100644
--- a/lib/jekyll/plugin_manager.rb
+++ b/lib/jekyll/plugin_manager.rb
@@ -82,7 +82,7 @@ module Jekyll
     # Returns an Array of plugin search paths
     def plugins_path
       if (site.config['plugins'] == Jekyll::Configuration::DEFAULTS['plugins'])
-        [site.reader.in_source_dir(site.config['plugins'])]
+        [site.in_source_dir(site.config['plugins'])]
       else
         Array(site.config['plugins']).map { |d| File.expand_path(d) }
       end
diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
index c80a35e4..780f40f7 100644
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -91,7 +91,7 @@ module Jekyll
 
     # Get the full path to the directory containing the post files
     def containing_dir(dir)
-      site.reader.in_source_dir(dir, '_posts')
+      site.in_source_dir(dir, '_posts')
     end
 
     # Read the YAML frontmatter.
@@ -278,7 +278,7 @@ module Jekyll
     # Returns destination file path String.
     def destination(dest)
       # The url needs to be unescaped in order to preserve the correct filename
-      path = site.reader.in_dest_dir(dest, URL.unescape_path(url))
+      path = site.in_dest_dir(dest, URL.unescape_path(url))
       path = File.join(path, "index.html") if self.url.end_with?("/")
       path << output_ext unless path.end_with?(output_ext)
       path
diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index 731937ff..79464d46 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -19,30 +19,6 @@ module Jekyll
       read_collections
     end
 
-    # Public: Prefix a given path with the source directory.
-    #
-    # paths - (optional) path elements to a file or directory within the
-    #         source directory
-    #
-    # Returns a path which is prefixed with the source directory.
-    def in_source_dir(*paths)
-      paths.reduce(site.source) do |base, path|
-        Jekyll.sanitized_path(base, path)
-      end
-    end
-
-    # Public: Prefix a given path with the destination directory.
-    #
-    # paths - (optional) path elements to a file or directory within the
-    #         destination directory
-    #
-    # Returns a path which is prefixed with the destination directory.
-    def in_dest_dir(*paths)
-      paths.reduce(site.dest) do |base, path|
-        Jekyll.sanitized_path(base, path)
-      end
-    end
-
     # Filter out any files/directories that are hidden or backup files (start
     # with "." or "#" or end with "~"), or contain site content (start with "_"),
     # or are excluded in the site configuration, unless they are web server
@@ -62,10 +38,10 @@ module Jekyll
     #
     # Returns the list of entries to process
     def get_entries(dir, subfolder)
-      base = in_source_dir(dir, subfolder)
+      base = site.in_source_dir(dir, subfolder)
       return [] unless File.exist?(base)
       entries = Dir.chdir(base) { filter_entries(Dir['**/*'], base) }
-      entries.delete_if { |e| File.directory?(in_source_dir(base, e)) }
+      entries.delete_if { |e| File.directory?(site.in_source_dir(base, e)) }
     end
 
 
@@ -92,7 +68,7 @@ module Jekyll
     #
     # Returns nothing.
     def read_directories(dir = '')
-      base = in_source_dir(dir)
+      base = site.in_source_dir(dir)
       entries = Dir.chdir(base) { filter_entries(Dir.entries('.'), base) }
 
       read_posts(dir)
@@ -101,7 +77,7 @@ module Jekyll
       limit_posts if site.limit_posts > 0 # limit the posts if :limit_posts option is set
 
       entries.each do |f|
-        f_abs = in_source_dir(base, f)
+        f_abs = site.in_source_dir(base, f)
         if File.directory?(f_abs)
           f_rel = File.join(dir, f)
           read_directories(f_rel) unless site.dest.sub(/\/$/, '') == f_abs
@@ -168,7 +144,7 @@ module Jekyll
     #
     # Returns nothing
     def read_data(dir)
-      base = in_source_dir(dir)
+      base = site.in_source_dir(dir)
       read_data_to(base, site.data)
     end
 
@@ -187,7 +163,7 @@ module Jekyll
       end
 
       entries.each do |entry|
-        path = in_source_dir(dir, entry)
+        path = site.in_source_dir(dir, entry)
         next if File.symlink?(path) && site.safe
 
         key = sanitize_filename(File.basename(entry, '.*'))
diff --git a/lib/jekyll/regenerator.rb b/lib/jekyll/regenerator.rb
index 07273db6..0616fdd9 100644
--- a/lib/jekyll/regenerator.rb
+++ b/lib/jekyll/regenerator.rb
@@ -19,7 +19,7 @@ module Jekyll
       case document
       when Post, Page
         document.asset_file? || document.data['regenerate'] ||
-          modified?(site.reader.in_source_dir(document.relative_path))
+          modified?(site.in_source_dir(document.relative_path))
       when Document
         !document.write? || document.data['regenerate'] || modified?(document.path)
       else
@@ -113,7 +113,7 @@ module Jekyll
     #
     # Returns the String path of the file.
     def metadata_file
-      site.reader.in_source_dir('.jekyll-metadata')
+      site.in_source_dir('.jekyll-metadata')
     end
 
     # Check if metadata has been disabled
diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index fd58bff9..f25ca343 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -141,8 +141,8 @@ module Jekyll
 
         # Add layout to dependency tree
         site.regenerator.add_dependency(
-          site.reader.in_source_dir(document.path),
-          site.reader.in_source_dir(layout.path)
+          site.in_source_dir(document.path),
+          site.in_source_dir(layout.path)
         ) if document.write?
 
         if layout = site.layouts[layout.data["layout"]]
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index fd1b2661..1e902e2d 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -342,6 +342,30 @@ module Jekyll
       @publisher ||= Publisher.new(self)
     end
 
+    # Public: Prefix a given path with the source directory.
+    #
+    # paths - (optional) path elements to a file or directory within the
+    #         source directory
+    #
+    # Returns a path which is prefixed with the source directory.
+    def in_source_dir(*paths)
+      paths.reduce(source) do |base, path|
+        Jekyll.sanitized_path(base, path)
+      end
+    end
+
+    # Public: Prefix a given path with the destination directory.
+    #
+    # paths - (optional) path elements to a file or directory within the
+    #         destination directory
+    #
+    # Returns a path which is prefixed with the destination directory.
+    def in_dest_dir(*paths)
+      paths.reduce(dest) do |base, path|
+        Jekyll.sanitized_path(base, path)
+      end
+    end
+
     private
 
     # Checks if the site has any pages containing relative links
diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index cb1b3079..b83f4fae 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -35,7 +35,7 @@ module Jekyll
     #
     # Returns destination file path.
     def destination(dest)
-      @site.reader.in_dest_dir(*[dest, destination_rel_dir, @name].compact)
+      @site.in_dest_dir(*[dest, destination_rel_dir, @name].compact)
     end
 
     def destination_rel_dir
diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index fcac41b2..b809ffe7 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -117,7 +117,7 @@ eos
         # Add include to dependency tree
         if context.registers[:page] and context.registers[:page].has_key? "path"
           site.regenerator.add_dependency(
-            site.reader.in_source_dir(context.registers[:page]["path"]),
+            site.in_source_dir(context.registers[:page]["path"]),
             path
           )
         end
@@ -135,7 +135,7 @@ eos
       end
 
       def resolved_includes_dir(context)
-        context.registers[:site].reader.in_source_dir(@includes_dir)
+        context.registers[:site].in_source_dir(@includes_dir)
       end
 
       def validate_path(path, dir, safe)
@@ -170,7 +170,7 @@ eos
       end
 
       def resolved_includes_dir(context)
-        context.registers[:site].reader.in_source_dir(page_path(context))
+        context.registers[:site].in_source_dir(page_path(context))
       end
     end
   end
diff --git a/test/test_regenerator.rb b/test/test_regenerator.rb
index cc505e39..15819487 100644
--- a/test/test_regenerator.rb
+++ b/test/test_regenerator.rb
@@ -63,7 +63,7 @@ class TestRegenerator < JekyllUnitTest
       }))
 
       @site.process
-      @path = @site.reader.in_source_dir(@site.pages.first.path)
+      @path = @site.in_source_dir(@site.pages.first.path)
       @regenerator = @site.regenerator
     end
 

From bebd80342e4f17bb9bff7240519a192cf06973bd Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Fri, 6 Mar 2015 12:39:50 +0100
Subject: [PATCH 21/24] Extracted draft, post reader into external classes.

Organized the draft, post and layout reader into the *readers* classes.
Fixed all references and ran tests.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll.rb                             |  4 ++-
 lib/jekyll/reader.rb                      | 39 ++++-------------------
 lib/jekyll/readers/draft_reader.rb        | 20 ++++++++++++
 lib/jekyll/{ => readers}/layout_reader.rb |  0
 lib/jekyll/readers/post_reader.rb         | 20 ++++++++++++
 lib/jekyll/site.rb                        |  2 +-
 test/test_site.rb                         |  2 +-
 test/test_tags.rb                         |  2 +-
 8 files changed, 52 insertions(+), 37 deletions(-)
 create mode 100644 lib/jekyll/readers/draft_reader.rb
 rename lib/jekyll/{ => readers}/layout_reader.rb (100%)
 create mode 100644 lib/jekyll/readers/post_reader.rb

diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 5beca7a5..f524c29f 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -49,7 +49,9 @@ module Jekyll
   autoload :Filters,             'jekyll/filters'
   autoload :FrontmatterDefaults, 'jekyll/frontmatter_defaults'
   autoload :Layout,              'jekyll/layout'
-  autoload :LayoutReader,        'jekyll/layout_reader'
+  autoload :LayoutReader,        'jekyll/readers/layout_reader'
+  autoload :DraftReader,        'jekyll/readers/draft_reader'
+  autoload :PostReader,        'jekyll/readers/post_reader'
   autoload :LogAdapter,          'jekyll/log_adapter'
   autoload :Page,                'jekyll/page'
   autoload :PluginManager,       'jekyll/plugin_manager'
diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index 79464d46..5e44f279 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -71,8 +71,12 @@ module Jekyll
       base = site.in_source_dir(dir)
       entries = Dir.chdir(base) { filter_entries(Dir.entries('.'), base) }
 
-      read_posts(dir)
-      read_drafts(dir) if site.show_drafts
+      site.posts += PostReader.new(site).read(dir)
+
+      if site.show_drafts
+        site.posts += DraftReader.new(site).read(dir)
+      end
+
       site.posts.sort!
       limit_posts if site.limit_posts > 0 # limit the posts if :limit_posts option is set
 
@@ -88,41 +92,10 @@ module Jekyll
           site.static_files << StaticFile.new(site, site.source, dir, f)
         end
       end
-
       site.pages.sort_by!(&:name)
       site.static_files.sort_by!(&:relative_path)
     end
 
-    # Read all the files in <source>/<dir>/_posts and create a new Post
-    # object with each one.
-    #
-    # dir - The String relative path of the directory to read.
-    #
-    # Returns nothing.
-    def read_posts(dir)
-      posts = read_content(dir, '_posts', Post)
-
-      posts.each do |post|
-        aggregate_post_info(post) if site.publisher.publish?(post)
-      end
-    end
-
-    # Read all the files in <source>/<dir>/_drafts and create a new Post
-    # object with each one.
-    #
-    # dir - The String relative path of the directory to read.
-    #
-    # Returns nothing.
-    def read_drafts(dir)
-      drafts = read_content(dir, '_drafts', Draft)
-
-      drafts.each do |draft|
-        if draft.published?
-          aggregate_post_info(draft)
-        end
-      end
-    end
-
     # Read all the content files from <source>/<dir>/magic_dir
     #   and return them with the type klass.
     #
diff --git a/lib/jekyll/readers/draft_reader.rb b/lib/jekyll/readers/draft_reader.rb
new file mode 100644
index 00000000..ac6ea964
--- /dev/null
+++ b/lib/jekyll/readers/draft_reader.rb
@@ -0,0 +1,20 @@
+module Jekyll
+  class DraftReader
+    attr_reader :site, :unfiltered_content
+    def initialize(site)
+      @site = site
+      @unfiltered_content = Array.new
+    end
+
+    # Read all the files in <source>/<dir>/_drafts and create a new Draft
+    # object with each one.
+    #
+    # dir - The String relative path of the directory to read.
+    #
+    # Returns nothing.
+    def read(dir)
+      @unfiltered_content = @site.reader.read_content(dir, '_drafts', Draft)
+      @unfiltered_content.select{ |draft| site.publisher.publish?(draft) }
+    end
+  end
+end
diff --git a/lib/jekyll/layout_reader.rb b/lib/jekyll/readers/layout_reader.rb
similarity index 100%
rename from lib/jekyll/layout_reader.rb
rename to lib/jekyll/readers/layout_reader.rb
diff --git a/lib/jekyll/readers/post_reader.rb b/lib/jekyll/readers/post_reader.rb
new file mode 100644
index 00000000..471f1414
--- /dev/null
+++ b/lib/jekyll/readers/post_reader.rb
@@ -0,0 +1,20 @@
+module Jekyll
+  class PostReader
+    attr_reader :site, :unfiltered_content
+    def initialize(site)
+      @site = site
+      @unfiltered_content = Array.new
+    end
+
+    # Read all the files in <source>/<dir>/_posts and create a new Post
+    # object with each one.
+    #
+    # dir - The String relative path of the directory to read.
+    #
+    # Returns nothing.
+    def read(dir)
+      @unfiltered_content = @site.reader.read_content(dir, '_posts', Post)
+      @unfiltered_content.select{ |post| site.publisher.publish?(post) }
+    end
+  end
+end
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 1e902e2d..af54f088 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -4,7 +4,7 @@ require 'csv'
 module Jekyll
   class Site
     attr_reader   :source, :dest, :config
-    attr_accessor :layouts, :posts, :pages, :static_files,
+    attr_accessor :layouts, :posts, :pages, :static_files, :drafts,
                   :exclude, :include, :lsi, :highlighter, :permalink_style,
                   :time, :future, :unpublished, :safe, :plugins, :limit_posts,
                   :show_drafts, :keep_files, :baseurl, :data, :file_read_opts,
diff --git a/test/test_site.rb b/test/test_site.rb
index c132bdda..e77a5ad1 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -189,7 +189,7 @@ class TestSite < JekyllUnitTest
     end
 
     should "read posts" do
-      @site.reader.read_posts('')
+      @site.posts += PostReader.new(@site).read('')
       posts = Dir[source_dir('_posts', '**', '*')]
       posts.delete_if { |post| File.directory?(post) && !Post.valid?(post) }
       assert_equal posts.size - @num_invalid_posts, @site.posts.size
diff --git a/test/test_tags.rb b/test/test_tags.rb
index eb998423..72d3a5e1 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -13,7 +13,7 @@ class TestTags < JekyllUnitTest
     site = Site.new(Jekyll.configuration)
 
     if override['read_posts']
-      site.reader.read_posts('')
+      site.posts += PostReader.new(site).read('')
     end
 
     info = { :filters => [Jekyll::Filters], :registers => { :site => site } }

From 00cdcbc184b245c76b59adcb771b0fc501f895fe Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Fri, 6 Mar 2015 17:20:25 +0100
Subject: [PATCH 22/24] Separated some more readers from the main reader.rb
 file.

 - Draft Reader
 - Collection Reader
 - Page Reader
 - Post Reader
 - Static File Reader

Fixed references and ran tests.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 History.markdown                              |   9 +-
 lib/jekyll.rb                                 |  10 +-
 lib/jekyll/collection.rb                      |   4 +-
 lib/jekyll/command.rb                         |   2 +
 lib/jekyll/configuration.rb                   |   2 +-
 lib/jekyll/filters.rb                         |   3 +
 lib/jekyll/page.rb                            |  14 +-
 lib/jekyll/reader.rb                          | 211 ++++++------------
 lib/jekyll/readers/draft_reader.rb            |  20 --
 .../readers/dynamic/collection_reader.rb      |  19 ++
 lib/jekyll/readers/dynamic/data_reader.rb     |  69 ++++++
 lib/jekyll/readers/dynamic/draft_reader.rb    |  37 +++
 .../readers/{ => dynamic}/layout_reader.rb    |   0
 lib/jekyll/readers/dynamic/page_reader.rb     |  21 ++
 lib/jekyll/readers/dynamic/post_reader.rb     |  37 +++
 lib/jekyll/readers/post_reader.rb             |  20 --
 .../readers/static/static_file_reader.rb      |  21 ++
 lib/jekyll/site.rb                            |  11 +
 lib/jekyll/url.rb                             |  10 +-
 lib/jekyll/utils.rb                           |  40 ++++
 lib/jekyll/version.rb                         |   2 +-
 lib/site_template/_layouts/post.html          |   2 +-
 site/_docs/history.md                         |   1 +
 site/_docs/plugins.md                         |   6 +-
 test/test_configuration.rb                    |   6 +-
 test/test_document.rb                         |  26 ++-
 test/test_filters.rb                          |   6 +
 test/test_page.rb                             |  54 ++++-
 test/test_site.rb                             |   4 +-
 test/test_utils.rb                            |  14 ++
 30 files changed, 467 insertions(+), 214 deletions(-)
 delete mode 100644 lib/jekyll/readers/draft_reader.rb
 create mode 100644 lib/jekyll/readers/dynamic/collection_reader.rb
 create mode 100644 lib/jekyll/readers/dynamic/data_reader.rb
 create mode 100644 lib/jekyll/readers/dynamic/draft_reader.rb
 rename lib/jekyll/readers/{ => dynamic}/layout_reader.rb (100%)
 create mode 100644 lib/jekyll/readers/dynamic/page_reader.rb
 create mode 100644 lib/jekyll/readers/dynamic/post_reader.rb
 delete mode 100644 lib/jekyll/readers/post_reader.rb
 create mode 100644 lib/jekyll/readers/static/static_file_reader.rb

diff --git a/History.markdown b/History.markdown
index 23f81a0e..9bcf00f8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -11,6 +11,7 @@
   * Move to Rouge as default highlighter (#3323)
   * Mimic GitHub Pages `.html` extension stripping behavior in WEBrick (#3452)
   * Always include file extension on output files (#3490)
+  * Improved permalinks for pages and collections (#3538)
 
 ### Minor Enhancements
 
@@ -46,6 +47,9 @@
   * Docs: document 'ordinal' built-in permalink style (#3532)
   * Upgrade liquid-c to 3.x (#3531)
   * Use consistent syntax for deprecation warning (#3535)
+  * Added build --destination and --source flags (#3418)
+  * Site template: remove unused `page.meta` attribute (#3537)
+  * Improve the error message when sorting null objects (#3520)
 
 ### Bug Fixes
 
@@ -89,6 +93,9 @@
   * Remove trailing whitespace (#3497)
   * Use `fixture_site` for Document tests (#3511)
   * Remove adapters deprecation warning (#3529)
+  * Minor fixes to `url.rb` to follow GitHub style guide (#3544)
+  * Minor changes to resolve deprecation warnings (#3547)
+  * Convert remaining textile test documents to markdown (#3528)
 
 ### Site Enhancements
 
@@ -129,6 +136,7 @@
   * Add jekyll-auto-image generator to the list of third-party plugins (#3489)
   * Replace link to the proposed `picture` element spec (#3530)
   * Add frontmatter date formatting information (#3469)
+  * Improve consistency and clarity of plugins options note (#3546)
 
 ## 2.5.3 / 2014-12-22
 
@@ -293,7 +301,6 @@
   * Allow Travis to 'parallelize' our tests (#2859)
   * Fix test for Liquid rendering in Sass (#2856)
   * Fixing "vertycal" typo in site template's `_base.scss` (#2889)
-  * Convert remaining textile test documents to markdown (#3528)
 
 ### Site Enhancements
 
diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index f524c29f..dc6ba753 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -49,9 +49,13 @@ module Jekyll
   autoload :Filters,             'jekyll/filters'
   autoload :FrontmatterDefaults, 'jekyll/frontmatter_defaults'
   autoload :Layout,              'jekyll/layout'
-  autoload :LayoutReader,        'jekyll/readers/layout_reader'
-  autoload :DraftReader,        'jekyll/readers/draft_reader'
-  autoload :PostReader,        'jekyll/readers/post_reader'
+  autoload :CollectionReader,        'jekyll/readers/dynamic/collection_reader'
+  autoload :DataReader,        'jekyll/readers/dynamic/data_reader'
+  autoload :LayoutReader,        'jekyll/readers/dynamic/layout_reader'
+  autoload :DraftReader,        'jekyll/readers/dynamic/draft_reader'
+  autoload :PostReader,        'jekyll/readers/dynamic/post_reader'
+  autoload :PageReader, 'jekyll/readers/dynamic/page_reader'
+  autoload :StaticFileReader,        'jekyll/readers/static/static_file_reader'
   autoload :LogAdapter,          'jekyll/log_adapter'
   autoload :Page,                'jekyll/page'
   autoload :PluginManager,       'jekyll/plugin_manager'
diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index b09a7ed9..e8740cf6 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -170,7 +170,9 @@ module Jekyll
     #
     # Returns the URL template to render collection's documents at.
     def url_template
-      metadata.fetch('permalink', "/:collection/:path:output_ext")
+      metadata.fetch('permalink') do
+          Utils.add_permalink_suffix("/:collection/:path", site.permalink_style)
+      end
     end
 
     # Extract options for this collection from the site configuration.
diff --git a/lib/jekyll/command.rb b/lib/jekyll/command.rb
index 12fd66e6..a72640fb 100644
--- a/lib/jekyll/command.rb
+++ b/lib/jekyll/command.rb
@@ -49,6 +49,8 @@ module Jekyll
       # Returns nothing
       def add_build_options(c)
         c.option 'config',  '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
+        c.option 'destination', '-d', '--destination DESTINATION', 'The current folder will be generated into DESTINATION'
+        c.option 'source', '-s', '--source SOURCE', 'Custom source directory'
         c.option 'future',  '--future', 'Publishes posts with a future date'
         c.option 'limit_posts', '--limit_posts MAX_POSTS', Integer, 'Limits the number of posts to parse and publish'
         c.option 'watch',   '-w', '--[no-]watch', 'Watch for changes and rebuild'
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index e4855a9d..ca5d4839 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -137,7 +137,7 @@ module Jekyll
       config_files = override.delete('config')
       if config_files.to_s.empty?
         default = %w[yml yaml].find(Proc.new { 'yml' }) do |ext|
-          File.exists? Jekyll.sanitized_path(source(override), "_config.#{ext}")
+          File.exist?(Jekyll.sanitized_path(source(override), "_config.#{ext}"))
         end
         config_files = Jekyll.sanitized_path(source(override), "_config.#{default}")
         @default_config_file = true
diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index d9c84fe8..12d4eb5a 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -222,6 +222,9 @@ module Jekyll
     #
     # Returns the filtered array of objects
     def sort(input, property = nil, nils = "first")
+      if input.nil?
+          raise ArgumentError.new("Cannot sort a null object.")
+      end
       if property.nil?
         input.sort
       else
diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index ca824245..a4ddb698 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -63,16 +63,12 @@ module Jekyll
     #
     # Returns the template String.
     def template
-      if site.permalink_style == :pretty
-        if index? && html?
-          "/:path/"
-        elsif html?
-          "/:path/:basename/"
-        else
-          "/:path/:basename:output_ext"
-        end
-      else
+      if !html?
         "/:path/:basename:output_ext"
+      elsif index?
+        "/:path/"
+      else
+        Utils.add_permalink_suffix("/:path/:basename", site.permalink_style)
       end
     end
 
diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index 5e44f279..51ba2ed5 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -13,10 +13,76 @@ module Jekyll
     #
     # Returns nothing.
     def read
-      site.layouts = LayoutReader.new(site).read
+      @site.layouts = LayoutReader.new(site).read
       read_directories
-      read_data(site.config['data_source'])
-      read_collections
+      @site.data = DataReader.new(site).read(site.config['data_source'])
+      CollectionReader.new(site).read
+    end
+
+    # Recursively traverse directories to find posts, pages and static files
+    # that will become part of the site according to the rules in
+    # filter_entries.
+    #
+    # dir - The String relative path of the directory to read. Default: ''.
+    #
+    # Returns nothing.
+    def read_directories(dir = '')
+      retrieve_posts(dir)
+
+      # Obtain sub-directories in order to recursively read them.
+      base = site.in_source_dir(dir)
+      dot = Dir.chdir(base) { filter_entries(Dir.entries('.'), base) }
+      dot_dirs = dot.select{ |file| File.directory?(@site.in_source_dir(base,file)) }
+      retrieve_dirs(base, dir, dot_dirs)
+
+      dot_files = (dot - dot_dirs)
+
+      # Obtain all the pages.
+      dot_pages = dot_files.select{ |file| Utils.has_yaml_header?(@site.in_source_dir(base,file)) }
+      retrieve_pages(dir, dot_pages)
+
+      # Assume the remaining files to be static files.
+      dot_static_files = dot_files - dot_pages
+      retrieve_static_files(dir, dot_static_files)
+    end
+
+    # Retrieves all the posts(posts/drafts) from the given directory
+    # and add them to the site and sort them.
+    #
+    # Returns nothing.
+    def retrieve_posts(dir)
+      site.posts += PostReader.new(site).read(dir)
+      site.posts += DraftReader.new(site).read(dir) if site.show_drafts
+      site.posts.sort!
+    end
+
+    # Recursively traverse directories with the read_directories function.
+    #
+    # Returns nothing.
+    def retrieve_dirs(base, dir, dot_dirs)
+      dot_dirs.map { |file|
+        dir_path = site.in_source_dir(dir,file)
+        rel_path = File.join(dir, file)
+        @site.reader.read_directories(rel_path) unless @site.dest.sub(/\/$/, '') == dir_path
+      }
+    end
+
+    # Retrieve all the pages from the current directory,
+    # add them to the site and sort them.
+    #
+    # Returns nothing.
+    def retrieve_pages(dir, dot_pages)
+      site.pages += PageReader.new(site, dir).read(dot_pages)
+      site.pages.sort_by!(&:name)
+    end
+
+    # Retrieve all the static files from the current directory,
+    # add them to the site and sort them.
+    #
+    # Returns nothing.
+    def retrieve_static_files(dir, dot_static_files)
+      site.static_files += StaticFileReader.new(site, dir).read(dot_static_files)
+      site.static_files.sort_by!(&:relative_path)
     end
 
     # Filter out any files/directories that are hidden or backup files (start
@@ -43,144 +109,5 @@ module Jekyll
       entries = Dir.chdir(base) { filter_entries(Dir['**/*'], base) }
       entries.delete_if { |e| File.directory?(site.in_source_dir(base, e)) }
     end
-
-
-    # Determines how to read a data file.
-    #
-    # Returns the contents of the data file.
-    def read_data_file(path)
-      case File.extname(path).downcase
-        when '.csv'
-          CSV.read(path, {
-                           :headers => true,
-                           :encoding => site.config['encoding']
-                       }).map(&:to_hash)
-        else
-          SafeYAML.load_file(path)
-      end
-    end
-
-    # Recursively traverse directories to find posts, pages and static files
-    # that will become part of the site according to the rules in
-    # filter_entries.
-    #
-    # dir - The String relative path of the directory to read. Default: ''.
-    #
-    # Returns nothing.
-    def read_directories(dir = '')
-      base = site.in_source_dir(dir)
-      entries = Dir.chdir(base) { filter_entries(Dir.entries('.'), base) }
-
-      site.posts += PostReader.new(site).read(dir)
-
-      if site.show_drafts
-        site.posts += DraftReader.new(site).read(dir)
-      end
-
-      site.posts.sort!
-      limit_posts if site.limit_posts > 0 # limit the posts if :limit_posts option is set
-
-      entries.each do |f|
-        f_abs = site.in_source_dir(base, f)
-        if File.directory?(f_abs)
-          f_rel = File.join(dir, f)
-          read_directories(f_rel) unless site.dest.sub(/\/$/, '') == f_abs
-        elsif Utils.has_yaml_header?(f_abs)
-          page = Page.new(site, site.source, dir, f)
-          site.pages << page if site.publisher.publish?(page)
-        else
-          site.static_files << StaticFile.new(site, site.source, dir, f)
-        end
-      end
-      site.pages.sort_by!(&:name)
-      site.static_files.sort_by!(&:relative_path)
-    end
-
-    # Read all the content files from <source>/<dir>/magic_dir
-    #   and return them with the type klass.
-    #
-    # dir - The String relative path of the directory to read.
-    # magic_dir - The String relative directory to <dir>,
-    #   looks for content here.
-    # klass - The return type of the content.
-    #
-    # Returns klass type of content files
-    def read_content(dir, magic_dir, klass)
-      get_entries(dir, magic_dir).map do |entry|
-        klass.new(site, site.source, dir, entry) if klass.valid?(entry)
-      end.reject do |entry|
-        entry.nil?
-      end
-    end
-
-    # Read and parse all yaml files under <source>/<dir>
-    #
-    # Returns nothing
-    def read_data(dir)
-      base = site.in_source_dir(dir)
-      read_data_to(base, site.data)
-    end
-
-    # Read and parse all yaml files under <dir> and add them to the
-    # <data> variable.
-    #
-    # dir - The string absolute path of the directory to read.
-    # data - The variable to which data will be added.
-    #
-    # Returns nothing
-    def read_data_to(dir, data)
-      return unless File.directory?(dir) && (!site.safe || !File.symlink?(dir))
-
-      entries = Dir.chdir(dir) do
-        Dir['*.{yaml,yml,json,csv}'] + Dir['*'].select { |fn| File.directory?(fn) }
-      end
-
-      entries.each do |entry|
-        path = site.in_source_dir(dir, entry)
-        next if File.symlink?(path) && site.safe
-
-        key = sanitize_filename(File.basename(entry, '.*'))
-        if File.directory?(path)
-          read_data_to(path, data[key] = {})
-        else
-          data[key] = read_data_file(path)
-        end
-      end
-    end
-
-    # Read in all collections specified in the configuration
-    #
-    # Returns nothing.
-    def read_collections
-      site.collections.each do |_, collection|
-        collection.read unless collection.label.eql?('data')
-      end
-    end
-
-    def sanitize_filename(name)
-      name.gsub!(/[^\w\s_-]+/, '')
-      name.gsub!(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2')
-      name.gsub(/\s+/, '_')
-    end
-
-    # Aggregate post information
-    #
-    # post - The Post object to aggregate information for
-    #
-    # Returns nothing
-    def aggregate_post_info(post)
-      site.posts << post
-    end
-
-    private
-
-    # Limits the current posts; removes the posts which exceed the limit_posts
-    #
-    # Returns nothing
-    def limit_posts
-      limit = site.posts.length < site.limit_posts ? site.posts.length : site.limit_posts
-      site.posts = site.posts[-limit, limit]
-    end
-
   end
 end
\ No newline at end of file
diff --git a/lib/jekyll/readers/draft_reader.rb b/lib/jekyll/readers/draft_reader.rb
deleted file mode 100644
index ac6ea964..00000000
--- a/lib/jekyll/readers/draft_reader.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-module Jekyll
-  class DraftReader
-    attr_reader :site, :unfiltered_content
-    def initialize(site)
-      @site = site
-      @unfiltered_content = Array.new
-    end
-
-    # Read all the files in <source>/<dir>/_drafts and create a new Draft
-    # object with each one.
-    #
-    # dir - The String relative path of the directory to read.
-    #
-    # Returns nothing.
-    def read(dir)
-      @unfiltered_content = @site.reader.read_content(dir, '_drafts', Draft)
-      @unfiltered_content.select{ |draft| site.publisher.publish?(draft) }
-    end
-  end
-end
diff --git a/lib/jekyll/readers/dynamic/collection_reader.rb b/lib/jekyll/readers/dynamic/collection_reader.rb
new file mode 100644
index 00000000..04324fa1
--- /dev/null
+++ b/lib/jekyll/readers/dynamic/collection_reader.rb
@@ -0,0 +1,19 @@
+module Jekyll
+  class CollectionReader
+    attr_reader :site, :content
+    def initialize(site)
+      @site = site
+      @content = {}
+    end
+
+    # Read in all collections specified in the configuration
+    #
+    # Returns nothing.
+    def read
+      site.collections.each do |_, collection|
+        collection.read unless collection.label.eql?('data')
+      end
+    end
+
+  end
+end
\ No newline at end of file
diff --git a/lib/jekyll/readers/dynamic/data_reader.rb b/lib/jekyll/readers/dynamic/data_reader.rb
new file mode 100644
index 00000000..e436bff4
--- /dev/null
+++ b/lib/jekyll/readers/dynamic/data_reader.rb
@@ -0,0 +1,69 @@
+module Jekyll
+  class DataReader
+    attr_reader :site, :content
+    def initialize(site)
+      @site = site
+      @content = {}
+    end
+
+    # Read all the files in <source>/<dir>/_drafts and create a new Draft
+    # object with each one.
+    #
+    # dir - The String relative path of the directory to read.
+    #
+    # Returns nothing.
+    def read(dir)
+      base = site.in_source_dir(dir)
+      read_data_to(base, @content)
+      @content
+    end
+
+    # Read and parse all yaml files under <dir> and add them to the
+    # <data> variable.
+    #
+    # dir - The string absolute path of the directory to read.
+    # data - The variable to which data will be added.
+    #
+    # Returns nothing
+    def read_data_to(dir, data)
+      return unless File.directory?(dir) && (!site.safe || !File.symlink?(dir))
+
+      entries = Dir.chdir(dir) do
+        Dir['*.{yaml,yml,json,csv}'] + Dir['*'].select { |fn| File.directory?(fn) }
+      end
+
+      entries.each do |entry|
+        path = @site.in_source_dir(dir, entry)
+        next if File.symlink?(path) && site.safe
+
+        key = sanitize_filename(File.basename(entry, '.*'))
+        if File.directory?(path)
+          read_data_to(path, data[key] = {})
+        else
+          data[key] = read_data_file(path)
+        end
+      end
+    end
+
+    # Determines how to read a data file.
+    #
+    # Returns the contents of the data file.
+    def read_data_file(path)
+      case File.extname(path).downcase
+        when '.csv'
+          CSV.read(path, {
+                           :headers => true,
+                           :encoding => site.config['encoding']
+                       }).map(&:to_hash)
+        else
+          SafeYAML.load_file(path)
+      end
+    end
+
+    def sanitize_filename(name)
+      name.gsub!(/[^\w\s_-]+/, '')
+      name.gsub!(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2')
+      name.gsub(/\s+/, '_')
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/jekyll/readers/dynamic/draft_reader.rb b/lib/jekyll/readers/dynamic/draft_reader.rb
new file mode 100644
index 00000000..d62029b2
--- /dev/null
+++ b/lib/jekyll/readers/dynamic/draft_reader.rb
@@ -0,0 +1,37 @@
+module Jekyll
+  class DraftReader
+    attr_reader :site, :unfiltered_content
+    def initialize(site)
+      @site = site
+      @unfiltered_content = Array.new
+    end
+
+    # Read all the files in <source>/<dir>/_drafts and create a new Draft
+    # object with each one.
+    #
+    # dir - The String relative path of the directory to read.
+    #
+    # Returns nothing.
+    def read(dir)
+      @unfiltered_content = read_content(dir, '_drafts')
+      @unfiltered_content.select{ |draft| site.publisher.publish?(draft) }
+    end
+
+    # Read all the content files from <source>/<dir>/magic_dir
+    #   and return them with the type klass.
+    #
+    # dir - The String relative path of the directory to read.
+    # magic_dir - The String relative directory to <dir>,
+    #   looks for content here.
+    # klass - The return type of the content.
+    #
+    # Returns klass type of content files
+    def read_content(dir, magic_dir)
+      @site.reader.get_entries(dir, magic_dir).map do |entry|
+        Draft.new(site, site.source, dir, entry) if Draft.valid?(entry)
+      end.reject do |entry|
+        entry.nil?
+      end
+    end
+  end
+end
diff --git a/lib/jekyll/readers/layout_reader.rb b/lib/jekyll/readers/dynamic/layout_reader.rb
similarity index 100%
rename from lib/jekyll/readers/layout_reader.rb
rename to lib/jekyll/readers/dynamic/layout_reader.rb
diff --git a/lib/jekyll/readers/dynamic/page_reader.rb b/lib/jekyll/readers/dynamic/page_reader.rb
new file mode 100644
index 00000000..099ebf13
--- /dev/null
+++ b/lib/jekyll/readers/dynamic/page_reader.rb
@@ -0,0 +1,21 @@
+module Jekyll
+  class PageReader
+    attr_reader :site, :dir, :unfiltered_content
+    def initialize(site, dir)
+      @site = site
+      @dir = dir
+      @unfiltered_content = Array.new
+    end
+
+    # Read all the files in <source>/<dir>/ for Yaml header and create a new Page
+    # object for each file.
+    #
+    # dir - The String relative path of the directory to read.
+    #
+    # Returns an array of static pages.
+    def read(files)
+      files.map{ |page| @unfiltered_content << Page.new(@site, @site.source, @dir, page) }
+      @unfiltered_content.select{ |page| site.publisher.publish?(page) }
+    end
+  end
+end
diff --git a/lib/jekyll/readers/dynamic/post_reader.rb b/lib/jekyll/readers/dynamic/post_reader.rb
new file mode 100644
index 00000000..73bdd85d
--- /dev/null
+++ b/lib/jekyll/readers/dynamic/post_reader.rb
@@ -0,0 +1,37 @@
+module Jekyll
+  class PostReader
+    attr_reader :site, :unfiltered_content
+    def initialize(site)
+      @site = site
+      @unfiltered_content = Array.new
+    end
+
+    # Read all the files in <source>/<dir>/_posts and create a new Post
+    # object with each one.
+    #
+    # dir - The String relative path of the directory to read.
+    #
+    # Returns nothing.
+    def read(dir)
+      @unfiltered_content = read_content(dir, '_posts')
+      @unfiltered_content.select{ |post| site.publisher.publish?(post) }
+    end
+
+    # Read all the content files from <source>/<dir>/magic_dir
+    #   and return them with the type klass.
+    #
+    # dir - The String relative path of the directory to read.
+    # magic_dir - The String relative directory to <dir>,
+    #   looks for content here.
+    # klass - The return type of the content.
+    #
+    # Returns klass type of content files
+    def read_content(dir, magic_dir)
+      @site.reader.get_entries(dir, magic_dir).map do |entry|
+        Post.new(site, site.source, dir, entry) if Post.valid?(entry)
+      end.reject do |entry|
+        entry.nil?
+      end
+    end
+  end
+end
diff --git a/lib/jekyll/readers/post_reader.rb b/lib/jekyll/readers/post_reader.rb
deleted file mode 100644
index 471f1414..00000000
--- a/lib/jekyll/readers/post_reader.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-module Jekyll
-  class PostReader
-    attr_reader :site, :unfiltered_content
-    def initialize(site)
-      @site = site
-      @unfiltered_content = Array.new
-    end
-
-    # Read all the files in <source>/<dir>/_posts and create a new Post
-    # object with each one.
-    #
-    # dir - The String relative path of the directory to read.
-    #
-    # Returns nothing.
-    def read(dir)
-      @unfiltered_content = @site.reader.read_content(dir, '_posts', Post)
-      @unfiltered_content.select{ |post| site.publisher.publish?(post) }
-    end
-  end
-end
diff --git a/lib/jekyll/readers/static/static_file_reader.rb b/lib/jekyll/readers/static/static_file_reader.rb
new file mode 100644
index 00000000..279bea46
--- /dev/null
+++ b/lib/jekyll/readers/static/static_file_reader.rb
@@ -0,0 +1,21 @@
+module Jekyll
+  class StaticFileReader
+    attr_reader :site, :dir, :unfiltered_content
+    def initialize(site, dir)
+      @site = site
+      @dir = dir
+      @unfiltered_content = Array.new
+    end
+
+    # Read all the files in <source>/<dir>/ for Yaml header and create a new Page
+    # object for each file.
+    #
+    # dir - The String relative path of the directory to read.
+    #
+    # Returns an array of static files.
+    def read(files)
+      files.map{ |file| @unfiltered_content << StaticFile.new(@site, @site.source, @dir, file)}
+      @unfiltered_content
+    end
+  end
+end
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index af54f088..30564044 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -130,6 +130,7 @@ module Jekyll
     # Returns nothing.
     def read
       reader.read
+      limit_posts!
     end
 
     # Run each of the Generators.
@@ -383,5 +384,15 @@ module Jekyll
     def site_cleaner
       @site_cleaner ||= Cleaner.new(self)
     end
+
+    # Limits the current posts; removes the posts which exceed the limit_posts
+    #
+    # Returns nothing
+    def limit_posts!
+      if limit_posts > 0
+        limit = posts.length < limit_posts ? posts.length : limit_posts
+        self.posts = posts[-limit, limit]
+      end
+    end
   end
 end
diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb
index 60c96507..14b70631 100644
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -44,12 +44,12 @@ module Jekyll
     #
     # Returns the _unsanitized String URL
     def generated_permalink
-      (@generated_permlink ||= generate_url(@permalink)) if @permalink
+      (@generated_permalink ||= generate_url(@permalink)) if @permalink
     end
 
     # Generates a URL from the template
     #
-    # Returns the _unsanitized String URL
+    # Returns the unsanitized String URL
     def generated_url
       @generated_url ||= generate_url(@template)
     end
@@ -57,7 +57,7 @@ module Jekyll
     # Internal: Generate the URL by replacing all placeholders with their
     # respective values in the given template
     #
-    # Returns the _unsanitizied_ String URL
+    # Returns the unsanitized String URL
     def generate_url(template)
       @placeholders.inject(template) do |result, token|
         break result if result.index(':').nil?
@@ -81,7 +81,7 @@ module Jekyll
         .gsub(/\A([^\/])/, '/\1')
 
       # Append a trailing slash to the URL if the unsanitized URL had one
-      url << "/" if in_url[-1].eql?('/')
+      url << "/" if in_url.end_with?("/")
 
       url
     end
@@ -107,7 +107,7 @@ module Jekyll
       #   pct-encoded   = "%" HEXDIG HEXDIG
       #   sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
       #                 / "*" / "+" / "," / ";" / "="
-      URI.escape(path, /[^a-zA-Z\d\-._~!$&\'()*+,;=:@\/]/).encode('utf-8')
+      URI.escape(path, /[^a-zA-Z\d\-._~!$&'()*+,;=:@\/]/).encode('utf-8')
     end
 
     # Unescapes a URL path segment
diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index bba8b148..39302790 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -158,5 +158,45 @@ module Jekyll
         downcase
     end
 
+    # Add an appropriate suffix to template so that it matches the specified
+    # permalink style.
+    #
+    # template - permalink template without trailing slash or file extension
+    # permalink_style - permalink style, either built-in or custom
+    #
+    # The returned permalink template will use the same ending style as
+    # specified in permalink_style.  For example, if permalink_style contains a
+    # trailing slash (or is :pretty, which indirectly has a trailing slash),
+    # then so will the returned template.  If permalink_style has a trailing
+    # ":output_ext" (or is :none, :date, or :ordinal) then so will the returned
+    # template.  Otherwise, template will be returned without modification.
+    #
+    # Examples:
+    #   add_permalink_suffix("/:basename", :pretty)
+    #   # => "/:basename/"
+    #
+    #   add_permalink_suffix("/:basename", :date)
+    #   # => "/:basename:output_ext"
+    #
+    #   add_permalink_suffix("/:basename", "/:year/:month/:title/")
+    #   # => "/:basename/"
+    #
+    #   add_permalink_suffix("/:basename", "/:year/:month/:title")
+    #   # => "/:basename"
+    #
+    # Returns the updated permalink template
+    def add_permalink_suffix(template, permalink_style)
+      case permalink_style
+      when :pretty
+        template << "/"
+      when :date, :ordinal, :none
+        template << ":output_ext"
+      else
+        template << "/" if permalink_style.to_s.end_with?("/")
+        template << ":output_ext" if permalink_style.to_s.end_with?(":output_ext")
+      end
+      template
+    end
+
   end
 end
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 8b67d1cf..64cdaba2 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '3.0.0-beta1'
+  VERSION = '3.0.0.beta2'
 end
diff --git a/lib/site_template/_layouts/post.html b/lib/site_template/_layouts/post.html
index d4f8be3e..3a0fb52e 100644
--- a/lib/site_template/_layouts/post.html
+++ b/lib/site_template/_layouts/post.html
@@ -5,7 +5,7 @@ layout: default
 
   <header class="post-header">
     <h1 class="post-title" itemprop="name headline">{{ page.title }}</h1>
-    <p class="post-meta"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">{{ page.date | date: "%b %-d, %Y" }}</time>{% if page.author %} • <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{{ page.author }}</span></span>{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
+    <p class="post-meta"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">{{ page.date | date: "%b %-d, %Y" }}</time>{% if page.author %} • <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{{ page.author }}</span></span>{% endif %}</p>
   </header>
 
   <div class="post-content" itemprop="articleBody">
diff --git a/site/_docs/history.md b/site/_docs/history.md
index 346dc131..98fb9bb8 100644
--- a/site/_docs/history.md
+++ b/site/_docs/history.md
@@ -191,6 +191,7 @@ permalink: "/docs/history/"
 - Allow Travis to 'parallelize' our tests ([#2859]({{ site.repository }}/issues/2859))
 - Fix test for Liquid rendering in Sass ([#2856]({{ site.repository }}/issues/2856))
 - Fixing "vertycal" typo in site template's `_base.scss` ([#2889]({{ site.repository }}/issues/2889))
+- Convert remaining textile test documents to markdown ([#3528]({{ site.repository }}/issues/3528))
 
 ### Site Enhancements
 {: #site-enhancements-v2-4-0}
diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 9f4afb97..4958add3 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -42,12 +42,12 @@ You have 3 options for installing plugins:
 
 <div class="note info">
   <h5>
-    <code>_plugins</code> and <code>gems</code>
+    <code>_plugins</code>, <code>_config.yml</code> and <code>Gemfile</code>
     can be used simultaneously
   </h5>
   <p>
-    You may use both of the aforementioned plugin options simultaneously in the
-    same site if you so choose. Use of one does not restrict the use of the other
+    You may use any of the aforementioned plugin options simultaneously in the
+    same site if you so choose. Use of one does not restrict the use of the others.
   </p>
 </div>
 
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index 7e14a418..8de8ac29 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -42,12 +42,12 @@ class TestConfiguration < JekyllUnitTest
       assert_equal [source_dir("_config.yml")], @config.config_files(@no_override)
     end
     should "return .yaml if it exists but .yml does not" do
-      mock(File).exists?(source_dir("_config.yml")) { false }
-      mock(File).exists?(source_dir("_config.yaml")) { true }
+      mock(File).exist?(source_dir("_config.yml")) { false }
+      mock(File).exist?(source_dir("_config.yaml")) { true }
       assert_equal [source_dir("_config.yaml")], @config.config_files(@no_override)
     end
     should "return .yml if both .yml and .yaml exist" do
-      mock(File).exists?(source_dir("_config.yml")) { true }
+      mock(File).exist?(source_dir("_config.yml")) { true }
       assert_equal [source_dir("_config.yml")], @config.config_files(@no_override)
     end
     should "return the config if given one config file" do
diff --git a/test/test_document.rb b/test/test_document.rb
index 56d6a671..f8b9db66 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -219,7 +219,31 @@ class TestDocument < JekyllUnitTest
       assert_equal "/slides/test/example-slide-1", @document.url
     end
 
-    should "produce the right destination" do
+    should "produce the right destination file" do
+      assert_equal @dest_file, @document.destination(dest_dir)
+    end
+  end
+
+  context "a document in a collection with pretty permalink style" do
+    setup do
+      @site = fixture_site({
+        "collections" => {
+          "slides" => {
+            "output"    => true,
+          }
+        },
+      })
+      @site.permalink_style = :pretty
+      @site.process
+      @document = @site.collections["slides"].docs[0]
+      @dest_file = dest_dir("slides/example-slide-1/index.html")
+    end
+
+    should "produce the right URL" do
+      assert_equal "/slides/example-slide-1/", @document.url
+    end
+
+    should "produce the right destination file" do
       assert_equal @dest_file, @document.destination(dest_dir)
     end
   end
diff --git a/test/test_filters.rb b/test/test_filters.rb
index eec08564..82d31922 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -280,6 +280,12 @@ class TestFilters < JekyllUnitTest
     end
 
     context "sort filter" do
+      should "raise Exception when input is nil" do
+        err = assert_raises ArgumentError do
+          @filter.sort(nil)
+        end
+        assert_equal "Cannot sort a null object.", err.message
+      end
       should "return sorted numbers" do
         assert_equal [1, 2, 2.2, 3], @filter.sort([3, 2.2, 2, 1])
       end
diff --git a/test/test_page.rb b/test/test_page.rb
index 9918442f..1e4d3da6 100644
--- a/test/test_page.rb
+++ b/test/test_page.rb
@@ -46,7 +46,7 @@ class TestPage < JekyllUnitTest
 
         should "create index url based on filename" do
           @page = setup_page('/contacts', 'index.html')
-          assert_equal "/contacts/index.html", @page.url
+          assert_equal "/contacts/", @page.url
         end
       end
 
@@ -129,6 +129,58 @@ class TestPage < JekyllUnitTest
         end
       end
 
+      context "with date permalink style" do
+        setup do
+          @site.permalink_style = :date
+        end
+
+        should "return url and destination correctly" do
+          @page = setup_page('contacts.html')
+          @dest_file = dest_dir("contacts.html")
+          assert_equal '/contacts.html', @page.url
+          assert_equal @dest_file, @page.destination(dest_dir)
+        end
+      end
+
+      context "with custom permalink style with trailing slash" do
+        setup do
+          @site.permalink_style = "/:title/"
+        end
+
+        should "return url and destination correctly" do
+          @page = setup_page('contacts.html')
+          @dest_file = dest_dir("contacts/index.html")
+          assert_equal '/contacts/', @page.url
+          assert_equal @dest_file, @page.destination(dest_dir)
+        end
+      end
+
+      context "with custom permalink style with file extension" do
+        setup do
+          @site.permalink_style = "/:title:output_ext"
+        end
+
+        should "return url and destination correctly" do
+          @page = setup_page('contacts.html')
+          @dest_file = dest_dir("contacts.html")
+          assert_equal '/contacts.html', @page.url
+          assert_equal @dest_file, @page.destination(dest_dir)
+        end
+      end
+
+      context "with custom permalink style with no extension" do
+        setup do
+          @site.permalink_style = "/:title"
+        end
+
+        should "return url and destination correctly" do
+          @page = setup_page('contacts.html')
+          @dest_file = dest_dir("contacts.html")
+          assert_equal '/contacts', @page.url
+          assert_equal @dest_file, @page.destination(dest_dir)
+        end
+      end
+
       context "with any other permalink style" do
         should "return dir correctly" do
           @site.permalink_style = nil
diff --git a/test/test_site.rb b/test/test_site.rb
index e77a5ad1..ce9cbc95 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -143,7 +143,7 @@ class TestSite < JekyllUnitTest
 
       # simulate destination file deletion
       File.unlink dest
-      refute File.exists?(dest)
+      refute File.exist?(dest)
 
       sleep 1
       @site.process
@@ -369,7 +369,7 @@ class TestSite < JekyllUnitTest
         site = Site.new(site_configuration)
         site.process
 
-        file_content = site.reader.read_data_file(source_dir('_data', 'members.yaml'))
+        file_content = DataReader.new(site).read_data_file(source_dir('_data', 'members.yaml'))
 
         assert_equal site.data['members'], file_content
         assert_equal site.site_payload['site']['data']['members'], file_content
diff --git a/test/test_utils.rb b/test/test_utils.rb
index ddb63d4b..9d4a5a4d 100644
--- a/test/test_utils.rb
+++ b/test/test_utils.rb
@@ -166,4 +166,18 @@ class TestUtils < JekyllUnitTest
     end
   end
 
+  context "The \`Utils.add_permalink_suffix\` method" do
+    should "handle built-in permalink styles" do
+      assert_equal "/:basename/", Utils.add_permalink_suffix("/:basename", :pretty)
+      assert_equal "/:basename:output_ext", Utils.add_permalink_suffix("/:basename", :date)
+      assert_equal "/:basename:output_ext", Utils.add_permalink_suffix("/:basename", :ordinal)
+      assert_equal "/:basename:output_ext", Utils.add_permalink_suffix("/:basename", :none)
+    end
+
+    should "handle custom permalink styles" do
+      assert_equal "/:basename/", Utils.add_permalink_suffix("/:basename", "/:title/")
+      assert_equal "/:basename:output_ext", Utils.add_permalink_suffix("/:basename", "/:title:output_ext")
+      assert_equal "/:basename", Utils.add_permalink_suffix("/:basename", "/:title")
+    end
+  end
 end

From 324748a5a679a2532baff91ac0d30c44a4f9f072 Mon Sep 17 00:00:00 2001
From: Martin Rogalla <martin@martinrogalla.com>
Date: Thu, 19 Mar 2015 14:56:00 +0100
Subject: [PATCH 23/24] Added corrections as suggested by @parkr.

 - Replaced occurrences of #array += with concat
   operations.(performance)
 - Corrected alignment.
 - Removed rebase artifact.

Signed-off-by: Martin Rogalla <martin@martinrogalla.com>
---
 lib/jekyll.rb         | 12 ++++++------
 lib/jekyll/reader.rb  | 10 +++++-----
 site/_docs/history.md |  1 -
 test/test_site.rb     |  2 +-
 test/test_tags.rb     |  2 +-
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index dc6ba753..8b5b4db0 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -49,13 +49,13 @@ module Jekyll
   autoload :Filters,             'jekyll/filters'
   autoload :FrontmatterDefaults, 'jekyll/frontmatter_defaults'
   autoload :Layout,              'jekyll/layout'
-  autoload :CollectionReader,        'jekyll/readers/dynamic/collection_reader'
-  autoload :DataReader,        'jekyll/readers/dynamic/data_reader'
+  autoload :CollectionReader,    'jekyll/readers/dynamic/collection_reader'
+  autoload :DataReader,          'jekyll/readers/dynamic/data_reader'
   autoload :LayoutReader,        'jekyll/readers/dynamic/layout_reader'
-  autoload :DraftReader,        'jekyll/readers/dynamic/draft_reader'
-  autoload :PostReader,        'jekyll/readers/dynamic/post_reader'
-  autoload :PageReader, 'jekyll/readers/dynamic/page_reader'
-  autoload :StaticFileReader,        'jekyll/readers/static/static_file_reader'
+  autoload :DraftReader,         'jekyll/readers/dynamic/draft_reader'
+  autoload :PostReader,          'jekyll/readers/dynamic/post_reader'
+  autoload :PageReader,          'jekyll/readers/dynamic/page_reader'
+  autoload :StaticFileReader,    'jekyll/readers/static/static_file_reader'
   autoload :LogAdapter,          'jekyll/log_adapter'
   autoload :Page,                'jekyll/page'
   autoload :PluginManager,       'jekyll/plugin_manager'
diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index 51ba2ed5..59c6f110 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -51,8 +51,8 @@ module Jekyll
     #
     # Returns nothing.
     def retrieve_posts(dir)
-      site.posts += PostReader.new(site).read(dir)
-      site.posts += DraftReader.new(site).read(dir) if site.show_drafts
+      site.posts.concat(PostReader.new(site).read(dir))
+      site.posts.concat(DraftReader.new(site).read(dir)) if site.show_drafts
       site.posts.sort!
     end
 
@@ -72,7 +72,7 @@ module Jekyll
     #
     # Returns nothing.
     def retrieve_pages(dir, dot_pages)
-      site.pages += PageReader.new(site, dir).read(dot_pages)
+      site.pages.concat(PageReader.new(site, dir).read(dot_pages))
       site.pages.sort_by!(&:name)
     end
 
@@ -81,7 +81,7 @@ module Jekyll
     #
     # Returns nothing.
     def retrieve_static_files(dir, dot_static_files)
-      site.static_files += StaticFileReader.new(site, dir).read(dot_static_files)
+      site.static_files.concat(StaticFileReader.new(site, dir).read(dot_static_files))
       site.static_files.sort_by!(&:relative_path)
     end
 
@@ -110,4 +110,4 @@ module Jekyll
       entries.delete_if { |e| File.directory?(site.in_source_dir(base, e)) }
     end
   end
-end
\ No newline at end of file
+end
diff --git a/site/_docs/history.md b/site/_docs/history.md
index 98fb9bb8..346dc131 100644
--- a/site/_docs/history.md
+++ b/site/_docs/history.md
@@ -191,7 +191,6 @@ permalink: "/docs/history/"
 - Allow Travis to 'parallelize' our tests ([#2859]({{ site.repository }}/issues/2859))
 - Fix test for Liquid rendering in Sass ([#2856]({{ site.repository }}/issues/2856))
 - Fixing "vertycal" typo in site template's `_base.scss` ([#2889]({{ site.repository }}/issues/2889))
-- Convert remaining textile test documents to markdown ([#3528]({{ site.repository }}/issues/3528))
 
 ### Site Enhancements
 {: #site-enhancements-v2-4-0}
diff --git a/test/test_site.rb b/test/test_site.rb
index ce9cbc95..e120d131 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -189,7 +189,7 @@ class TestSite < JekyllUnitTest
     end
 
     should "read posts" do
-      @site.posts += PostReader.new(@site).read('')
+      @site.posts.concat(PostReader.new(@site).read(''))
       posts = Dir[source_dir('_posts', '**', '*')]
       posts.delete_if { |post| File.directory?(post) && !Post.valid?(post) }
       assert_equal posts.size - @num_invalid_posts, @site.posts.size
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 72d3a5e1..b9f7fa10 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -13,7 +13,7 @@ class TestTags < JekyllUnitTest
     site = Site.new(Jekyll.configuration)
 
     if override['read_posts']
-      site.posts += PostReader.new(site).read('')
+      site.posts.concat(PostReader.new(site).read(''))
     end
 
     info = { :filters => [Jekyll::Filters], :registers => { :site => site } }

From 63a1ec8949358be46cce0d9bce067fe1413ceb64 Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Fri, 20 Mar 2015 12:15:50 +0100
Subject: [PATCH 24/24] Made corrections as suggested by @mattr-.

 - Corrected TomDoc, added variables and fixed typos.
 - deprecated_rel_permalink -> relative_permalinks_are_deprecated.
 - Grouped calls together in @reader.read.
 - Removed dynamic and static reader subdirectories.
 - Removed unnecessary move of limit_posts.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll.rb                                 | 14 ++++----
 lib/jekyll/reader.rb                          | 32 ++++++++++++-------
 .../{dynamic => }/collection_reader.rb        |  0
 .../readers/{dynamic => }/data_reader.rb      |  0
 .../readers/{dynamic => }/draft_reader.rb     |  0
 .../readers/{dynamic => }/layout_reader.rb    |  0
 .../readers/{dynamic => }/page_reader.rb      |  0
 .../readers/{dynamic => }/post_reader.rb      |  0
 .../{static => }/static_file_reader.rb        |  0
 lib/jekyll/site.rb                            | 24 +++++++-------
 10 files changed, 39 insertions(+), 31 deletions(-)
 rename lib/jekyll/readers/{dynamic => }/collection_reader.rb (100%)
 rename lib/jekyll/readers/{dynamic => }/data_reader.rb (100%)
 rename lib/jekyll/readers/{dynamic => }/draft_reader.rb (100%)
 rename lib/jekyll/readers/{dynamic => }/layout_reader.rb (100%)
 rename lib/jekyll/readers/{dynamic => }/page_reader.rb (100%)
 rename lib/jekyll/readers/{dynamic => }/post_reader.rb (100%)
 rename lib/jekyll/readers/{static => }/static_file_reader.rb (100%)

diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 8b5b4db0..7506553a 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -49,13 +49,13 @@ module Jekyll
   autoload :Filters,             'jekyll/filters'
   autoload :FrontmatterDefaults, 'jekyll/frontmatter_defaults'
   autoload :Layout,              'jekyll/layout'
-  autoload :CollectionReader,    'jekyll/readers/dynamic/collection_reader'
-  autoload :DataReader,          'jekyll/readers/dynamic/data_reader'
-  autoload :LayoutReader,        'jekyll/readers/dynamic/layout_reader'
-  autoload :DraftReader,         'jekyll/readers/dynamic/draft_reader'
-  autoload :PostReader,          'jekyll/readers/dynamic/post_reader'
-  autoload :PageReader,          'jekyll/readers/dynamic/page_reader'
-  autoload :StaticFileReader,    'jekyll/readers/static/static_file_reader'
+  autoload :CollectionReader,    'jekyll/readers/collection_reader'
+  autoload :DataReader,          'jekyll/readers/data_reader'
+  autoload :LayoutReader,        'jekyll/readers/layout_reader'
+  autoload :DraftReader,         'jekyll/readers/draft_reader'
+  autoload :PostReader,          'jekyll/readers/post_reader'
+  autoload :PageReader,          'jekyll/readers/page_reader'
+  autoload :StaticFileReader,    'jekyll/readers/static_file_reader'
   autoload :LogAdapter,          'jekyll/log_adapter'
   autoload :Page,                'jekyll/page'
   autoload :PluginManager,       'jekyll/plugin_manager'
diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index 59c6f110..f7a6ab48 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -27,28 +27,25 @@ module Jekyll
     #
     # Returns nothing.
     def read_directories(dir = '')
-      retrieve_posts(dir)
-
-      # Obtain sub-directories in order to recursively read them.
       base = site.in_source_dir(dir)
+
       dot = Dir.chdir(base) { filter_entries(Dir.entries('.'), base) }
       dot_dirs = dot.select{ |file| File.directory?(@site.in_source_dir(base,file)) }
-      retrieve_dirs(base, dir, dot_dirs)
-
       dot_files = (dot - dot_dirs)
-
-      # Obtain all the pages.
       dot_pages = dot_files.select{ |file| Utils.has_yaml_header?(@site.in_source_dir(base,file)) }
-      retrieve_pages(dir, dot_pages)
-
-      # Assume the remaining files to be static files.
       dot_static_files = dot_files - dot_pages
+
+      retrieve_posts(dir)
+      retrieve_dirs(base, dir, dot_dirs)
+      retrieve_pages(dir, dot_pages)
       retrieve_static_files(dir, dot_static_files)
     end
 
     # Retrieves all the posts(posts/drafts) from the given directory
     # and add them to the site and sort them.
     #
+    # dir - The String representing the directory to retrieve the posts from.
+    #
     # Returns nothing.
     def retrieve_posts(dir)
       site.posts.concat(PostReader.new(site).read(dir))
@@ -58,6 +55,10 @@ module Jekyll
 
     # Recursively traverse directories with the read_directories function.
     #
+    # base - The String representing the site's base directory.
+    # dir - The String representing the directory to traverse down.
+    # dot_dirs - The Array of subdirectories in the dir.
+    #
     # Returns nothing.
     def retrieve_dirs(base, dir, dot_dirs)
       dot_dirs.map { |file|
@@ -70,6 +71,9 @@ module Jekyll
     # Retrieve all the pages from the current directory,
     # add them to the site and sort them.
     #
+    # dir - The String representing the directory retrieve the pages from.
+    # dot_pages - The Array of pages in the dir.
+    #
     # Returns nothing.
     def retrieve_pages(dir, dot_pages)
       site.pages.concat(PageReader.new(site, dir).read(dot_pages))
@@ -79,6 +83,9 @@ module Jekyll
     # Retrieve all the static files from the current directory,
     # add them to the site and sort them.
     #
+    # dir - The directory retrieve the static files from.
+    # dot_static_files - The static files in the dir.
+    #
     # Returns nothing.
     def retrieve_static_files(dir, dot_static_files)
       site.static_files.concat(StaticFileReader.new(site, dir).read(dot_static_files))
@@ -91,6 +98,7 @@ module Jekyll
     # files such as '.htaccess'.
     #
     # entries - The Array of String file/directory entries to filter.
+    # base_directory - The string representing the optional base directory.
     #
     # Returns the Array of filtered entries.
     def filter_entries(entries, base_directory = nil)
@@ -99,8 +107,8 @@ module Jekyll
 
     # Read the entries from a particular directory for processing
     #
-    # dir - The String relative path of the directory to read
-    # subfolder - The String directory to read
+    # dir - The String representing the relative path of the directory to read.
+    # subfolder - The String representing the directory to read.
     #
     # Returns the list of entries to process
     def get_entries(dir, subfolder)
diff --git a/lib/jekyll/readers/dynamic/collection_reader.rb b/lib/jekyll/readers/collection_reader.rb
similarity index 100%
rename from lib/jekyll/readers/dynamic/collection_reader.rb
rename to lib/jekyll/readers/collection_reader.rb
diff --git a/lib/jekyll/readers/dynamic/data_reader.rb b/lib/jekyll/readers/data_reader.rb
similarity index 100%
rename from lib/jekyll/readers/dynamic/data_reader.rb
rename to lib/jekyll/readers/data_reader.rb
diff --git a/lib/jekyll/readers/dynamic/draft_reader.rb b/lib/jekyll/readers/draft_reader.rb
similarity index 100%
rename from lib/jekyll/readers/dynamic/draft_reader.rb
rename to lib/jekyll/readers/draft_reader.rb
diff --git a/lib/jekyll/readers/dynamic/layout_reader.rb b/lib/jekyll/readers/layout_reader.rb
similarity index 100%
rename from lib/jekyll/readers/dynamic/layout_reader.rb
rename to lib/jekyll/readers/layout_reader.rb
diff --git a/lib/jekyll/readers/dynamic/page_reader.rb b/lib/jekyll/readers/page_reader.rb
similarity index 100%
rename from lib/jekyll/readers/dynamic/page_reader.rb
rename to lib/jekyll/readers/page_reader.rb
diff --git a/lib/jekyll/readers/dynamic/post_reader.rb b/lib/jekyll/readers/post_reader.rb
similarity index 100%
rename from lib/jekyll/readers/dynamic/post_reader.rb
rename to lib/jekyll/readers/post_reader.rb
diff --git a/lib/jekyll/readers/static/static_file_reader.rb b/lib/jekyll/readers/static_file_reader.rb
similarity index 100%
rename from lib/jekyll/readers/static/static_file_reader.rb
rename to lib/jekyll/readers/static_file_reader.rb
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 30564044..9c6ef309 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -146,7 +146,7 @@ module Jekyll
     #
     # Returns nothing.
     def render
-      deprecated_rel_permalink
+      relative_permalinks_are_deprecated
 
       payload = site_payload
       collections.each do |label, collection|
@@ -281,12 +281,12 @@ module Jekyll
       end
     end
 
-    # Warns the user if permanent links are relative tot the parent
+    # Warns the user if permanent links are relative to the parent
     # directory. As this is a deprecated function of Jekyll.
     #
     # Returns
-    def deprecated_rel_permalink
-      if config['relative_permalinks'] && has_relative_page?
+    def relative_permalinks_are_deprecated
+    if config['relative_permalinks'] && has_relative_page?
         Jekyll::Deprecator.deprecation_message "Since v2.0, permalinks for pages" +
                                             " in subfolders must be relative to the" +
                                             " site source directory, not the parent" +
@@ -377,14 +377,6 @@ module Jekyll
       pages.any? { |page| page.uses_relative_permalinks }
     end
 
-    # Returns the Cleaner or creates a new Cleaner if it doesn't
-    # already exist.
-    #
-    # Returns The Cleaner
-    def site_cleaner
-      @site_cleaner ||= Cleaner.new(self)
-    end
-
     # Limits the current posts; removes the posts which exceed the limit_posts
     #
     # Returns nothing
@@ -394,5 +386,13 @@ module Jekyll
         self.posts = posts[-limit, limit]
       end
     end
+
+    # Returns the Cleaner or creates a new Cleaner if it doesn't
+    # already exist.
+    #
+    # Returns The Cleaner
+    def site_cleaner
+      @site_cleaner ||= Cleaner.new(self)
+    end
   end
 end