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

fixed test for CRLF (extra newline was being picked up)

This commit is contained in:
Simon Chiang 2009-06-23 20:52:05 -06:00
parent 09946386b1
commit b616a4ceca
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/jekyll/convertible.rb
View File

@ -17,11 +17,11 @@ module Jekyll
# Returns nothing # Returns nothing
def read_yaml(base, name) def read_yaml(base, name)
self.content = File.read(File.join(base, name)) self.content = File.read(File.join(base, name))
if self.content =~ /^(---\s*\n.*?)\r?\n---\s*\n/m if self.content =~ /^(---\s*\n.*?\n?)(---.*?\n)/m
self.content = self.content[($1.size + 5)..-1] self.content = self.content[($1.size + $2.size)..-1]
self.data = YAML.load($1.dup) self.data = YAML.load($1)
end end
end end

2
test/test_post.rb
View File

@ -77,7 +77,7 @@ class TestPost < Test::Unit::TestCase
@post.read_yaml(@source, @real_file) @post.read_yaml(@source, @real_file)
assert_equal({"title" => "Test title", "layout" => "post", "tag" => "Ruby"}, @post.data) assert_equal({"title" => "Test title", "layout" => "post", "tag" => "Ruby"}, @post.data)
assert_equal "\r\n\r\nThis is the content", @post.content assert_equal "\r\nThis is the content", @post.content
end end
end end