dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rework excerpt to be an accessor method 

Instead of setting self.excerpt, make it a method
that returns either the custom excerpt or the pre-
viously extracted excerpt.
This commit is contained in:
maul.esel 2013-04-11 17:13:15 +02:00
parent 2792e1e427
commit 654d598fcf
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/jekyll/post.rb
View File

@ -19,10 +19,10 @@ module Jekyll
end end
attr_accessor :site attr_accessor :site
attr_accessor :data, :excerpt, :content, :output, :ext attr_accessor :data, :extracted_excerpt, :content, :output, :ext
attr_accessor :date, :slug, :published, :tags, :categories attr_accessor :date, :slug, :published, :tags, :categories
attr_reader :name attr_reader :name, :excerpt
# Initialize this Post instance. # Initialize this Post instance.
# #
@ -80,10 +80,18 @@ module Jekyll
# Returns nothing. # Returns nothing.
def read_yaml(base, name) def read_yaml(base, name)
super(base, name) super(base, name)
self.excerpt = self.data["excerpt"] || self.extract_excerpt self.extracted_excerpt = self.extract_excerpt
self.data['layout'] = 'post' unless self.data.has_key?('layout') self.data['layout'] = 'post' unless self.data.has_key?('layout')
end end
# The post excerpt. This is either a custom excerpt
# set in YAML front matter or the result of extract_excerpt.
#
# Returns excerpt string.
def excerpt
self.data['excerpt'] ? converter.convert(self.data['excerpt']) : self.extracted_excerpt
end
# Compares Post objects. First compares the Post date. If the dates are # Compares Post objects. First compares the Post date. If the dates are
# equal, it compares the Post slugs. # equal, it compares the Post slugs.
# #
@ -117,7 +125,7 @@ module Jekyll
# Returns nothing. # Returns nothing.
def transform def transform
super super
self.excerpt = converter.convert(self.excerpt) self.extracted_excerpt = converter.convert(self.extracted_excerpt)
end end
# The generated directory into which the post will be placed # The generated directory into which the post will be placed