wikitext 1.5.1 → 1.5.2

data/ext/parser.c

@@ -31,6 +31,7 @@ typedef struct
     VALUE   link_target;            // short term "memory" for parsing links
     VALUE   link_text;              // short term "memory" for parsing links
     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
     ary_t   *scope;                 // stack for tracking scope
     ary_t   *line;                  // stack for tracking scope as implied by current line
@@ -220,12 +221,20 @@ VALUE _Wikitext_downcase(VALUE string)
     return string;
 }
 
-VALUE _Wikitext_hyperlink(VALUE link_prefix, VALUE link_target, VALUE link_text, VALUE link_class)
+VALUE _Wikitext_hyperlink(parser_t *parser, VALUE link_prefix, VALUE link_target, VALUE link_text, VALUE link_class)
 {
     VALUE string = rb_str_new(a_start, sizeof(a_start) - 1);        // <a href="
     if (!NIL_P(link_prefix))
         rb_str_append(string, link_prefix);
     rb_str_append(string, link_target);
+
+    /* special handling for mailto URIs */
+    const char *mailto = "mailto:";
+    if (NIL_P(link_prefix) &&
+        RSTRING_LEN(link_target) >= (long)sizeof(mailto) &&
+        strncmp(mailto, RSTRING_PTR(link_target), sizeof(mailto)) == 0)
+        link_class = parser->mailto_class; // use mailto_class from parser
+
     if (link_class != Qnil)
     {
         rb_str_cat(string, a_class, sizeof(a_class) - 1);           // " class="
@@ -457,6 +466,12 @@ void _Wikitext_pop_from_stack_up_to(parser_t *parser, VALUE target, int item, VA
     } while (continue_looping);
 }
 
+void _Wikitext_pop_all_from_stack(parser_t *parser, VALUE target)
+{
+    while (!NO_ITEM(ary_entry(parser->scope, -1)))
+        _Wikitext_pop_from_stack(parser, target);
+}
+
 void _Wikitext_start_para_if_necessary(parser_t *parser)
 {
     if (!NIL_P(parser->capture))    // we don't do anything if in capturing mode
@@ -864,7 +879,7 @@ void _Wikitext_rollback_failed_external_link(parser_t *parser)
     if (!NIL_P(parser->link_target))
     {
         if (parser->autolink == Qtrue)
-            parser->link_target = _Wikitext_hyperlink(Qnil, parser->link_target, parser->link_target, parser->external_link_class);
+            parser->link_target = _Wikitext_hyperlink(parser, Qnil, parser->link_target, parser->link_target, parser->external_link_class);
         rb_str_append(parser->output, parser->link_target);
         if (scope_includes_space)
         {
@@ -989,6 +1004,7 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
     parser->link_target             = Qnil;
     parser->link_text               = Qnil;
     parser->external_link_class     = link_class;
+    parser->mailto_class            = mailto_class;
     parser->img_prefix              = rb_iv_get(self, "@img_prefix");
     parser->scope                   = ary_new();
     GC_WRAP_ARY(parser->scope, scope_gc);
@@ -1119,11 +1135,23 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
                 }
                 else if (IN(BLOCKQUOTE))
                 {
-                    // PRE_START is illegal
-                    i = NIL_P(parser->capture) ? parser->output : parser->capture;
-                    _Wikitext_pop_excess_elements(parser);
-                    _Wikitext_start_para_if_necessary(parser);
-                    rb_str_cat(i, escaped_pre_start, sizeof(escaped_pre_start) - 1);
+                    if (token->column_start == 1) // only allowed in first column
+                    {
+                        _Wikitext_rollback_failed_link(parser);             // if any
+                        _Wikitext_rollback_failed_external_link(parser);    // if any
+                        _Wikitext_pop_all_from_stack(parser, Qnil);
+                        _Wikitext_indent(parser);
+                        rb_str_cat(parser->output, pre_start, sizeof(pre_start) - 1);
+                        ary_push(parser->scope, PRE_START);
+                        ary_push(parser->line, PRE_START);
+                    }
+                    else // PRE_START illegal here
+                    {
+                        i = NIL_P(parser->capture) ? parser->output : parser->capture;
+                        _Wikitext_pop_excess_elements(parser);
+                        _Wikitext_start_para_if_necessary(parser);
+                        rb_str_cat(i, escaped_pre_start, sizeof(escaped_pre_start) - 1);
+                    }
                 }
                 else
                 {
@@ -1230,11 +1258,24 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
                 }
                 else if (IN(BLOCKQUOTE))
                 {
-                    // illegal here
-                    i = NIL_P(parser->capture) ? parser->output : parser->capture;
-                    _Wikitext_pop_excess_elements(parser);
-                    _Wikitext_start_para_if_necessary(parser);
-                    rb_str_cat(i, escaped_blockquote_start, sizeof(escaped_blockquote_start) - 1);
+                    if (token->column_start == 1) // only allowed in first column
+                    {
+                        _Wikitext_rollback_failed_link(parser);             // if any
+                        _Wikitext_rollback_failed_external_link(parser);    // if any
+                        _Wikitext_pop_all_from_stack(parser, Qnil);
+                        _Wikitext_indent(parser);
+                        rb_str_cat(parser->output, blockquote_start, sizeof(blockquote_start) - 1);
+                        rb_str_cat(parser->output, parser->line_ending->ptr, parser->line_ending->len);
+                        ary_push(parser->scope, BLOCKQUOTE_START);
+                        ary_push(parser->line, BLOCKQUOTE_START);
+                    }
+                    else // BLOCKQUOTE_START illegal here
+                    {
+                        i = NIL_P(parser->capture) ? parser->output : parser->capture;
+                        _Wikitext_pop_excess_elements(parser);
+                        _Wikitext_start_para_if_necessary(parser);
+                        rb_str_cat(i, escaped_blockquote_start, sizeof(escaped_blockquote_start) - 1);
+                    }
                 }
                 else
                 {
@@ -1884,7 +1925,7 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
                     _Wikitext_start_para_if_necessary(parser);
                     i = TOKEN_TEXT(token);
                     if (parser->autolink == Qtrue)
-                        i = _Wikitext_hyperlink(rb_str_new2("mailto:"), i, i, mailto_class);
+                        i = _Wikitext_hyperlink(parser, rb_str_new2("mailto:"), i, i, mailto_class);
                     rb_str_append(parser->output, i);
                 }
                 break;
@@ -1900,7 +1941,7 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
                     _Wikitext_rollback_failed_link(parser);
                     i = TOKEN_TEXT(token);
                     if (parser->autolink == Qtrue)
-                        i = _Wikitext_hyperlink(Qnil, i, i, parser->external_link_class); // link target, link text
+                        i = _Wikitext_hyperlink(parser, Qnil, i, i, parser->external_link_class); // link target, link text
                     rb_str_append(parser->output, i);
                 }
                 else if (IN(EXT_LINK_START))
@@ -1926,7 +1967,7 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
                             _Wikitext_start_para_if_necessary(parser);
                             rb_str_cat(parser->output, ext_link_start, sizeof(ext_link_start) - 1);
                             if (parser->autolink == Qtrue)
-                                i = _Wikitext_hyperlink(Qnil, i, i, parser->external_link_class); // link target, link text
+                                i = _Wikitext_hyperlink(parser, Qnil, i, i, parser->external_link_class); // link target, link text
                             rb_str_append(parser->output, i);
                         }
                     }
@@ -1947,7 +1988,7 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
                     _Wikitext_start_para_if_necessary(parser);
                     i = TOKEN_TEXT(token);
                     if (parser->autolink == Qtrue)
-                        i = _Wikitext_hyperlink(Qnil, i, i, parser->external_link_class); // link target, link text
+                        i = _Wikitext_hyperlink(parser, Qnil, i, i, parser->external_link_class); // link target, link text
                     rb_str_append(parser->output, i);
                 }
                 break;
@@ -2125,7 +2166,7 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
                     _Wikitext_parser_encode_link_target(parser);
                     _Wikitext_pop_from_stack_up_to(parser, i, LINK_START, Qtrue);
                     parser->capture     = Qnil;
-                    i = _Wikitext_hyperlink(prefix, parser->link_target, parser->link_text, Qnil);
+                    i = _Wikitext_hyperlink(parser, prefix, parser->link_target, parser->link_text, Qnil);
                     rb_str_append(parser->output, i);
                     parser->link_target = Qnil;
                     parser->link_text   = Qnil;
@@ -2209,7 +2250,7 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
                         j = IN(PATH) ? Qnil : parser->external_link_class;
                         _Wikitext_pop_from_stack_up_to(parser, i, EXT_LINK_START, Qtrue);
                         parser->capture = Qnil;
-                        i = _Wikitext_hyperlink(Qnil, parser->link_target, parser->link_text, j);
+                        i = _Wikitext_hyperlink(parser, Qnil, parser->link_target, parser->link_text, j);
                         rb_str_append(parser->output, i);
                     }
                     parser->link_target = Qnil;

data/ext/wikitext_ragel.c

@@ -1,3 +1,4 @@
+
 #line 1 "wikitext_ragel.rl"
 // Copyright 2008-2009 Wincent Colaiuta
 // This program is free software: you can redistribute it and/or modify
@@ -31,13 +32,14 @@
 #define NEXT_CHAR() (*(p + 1))
 
 
-#line 35 "wikitext_ragel.c"
+#line 36 "wikitext_ragel.c"
 static const int wikitext_start = 94;
 static const int wikitext_first_final = 94;
 static const int wikitext_error = 0;
 
 static const int wikitext_en_main = 94;
 
+
 #line 468 "wikitext_ragel.rl"
 
 
@@ -81,16 +83,17 @@ void next_token(token_t *out, token_t *last_token, char *p, char *pe)
     char    *te;        // token end (scanner)
     int     act;        // identity of last patterned matched (scanner)
     
-#line 85 "wikitext_ragel.c"
+#line 87 "wikitext_ragel.c"
 	{
 	cs = wikitext_start;
 	ts = 0;
 	te = 0;
 	act = 0;
 	}
+
 #line 510 "wikitext_ragel.rl"
     
-#line 94 "wikitext_ragel.c"
+#line 97 "wikitext_ragel.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -213,7 +216,6 @@ tr23:
             {p++; cs = 94; goto _out;}
         }
 	break;
-	default: break;
 	}
 	}
 	goto st94;
@@ -665,7 +667,7 @@ st94:
 case 94:
 #line 1 "wikitext_ragel.rl"
 	{ts = p;}
-#line 669 "wikitext_ragel.c"
+#line 671 "wikitext_ragel.c"
 	switch( (*p) ) {
 		case 10: goto tr111;
 		case 13: goto tr112;
@@ -786,7 +788,7 @@ st95:
 	if ( ++p == pe )
 		goto _test_eof95;
 case 95:
-#line 790 "wikitext_ragel.c"
+#line 792 "wikitext_ragel.c"
 	if ( (*p) == 10 )
 		goto tr139;
 	goto tr138;
@@ -800,7 +802,7 @@ st96:
 	if ( ++p == pe )
 		goto _test_eof96;
 case 96:
-#line 804 "wikitext_ragel.c"
+#line 806 "wikitext_ragel.c"
 	if ( (*p) == 32 )
 		goto st96;
 	goto tr140;
@@ -846,7 +848,7 @@ st99:
 	if ( ++p == pe )
 		goto _test_eof99;
 case 99:
-#line 850 "wikitext_ragel.c"
+#line 852 "wikitext_ragel.c"
 	switch( (*p) ) {
 		case 35: goto st7;
 		case 97: goto st13;
@@ -1083,7 +1085,7 @@ st104:
 	if ( ++p == pe )
 		goto _test_eof104;
 case 104:
-#line 1087 "wikitext_ragel.c"
+#line 1089 "wikitext_ragel.c"
 	switch( (*p) ) {
 		case 43: goto st98;
 		case 45: goto tr121;
@@ -1192,7 +1194,7 @@ st105:
 	if ( ++p == pe )
 		goto _test_eof105;
 case 105:
-#line 1196 "wikitext_ragel.c"
+#line 1198 "wikitext_ragel.c"
 	if ( (*p) == 46 )
 		goto st23;
 	if ( (*p) < 65 ) {
@@ -1214,7 +1216,7 @@ st106:
 	if ( ++p == pe )
 		goto _test_eof106;
 case 106:
-#line 1218 "wikitext_ragel.c"
+#line 1220 "wikitext_ragel.c"
 	if ( (*p) == 46 )
 		goto st23;
 	if ( (*p) < 65 ) {
@@ -1236,7 +1238,7 @@ st107:
 	if ( ++p == pe )
 		goto _test_eof107;
 case 107:
-#line 1240 "wikitext_ragel.c"
+#line 1242 "wikitext_ragel.c"
 	if ( (*p) == 46 )
 		goto st23;
 	if ( (*p) < 65 ) {
@@ -1258,7 +1260,7 @@ st108:
 	if ( ++p == pe )
 		goto _test_eof108;
 case 108:
-#line 1262 "wikitext_ragel.c"
+#line 1264 "wikitext_ragel.c"
 	if ( (*p) == 46 )
 		goto st23;
 	if ( (*p) < 65 ) {
@@ -1280,7 +1282,7 @@ st109:
 	if ( ++p == pe )
 		goto _test_eof109;
 case 109:
-#line 1284 "wikitext_ragel.c"
+#line 1286 "wikitext_ragel.c"
 	switch( (*p) ) {
 		case 43: goto st98;
 		case 45: goto st98;
@@ -1314,7 +1316,7 @@ st110:
 	if ( ++p == pe )
 		goto _test_eof110;
 case 110:
-#line 1318 "wikitext_ragel.c"
+#line 1320 "wikitext_ragel.c"
 	switch( (*p) ) {
 		case 33: goto st97;
 		case 44: goto st97;
@@ -1436,7 +1438,7 @@ st115:
 	if ( ++p == pe )
 		goto _test_eof115;
 case 115:
-#line 1440 "wikitext_ragel.c"
+#line 1442 "wikitext_ragel.c"
 	switch( (*p) ) {
 		case 64: goto st21;
 		case 95: goto st20;
@@ -1461,7 +1463,7 @@ st116:
 	if ( ++p == pe )
 		goto _test_eof116;
 case 116:
-#line 1465 "wikitext_ragel.c"
+#line 1467 "wikitext_ragel.c"
 	switch( (*p) ) {
 		case 47: goto st25;
 		case 66: goto st55;
@@ -2005,7 +2007,7 @@ st117:
 	if ( ++p == pe )
 		goto _test_eof117;
 case 117:
-#line 2009 "wikitext_ragel.c"
+#line 2011 "wikitext_ragel.c"
 	switch( (*p) ) {
 		case 32: goto st118;
 		case 61: goto tr126;
@@ -2028,7 +2030,7 @@ st119:
 	if ( ++p == pe )
 		goto _test_eof119;
 case 119:
-#line 2032 "wikitext_ragel.c"
+#line 2034 "wikitext_ragel.c"
 	if ( (*p) == 32 )
 		goto tr174;
 	goto tr173;
@@ -2042,7 +2044,7 @@ st120:
 	if ( ++p == pe )
 		goto _test_eof120;
 case 120:
-#line 2046 "wikitext_ragel.c"
+#line 2048 "wikitext_ragel.c"
 	switch( (*p) ) {
 		case 64: goto st21;
 		case 84: goto tr175;
@@ -2071,7 +2073,7 @@ st121:
 	if ( ++p == pe )
 		goto _test_eof121;
 case 121:
-#line 2075 "wikitext_ragel.c"
+#line 2077 "wikitext_ragel.c"
 	switch( (*p) ) {
 		case 64: goto st21;
 		case 80: goto tr176;
@@ -2100,7 +2102,7 @@ st122:
 	if ( ++p == pe )
 		goto _test_eof122;
 case 122:
-#line 2104 "wikitext_ragel.c"
+#line 2106 "wikitext_ragel.c"
 	switch( (*p) ) {
 		case 58: goto st84;
 		case 64: goto st21;
@@ -2165,7 +2167,7 @@ st123:
 	if ( ++p == pe )
 		goto _test_eof123;
 case 123:
-#line 2169 "wikitext_ragel.c"
+#line 2171 "wikitext_ragel.c"
 	switch( (*p) ) {
 		case 33: goto st87;
 		case 41: goto st87;
@@ -2224,7 +2226,7 @@ st124:
 	if ( ++p == pe )
 		goto _test_eof124;
 case 124:
-#line 2228 "wikitext_ragel.c"
+#line 2230 "wikitext_ragel.c"
 	switch( (*p) ) {
 		case 64: goto st21;
 		case 84: goto tr179;
@@ -2253,7 +2255,7 @@ st125:
 	if ( ++p == pe )
 		goto _test_eof125;
 case 125:
-#line 2257 "wikitext_ragel.c"
+#line 2259 "wikitext_ragel.c"
 	switch( (*p) ) {
 		case 64: goto st21;
 		case 84: goto tr180;
@@ -2282,7 +2284,7 @@ st126:
 	if ( ++p == pe )
 		goto _test_eof126;
 case 126:
-#line 2286 "wikitext_ragel.c"
+#line 2288 "wikitext_ragel.c"
 	switch( (*p) ) {
 		case 64: goto st21;
 		case 80: goto tr181;
@@ -2311,7 +2313,7 @@ st127:
 	if ( ++p == pe )
 		goto _test_eof127;
 case 127:
-#line 2315 "wikitext_ragel.c"
+#line 2317 "wikitext_ragel.c"
 	switch( (*p) ) {
 		case 58: goto st84;
 		case 64: goto st21;
@@ -2341,7 +2343,7 @@ st128:
 	if ( ++p == pe )
 		goto _test_eof128;
 case 128:
-#line 2345 "wikitext_ragel.c"
+#line 2347 "wikitext_ragel.c"
 	switch( (*p) ) {
 		case 64: goto st21;
 		case 65: goto tr182;
@@ -2370,7 +2372,7 @@ st129:
 	if ( ++p == pe )
 		goto _test_eof129;
 case 129:
-#line 2374 "wikitext_ragel.c"
+#line 2376 "wikitext_ragel.c"
 	switch( (*p) ) {
 		case 64: goto st21;
 		case 73: goto tr183;
@@ -2399,7 +2401,7 @@ st130:
 	if ( ++p == pe )
 		goto _test_eof130;
 case 130:
-#line 2403 "wikitext_ragel.c"
+#line 2405 "wikitext_ragel.c"
 	switch( (*p) ) {
 		case 64: goto st21;
 		case 76: goto tr184;
@@ -2428,7 +2430,7 @@ st131:
 	if ( ++p == pe )
 		goto _test_eof131;
 case 131:
-#line 2432 "wikitext_ragel.c"
+#line 2434 "wikitext_ragel.c"
 	switch( (*p) ) {
 		case 64: goto st21;
 		case 84: goto tr185;
@@ -2457,7 +2459,7 @@ st132:
 	if ( ++p == pe )
 		goto _test_eof132;
 case 132:
-#line 2461 "wikitext_ragel.c"
+#line 2463 "wikitext_ragel.c"
 	switch( (*p) ) {
 		case 64: goto st21;
 		case 79: goto tr186;
@@ -2486,7 +2488,7 @@ st133:
 	if ( ++p == pe )
 		goto _test_eof133;
 case 133:
-#line 2490 "wikitext_ragel.c"
+#line 2492 "wikitext_ragel.c"
 	switch( (*p) ) {
 		case 58: goto st88;
 		case 64: goto st21;
@@ -2608,7 +2610,7 @@ st134:
 	if ( ++p == pe )
 		goto _test_eof134;
 case 134:
-#line 2612 "wikitext_ragel.c"
+#line 2614 "wikitext_ragel.c"
 	if ( (*p) == 46 )
 		goto st92;
 	if ( (*p) < 65 ) {
@@ -2630,7 +2632,7 @@ st135:
 	if ( ++p == pe )
 		goto _test_eof135;
 case 135:
-#line 2634 "wikitext_ragel.c"
+#line 2636 "wikitext_ragel.c"
 	if ( (*p) == 46 )
 		goto st92;
 	if ( (*p) < 65 ) {
@@ -2652,7 +2654,7 @@ st136:
 	if ( ++p == pe )
 		goto _test_eof136;
 case 136:
-#line 2656 "wikitext_ragel.c"
+#line 2658 "wikitext_ragel.c"
 	if ( (*p) == 46 )
 		goto st92;
 	if ( (*p) < 65 ) {
@@ -2674,7 +2676,7 @@ st137:
 	if ( ++p == pe )
 		goto _test_eof137;
 case 137:
-#line 2678 "wikitext_ragel.c"
+#line 2680 "wikitext_ragel.c"
 	if ( (*p) == 46 )
 		goto st92;
 	if ( (*p) < 65 ) {
@@ -2696,7 +2698,7 @@ st138:
 	if ( ++p == pe )
 		goto _test_eof138;
 case 138:
-#line 2700 "wikitext_ragel.c"
+#line 2702 "wikitext_ragel.c"
 	switch( (*p) ) {
 		case 64: goto st21;
 		case 86: goto tr191;
@@ -2725,7 +2727,7 @@ st139:
 	if ( ++p == pe )
 		goto _test_eof139;
 case 139:
-#line 2729 "wikitext_ragel.c"
+#line 2731 "wikitext_ragel.c"
 	switch( (*p) ) {
 		case 64: goto st21;
 		case 78: goto tr176;
@@ -3062,6 +3064,7 @@ case 143:
 
 	_out: {}
 	}
+
 #line 511 "wikitext_ragel.rl"
     if (cs == wikitext_error)
         rb_raise(eWikitextParserError, "failed before finding a token");

data/lib/wikitext/version.rb

@@ -13,5 +13,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Wikitext
-  VERSION = '1.5.1'
+  VERSION = '1.5.2'
 end # module Wikitext

data/rails/init.rb

@@ -1,4 +1,4 @@
-# Copyright 2008 Wincent Colaiuta
+# Copyright 2008-2009 Wincent Colaiuta
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -12,6 +12,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require 'wikitext/nil_class'
-require 'wikitext/string'
-require 'wikitext/rails'
+# Avoid Rails bug #2266 by not requiring during "rake gems:build"
+# See: https://rails.lighthouseapp.com/projects/8994/tickets/2266
+unless $gems_build_rake_task
+  require 'wikitext/nil_class'
+  require 'wikitext/string'
+  require 'wikitext/rails'
+end

data/spec/autolinking_spec.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# Copyright 2007-2008 Wincent Colaiuta
+# Copyright 2007-2009 Wincent Colaiuta
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -43,7 +43,7 @@ describe Wikitext::Parser, 'autolinking' do
 
     it 'should convert mailto URIs into hyperlinks' do
       uri = 'mailto:user@example.com'
-      @parser.parse(uri).should == %Q{<p><a href="mailto:user@example.com" class="external">mailto:user@example.com</a></p>\n}
+      @parser.parse(uri).should == %Q{<p><a href="mailto:user@example.com" class="mailto">mailto:user@example.com</a></p>\n}
     end
 
     it 'should convert SVN URIs into hyperlinks' do
@@ -81,18 +81,30 @@ describe Wikitext::Parser, 'autolinking' do
       @parser.parse(uri).should == %Q{<p><a href="mailto:user@example.com" class="mailto">user@example.com</a></p>\n}
     end
 
-    it 'should apply the mailto CSS class if set' do
+    it 'should apply the mailto CSS class if set (raw address)' do
       uri = 'user@example.com'
       @parser.mailto_class = 'foo'
       @parser.parse(uri).should == %Q{<p><a href="mailto:user@example.com" class="foo">user@example.com</a></p>\n}
     end
 
-    it 'should apply no CSS if the mailto class is set to nil' do
+    it 'should apply the mailto CSS class if set (mailto URI)' do
+      uri = 'mailto:user@example.com'
+      @parser.mailto_class = 'foo'
+      @parser.parse(uri).should == %Q{<p><a href="mailto:user@example.com" class="foo">mailto:user@example.com</a></p>\n}
+    end
+
+    it 'should apply no CSS if the mailto class is set to nil (raw address)' do
       uri = 'user@example.com'
       @parser.mailto_class = nil
       @parser.parse(uri).should == %Q{<p><a href="mailto:user@example.com">user@example.com</a></p>\n}
     end
 
+    it 'should apply no CSS if the mailto class is set to nil (mailto URI)' do
+      uri = 'mailto:user@example.com'
+      @parser.mailto_class = nil
+      @parser.parse(uri).should == %Q{<p><a href="mailto:user@example.com">mailto:user@example.com</a></p>\n}
+    end
+
     it 'should pass through emails unchanged inside <nowiki></nowiki> spans' do
       @parser.parse("<nowiki>user@example.com</nowiki>").should == "<p>user@example.com</p>\n"  # was a crasher
     end
@@ -476,37 +488,37 @@ describe Wikitext::Parser, 'autolinking' do
     describe 'after "mailto:" URIs' do
       it 'should terminate if followed by a period' do
         input     = 'Try mailto:user@example.com.'
-        expected  = %Q{<p>Try <a href="mailto:user@example.com" class="external">mailto:user@example.com</a>.</p>\n}
+        expected  = %Q{<p>Try <a href="mailto:user@example.com" class="mailto">mailto:user@example.com</a>.</p>\n}
         @parser.parse(input).should == expected
       end
 
       it 'should not terminate on periods that occur within the URI' do
         input     = 'Try mailto:user.name@example.com.'
-        expected  = %Q{<p>Try <a href="mailto:user.name@example.com" class="external">mailto:user.name@example.com</a>.</p>\n}
+        expected  = %Q{<p>Try <a href="mailto:user.name@example.com" class="mailto">mailto:user.name@example.com</a>.</p>\n}
         @parser.parse(input).should == expected
       end
 
       it 'should terminate if followed by a colon' do
         input     = 'Try mailto:user@example.com:'
-        expected  = %Q{<p>Try <a href="mailto:user@example.com" class="external">mailto:user@example.com</a>:</p>\n}
+        expected  = %Q{<p>Try <a href="mailto:user@example.com" class="mailto">mailto:user@example.com</a>:</p>\n}
         @parser.parse(input).should == expected
       end
 
       it 'should terminate if followed by a comma' do
         input     = 'Try mailto:user@example.com,'
-        expected  = %Q{<p>Try <a href="mailto:user@example.com" class="external">mailto:user@example.com</a>,</p>\n}
+        expected  = %Q{<p>Try <a href="mailto:user@example.com" class="mailto">mailto:user@example.com</a>,</p>\n}
         @parser.parse(input).should == expected
       end
 
       it 'should terminate if followed by an exclamation mark' do
         input     = 'Try mailto:user@example.com!'
-        expected  = %Q{<p>Try <a href="mailto:user@example.com" class="external">mailto:user@example.com</a>!</p>\n}
+        expected  = %Q{<p>Try <a href="mailto:user@example.com" class="mailto">mailto:user@example.com</a>!</p>\n}
         @parser.parse(input).should == expected
       end
 
       it 'should terminate if followed by a question mark' do
         input     = 'Try mailto:user@example.com?'
-        expected  = %Q{<p>Try <a href="mailto:user@example.com" class="external">mailto:user@example.com</a>?</p>\n}
+        expected  = %Q{<p>Try <a href="mailto:user@example.com" class="mailto">mailto:user@example.com</a>?</p>\n}
         @parser.parse(input).should == expected
       end
 
@@ -520,13 +532,13 @@ describe Wikitext::Parser, 'autolinking' do
 
       it 'should terminate if followed by a semi-colon' do
         input     = 'Try mailto:user@example.com;'
-        expected  = %Q{<p>Try <a href="mailto:user@example.com" class="external">mailto:user@example.com</a>;</p>\n}
+        expected  = %Q{<p>Try <a href="mailto:user@example.com" class="mailto">mailto:user@example.com</a>;</p>\n}
         @parser.parse(input).should == expected
       end
 
       it 'should terminate if followed by a right parenthesis' do
         input     = '(Try mailto:user@example.com)'
-        expected  = %Q{<p>(Try <a href="mailto:user@example.com" class="external">mailto:user@example.com</a>)</p>\n}
+        expected  = %Q{<p>(Try <a href="mailto:user@example.com" class="mailto">mailto:user@example.com</a>)</p>\n}
         @parser.parse(input).should == expected
       end
     end

data/spec/external_link_spec.rb

@@ -43,12 +43,15 @@ describe Wikitext::Parser, 'external links' do
   end
 
   it 'should format valid external mailto links' do
-    # although note in this case the CSS class is "external" rather than "mailto"
-    # this is because we're matching this as a (generic) URI rather than an email address
-    expected = %Q{<p><a href="mailto:user@example.com" class="external">john</a></p>\n}
+    expected = %Q{<p><a href="mailto:user@example.com" class="mailto">john</a></p>\n}
     @parser.parse('[mailto:user@example.com john]').should == expected
   end
 
+  it 'should not treat raw email addresses as valid link targets' do
+    expected = %Q{<p>[<a href="mailto:user@example.com" class="mailto">user@example.com</a> john]</p>\n}
+    @parser.parse('[user@example.com john]').should == expected
+  end
+
   it 'should format absolute path links' do
     expected = %Q{<p><a href="/foo/bar">fb</a></p>\n} # note no "external" class
     @parser.parse('[/foo/bar fb]').should == expected

data/spec/regressions_spec.rb

@@ -763,4 +763,76 @@ describe Wikitext::Parser, 'regressions' do
     END
     @parser.parse(input).should == expected
   end
+
+  # https://wincent.com/issues/818
+  it 'should handle BLOCKQUOTE_START blocks which follow BLOCKQUOTE shorthand' do
+    input = dedent <<-END
+      > foo
+      <blockquote>bar</blockquote>
+    END
+    expected = dedent <<-END
+      <blockquote>
+        <p>foo</p>
+      </blockquote>
+      <blockquote>
+        <p>bar</p>
+      </blockquote>
+    END
+    @parser.parse(input).should == expected
+  end
+
+  # https://wincent.com/issues/818
+  it 'should handle PRE_START blocks which follow BLOCKQUOTE shorthand' do
+    input = dedent <<-END
+      > foo
+      <pre>bar</pre>
+    END
+    expected = dedent <<-END
+      <blockquote>
+        <p>foo</p>
+      </blockquote>
+      <pre>bar</pre>
+    END
+    @parser.parse(input).should == expected
+  end
+
+  # https://wincent.com/issues/818
+  it 'should handle BLOCKQUOTE_START blocks which follow nested BLOCKQUOTE shorthand' do
+    input = dedent <<-END
+      >>> foo
+      <blockquote>bar</blockquote>
+    END
+    expected = dedent <<-END
+      <blockquote>
+        <blockquote>
+          <blockquote>
+            <p>foo</p>
+          </blockquote>
+        </blockquote>
+      </blockquote>
+      <blockquote>
+        <p>bar</p>
+      </blockquote>
+    END
+    @parser.parse(input).should == expected
+  end
+
+  # https://wincent.com/issues/818
+  it 'should handle PRE_START blocks which follow nested BLOCKQUOTE shorthand' do
+    input = dedent <<-END
+      >>> foo
+      <pre>bar</pre>
+    END
+    expected = dedent <<-END
+      <blockquote>
+        <blockquote>
+          <blockquote>
+            <p>foo</p>
+          </blockquote>
+        </blockquote>
+      </blockquote>
+      <pre>bar</pre>
+    END
+    @parser.parse(input).should == expected
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wikitext
 version: !ruby/object:Gem::Version 
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors: 
 - Wincent Colaiuta
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-17 00:00:00 +01:00
+date: 2009-03-27 00:00:00 +01:00
 default_executable: 
 dependencies: []