spec/redcloth/parser_spec.rb @@ -2,4 +2,15 @@ require "rubygems" gem 'treetop', "> 1.2.5" require "treetop" -require "redcloth/parser" \ No newline at end of file +require "redcloth/parser" +require "redcloth/ast" +require "redcloth/formatter/html" + +module RedCloth + # A convenience method for creating a new TextileDoc. See + # RedCloth::TextileDoc. + def self.new( string, &block ) + RedCloth::Parser::TextileDocParser.new.parse_or_fail( string, &block ) + end + +end \ No newline at end of file lib/redcloth.rb @@ -1,7 +1,6 @@ require 'redcloth/ast/textile_doc' require 'redcloth/ast/list' require 'redcloth/ast/list_item' -require 'redcloth/ast/inline' require 'redcloth/ast/element' require 'redcloth/ast/visitor' @@ -23,4 +22,4 @@ class String def to_sexp self end -end \ No newline at end of file +end lib/redcloth/ast.rb @@ -9,6 +9,10 @@ module RedCloth def strong(element) accept_contents(element) end + + def bold(element) + accept_contents(element) + end def accept_contents(element) element.contained_elements.map {|e| e.is_a?(String) ? e : e.accept(self) }.join lib/redcloth/ast/visitor.rb @@ -9,27 +9,38 @@ module RedCloth module Formatter class Html < Ast::Visitor - def initialize(io, options={}) + def initialize(textile_doc=nil, options={}) @options = options - @builder = create_builder(io) + format(textile_doc) if textile_doc end - def create_builder(io) - Builder::XmlMarkup.new(:target => io, :indent => 0) + def format(textile_doc) + textile_doc.accept(self) + end + + def builder + @builder ||= Builder::XmlMarkup.new(:indent => 0) end def block_element(element) p(element) end + # FIXME: Yeah, these aren't DRY, but you know what they say about premature optimization def p(element) - @builder.p do |p| + builder.p do accept_contents(element) end end def strong(element) - @builder.strong do |p| + builder.strong do + accept_contents(element) + end + end + + def b(element) + builder.b do accept_contents(element) end end @@ -39,14 +50,23 @@ module RedCloth def accept_contents(element) element.contained_elements.each do |e| if e.is_a?(String) - @builder.text! e + builder.text! e else e.accept(self) end end end - + end + end +end + +module RedCloth + module Ast + class TextileDoc + def to_html + RedCloth::Formatter::Html.new(self) + end end end end \ No newline at end of file lib/redcloth/formatter/html.rb @@ -6,7 +6,7 @@ module RedCloth module Formatter describe Html do before(:each) do - @formatter = Html.new("") + @formatter = Html.new end describe "#block_element" do @@ -43,6 +43,13 @@ module RedCloth end end + describe "#bold" do + it "should format a bold phrase" do + @bold = Ast::Element.new({:type => 'bold'}, ['Bold phrase.']) + @formatter.b(@bold).should == "<b>Bold phrase.</b>" + end + end + end end end spec/redcloth/formatter/html_spec.rb @@ -61,7 +61,7 @@ module RedCloth describe "InlineParser integration" do - it "should parse a paragraph with inline strong" do + it "should parse a paragraph containing inline elements" do parse("p. This is *my* paragraph").to_sexp.should == [[:p, {}, [ "This is ", spec/redcloth/parser/textile_doc_parser_spec.rb 678c92b9c86ef7be0a703d4921f85c158ed791b9 Jason Garber jg@jasongarber.com http://github.com/jgarber/redcloth-treetop/commit/f5328d48e2e84a5dc9cf7cbe5b1fef0a6123027b f5328d48e2e84a5dc9cf7cbe5b1fef0a6123027b 2009-07-02T06:31:41-07:00 2009-07-02T06:31:41-07:00 End-to-end textile parsing and HTML formatting. 342e9cf503a0132fa7bbfb53e19ed70c27663cf3 Jason Garber jg@jasongarber.com