get procedure for default excerpt separator for both cases site and p…

…age was moved to the post's specific method :excerpt_separator.
jekyll · Jan 10, 2015 · a0f2b5f · a0f2b5f
1 parent 54d0bf4
commit a0f2b5f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/lib/jekyll/excerpt.rb b/lib/jekyll/excerpt.rb
@@ -105,10 +105,7 @@ def inspect
     #
     # Returns excerpt String
     def extract_excerpt(post_content)
-      separator     = !post.excerpt_separator.empty? &&
-                       post.excerpt_separator ||
-                       site.config['excerpt_separator']
-      head, _, tail = post_content.to_s.partition(separator)
+      head, _, tail = post_content.to_s.partition(post.excerpt_separator)
 
       "" << head << "\n\n" << tail.scan(/^\[[^\]]+\]:.+$/).join("\n")
     end

diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
@@ -119,11 +119,12 @@ def title
       data.fetch('title') { titleized_slug }
     end
 
-    # Public: the Post excerpt_separator, from the YAML Front-Matter or empty string
+    # Public: the Post excerpt_separator, from the YAML Front-Matter or site default
+    #         excerpt_separator value
     #
     # Returns the post excerpt_separator
     def excerpt_separator
-      data.fetch('excerpt_separator') { "" }
+      data.fetch('excerpt_separator') { site.config['excerpt_separator'].to_s }
     end
 
     # Turns the post slug into a suitable title
@@ -315,7 +316,7 @@ def extract_excerpt
     end
 
     def generate_excerpt?
-      !site.config['excerpt_separator'].to_s.empty? || !excerpt_separator.empty?
+      !excerpt_separator.empty?
     end
   end
 end