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

document: fix issue with bad comparison

This commit is contained in:
Parker Moore 2015-12-24 15:07:31 -05:00
parent d070a77716
commit fcce0d5482
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/jekyll/document.rb
View File

@ -12,11 +12,13 @@ module Jekyll
# Create a new Document. # Create a new Document.
# #
# site - the Jekyll::Site instance to which this Document belongs
# path - the path to the file # path - the path to the file
# relations - a hash with keys :site and :collection, the values of which
# are the Jekyll::Site and Jekyll::Collection to which this
# Document belong.
# #
# Returns nothing. # Returns nothing.
def initialize(path, relations) def initialize(path, relations = {})
@site = relations[:site] @site = relations[:site]
@path = path @path = path
@extname = File.extname(path) @extname = File.extname(path)
@ -354,9 +356,11 @@ module Jekyll
# equal or greater than the other doc's path. See String#<=> for more details. # equal or greater than the other doc's path. See String#<=> for more details.
def <=>(other) def <=>(other)
return ArgumentError.new("document cannot be compared against #{other}") unless other.respond_to?(:data) return ArgumentError.new("document cannot be compared against #{other}") unless other.respond_to?(:data)
cmp = data['date'] <=> other.data['date'] if data['date'] && other.data['date'] && (cmp = data['date'] <=> other.data['date']) != 0
cmp = path <=> other.path if cmp == 0
cmp cmp
else
path <=> other.path
end
end end
# Determine whether this document should be written. # Determine whether this document should be written.