deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #413 from bhollis/maruku

Browse source 
Switch back to maruku
This commit is contained in:
Thomas Reynolds 2012-05-02 15:10:00 -07:00
parent 7b8457d963 49bbc9feaa
commit 7fb16a4b1b
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
middleman-more/features/markdown.feature
View file

@ -9,19 +9,23 @@ Feature: Markdown support
Scenario: Redcarpet 2 extensions Scenario: Redcarpet 2 extensions
Given the Server is running at "markdown-app" Given the Server is running at "markdown-app"
When I go to "/smarty_pants.html" When I go to "/smarty_pants.html"
Then I should see "“" Then I should see "“"
When I go to "/no_intra_emphasis.html" When I go to "/no_intra_emphasis.html"
Then I should not see "<em>" Then I should not see "<em>"
When I go to "/tables.html" When I go to "/tables.html"
Then I should see "<table>" Then I should see "<table>"
When I go to "/fenced_code_blocks.html" # Maruku doesn't support fenced code blocks :-(
Then I should see "<code>" #When I go to "/fenced_code_blocks.html"
When I go to "/autolink.html" #Then I should see "<code>"
Then I should see "<a href" # or autolink
When I go to "/strikethrough.html" #When I go to "/autolink.html"
Then I should see "<del>" #Then I should see "<a href"
# or del
#When I go to "/strikethrough.html"
#Then I should see "<del>"
When I go to "/space_after_headers.html" When I go to "/space_after_headers.html"
Then I should not see "<h1>" Then I should not see "<h1>"
When I go to "/superscript.html" # or superscript
Then I should see "<sup>" #When I go to "/superscript.html"
#Then I should see "<sup>"

4
middleman-more/lib/middleman-more/renderers/markdown.rb
View file

@ -11,7 +11,7 @@ module Middleman
def registered(app) def registered(app)
# Set our preference for a markdown engine # Set our preference for a markdown engine
# TODO: Find a JRuby-compatible version # TODO: Find a JRuby-compatible version
app.set :markdown_engine, :redcarpet app.set :markdown_engine, :maruku
app.set :markdown_engine_prefix, ::Tilt app.set :markdown_engine_prefix, ::Tilt
app.before_configuration do app.before_configuration do
@ -54,4 +54,4 @@ module Middleman
end end
end end
end end
end end

2
middleman-more/middleman-more.gemspec
View file

@ -26,6 +26,6 @@ Gem::Specification.new do |s|
s.add_dependency("execjs", ["~> 1.2"]) s.add_dependency("execjs", ["~> 1.2"])
s.add_dependency("sprockets", ["~> 2.1"]) s.add_dependency("sprockets", ["~> 2.1"])
s.add_dependency("sprockets-sass", ["~> 0.8.0"]) s.add_dependency("sprockets-sass", ["~> 0.8.0"])
s.add_dependency("redcarpet", ["~> 2.1.0"]) s.add_dependency("maruku", ["~> 0.6.0"])
end end