3.9-stable: allow Pages to be Excerpted (#9550)

Merge pull request 9550

lib/jekyll/page.rb

@@ -183,5 +183,20 @@ def trigger_hooks(hook_name, *args)
     def write?
       true
     end
+
+    # The Page excerpt_separator, from the YAML Front-Matter or site
+    # default excerpt_separator value
+    #
+    # Returns the document excerpt_separator
+    def excerpt_separator
+      (data["excerpt_separator"] || site.config["excerpt_separator"]).to_s
+    end
+
+    # Whether to generate an excerpt
+    #
+    # Returns true if the excerpt separator is configured.
+    def generate_excerpt?
+      !excerpt_separator.empty?
+    end
   end
 end

test/source/page_with_excerpt.md

@@ -0,0 +1,7 @@
+---
+title: I am a page with an excerpt
+---
+
+I am the excerpt
+
+I am the remainder of the page

test/test_excerpt.rb

@@ -10,6 +10,10 @@ def setup_post(file)
     }).tap(&:read)
   end
 
+  def setup_page
+    Page.new(@site, @site.in_source_dir, "", "page_with_excerpt.md")
+  end
+
   def do_render(document)
     @site.layouts = {
       "default" => Layout.new(@site, source_dir("_layouts"), "simple.html"),
@@ -300,4 +304,18 @@ def do_render(document)
       assert_equal true, @excerpt.is_a?(Jekyll::Excerpt)
     end
   end
+
+  context "On a page" do
+    setup do
+      clear_dest
+      @site = fixture_site
+      @page = setup_page
+      @excerpt = Jekyll::Excerpt.new(@page)
+    end
+
+
+    should "produce a proper excerpt" do
+      assert_equal @excerpt.content, "I am the excerpt\n\n"
+    end
+  end
 end

test/test_filters.rb

@@ -809,7 +809,7 @@ def to_liquid
               "The list of grouped items for '' is not an Array."
             )
             # adjust array.size to ignore symlinked page in Windows
-            qty = Utils::Platforms.really_windows? ? 14 : 15
+            qty = Utils::Platforms.really_windows? ? 15 : 16
             assert_equal qty, g["items"].size
           end
         end
@@ -1007,7 +1007,7 @@ def to_liquid
               "The list of grouped items for '' is not an Array."
             )
             # adjust array.size to ignore symlinked page in Windows
-            qty = Utils::Platforms.really_windows? ? 14 : 15
+            qty = Utils::Platforms.really_windows? ? 15 : 16
             assert_equal qty, g["items"].size
           end
         end

test/test_site.rb

@@ -231,6 +231,7 @@ def generate(site)
         index.html
         info.md
         main.scss
+        page_with_excerpt.md
         properties.html
         sitemap.xml
         static_files.html