to_text formatting

lib/erector/convenience.rb

@@ -7,9 +7,17 @@ def to_pretty(options = {})
       to_s(options.merge(:prettyprint => true))
     end
 
-    # Render (like to_s) but stripping all tags.
+    # Render (like to_s) but stripping all tags and inserting some
+    # appropriate formatting.
     def to_text(options = {})
-      CGI.unescapeHTML(to_s(options.merge(:prettyprint => false)).gsub(/<[^>]*>/, ''))
+      html = to_s(options.merge(:prettyprint => false))
+      html.gsub!(/(<(ul|ol)>)?<li>/, "\n* ")
+      html.gsub!(/<(\/?(ul|ol|p|br))( \/)?>/, "\n")
+      CGI.unescapeHTML(html.gsub(/<[^>]*>/, ''))
+    end
+
+    def to_html(*args)
+      to_s(*args)
     end
 
     # Emits the result of joining the elements in array with the separator.

spec/erector/convenience_spec.rb

@@ -29,6 +29,14 @@
     end
   end
 
+  describe "#to_html" do
+    it "returns html" do
+      Erector.inline do
+        div "foo"
+      end.to_html.should == "<div>foo</div>"
+    end
+  end
+
   describe "#to_text" do
     it "strips tags" do
       Erector.inline do
@@ -79,6 +87,43 @@ def funny
       end
       Funny.new.to_text(:content_method_name => :funny).should == "haha"
     end
+
+    it "puts a blank line (two newlines) after a /p tag" do
+      Erector.inline do
+        p "first paragraph"
+        p "second paragraph"
+      end.to_text.should == "\nfirst paragraph\n\nsecond paragraph\n"
+    end
+
+    it "puts a newline after a br tag" do
+      Erector.inline do
+        text "first line"
+        br
+        text "second line"
+      end.to_text.should == "first line\nsecond line"
+    end
+
+    it "formats a UL (unordered list) using asterisks for bullets" do
+      Erector.inline do
+        ul do
+          li "vanilla"
+          li "chocolate"
+          li "strawberry"
+        end
+      end.to_text.should == "\n* vanilla\n* chocolate\n* strawberry\n"
+    end
+
+    # it's too hard to keep track of numbers with a regexp munger, so just use asterisks for bullets
+    # todo: integrate text output into core rendering code
+    it "formats an OL (ordered list)" do
+      Erector.inline do
+        ol do
+          li "vanilla"
+          li "chocolate"
+          li "strawberry"
+        end
+      end.to_text.should == "\n* vanilla\n* chocolate\n* strawberry\n"
+    end
   end
 
   describe "#join" do