make corrections based on feedback

features/collections_dir.feature

@@ -61,7 +61,7 @@ Feature: Collections Directory
     Then I should get a zero exit status
     And the _site directory should exist
     And the "_site/puppies/rover.html" file should exist
-    And the "_site/post-at-root.html" file should not exist
+    And the "_site/2009/03/27/post-at-root.html" file should not exist
     And the _site/_posts directory should not exist
 
   Scenario: Rendered collection in custom collections_dir also containing drafts
@@ -150,8 +150,7 @@ Feature: Collections Directory
     And the "_site/puppies/rover-in-gathering.html" file should exist
     And the "_site/2009/03/27/post-in-gathering.html" file should exist
     And the "_site/2009/03/27/draft-in-gathering.html" file should exist
-    And the "_site/gathering/2009/03/27/draft-in-gathering.html" file should not exist
     And the "_site/2009/03/27/draft-at-root.html" file should not exist
-    But the "_site/puppies/rover-at-root.html" file should not exist
+    And the "_site/puppies/rover-at-root.html" file should not exist
     And the _site/gathering directory should not exist
     And the _site/_posts directory should not exist

lib/jekyll/reader.rb

@@ -62,7 +62,7 @@ def read_directories(dir = "")
     #
     # Returns nothing.
     def retrieve_posts(dir)
-      return if not_within_configured_directory?(dir)
+      return if outside_configured_directory?(dir)
       site.posts.docs.concat(PostReader.new(site).read_posts(dir))
       site.posts.docs.concat(PostReader.new(site).read_drafts(dir)) if site.show_drafts
     end
@@ -142,7 +142,7 @@ def get_entries(dir, subfolder)
     #
     # Returns true if a custom collections_dir has been set but current directory lies
     # outside that directory.
-    def not_within_configured_directory?(dir)
+    def outside_configured_directory?(dir)
       collections_dir = site.config["collections_dir"]
       !collections_dir.empty? && !dir.start_with?("/#{collections_dir}")
     end