From 0bdfed4b255d3a0297917fd5eae5458172b46214 Mon Sep 17 00:00:00 2001 From: Matthew Iversen Date: Thu, 5 Dec 2013 11:59:36 +1100 Subject: [PATCH 1/3] Update requirements to maruku 0.7 --- jekyll.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jekyll.gemspec b/jekyll.gemspec index ee48478c..da3b32a2 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -26,7 +26,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency('liquid', "~> 2.5.2") s.add_runtime_dependency('classifier', "~> 1.3") s.add_runtime_dependency('listen', "~> 1.3") - s.add_runtime_dependency('maruku', "~> 0.6.0") + s.add_runtime_dependency('maruku', "~> 0.7.0") s.add_runtime_dependency('pygments.rb', "~> 0.5.0") s.add_runtime_dependency('commander', "~> 4.1.3") s.add_runtime_dependency('safe_yaml', "~> 0.9.7") From 5ed9d21ec7954c66ba1fad4f840c80754addefa3 Mon Sep 17 00:00:00 2001 From: Matthew Iversen Date: Thu, 5 Dec 2013 12:04:55 +1100 Subject: [PATCH 2/3] Remove extraneous newlines from XHTML output --- lib/jekyll/converters/markdown/maruku_parser.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/converters/markdown/maruku_parser.rb b/lib/jekyll/converters/markdown/maruku_parser.rb index 74f9289f..ad9834cf 100644 --- a/lib/jekyll/converters/markdown/maruku_parser.rb +++ b/lib/jekyll/converters/markdown/maruku_parser.rb @@ -41,7 +41,7 @@ module Jekyll end def convert(content) - converted = Maruku.new(content, :error_stream => @errors).to_html + converted = Maruku.new(content, :error_stream => @errors).to_html.strip print_errors_and_fail unless @errors.empty? converted end From fb9de8cbf609e929ec263c4f2e9293c8b00d7b36 Mon Sep 17 00:00:00 2001 From: Matthew Iversen Date: Thu, 5 Dec 2013 12:20:11 +1100 Subject: [PATCH 3/3] Fix tests to expect maruku 0.7 output --- features/markdown.feature | 8 ++++---- features/site_configuration.feature | 8 ++++---- test/test_excerpt.rb | 2 +- test/test_post.rb | 2 +- test/test_tags.rb | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/features/markdown.feature b/features/markdown.feature index 7aedbe44..a3803233 100644 --- a/features/markdown.feature +++ b/features/markdown.feature @@ -13,8 +13,8 @@ Feature: Markdown When I run jekyll Then the _site directory should exist And I should see "Index" in "_site/index.html" - And I should see "

My Title

" in "_site/2009/03/27/hackers.html" - And I should see "

My Title

" in "_site/index.html" + And I should see "

My Title

" in "_site/2009/03/27/hackers.html" + And I should see "

My Title

" in "_site/index.html" Scenario: Markdown in pagination on index Given I have a configuration file with "paginate" set to "5" @@ -26,5 +26,5 @@ Feature: Markdown When I run jekyll Then the _site directory should exist And I should see "Index" in "_site/index.html" - And I should see "

My Title

" in "_site/index.html" - \ No newline at end of file + And I should see "

My Title

" in "_site/index.html" + diff --git a/features/site_configuration.feature b/features/site_configuration.feature index 4f807eae..4052315d 100644 --- a/features/site_configuration.feature +++ b/features/site_configuration.feature @@ -67,28 +67,28 @@ Feature: Site configuration And I have a configuration file with "markdown" set to "rdiscount" When I run jekyll Then the _site directory should exist - And I should see "Google" in "_site/index.html" + And I should see "Google" in "_site/index.html" Scenario: Use Kramdown for markup Given I have an "index.markdown" page that contains "[Google](http://google.com)" And I have a configuration file with "markdown" set to "kramdown" When I run jekyll Then the _site directory should exist - And I should see "Google" in "_site/index.html" + And I should see "Google" in "_site/index.html" Scenario: Use Redcarpet for markup Given I have an "index.markdown" page that contains "[Google](http://google.com)" And I have a configuration file with "markdown" set to "redcarpet" When I run jekyll Then the _site directory should exist - And I should see "Google" in "_site/index.html" + And I should see "Google" in "_site/index.html" Scenario: Use Maruku for markup Given I have an "index.markdown" page that contains "[Google](http://google.com)" And I have a configuration file with "markdown" set to "maruku" When I run jekyll Then the _site directory should exist - And I should see "Google" in "_site/index.html" + And I should see "Google" in "_site/index.html" Scenario: Highlight code with pygments Given I have an "index.html" file that contains "{% highlight ruby %} puts 'Hello world!' {% endhighlight %}" diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb index 234d51ba..410e9e75 100644 --- a/test/test_excerpt.rb +++ b/test/test_excerpt.rb @@ -66,7 +66,7 @@ class TestExcerpt < Test::Unit::TestCase end should "be the first paragraph of the page" do - assert_equal "

First paragraph with link ref.

", @extracted_excerpt.content + assert_equal "

First paragraph with link ref.

", @extracted_excerpt.content end should "link properly" do diff --git a/test/test_post.rb b/test/test_post.rb index 57979c65..a61fc674 100644 --- a/test/test_post.rb +++ b/test/test_post.rb @@ -284,7 +284,7 @@ class TestPost < Test::Unit::TestCase end should "return rendered HTML" do - assert_equal "

First paragraph with link ref.

", + assert_equal "

First paragraph with link ref.

", @post.excerpt end diff --git a/test/test_tags.rb b/test/test_tags.rb index 07547900..0368c6db 100644 --- a/test/test_tags.rb +++ b/test/test_tags.rb @@ -252,7 +252,7 @@ CONTENT end should "write script tag" do - assert_match "", @result + assert_match "", @result end end @@ -272,7 +272,7 @@ CONTENT end should "write script tag with specific file in gist" do - assert_match "", @result + assert_match "", @result end end @@ -308,7 +308,7 @@ CONTENT end should "write script tag with specific file in gist" do - assert_match "", @result + assert_match "", @result end end