Made the Reader responsible for the actual Reading.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>

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

lib/jekyll/site.rb

@@ -129,10 +129,7 @@ module Jekyll
     #
     # Returns nothing.
     def read
-      self.layouts = LayoutReader.new(self).read
+      reader.read
-      reader.read_directories
-      reader.read_data(config['data_source'])
-      reader.read_collections
     end
 
     # Run each of the Generators.