wikitext 1.10 → 1.10.1

data/ext/parser.c

@@ -287,9 +287,12 @@ void wiki_append_hyperlink(parser_t *parser, VALUE link_prefix, str_t *link_targ
 
         // special handling for mailto URIs
         const char *mailto = "mailto:";
-        if (NIL_P(link_prefix) &&
-            link_target->len >= (long)sizeof(mailto) &&
-            strncmp(mailto, link_target->ptr, sizeof(mailto)) == 0)
+        long mailto_len = (long)sizeof(mailto) - 1; // don't count NUL byte
+        if ((link_target->len >= mailto_len &&
+             strncmp(mailto, link_target->ptr, mailto_len) == 0) ||
+            (!NIL_P(link_prefix) &&
+             RSTRING_LEN(link_prefix) >= mailto_len &&
+             strncmp(mailto, RSTRING_PTR(link_prefix), mailto_len) == 0))
             link_class = parser->mailto_class; // use mailto_class from parser
         if (link_class != Qnil)
         {

data/ext/wikitext_ragel.c

@@ -193,7 +193,7 @@ tr22:
         }}
 	goto st106;
 tr23:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{	switch( act ) {
 	case 21:
 	{{p = ((te))-1;}
@@ -676,12 +676,12 @@ tr212:
         }}
 	goto st106;
 st106:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
 		goto _test_eof106;
 case 106:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{ts = p;}
 #line 687 "wikitext_ragel.c"
 	switch( (*p) ) {
@@ -857,7 +857,7 @@ case 110:
 		goto st110;
 	goto tr155;
 tr130:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 	goto st111;
 st111:
@@ -1092,7 +1092,7 @@ case 115:
 		goto tr164;
 	goto tr160;
 tr133:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 454 "wikitext_ragel.rl"
 	{act = 45;}
@@ -1201,7 +1201,7 @@ case 24:
 		goto tr29;
 	goto tr23;
 tr29:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 303 "wikitext_ragel.rl"
 	{act = 22;}
@@ -1223,7 +1223,7 @@ case 117:
 		goto tr167;
 	goto tr166;
 tr167:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 303 "wikitext_ragel.rl"
 	{act = 22;}
@@ -1245,7 +1245,7 @@ case 118:
 		goto tr168;
 	goto tr166;
 tr168:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 303 "wikitext_ragel.rl"
 	{act = 22;}
@@ -1267,7 +1267,7 @@ case 119:
 		goto tr169;
 	goto tr166;
 tr169:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 303 "wikitext_ragel.rl"
 	{act = 22;}
@@ -1289,7 +1289,7 @@ case 120:
 		goto st22;
 	goto tr166;
 tr165:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 454 "wikitext_ragel.rl"
 	{act = 45;}
@@ -1323,7 +1323,7 @@ case 121:
 		goto st22;
 	goto tr155;
 tr134:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 436 "wikitext_ragel.rl"
 	{act = 43;}
@@ -1445,7 +1445,7 @@ case 126:
 		goto st125;
 	goto tr170;
 tr136:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 442 "wikitext_ragel.rl"
 	{act = 44;}
@@ -1472,7 +1472,7 @@ case 127:
 		goto tr136;
 	goto tr174;
 tr137:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 	goto st128;
 st128:
@@ -2149,7 +2149,7 @@ case 131:
 		goto tr187;
 	goto tr186;
 tr140:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 442 "wikitext_ragel.rl"
 	{act = 44;}
@@ -2178,7 +2178,7 @@ case 132:
 		goto tr136;
 	goto tr174;
 tr188:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 442 "wikitext_ragel.rl"
 	{act = 44;}
@@ -2207,7 +2207,7 @@ case 133:
 		goto tr136;
 	goto tr174;
 tr189:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 442 "wikitext_ragel.rl"
 	{act = 44;}
@@ -2274,7 +2274,7 @@ case 98:
 		goto tr110;
 	goto tr107;
 tr110:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 	goto st135;
 st135:
@@ -2331,7 +2331,7 @@ case 99:
 		goto st99;
 	goto tr111;
 tr141:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 442 "wikitext_ragel.rl"
 	{act = 44;}
@@ -2360,7 +2360,7 @@ case 136:
 		goto tr136;
 	goto tr174;
 tr192:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 442 "wikitext_ragel.rl"
 	{act = 44;}
@@ -2389,7 +2389,7 @@ case 137:
 		goto tr136;
 	goto tr174;
 tr193:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 442 "wikitext_ragel.rl"
 	{act = 44;}
@@ -2418,7 +2418,7 @@ case 138:
 		goto tr136;
 	goto tr174;
 tr194:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 442 "wikitext_ragel.rl"
 	{act = 44;}
@@ -2448,7 +2448,7 @@ case 139:
 		goto tr136;
 	goto tr174;
 tr142:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 442 "wikitext_ragel.rl"
 	{act = 44;}
@@ -2477,7 +2477,7 @@ case 140:
 		goto tr136;
 	goto tr174;
 tr195:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 442 "wikitext_ragel.rl"
 	{act = 44;}
@@ -2506,7 +2506,7 @@ case 141:
 		goto tr136;
 	goto tr174;
 tr196:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 442 "wikitext_ragel.rl"
 	{act = 44;}
@@ -2535,7 +2535,7 @@ case 142:
 		goto tr136;
 	goto tr174;
 tr197:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 442 "wikitext_ragel.rl"
 	{act = 44;}
@@ -2564,7 +2564,7 @@ case 143:
 		goto tr136;
 	goto tr174;
 tr198:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 442 "wikitext_ragel.rl"
 	{act = 44;}
@@ -2593,7 +2593,7 @@ case 144:
 		goto tr136;
 	goto tr174;
 tr199:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 442 "wikitext_ragel.rl"
 	{act = 44;}
@@ -2715,7 +2715,7 @@ case 105:
 		goto tr118;
 	goto tr23;
 tr118:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 297 "wikitext_ragel.rl"
 	{act = 21;}
@@ -2737,7 +2737,7 @@ case 146:
 		goto tr201;
 	goto tr191;
 tr201:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 297 "wikitext_ragel.rl"
 	{act = 21;}
@@ -2759,7 +2759,7 @@ case 147:
 		goto tr202;
 	goto tr191;
 tr202:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 297 "wikitext_ragel.rl"
 	{act = 21;}
@@ -2781,7 +2781,7 @@ case 148:
 		goto tr203;
 	goto tr191;
 tr203:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 297 "wikitext_ragel.rl"
 	{act = 21;}
@@ -2803,7 +2803,7 @@ case 149:
 		goto st103;
 	goto tr191;
 tr143:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 442 "wikitext_ragel.rl"
 	{act = 44;}
@@ -2832,7 +2832,7 @@ case 150:
 		goto tr136;
 	goto tr174;
 tr204:
-#line 1 "wikitext_ragel.rl"
+#line 1 "NONE"
 	{te = p+1;}
 #line 442 "wikitext_ragel.rl"
 	{act = 44;}

data/lib/wikitext/version.rb

@@ -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:
@@ -22,5 +22,5 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 module Wikitext
-  VERSION = '1.10'
+  VERSION = '1.10.1'
 end # module Wikitext

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wikitext
 version: !ruby/object:Gem::Version 
-  version: "1.10"
+  version: 1.10.1
 platform: ruby
 authors: 
 - Wincent Colaiuta
@@ -9,11 +9,30 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-01 00:00:00 +01:00
+date: 2010-03-21 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
-description: "    Wikitext is a fast wikitext-to-HTML translator written in C.\n"
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: wopen3
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: Wikitext is a fast wikitext-to-HTML translator written in C.
 email: win@wincent.com
 executables: 
 - wikitext
@@ -77,6 +96,7 @@ files:
 - spec/strong_em_spec.rb
 - spec/strong_spec.rb
 - spec/tokenizing_spec.rb
+- spec/trash
 - spec/tt_spec.rb
 - spec/ul_spec.rb
 - spec/version_spec.rb
@@ -84,8 +104,6 @@ files:
 - spec/wikitext_spec.rb
 has_rdoc: true
 homepage: http://wikitext.rubyforge.org/
-licenses: []
-
 post_install_message: 
 rdoc_options: []
 
@@ -107,9 +125,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: wikitext
-rubygems_version: 1.3.5
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Wikitext-to-HTML translator
 test_files: []