wikitext 1.12 → 2.0

data/ext/parser.c

@@ -1,4 +1,4 @@
-// Copyright 2007-2009 Wincent Colaiuta. All rights reserved.
+// Copyright 2007-2010 Wincent Colaiuta. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are met:
@@ -33,6 +33,9 @@
 #define IN_EITHER_OF(type1, type2) ary_includes2(parser->scope, type1, type2)
 #define IN_ANY_OF(type1, type2, type3) ary_includes3(parser->scope, type1, type2, type3)
 
+// output styles
+enum { HTML_OUTPUT, XML_OUTPUT };
+
 // poor man's object orientation in C:
 // instead of passing around multiple parameters between functions in the parser
 // we pack everything into a struct and pass around only a pointer to that
@@ -50,6 +53,7 @@ typedef struct
     VALUE   external_link_class;    // CSS class applied to external links
     VALUE   mailto_class;           // CSS class applied to email (mailto) links
     VALUE   img_prefix;             // path prepended when emitting img tags
+    int     output_style;           // HTML_OUTPUT (default) or XML_OUTPUT
     int     base_indent;            // controlled by the :indent option to Wikitext::Parser#parse
     int     current_indent;         // fluctuates according to currently nested structures
     int     base_heading_level;
@@ -83,8 +87,8 @@ const char strong_start[]               = "<strong>";
 const char strong_end[]                 = "</strong>";
 const char em_start[]                   = "<em>";
 const char em_end[]                     = "</em>";
-const char tt_start[]                   = "<tt>";
-const char tt_end[]                     = "</tt>";
+const char code_start[]                 = "<code>";
+const char code_end[]                   = "</code>";
 const char ol_start[]                   = "<ol>";
 const char ol_end[]                     = "</ol>";
 const char ul_start[]                   = "<ul>";
@@ -125,7 +129,8 @@ const char escaped_blockquote[]         = "&gt; ";
 const char ext_link_end[]               = "]";
 const char literal_img_start[]          = "{{";
 const char img_start[]                  = "<img src=\"";
-const char img_end[]                    = "\" />";
+const char img_end_xml[]                = "\" />";
+const char img_end_html[]               = "\">";
 const char img_alt[]                    = "\" alt=\"";
 const char pre_class_start[]            = "<pre class=\"";
 const char pre_class_end[]              = "-syntax\">";
@@ -150,6 +155,7 @@ parser_t *parser_new(void)
     parser->external_link_class     = Qnil; // caller should set up
     parser->mailto_class            = Qnil; // caller should set up
     parser->img_prefix              = Qnil; // caller should set up
+    parser->output_style            = HTML_OUTPUT;
     parser->base_indent             = 0;
     parser->current_indent          = 0;
     parser->base_heading_level      = 0;
@@ -310,13 +316,16 @@ void wiki_append_hyperlink(parser_t *parser, VALUE link_prefix, str_t *link_targ
 
 void wiki_append_img(parser_t *parser, char *token_ptr, int token_len)
 {
-    str_append(parser->output, img_start, sizeof(img_start) - 1);   // <img src="
-    if (!NIL_P(parser->img_prefix) && *token_ptr != '/')            // len always > 0
+    str_append(parser->output, img_start, sizeof(img_start) - 1);           // <img src="
+    if (!NIL_P(parser->img_prefix) && *token_ptr != '/')                    // len always > 0
         str_append_string(parser->output, parser->img_prefix);
     str_append(parser->output, token_ptr, token_len);
-    str_append(parser->output, img_alt, sizeof(img_alt) - 1);       // " alt="
+    str_append(parser->output, img_alt, sizeof(img_alt) - 1);               // " alt="
     str_append(parser->output, token_ptr, token_len);
-    str_append(parser->output, img_end, sizeof(img_end) - 1);       // " />
+    if (parser->output_style == XML_OUTPUT)
+        str_append(parser->output, img_end_xml, sizeof(img_end_xml) - 1);   // " />
+    else
+        str_append(parser->output, img_end_html, sizeof(img_end_html) - 1); // ">
 }
 
 // will emit indentation only if we are about to emit any of:
@@ -422,7 +431,7 @@ void wiki_pop_from_stack(parser_t *parser, str_t *target)
 
         case TT:
         case TT_START:
-            str_append(target, tt_end, sizeof(tt_end) - 1);
+            str_append(target, code_end, sizeof(code_end) - 1);
             break;
 
         case OL:
@@ -992,6 +1001,7 @@ VALUE Wikitext_parser_initialize(int argc, VALUE *argv, VALUE self)
     VALUE mailto_class                  = rb_str_new2("mailto");
     VALUE internal_link_prefix          = rb_str_new2("/wiki/");
     VALUE img_prefix                    = rb_str_new2("/images/");
+    VALUE output_style                  = ID2SYM(rb_intern("html"));
     VALUE space_to_underscore           = Qtrue;
     VALUE minimum_fulltext_token_length = INT2NUM(3);
     VALUE base_heading_level            = INT2NUM(0);
@@ -1007,6 +1017,7 @@ VALUE Wikitext_parser_initialize(int argc, VALUE *argv, VALUE self)
         mailto_class                    = OVERRIDE_IF_SET(mailto_class);
         internal_link_prefix            = OVERRIDE_IF_SET(internal_link_prefix);
         img_prefix                      = OVERRIDE_IF_SET(img_prefix);
+        output_style                    = OVERRIDE_IF_SET(output_style);
         space_to_underscore             = OVERRIDE_IF_SET(space_to_underscore);
         minimum_fulltext_token_length   = OVERRIDE_IF_SET(minimum_fulltext_token_length);
         base_heading_level              = OVERRIDE_IF_SET(base_heading_level);
@@ -1019,6 +1030,7 @@ VALUE Wikitext_parser_initialize(int argc, VALUE *argv, VALUE self)
     rb_iv_set(self, "@mailto_class",                    mailto_class);
     rb_iv_set(self, "@internal_link_prefix",            internal_link_prefix);
     rb_iv_set(self, "@img_prefix",                      img_prefix);
+    rb_iv_set(self, "@output_style",                    output_style);
     rb_iv_set(self, "@space_to_underscore",             space_to_underscore);
     rb_iv_set(self, "@minimum_fulltext_token_length",   minimum_fulltext_token_length);
     rb_iv_set(self, "@base_heading_level",              base_heading_level);
@@ -1032,6 +1044,17 @@ VALUE Wikitext_parser_profiling_parse(VALUE self, VALUE string)
     return Qnil;
 }
 
+// convert a Ruby object (:xml, :html etc) into an int output style
+int Wikitext_output_style(VALUE output)
+{
+    if (TYPE(output) == T_SYMBOL)
+    {
+        if (SYM2ID(output) == rb_intern("xml"))
+            return XML_OUTPUT;
+    }
+    return HTML_OUTPUT; // fall back to default
+}
+
 VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
 {
     // process arguments
@@ -1042,6 +1065,16 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
         return Qnil;
     string = StringValue(string);
 
+    // access these once per parse
+    VALUE line_ending   = rb_iv_get(self, "@line_ending");
+    line_ending         = StringValue(line_ending);
+    VALUE link_class    = rb_iv_get(self, "@external_link_class");
+    link_class          = NIL_P(link_class) ? Qnil : StringValue(link_class);
+    VALUE mailto_class  = rb_iv_get(self, "@mailto_class");
+    mailto_class        = NIL_P(mailto_class) ? Qnil : StringValue(mailto_class);
+    VALUE prefix        = rb_iv_get(self, "@internal_link_prefix");
+    int output_style    = Wikitext_output_style(rb_iv_get(self, "@output_style"));
+
     // process options hash
     int base_indent = 0;
     int base_heading_level = NUM2INT(rb_iv_get(self, "@base_heading_level"));
@@ -1069,6 +1102,11 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
         if (rb_funcall(options, has_key, 1, id) == Qtrue)
             base_heading_level = NUM2INT(rb_hash_aref(options, id));
 
+        // :output_style => :html/:xml
+        id = ID2SYM(rb_intern("output_style"));
+        if (rb_funcall(options, has_key, 1, id) == Qtrue)
+            output_style = Wikitext_output_style(rb_hash_aref(options, id));
+
         // :link_proc => lambda { |link_target| ... }
         id = ID2SYM(rb_intern("link_proc"));
         if (rb_funcall(options, has_key, 1, id) == Qtrue)
@@ -1086,15 +1124,6 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
     long len = RSTRING_LEN(string);
     char *pe = p + len;
 
-    // access these once per parse
-    VALUE line_ending   = rb_iv_get(self, "@line_ending");
-    line_ending         = StringValue(line_ending);
-    VALUE link_class    = rb_iv_get(self, "@external_link_class");
-    link_class          = NIL_P(link_class) ? Qnil : StringValue(link_class);
-    VALUE mailto_class  = rb_iv_get(self, "@mailto_class");
-    mailto_class        = NIL_P(mailto_class) ? Qnil : StringValue(mailto_class);
-    VALUE prefix        = rb_iv_get(self, "@internal_link_prefix");
-
     // set up parser struct to make passing parameters a little easier
     parser_t *parser                = parser_new();
     GC_WRAP_PARSER(parser, parser_gc);
@@ -1106,6 +1135,7 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
     parser->line_ending             = str_new_from_string(line_ending);
     parser->base_indent             = base_indent;
     parser->base_heading_level      = base_heading_level;
+    parser->output_style            = output_style;
 
     // this simple looping design leads to a single enormous function,
     // but it's faster than doing actual recursive descent and also secure in the face of
@@ -1608,7 +1638,7 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
                         wiki_pop_from_stack_up_to(parser, output, EM_START, true);
                     else
                     {
-                        // no EM_START in scope, so must interpret the TT_END without any special meaning
+                        // no EM_START in scope, so must interpret the EM_END without any special meaning
                         wiki_pop_excess_elements(parser);
                         wiki_start_para_if_necessary(parser);
                         str_append(output, escaped_em_end, sizeof(escaped_em_end) - 1);
@@ -1636,7 +1666,7 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
                         // this is a new opening
                         wiki_pop_excess_elements(parser);
                         wiki_start_para_if_necessary(parser);
-                        str_append(output, tt_start, sizeof(tt_start) - 1);
+                        str_append(output, code_start, sizeof(code_start) - 1);
                         ary_push(parser->scope, TT);
                         ary_push(parser->line, TT);
                     }
@@ -1658,7 +1688,7 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
                     {
                         wiki_pop_excess_elements(parser);
                         wiki_start_para_if_necessary(parser);
-                        str_append(output, tt_start, sizeof(tt_start) - 1);
+                        str_append(output, code_start, sizeof(code_start) - 1);
                         ary_push(parser->scope, TT_START);
                         ary_push(parser->line, TT_START);
                     }

data/ext/wikitext.c

@@ -29,6 +29,36 @@ VALUE cWikitextParser        = 0;   // class Wikitext::Parser
 VALUE eWikitextParserError   = 0;   // class Wikitext::Parser::Error
 VALUE cWikitextParserToken   = 0;   // class Wikitext::Parser::Token
 
+// In order to replicate this Ruby code:
+//
+//   ActiveSupport.on_load(:action_view) do
+//     require 'wikitext/rails_template_handler'
+//   end
+//
+// here in C we have to jump through some hoops using the following two
+// functions.
+//
+// First we have wikitext_on_load_block(), which is a function which defines
+// the "block" of code that we want to have evaluated.
+//
+// To actually pass this block in to the ActiveSupport::on_load method we
+// need the help of an intermediate helper function,
+// wikitext_block_forwarder(), which we invoke with the aid of rb_iterate()
+// later on.
+//
+// This works because the rb_funcall() function in wikitext_block_forwarder()
+// propagates the block through to the called method.
+VALUE wikitext_on_load_block(VALUE yielded, VALUE other)
+{
+    return rb_require("wikitext/rails_template_handler");
+}
+
+VALUE wikitext_block_forwarder(VALUE receiver)
+{
+    return rb_funcall(receiver, rb_intern("on_load"), 1,
+        ID2SYM(rb_intern("action_view")));
+}
+
 void Init_wikitext()
 {
     // Wikitext
@@ -53,6 +83,7 @@ void Init_wikitext()
     rb_define_attr(cWikitextParser, "space_to_underscore", Qtrue, Qtrue);
     rb_define_attr(cWikitextParser, "minimum_fulltext_token_length", Qtrue, Qtrue);
     rb_define_attr(cWikitextParser, "base_heading_level", Qtrue, Qtrue);
+    rb_define_attr(cWikitextParser, "output_style", Qtrue, Qtrue);
 
     // Wikitext::Parser::Error
     eWikitextParserError = rb_define_class_under(cWikitextParser, "Error", rb_eException);
@@ -69,4 +100,24 @@ void Init_wikitext()
     rb_define_attr(cWikitextParserToken, "code_point", Qtrue, Qfalse);
     rb_define_attr(cWikitextParserToken, "token_type", Qtrue, Qfalse);
     rb_define_attr(cWikitextParserToken, "string_value", Qtrue, Qfalse);
+
+    // check to see if ::ActiveSupport is defined
+    if (rb_funcall(rb_cObject, rb_intern("const_defined?"), 1,
+        ID2SYM(rb_intern("ActiveSupport"))) == Qtrue)
+    {
+        // we are running under Rails
+        rb_require("wikitext/nil_class");
+        rb_require("wikitext/string");
+
+        // now check for Rails version
+        VALUE active_support = rb_const_get(rb_cObject,
+            rb_intern("ActiveSupport"));
+        if (rb_respond_to(active_support, rb_intern("on_load")))
+            // running under Rails 3
+            rb_iterate(wikitext_block_forwarder, active_support,
+                wikitext_on_load_block, Qnil);
+        else
+            // running under Rails 2
+            rb_require("wikitext/rails_template_handler");
+    }
 }

data/lib/wikitext/preprocess.rb

@@ -0,0 +1,50 @@
+# Copyright 2008-2010 Wincent Colaiuta. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+class String
+  # This is an example preprocessing method that will be called by the
+  # String#to_wikitext method prior to feeding the markup into the parser.
+  # In this case we take input like this:
+  #
+  #   For more info see issue #125, which was filed last week.
+  #
+  # And transform it into:
+  #
+  #   For more info see [/issues/125 issue #125], which was filed last week.
+  #
+  # Which in turn is translated into the following HTML by the parser:
+  #
+  #   <p>For more info see <a href="/issues/125">issue #125</a>, which was
+  #   filed last week.</p>
+  #
+  # Obviously this file is an example designed to work with a specific
+  # application and is optional, so will only come into play if explicitly
+  # required. To provide different behavior, simply define a new definition of
+  # String#wikitext_preprocess.
+  #
+  # For now this is done in pure Ruby; if speed became a concern we could
+  # provide a fast Ragel C extension to do it instead.
+  def wikitext_preprocess
+    gsub /\b(bug|issue|request|ticket) #(\d+)/i, '[/issues/\2 \1 #\2]'
+  end
+end

data/lib/wikitext/{rails.rb → rails_template_handler.rb}

@@ -24,12 +24,35 @@
 require 'wikitext/nil_class'
 require 'wikitext/string'
 
-module Wikitext
-  class TemplateHandler
-    def self.call template
-      'template.source.w'
-    end
-  end
-end
-
-ActionView::Template.register_template_handler :wikitext, Wikitext::TemplateHandler
+module ActionView
+  class Template
+    module Handlers
+
+      begin
+
+        # assume Rails 3
+        class Wikitext < Handler
+          include Compilable
+
+          def compile template
+            "'" + template.source.w.gsub("'", "\\\\'") + "'"
+          end
+        end # class Wikitext
+
+      rescue NameError
+
+        # fall back to Rails 2
+        class Wikitext
+          def self.call template
+            'template.source.w'
+          end
+        end # class Wikitext
+
+      end
+
+    end # module Handlers
+  end # class Template
+end # module ActionView
+
+ActionView::Template.register_template_handler :wikitext,
+  ActionView::Template::Handlers::Wikitext

data/lib/wikitext/string.rb

@@ -26,18 +26,10 @@ require 'wikitext/parser'
 class String
   def to_wikitext options = {}
     default_options = { :indent => false }
-    html = Wikitext::Parser.shared_parser.parse wikitext_preprocess,
+    markup = respond_to?(:wikitext_preprocess) ? wikitext_preprocess : self
+    html = Wikitext::Parser.shared_parser.parse markup,
       default_options.merge(options)
     html.respond_to?(:html_safe) ? html.html_safe : html
   end
   alias :w :to_wikitext
-
-private
-
-  # for now do this in pure Ruby
-  # if speed later becomes a concern can whip up a Ragel C extension to do it
-  # TODO: make this customizable (accept a lambda that performs preprocessing)
-  def wikitext_preprocess
-    gsub /\b(bug|issue|request|ticket) #(\d+)/i, '[/issues/\2 \1 #\2]'
-  end
 end

data/lib/wikitext/version.rb

@@ -22,5 +22,5 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 module Wikitext
-  VERSION = '1.12'
+  VERSION = '2.0'
 end # module Wikitext

data/rails/init.rb

@@ -21,11 +21,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-# Avoid Rails bug #2266 by not requiring during "rake gems:build"
-# See: https://rails.lighthouseapp.com/projects/8994/tickets/2266
+# this file evaluated automatically under Rails 2
 unless $gems_build_rake_task
-  libdir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'wikitext'))
-  require File.join(libdir, 'nil_class')
-  require File.join(libdir, 'string')
-  require File.join(libdir, 'rails')
+  # avoid Rails bug #2266 by not requiring during "rake gems:build"
+  # see: https://rails.lighthouseapp.com/projects/8994/tickets/2266
+  require 'wikitext'
 end

data/spec/blockquote_spec.rb

@@ -194,7 +194,7 @@ describe Wikitext::Parser, 'standard blockquotes (">" in first column)' do
     END
     expected = dedent <<-END
       <blockquote>
-        <p>link to <a href="/wiki/something">something</a>, and <em>other</em> <tt>styled</tt> <strong>spans</strong>.</p>
+        <p>link to <a href="/wiki/something">something</a>, and <em>other</em> <code>styled</code> <strong>spans</strong>.</p>
       </blockquote>
     END
     @parser.parse(input).should == expected
@@ -243,7 +243,7 @@ describe Wikitext::Parser, 'standard blockquotes (">" in first column)' do
           <li>a</li>
           <li>list</li>
         </ul>
-        <p>outer para with <em>styled</em> <tt>stuff</tt> in it</p>
+        <p>outer para with <em>styled</em> <code>stuff</code> in it</p>
         <blockquote>
           <p>inner blockquote</p>
           <ol>
@@ -268,7 +268,7 @@ describe Wikitext::Parser, 'standard blockquotes (">" in first column)' do
     END
     expected = dedent <<-END
       <blockquote>
-        <p>some <tt>styled</tt></p>
+        <p>some <code>styled</code></p>
       </blockquote>
     END
     @parser.parse(input).should == expected

data/spec/external_link_spec.rb

@@ -117,12 +117,12 @@ describe Wikitext::Parser, 'external links' do
   end
 
   it 'should format a link with <tt></tt> tags in the link text' do
-    expected = %Q{<p><a href="http://google.com/" class="external">Google <tt>SOC</tt></a></p>\n}
+    expected = %Q{<p><a href="http://google.com/" class="external">Google <code>SOC</code></a></p>\n}
     @parser.parse("[http://google.com/ Google <tt>SOC</tt>]").should == expected
   end
 
   it 'should automatically close unmatched <tt> tags in the link text' do
-    expected = %Q{<p><a href="http://google.com/" class="external">Google <tt>SOC</tt></a></p>\n}
+    expected = %Q{<p><a href="http://google.com/" class="external">Google <code>SOC</code></a></p>\n}
     @parser.parse("[http://google.com/ Google <tt>SOC]").should == expected
   end
 
@@ -194,7 +194,7 @@ describe Wikitext::Parser, 'external links' do
     @parser.parse("foo '']'' bar").should == "<p>foo <em>]</em> bar</p>\n"                        # in EM scope
     @parser.parse("foo ''']''' bar").should == "<p>foo <strong>]</strong> bar</p>\n"              # in STRONG scope
     @parser.parse("foo ''''']''''' bar").should == "<p>foo <strong><em>]</em></strong> bar</p>\n" # in STRONG_EM scope
-    @parser.parse('foo <tt>]</tt> bar').should == "<p>foo <tt>]</tt> bar</p>\n"                   # in TT scope
+    @parser.parse('foo <tt>]</tt> bar').should == "<p>foo <code>]</code> bar</p>\n"               # in TT scope
     @parser.parse('= foo ] bar =').should == "<h1>foo ] bar</h1>\n"                               # in H1 scope
     @parser.parse('== foo ] bar ==').should == "<h2>foo ] bar</h2>\n"                             # in H2 scope
     @parser.parse('=== foo ] bar ===').should == "<h3>foo ] bar</h3>\n"                           # in H3 scope

data/spec/img_spec.rb

@@ -30,15 +30,48 @@ describe Wikitext::Parser, 'embedding img tags' do
   end
 
   it 'should convert valid markup into inline image tags' do
-    @parser.parse('{{foo.png}}').should == %Q{<p><img src="/images/foo.png" alt="foo.png" /></p>\n}
+    expected = %Q{<p><img src="/images/foo.png" alt="foo.png"></p>\n}
+    @parser.parse('{{foo.png}}').should == expected
+  end
+
+  it 'should produce XML output if passed option at parse time' do
+    expected = %Q{<p><img src="/images/foo.png" alt="foo.png" /></p>\n}
+    @parser.parse('{{foo.png}}', :output_style => :xml).should == expected
+  end
+
+  it 'should produce XML output if set via instance variable' do
+    expected = %Q{<p><img src="/images/foo.png" alt="foo.png" /></p>\n}
+    parser = Wikitext::Parser.new
+    parser.output_style = :xml
+    parser.parse('{{foo.png}}').should == expected
+  end
+
+  it 'should produce XML output if option set during initialization' do
+    expected = %Q{<p><img src="/images/foo.png" alt="foo.png" /></p>\n}
+    parser = Wikitext::Parser.new :output_style => :xml
+    parser.parse('{{foo.png}}').should == expected
+  end
+
+  it 'should produce HTML output if passed unrecognized output style' do
+    expected = %Q{<p><img src="/images/foo.png" alt="foo.png"></p>\n}
+
+    # the _only_ recognized override is :xml (case-sensitive)
+    @parser.parse('{{foo.png}}', :output_style => :html).should == expected
+    @parser.parse('{{foo.png}}', :output_style => false).should == expected
+    @parser.parse('{{foo.png}}', :output_style => nil).should == expected
+    @parser.parse('{{foo.png}}', :output_style => 42).should == expected
+    @parser.parse('{{foo.png}}', :output_style => 'XML').should == expected
+    @parser.parse('{{foo.png}}', :output_style => :XML).should == expected
   end
 
   it 'should appear embedded in an inline flow' do
-    @parser.parse('before {{foo.png}} after').should == %Q{<p>before <img src="/images/foo.png" alt="foo.png" /> after</p>\n}
+    expected = %Q{<p>before <img src="/images/foo.png" alt="foo.png"> after</p>\n}
+    @parser.parse('before {{foo.png}} after').should == expected
   end
 
   it 'should allow images in subdirectories' do
-    @parser.parse('{{foo/bar.png}}').should == %Q{<p><img src="/images/foo/bar.png" alt="foo/bar.png" /></p>\n}
+    expected = %Q{<p><img src="/images/foo/bar.png" alt="foo/bar.png"></p>\n}
+    @parser.parse('{{foo/bar.png}}').should == expected
   end
 
   it 'should pass through empty image tags unchanged' do
@@ -46,14 +79,14 @@ describe Wikitext::Parser, 'embedding img tags' do
   end
 
   it 'should not append prefix if img src starts with a slash' do
-    @parser.parse('{{/foo.png}}').should ==
-      %Q{<p><img src="/foo.png" alt="/foo.png" /></p>\n}
+    expected = %Q{<p><img src="/foo.png" alt="/foo.png"></p>\n}
+    @parser.parse('{{/foo.png}}').should == expected
   end
 
   it 'should work in BLOCKQUOTE blocks' do
     expected = dedent <<-END
       <blockquote>
-        <p><img src="/images/foo.png" alt="foo.png" /></p>
+        <p><img src="/images/foo.png" alt="foo.png"></p>
       </blockquote>
     END
     @parser.parse('> {{foo.png}}').should == expected
@@ -67,9 +100,9 @@ describe Wikitext::Parser, 'embedding img tags' do
     END
     expected = dedent <<-END
       <ul>
-        <li><img src="/images/foo.png" alt="foo.png" /></li>
-        <li><img src="/images/bar.png" alt="bar.png" /></li>
-        <li><img src="/images/baz.png" alt="baz.png" /></li>
+        <li><img src="/images/foo.png" alt="foo.png"></li>
+        <li><img src="/images/bar.png" alt="bar.png"></li>
+        <li><img src="/images/baz.png" alt="baz.png"></li>
       </ul>
     END
     @parser.parse(input).should == expected
@@ -83,36 +116,42 @@ describe Wikitext::Parser, 'embedding img tags' do
     END
     expected = dedent <<-END
       <ol>
-        <li><img src="/images/foo.png" alt="foo.png" /></li>
-        <li><img src="/images/bar.png" alt="bar.png" /></li>
-        <li><img src="/images/baz.png" alt="baz.png" /></li>
+        <li><img src="/images/foo.png" alt="foo.png"></li>
+        <li><img src="/images/bar.png" alt="bar.png"></li>
+        <li><img src="/images/baz.png" alt="baz.png"></li>
       </ol>
     END
     @parser.parse(input).should == expected
   end
 
   it 'should work in <h1> headings' do
-    @parser.parse('= {{foo.png}} =').should == %Q{<h1><img src="/images/foo.png" alt="foo.png" /></h1>\n}
+    expected = %Q{<h1><img src="/images/foo.png" alt="foo.png"></h1>\n}
+    @parser.parse('= {{foo.png}} =').should == expected
   end
 
   it 'should work in <h2> headings' do
-    @parser.parse('== {{foo.png}} ==').should == %Q{<h2><img src="/images/foo.png" alt="foo.png" /></h2>\n}
+    expected = %Q{<h2><img src="/images/foo.png" alt="foo.png"></h2>\n}
+    @parser.parse('== {{foo.png}} ==').should == expected
   end
 
   it 'should work in <h3> headings' do
-    @parser.parse('=== {{foo.png}} ===').should == %Q{<h3><img src="/images/foo.png" alt="foo.png" /></h3>\n}
+    expected = %Q{<h3><img src="/images/foo.png" alt="foo.png"></h3>\n}
+    @parser.parse('=== {{foo.png}} ===').should == expected
   end
 
   it 'should work in <h4> headings' do
-    @parser.parse('==== {{foo.png}} ====').should == %Q{<h4><img src="/images/foo.png" alt="foo.png" /></h4>\n}
+    expected = %Q{<h4><img src="/images/foo.png" alt="foo.png"></h4>\n}
+    @parser.parse('==== {{foo.png}} ====').should == expected
   end
 
   it 'should work in <h5> headings' do
-    @parser.parse('===== {{foo.png}} =====').should == %Q{<h5><img src="/images/foo.png" alt="foo.png" /></h5>\n}
+    expected = %Q{<h5><img src="/images/foo.png" alt="foo.png"></h5>\n}
+    @parser.parse('===== {{foo.png}} =====').should == expected
   end
 
   it 'should work in <h6> headings' do
-    @parser.parse('====== {{foo.png}} ======').should == %Q{<h6><img src="/images/foo.png" alt="foo.png" /></h6>\n}
+    expected = %Q{<h6><img src="/images/foo.png" alt="foo.png"></h6>\n}
+    @parser.parse('====== {{foo.png}} ======').should == expected
   end
 
   it 'should pass single curly braces through unaltered' do
@@ -124,23 +163,27 @@ describe Wikitext::Parser, 'embedding img tags' do
   end
 
   it 'should have no effect inside PRE_START blocks' do
-    @parser.parse('<pre>{{foo.png}}</pre>').should == %Q{<pre>{{foo.png}}</pre>\n}
+    expected = %Q{<pre>{{foo.png}}</pre>\n}
+    @parser.parse('<pre>{{foo.png}}</pre>').should == expected
   end
 
   it 'should have no effect inside NO_WIKI spans' do
-    @parser.parse('<nowiki>{{foo.png}}</nowiki>').should == %Q{<p>{{foo.png}}</p>\n}
+    expected = %Q{<p>{{foo.png}}</p>\n}
+    @parser.parse('<nowiki>{{foo.png}}</nowiki>').should == expected
   end
 
   it 'should be passed through in internal link targets' do
-    @parser.parse('[[{{foo.png}}]]').should == %Q{<p><a href="/wiki/%7b%7bfoo.png%7d%7d">{{foo.png}}</a></p>\n}
+    expected = %Q{<p><a href="/wiki/%7b%7bfoo.png%7d%7d">{{foo.png}}</a></p>\n}
+    @parser.parse('[[{{foo.png}}]]').should == expected
   end
 
   it 'should be passed through in internal link text' do
-    @parser.parse('[[article|{{foo.png}}]]').should == %Q{<p><a href="/wiki/article">{{foo.png}}</a></p>\n}
+    expected = %Q{<p><a href="/wiki/article">{{foo.png}}</a></p>\n}
+    @parser.parse('[[article|{{foo.png}}]]').should == expected
   end
 
   it 'should not be allowed as an external link target' do
-    expected = %Q{<p>[<img src="/images/foo.png" alt="foo.png" /> the link]</p>\n}
+    expected = %Q{<p>[<img src="/images/foo.png" alt="foo.png"> the link]</p>\n}
     @parser.parse('[{{foo.png}} the link]').should == expected
   end
 
@@ -150,7 +193,8 @@ describe Wikitext::Parser, 'embedding img tags' do
   end
 
   it 'should not allow embedded quotes' do
-    @parser.parse('{{"fun".png}}').should == %Q{<p>{{&quot;fun&quot;.png}}</p>\n}
+    expected = %Q{<p>{{&quot;fun&quot;.png}}</p>\n}
+    @parser.parse('{{"fun".png}}').should == expected
   end
 
   it 'should not allow embedded spaces' do
@@ -163,31 +207,37 @@ describe Wikitext::Parser, 'embedding img tags' do
 
   it 'should allow overrides of the image prefix at initialization time' do
     parser = Wikitext::Parser.new(:img_prefix => '/gfx/')
-    parser.parse('{{foo.png}}').should == %Q{<p><img src="/gfx/foo.png" alt="foo.png" /></p>\n}
+    expected = %Q{<p><img src="/gfx/foo.png" alt="foo.png"></p>\n}
+    parser.parse('{{foo.png}}').should == expected
   end
 
   it 'should suppress the image prefix if passed an empty string at initialization time' do
     parser = Wikitext::Parser.new(:img_prefix => '')
-    parser.parse('{{foo.png}}').should == %Q{<p><img src="foo.png" alt="foo.png" /></p>\n}
+    expected = %Q{<p><img src="foo.png" alt="foo.png"></p>\n}
+    parser.parse('{{foo.png}}').should == expected
   end
 
   it 'should suppress image prefix if passed nil at initialization time' do
     parser = Wikitext::Parser.new(:img_prefix => nil)
-    parser.parse('{{foo.png}}').should == %Q{<p><img src="foo.png" alt="foo.png" /></p>\n}
+    expected = %Q{<p><img src="foo.png" alt="foo.png"></p>\n}
+    parser.parse('{{foo.png}}').should == expected
   end
 
   it 'should allow overrides of the image prefix after initialization' do
     @parser.img_prefix = '/gfx/'
-    @parser.parse('{{foo.png}}').should == %Q{<p><img src="/gfx/foo.png" alt="foo.png" /></p>\n}
+    expected = %Q{<p><img src="/gfx/foo.png" alt="foo.png"></p>\n}
+    @parser.parse('{{foo.png}}').should == expected
   end
 
   it 'should suppress image if prefix set to an empty string after initialization' do
     @parser.img_prefix = ''
-    @parser.parse('{{foo.png}}').should == %Q{<p><img src="foo.png" alt="foo.png" /></p>\n}
+    expected = %Q{<p><img src="foo.png" alt="foo.png"></p>\n}
+    @parser.parse('{{foo.png}}').should == expected
   end
 
   it 'should suppress image if prefix set to nil after initialization' do
     @parser.img_prefix = nil
-    @parser.parse('{{foo.png}}').should == %Q{<p><img src="foo.png" alt="foo.png" /></p>\n}
+    expected = %Q{<p><img src="foo.png" alt="foo.png"></p>\n}
+    @parser.parse('{{foo.png}}').should == expected
   end
 end

data/spec/integration_spec.rb

@@ -186,14 +186,14 @@ describe Wikitext::Parser, 'with large slab of input text' do
       syntax as you can see.</pre>
       </blockquote>
       <h2>another heading</h2>
-      <p>paragraph within <em>multiple <strong>styles</strong></em> and <tt>tt span</tt></p>
+      <p>paragraph within <em>multiple <strong>styles</strong></em> and <code>tt span</code></p>
       <p>similar, but with <strong>styles in <em>different</em> order</strong></p>
       <p>again, a <strong>different <em>order</em></strong></p>
       <ul>
         <li>list item 1 [<a href="http://google.com/" class="external">http://google.com/</a> unterminated
           <ul>
             <li>nested list item 1 with [[bad link</li>
-            <li>nested list item 2 with unclosed <tt>span</tt></li>
+            <li>nested list item 2 with unclosed <code>span</code></li>
             <li>nested list item 3</li>
           </ul>
         </li>
@@ -204,7 +204,7 @@ describe Wikitext::Parser, 'with large slab of input text' do
       which would '''otherwise''' have &lt;tt&gt;special&lt;/tt&gt; meaning
       although explicit entities &copy; are passed through unchanged</pre>
       <p>a normal paragraph again</p>
-      <p><img src="/images/an_image.png" alt="an_image.png" /></p>
+      <p><img src="/images/an_image.png" alt="an_image.png"></p>
       <blockquote>
         <p>This is another blockquote which demonstrates that we can nest other structures inside of it. For example, here we have a code sample:</p>
         <pre>line 1
@@ -216,7 +216,7 @@ describe Wikitext::Parser, 'with large slab of input text' do
           <li>a</li>
           <li>list</li>
         </ul>
-        <p>And here is a link to <a href="/wiki/something">something</a>, and some <em>other</em> <tt>styled</tt> <strong>spans</strong>.</p>
+        <p>And here is a link to <a href="/wiki/something">something</a>, and some <em>other</em> <code>styled</code> <strong>spans</strong>.</p>
         <blockquote>
           <p>Finally we have a nested blockquote.</p>
           <ol>

data/spec/internal_link_spec.rb

@@ -34,7 +34,7 @@ describe Wikitext::Parser, 'internal links (space to underscore off)' do
     @parser.parse("foo '']]'' bar").should == "<p>foo <em>]]</em> bar</p>\n"                        # in EM scope
     @parser.parse("foo ''']]''' bar").should == "<p>foo <strong>]]</strong> bar</p>\n"              # in STRONG scope
     @parser.parse("foo ''''']]''''' bar").should == "<p>foo <strong><em>]]</em></strong> bar</p>\n" # in STRONG_EM scope
-    @parser.parse('foo <tt>]]</tt> bar').should == "<p>foo <tt>]]</tt> bar</p>\n"                   # in TT scope
+    @parser.parse('foo <tt>]]</tt> bar').should == "<p>foo <code>]]</code> bar</p>\n"               # in TT scope
     @parser.parse('= foo ]] bar =').should == "<h1>foo ]] bar</h1>\n"                               # in H1 scope
     @parser.parse('== foo ]] bar ==').should == "<h2>foo ]] bar</h2>\n"                             # in H2 scope
     @parser.parse('=== foo ]] bar ===').should == "<h3>foo ]] bar</h3>\n"                           # in H3 scope
@@ -314,12 +314,12 @@ describe Wikitext::Parser, 'internal links (space to underscore off)' do
     end
 
     it 'should allow tt markup in the custom link text' do
-      expected = %Q{<p><a href="/wiki/foo">bar <tt>baz</tt></a></p>\n}
+      expected = %Q{<p><a href="/wiki/foo">bar <code>baz</code></a></p>\n}
       @parser.parse('[[foo|bar <tt>baz</tt>]]').should == expected
     end
 
     it 'should automatically close unclosed tt markup in the custom link text' do
-      expected = %Q{<p><a href="/wiki/foo">bar <tt>baz</tt></a></p>\n}
+      expected = %Q{<p><a href="/wiki/foo">bar <code>baz</code></a></p>\n}
       @parser.parse('[[foo|bar <tt>baz]]').should == expected
     end
 
@@ -579,7 +579,7 @@ describe Wikitext::Parser, 'internal links (space to underscore on)' do
     @parser.parse("foo '']]'' bar").should == "<p>foo <em>]]</em> bar</p>\n"                        # in EM scope
     @parser.parse("foo ''']]''' bar").should == "<p>foo <strong>]]</strong> bar</p>\n"              # in STRONG scope
     @parser.parse("foo ''''']]''''' bar").should == "<p>foo <strong><em>]]</em></strong> bar</p>\n" # in STRONG_EM scope
-    @parser.parse('foo <tt>]]</tt> bar').should == "<p>foo <tt>]]</tt> bar</p>\n"                   # in TT scope
+    @parser.parse('foo <tt>]]</tt> bar').should == "<p>foo <code>]]</code> bar</p>\n"               # in TT scope
     @parser.parse('= foo ]] bar =').should == "<h1>foo ]] bar</h1>\n"                               # in H1 scope
     @parser.parse('== foo ]] bar ==').should == "<h2>foo ]] bar</h2>\n"                             # in H2 scope
     @parser.parse('=== foo ]] bar ===').should == "<h3>foo ]] bar</h3>\n"                           # in H3 scope
@@ -854,12 +854,12 @@ describe Wikitext::Parser, 'internal links (space to underscore on)' do
     end
 
     it 'should allow tt markup in the custom link text' do
-      expected = %Q{<p><a href="/wiki/foo">bar <tt>baz</tt></a></p>\n}
+      expected = %Q{<p><a href="/wiki/foo">bar <code>baz</code></a></p>\n}
       @parser.parse('[[foo|bar <tt>baz</tt>]]').should == expected
     end
 
     it 'should automatically close unclosed tt markup in the custom link text' do
-      expected = %Q{<p><a href="/wiki/foo">bar <tt>baz</tt></a></p>\n}
+      expected = %Q{<p><a href="/wiki/foo">bar <code>baz</code></a></p>\n}
       @parser.parse('[[foo|bar <tt>baz]]').should == expected
     end
 

data/spec/parser_spec.rb

@@ -35,7 +35,7 @@ describe Wikitext::Parser do
     original_prefix                    = '/images/'
     parser.img_prefix                  = original_prefix
     parser.img_prefix.should           == original_prefix
-    parser.parse('{{foo.png}}').should == %Q{<p><img src="/images/foo.png" alt="foo.png" /></p>\n}
+    parser.parse('{{foo.png}}').should == %Q{<p><img src="/images/foo.png" alt="foo.png"></p>\n}
 
     # second pass
     parser                             = Wikitext::Parser.shared_parser
@@ -43,6 +43,6 @@ describe Wikitext::Parser do
     new_prefix                         = '/totally-different-prefix/'
     parser.img_prefix                  = new_prefix
     parser.img_prefix.should           == new_prefix
-    parser.parse('{{bar.png}}').should == %Q{<p><img src="/totally-different-prefix/bar.png" alt="bar.png" /></p>\n}
+    parser.parse('{{bar.png}}').should == %Q{<p><img src="/totally-different-prefix/bar.png" alt="bar.png"></p>\n}
   end
 end

data/spec/pre_spec.rb

@@ -420,7 +420,7 @@ describe Wikitext::Parser, 'parsing PRE_START/PRE_END blocks' do
 
     # `
     expected = dedent <<-END
-      <p>hello <tt>my </tt></p>
+      <p>hello <code>my </code></p>
       <pre>world</pre>
     END
     @parser.parse("hello `my <pre>world</pre>").should == expected
@@ -448,7 +448,7 @@ describe Wikitext::Parser, 'parsing PRE_START/PRE_END blocks' do
 
     # <tt>
     expected = dedent <<-END
-      <p>hello <tt>my </tt></p>
+      <p>hello <code>my </code></p>
       <pre>world</pre>
     END
     @parser.parse("hello <tt>my <pre>world</pre>").should == expected

data/spec/rails_spec.rb

@@ -1,4 +1,4 @@
-# Copyright 2009 Wincent Colaiuta. All rights reserved.
+# Copyright 2009-2010 Wincent Colaiuta. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -29,10 +29,12 @@ require 'wopen3'
 require 'ostruct'
 
 module RailsSpecs
-  TRASH_PATH    = Pathname.new(__FILE__).dirname + 'trash'
-  CLONE_PATH    = TRASH_PATH + 'rails.git'
-  RAILS_PATH    = CLONE_PATH + 'railties' + 'bin' + 'rails'
-  EDGE_APP_PATH = TRASH_PATH + 'edge-app'
+  TRASH_PATH              = Pathname.new(__FILE__).dirname + 'trash'
+  CLONE_PATH              = TRASH_PATH + 'rails.git'
+  RAILS2_BIN_PATH         = CLONE_PATH + 'railties' + 'bin' + 'rails'
+  RAILS3_BIN_PATH         = CLONE_PATH + 'bin' + 'rails'
+  WIKITEXT_GEM_PATH       = TRASH_PATH + '..' + '..'
+  SUCCESSFUL_TEST_RESULT  = /1 tests, 3 assertions, 0 failures, 0 errors/
 
   def run cmd, *args
     result = OpenStruct.new
@@ -51,7 +53,7 @@ module RailsSpecs
     status = $?.exitstatus
     if status != 0
       command_string = ([cmd] + args).join(' ')
-      puts "*** COMMAND #{command_string} EXITED WITH NON-ZERO EXIT STATUS (#{status})"
+      puts "\n*** COMMAND #{command_string} EXITED WITH NON-ZERO EXIT STATUS (#{status})"
       puts "*** STDOUT FOR COMMAND #{command_string}:", result.stdout
       puts "*** STDERR FOR COMMAND #{command_string}:", result.stderr
       raise "non-zero exit status (#{status}) for '#{cmd}'"
@@ -70,14 +72,20 @@ module RailsSpecs
   end
 
   def app_path version
+    version = 'edge' if version.nil?
+    version = "v#{version}" if version =~ /\A3\./
     TRASH_PATH + "#{version}-app"
   end
 
-  def create_base_app_and_symlinks app, &block
+  def create_rails2_app version
+    app = app_path version
     clone
     FileUtils.rm_r(app) if File.exist?(app)
-    yield
-    run 'ruby', RAILS_PATH, app
+    FileUtils.cd CLONE_PATH do
+      run 'git', 'checkout', '-f', "v#{version}"
+      run 'git', 'clean', '-f'
+    end
+    run 'ruby', RAILS2_BIN_PATH, app
     vendor = app + 'vendor'
     gems = vendor + 'gems'
     FileUtils.cd vendor do
@@ -89,13 +97,22 @@ module RailsSpecs
     end
   end
 
-  def create_release_app version
-    create_base_app_and_symlinks app_path(version) do
-      FileUtils.cd CLONE_PATH do
-        run 'git', 'checkout', "v#{version}"
-        run 'git', 'clean', '-f'
+  # if version is nil will create an "Edge" app
+  def create_rails3_app version
+    app = app_path version
+    clone
+    FileUtils.rm_r(app) if File.exist?(app)
+    FileUtils.cd CLONE_PATH do
+      if version
+        run 'git', 'checkout', '-f', "v#{version}"
+      else # "Edge"
+        run 'git', 'checkout', '-f', 'master'
+        run 'git', 'merge', 'origin/master'
       end
+      run 'git', 'clean', '-f'
     end
+    run 'ruby', RAILS3_BIN_PATH, 'new', app, '--skip-activerecord', '--dev'
+    create_gemfile app
   end
 
   def insert text, after, infile
@@ -112,10 +129,25 @@ module RailsSpecs
     raise "text '#{after}' not found" unless found
   end
 
+  # Rails 2 only
   def add_text_to_initializer text, infile
     insert text, 'Rails::Initializer.run do', infile
   end
 
+  # Rails 3 only
+  def add_text_to_routes text, infile
+    insert text, 'Application.routes.draw', infile
+  end
+
+  def create_gemfile app
+    File.open(app + 'Gemfile', 'w') do |f|
+      f.write <<-GEMFILE
+        gem 'rails', :path => "#{CLONE_PATH.realpath}"
+        gem 'wikitext', :path => "#{WIKITEXT_GEM_PATH.realpath}"
+      GEMFILE
+    end
+  end
+
   def create_controller app
     File.open(app + 'app' + 'controllers' + 'wiki_controller.rb', 'w') do |f|
       f.write 'class WikiController < ApplicationController; end'
@@ -150,16 +182,7 @@ TEST
       end
   end
 
-  def create_edge_app
-    create_base_app_and_symlinks EDGE_APP_PATH do
-      FileUtils.cd CLONE_PATH do
-        run 'git', 'checkout', 'master'
-        run 'git', 'merge', 'origin/master'
-        run 'git', 'clean', '-f'
-      end
-    end
-  end
-
+  # Rails 2 only
   def update_environment app
     environment =  app + 'config' + 'environment.rb'
     add_text_to_initializer "  config.gem 'wikitext', :version => '#{Wikitext::VERSION}'", environment
@@ -168,21 +191,32 @@ TEST
     end
   end
 
-  def setup_release_app version
-    create_release_app version
-    path = app_path(version)
+  # Rails 3 only
+  def update_routes app
+    routes = app + 'config' + 'routes.rb'
+    add_text_to_routes 'match "/wiki" => "wiki#index"', routes
+  end
+
+  def setup_rails2_app version
+    create_rails2_app version
+    path = app_path version
     update_environment path
     create_controller path
     create_template path
     create_test path
   end
 
+  def setup_rails3_app version = nil
+    create_rails3_app version
+    path = app_path version
+    update_routes path
+    create_controller path
+    create_template path
+    create_test path
+  end
+
   def setup_edge_app
-    create_edge_app
-    update_environment EDGE_APP_PATH
-    create_controller EDGE_APP_PATH
-    create_template EDGE_APP_PATH
-    create_test EDGE_APP_PATH
+    setup_rails3_app
   end
 
   def run_integration_test app
@@ -192,29 +226,63 @@ TEST
   end
 end # module RailsSpecs
 
-describe 'Template handler in Rails 2.2.2' do
+describe 'Template handler in Rails 2.3.0' do
   include RailsSpecs
-  version = '2.2.2'
 
-  before(:all) do
-    setup_release_app version
-    @path = app_path(version)
+  before :all do
+    setup_rails2_app '2.3.0'
+    @path = app_path '2.3.0'
   end
 
   it 'should process the template using the wikitext module' do
-    run_integration_test(@path).should =~ /1 tests, 3 assertions, 0 failures, 0 errors/
+    pending 'Rack::Lint::LintError'
+    # Rack::Lint::LintError: a header value must be a String, but the value of
+    # 'Set-Cookie' is a Array
+    run_integration_test(@path).should =~ RailsSpecs::SUCCESSFUL_TEST_RESULT
+  end
+end
+
+# test other Rails 2 versions
+%w{2.2.2 2.2.3 2.3.1 2.3.2 2.3.2.1 2.3.3 2.3.3.1 2.3.4 2.3.5 2.3.6
+   2.3.7 2.3.8}.each do |version|
+  describe "Template handler in Rails #{version}" do
+    include RailsSpecs
+
+    before :all do
+      setup_rails2_app version
+      @path = app_path version
+    end
+
+    it 'should process the template using the wikitext module' do
+      run_integration_test(@path).should =~ RailsSpecs::SUCCESSFUL_TEST_RESULT
+    end
+  end
+end
+
+%w{3.0.0.beta4}.each do |version|
+  describe "Template handler in Rails #{version}" do
+    include RailsSpecs
+
+    before :all do
+      setup_rails3_app version
+      @path = app_path version
+    end
+
+    it 'should process the template using the wikitext module' do
+      run_integration_test(@path).should =~ RailsSpecs::SUCCESSFUL_TEST_RESULT
+    end
   end
 end
 
 describe 'Template handler in Edge Rails' do
   include RailsSpecs
 
-  before(:all) do
+  before :all do
     setup_edge_app
-    @path = RailsSpecs::EDGE_APP_PATH
+    @path = app_path nil
   end
 
   it 'should process the template using the wikitext module' do
-    run_integration_test(@path).should =~ /1 tests, 3 assertions, 0 failures, 0 errors/
+    run_integration_test(@path).should =~ RailsSpecs::SUCCESSFUL_TEST_RESULT
   end
 end

data/spec/tt_spec.rb

@@ -31,21 +31,23 @@ describe Wikitext::Parser, 'parsing <tt> spans' do
   end
 
   it 'should recognize paired <tt> and </tt> tags' do
-    @parser.parse('foo <tt>bar</tt> baz').should == "<p>foo <tt>bar</tt> baz</p>\n"
+    # note how in version 2.0 and above, we output <code> tags instead of <tt>
+    # tags, seeing as the latter have been removed from HTML5
+    @parser.parse('foo <tt>bar</tt> baz').should == "<p>foo <code>bar</code> baz</p>\n"
   end
 
   it 'should recognize <tt> tags case-insensitively' do
-    @parser.parse('foo <TT>bar</tT> baz').should == "<p>foo <tt>bar</tt> baz</p>\n"
-    @parser.parse('foo <tT>bar</Tt> baz').should == "<p>foo <tt>bar</tt> baz</p>\n"
-    @parser.parse('foo <Tt>bar</TT> baz').should == "<p>foo <tt>bar</tt> baz</p>\n"
+    @parser.parse('foo <TT>bar</tT> baz').should == "<p>foo <code>bar</code> baz</p>\n"
+    @parser.parse('foo <tT>bar</Tt> baz').should == "<p>foo <code>bar</code> baz</p>\n"
+    @parser.parse('foo <Tt>bar</TT> baz').should == "<p>foo <code>bar</code> baz</p>\n"
   end
 
   it 'should automatically insert missing closing tags' do
-    @parser.parse('foo <tt>bar').should == "<p>foo <tt>bar</tt></p>\n"
+    @parser.parse('foo <tt>bar').should == "<p>foo <code>bar</code></p>\n"
   end
 
   it 'should automatically close unclosed spans upon hitting newline' do
-    @parser.parse("foo <tt>bar\nbaz").should == "<p>foo <tt>bar</tt> baz</p>\n"
+    @parser.parse("foo <tt>bar\nbaz").should == "<p>foo <code>bar</code> baz</p>\n"
   end
 
   it 'should convert unexpected closing tags into entities' do
@@ -53,11 +55,11 @@ describe Wikitext::Parser, 'parsing <tt> spans' do
   end
 
   it 'should handle (illegal) nested <tt> spans' do
-    @parser.parse('foo <tt>bar <tt>inner</tt></tt> baz').should == "<p>foo <tt>bar &lt;tt&gt;inner</tt>&lt;/tt&gt; baz</p>\n"
+    @parser.parse('foo <tt>bar <tt>inner</tt></tt> baz').should == "<p>foo <code>bar &lt;tt&gt;inner</code>&lt;/tt&gt; baz</p>\n"
   end
 
   it 'should handle (illegal) interleaved spans' do
-    @parser.parse("foo <tt>bar '''inner</tt> baz'''").should == "<p>foo <tt>bar <strong>inner</strong></tt> baz<strong></strong></p>\n"
+    @parser.parse("foo <tt>bar '''inner</tt> baz'''").should == "<p>foo <code>bar <strong>inner</strong></code> baz<strong></strong></p>\n"
   end
 
   it 'should have no effect inside <pre> blocks' do
@@ -69,7 +71,7 @@ describe Wikitext::Parser, 'parsing <tt> spans' do
   end
 
   it 'should have no effect if a backtick span is already open' do
-    @parser.parse('foo `<tt>bar</tt>` baz').should == "<p>foo <tt>&lt;tt&gt;bar&lt;/tt&gt;</tt> baz</p>\n"
+    @parser.parse('foo `<tt>bar</tt>` baz').should == "<p>foo <code>&lt;tt&gt;bar&lt;/tt&gt;</code> baz</p>\n"
   end
 end
 
@@ -79,19 +81,19 @@ describe Wikitext::Parser, 'parsing backtick spans' do
   end
 
   it 'should recognize paired backticks' do
-    @parser.parse('foo `bar` baz').should == "<p>foo <tt>bar</tt> baz</p>\n"
+    @parser.parse('foo `bar` baz').should == "<p>foo <code>bar</code> baz</p>\n"
   end
 
   it 'should automatically insert missing closing backtick' do
-    @parser.parse('foo `bar').should == "<p>foo <tt>bar</tt></p>\n"
+    @parser.parse('foo `bar').should == "<p>foo <code>bar</code></p>\n"
   end
 
   it 'should automatically close unclosed spans upon hitting newline' do
-    @parser.parse("foo `bar\nbaz").should == "<p>foo <tt>bar</tt> baz</p>\n"
+    @parser.parse("foo `bar\nbaz").should == "<p>foo <code>bar</code> baz</p>\n"
   end
 
   it 'should handle (illegal) interleaved spans' do
-    @parser.parse("foo `bar '''inner` baz'''").should == "<p>foo <tt>bar <strong>inner</strong></tt> baz<strong></strong></p>\n"
+    @parser.parse("foo `bar '''inner` baz'''").should == "<p>foo <code>bar <strong>inner</strong></code> baz<strong></strong></p>\n"
   end
 
   it 'should have no effect inside <pre> blocks' do
@@ -103,7 +105,7 @@ describe Wikitext::Parser, 'parsing backtick spans' do
   end
 
   it 'should have no effect if a <tt> span is already open' do
-    @parser.parse('foo <tt>`bar`</tt> baz').should == "<p>foo <tt>`bar`</tt> baz</p>\n"
+    @parser.parse('foo <tt>`bar`</tt> baz').should == "<p>foo <code>`bar`</code> baz</p>\n"
   end
 end
 

data/spec/ul_spec.rb

@@ -223,7 +223,7 @@ describe Wikitext::Parser, 'parsing unordered lists' do
     END
     expected = dedent <<-END
       <ul>
-        <li><tt>hello</tt></li>
+        <li><code>hello</code></li>
         <li>world</li>
       </ul>
     END
@@ -237,7 +237,7 @@ describe Wikitext::Parser, 'parsing unordered lists' do
     END
     expected = dedent <<-END
       <ul>
-        <li><tt>hello</tt></li>
+        <li><code>hello</code></li>
         <li>world</li>
       </ul>
     END

metadata

@@ -3,9 +3,9 @@ name: wikitext
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 1
-  - 12
-  version: "1.12"
+  - 2
+  - 0
+  version: "2.0"
 platform: ruby
 authors: 
 - Wincent Colaiuta
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-09 00:00:00 +02:00
+date: 2010-06-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,7 +29,7 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: wopen3
+  name: thor
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
@@ -40,6 +40,18 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: wopen3
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: "    Wikitext is a fast wikitext-to-HTML translator written in C.\n"
 email: win@wincent.com
 executables: 
@@ -67,7 +79,8 @@ files:
 - ext/depend
 - lib/wikitext/nil_class.rb
 - lib/wikitext/parser.rb
-- lib/wikitext/rails.rb
+- lib/wikitext/preprocess.rb
+- lib/wikitext/rails_template_handler.rb
 - lib/wikitext/string.rb
 - lib/wikitext/version.rb
 - rails/init.rb