vendor/maruku/maruku.rb vendor/maruku/maruku/attic/parse_span.rb.txt vendor/maruku/maruku/attributes.rb vendor/maruku/maruku/defaults.rb vendor/maruku/maruku/errors_management.rb vendor/maruku/maruku/ext/div.rb vendor/maruku/maruku/ext/math.rb vendor/maruku/maruku/ext/math/elements.rb vendor/maruku/maruku/ext/math/latex_fix.rb vendor/maruku/maruku/ext/math/mathml_engines/blahtex.rb vendor/maruku/maruku/ext/math/mathml_engines/itex2mml.rb vendor/maruku/maruku/ext/math/mathml_engines/none.rb vendor/maruku/maruku/ext/math/mathml_engines/ritex.rb vendor/maruku/maruku/ext/math/parsing.rb vendor/maruku/maruku/ext/math/to_html.rb vendor/maruku/maruku/ext/math/to_latex.rb vendor/maruku/maruku/helpers.rb vendor/maruku/maruku/input/charsource.rb vendor/maruku/maruku/input/extensions.rb vendor/maruku/maruku/input/html_helper.rb vendor/maruku/maruku/input/linesource.rb vendor/maruku/maruku/input/parse_block.rb vendor/maruku/maruku/input/parse_doc.rb vendor/maruku/maruku/input/parse_span_better.rb vendor/maruku/maruku/input/rubypants.rb vendor/maruku/maruku/input/type_detection.rb vendor/maruku/maruku/input_textile2/t2_parser.rb vendor/maruku/maruku/maruku.rb vendor/maruku/maruku/output/s5/fancy.rb vendor/maruku/maruku/output/s5/to_s5.rb vendor/maruku/maruku/output/to_html.rb vendor/maruku/maruku/output/to_latex.rb vendor/maruku/maruku/output/to_latex_entities.rb vendor/maruku/maruku/output/to_latex_strings.rb vendor/maruku/maruku/output/to_markdown.rb vendor/maruku/maruku/output/to_s.rb vendor/maruku/maruku/string_utils.rb vendor/maruku/maruku/structures.rb vendor/maruku/maruku/structures_inspect.rb vendor/maruku/maruku/structures_iterators.rb vendor/maruku/maruku/tests/benchmark.rb vendor/maruku/maruku/tests/new_parser.rb vendor/maruku/maruku/tests/tests.rb vendor/maruku/maruku/textile2.rb vendor/maruku/maruku/toc.rb vendor/maruku/maruku/usage/example1.rb vendor/maruku/maruku/version.rb @@ -1,4 +1,4 @@ -require 'rdiscount' +require File.dirname(__FILE__) + '/../vendor/maruku/maruku' require 'syntax/convertors/html' class Post < Sequel::Model @@ -52,7 +52,7 @@ class Post < Sequel::Model ######## def to_html(markdown) - h = RDiscount.new(markdown).to_html + h = Maruku.new(markdown).to_html h.gsub(/<code>([^<]+)<\/code>/m) do convertor = Syntax::Convertors::HTML.for_syntax "ruby" highlighted = convertor.convert($1) lib/post.rb @@ -20,11 +20,11 @@ describe Post do it "produces html from the markdown body" do @post.body = "* Bullet" - @post.body_html.should == "<ul>\n<li>Bullet</li>\n</ul>\n\n" + @post.body_html.should == "<ul>\n<li>Bullet</li>\n</ul>" end it "syntax highlights code blocks" do - @post.to_html("<code>\none\ntwo</code>").should == "<p><code><pre>\n<span class=\"ident\">one</span>\n<span class=\"ident\">two</span></pre></code></p>\n" + @post.to_html("<code>\none\ntwo</code>").should == "<code><pre>\n<span class=\"ident\">one</span>\n<span class=\"ident\">two</span></pre></code>" end it "makes the tags into links to the tag search" do spec/post_spec.rb 9efe3fb7e817bbf3e58b880d310eea890ebb0ba6 Adam Wiggins adam@heroku.com http://github.com/adamwiggins/scanty/commit/128f72d96dae6175011f1fc82d5ca1346f8eb57c 128f72d96dae6175011f1fc82d5ca1346f8eb57c 2008-11-13T15:11:49-08:00 2008-11-13T15:11:49-08:00 use maruku for markdown and vendor it 8f70cc08fc108759b4fc4a2ef20b06431ad1c9a6 Adam Wiggins adam@heroku.com