Merge pull request #5022 from ayastreb/collection

Merge pull request 5022

.rubocop.yml

@@ -4,7 +4,6 @@ AllCops:
   Include:
   - lib/**/*.rb
   Exclude:
-  - lib/jekyll/collection.rb
   - lib/jekyll/convertible.rb
   - lib/jekyll/document.rb
   - lib/jekyll/renderer.rb

lib/jekyll/collection.rb

@@ -57,18 +57,9 @@ module Jekyll
         full_path = collection_dir(file_path)
         next if File.directory?(full_path)
         if Utils.has_yaml_header? full_path
-          doc = Jekyll::Document.new(full_path, { :site => site, :collection => self })
+          read_document(full_path)
-          doc.read
-          if site.publisher.publish?(doc) || !write?
-            docs << doc
-          else
-            Jekyll.logger.debug "Skipped From Publishing:", doc.relative_path
-          end
         else
-          relative_dir = Jekyll.sanitized_path(relative_directory,
+          read_static_file(file_path, full_path)
-            File.dirname(file_path)).chomp("/.")
-          files << StaticFile.new(site, site.source, relative_dir,
-            File.basename(full_path), self)
         end
       end
       docs.sort!
@@ -164,7 +155,7 @@ module Jekyll
     #
     # Returns a sanitized version of the label.
     def sanitize_label(label)
-      label.gsub(/[^a-z0-9_\-\.]/i, "")
+      label.gsub(%r![^a-z0-9_\-\.]!i, "")
     end
 
     # Produce a representation of this Collection for use in Liquid.
@@ -204,5 +195,27 @@ module Jekyll
         {}
       end
     end
+
+    private
+    def read_document(full_path)
+      doc = Jekyll::Document.new(full_path, :site => site, :collection => self)
+      doc.read
+      if site.publisher.publish?(doc) || !write?
+        docs << doc
+      else
+        Jekyll.logger.debug "Skipped From Publishing:", doc.relative_path
+      end
+    end
+
+    private
+    def read_static_file(file_path, full_path)
+      relative_dir = Jekyll.sanitized_path(
+        relative_directory,
+        File.dirname(file_path)
+      ).chomp("/.")
+
+      files << StaticFile.new(site, site.source, relative_dir,
+        File.basename(full_path), self)
+    end
   end
 end