breakout_parser 0.0.20 → 0.0.23

data/ChangeLog

@@ -1,3 +1,9 @@
+[ 0.0.21 ]
+    * emit correct urls for external svn links
+        (https://www.assembla.com/spaces/breakout/tickets/8472)
+    * emit restful wiki links
+        (https://www.assembla.com/spaces/breakout/tickets/8396)
+
 [ 0.0.20 ]
 
     * parse "$REV$" in external repo links
@@ -9,26 +15,26 @@
         (https://www.assembla.com/spaces/breakout/tickets/6513)
 
 [ 0.0.18 ]
-    
+
     * added README
     * added option to make relative urls absolute
         (https://www.assembla.com/spaces/breakout/tickets/6513)
 
 [ 0.0.17 ]
-    
+
     * fix not-closing bold/italics tags when opened before <pre> and/or <code>
         (https://www.assembla.com/spaces/breakout/tickets/6385)
 
 [ 0.0.16 ]
-    
+
     * make a [[issue:123]] as a synonym to [[ticket:123]]
 
 [ 0.0.15 ]
-    
+
     * allow spaces in links to wiki pages, re http://www.assembla.com/spaces/breakout/tickets/5916
 
 [ 0.0.14 ]
-    
+
     * fix handling of broken multilevel lists, re https://www.assembla.com/spaces/breakout/tickets/5902
 
 [ 0.0.13 ]

data/README

@@ -4,6 +4,11 @@ Breakout Parser
  - simplified Textile parser with some Assembla-specific features
  - converts Textile into HTML
 
+Build dependencies
+==================
+
+You will need Flex, Bison, GCC, and GNU Make to build this gem.
+
 
 Usage
 ===============
@@ -24,5 +29,5 @@ Arguments
   	data,			# data to parse
 	space_name,		# space name - for links parsing
 	site_url,		# [optional] global site url
-	git_url			# [optional] custom GIT url - f.ex. for github-hosted repos
+	vcs_url			# [optional] custom VCS url - f.ex. for github-hosted repos
   )

data/ext/breakout_parser/lex.yy.c

@@ -53,7 +53,6 @@ typedef int flex_int32_t;
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
@@ -84,6 +83,8 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#endif /* ! C99 */
+
 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
@@ -140,7 +141,15 @@ typedef unsigned int flex_uint32_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
 #define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -1188,7 +1197,7 @@ extern size_t in_buf_len;
 
 
 
-#line 1192 "lex.yy.c"
+#line 1201 "lex.yy.c"
 
 #define INITIAL 0
 #define _PRE_CODE 1
@@ -1286,7 +1295,12 @@ static int input (void );
     
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
 #define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -1294,7 +1308,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1305,7 +1319,7 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		int n; \
+		size_t n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -1394,7 +1408,7 @@ YY_DECL
 
     if( parse_links_only ) BEGIN(_LINKS_ONLY);
 
-#line 1398 "lex.yy.c"
+#line 1412 "lex.yy.c"
 
 	if ( !(yy_init) )
 		{
@@ -1954,7 +1968,7 @@ YY_RULE_SETUP
 #line 203 "parser.l"
 ECHO;
 	YY_BREAK
-#line 1958 "lex.yy.c"
+#line 1972 "lex.yy.c"
 			case YY_STATE_EOF(INITIAL):
 			case YY_STATE_EOF(_LINKS_ONLY):
 				yyterminate();
@@ -2474,19 +2488,9 @@ static void yy_load_buffer_state  (void)
 	yyfree((void *) b  );
 }
 
-#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __THROW /* this is a gnuism */
-extern int isatty (int ) __THROW;
-#else
+#ifndef __cplusplus
 extern int isatty (int );
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
+#endif /* __cplusplus */
     
 /* Initializes or reinitializes a buffer.
  * This function is sometimes called more than once on the same buffer,
@@ -2692,8 +2696,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
 
 /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
  * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
  * 
  * @return the newly allocated buffer state object.
  */

data/ext/breakout_parser/parser.tab.c

@@ -1,9 +1,10 @@
-/* A Bison parser, made by GNU Bison 2.4.2.  */
+
+/* A Bison parser, made by GNU Bison 2.4.1.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989-1990, 2000-2006, 2009-2010 Free Software
-   Foundation, Inc.
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
    
    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
@@ -45,7 +46,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.2"
+#define YYBISON_VERSION "2.4.1"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -93,7 +94,7 @@ size_t space_name_len = 0;
 const char *site_url = NULL;
 size_t site_url_len = 0;
 
-extern VALUE git_url;
+extern VALUE vcs_url;
 
 int list_level = 1;
 int absolute_urls = 0;
@@ -137,7 +138,7 @@ void yyerror(const char *msg)
 
 
 /* Line 189 of yacc.c  */
-#line 141 "parser.tab.c"
+#line 142 "parser.tab.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -226,7 +227,7 @@ typedef union YYSTYPE
 
 
 /* Line 214 of yacc.c  */
-#line 230 "parser.tab.c"
+#line 231 "parser.tab.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -238,7 +239,7 @@ typedef union YYSTYPE
 
 
 /* Line 264 of yacc.c  */
-#line 242 "parser.tab.c"
+#line 243 "parser.tab.c"
 
 #ifdef short
 # undef short
@@ -288,7 +289,7 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
+# if YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -733,18 +734,9 @@ static const yytype_uint8 yystos[] =
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  However,
-   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
-   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
-   discussed.  */
+   Once GCC version 2 has supplanted version 1, this can go.  */
 
 #define YYFAIL		goto yyerrlab
-#if defined YYFAIL
-  /* This is here to suppress warnings from the GCC cpp's
-     -Wunused-macros.  Normally we don't worry about that warning, but
-     some users do, and we want to make it easy for users to remove
-     YYFAIL uses, which will produce warnings from Bison 2.5.  */
-#endif
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
@@ -801,7 +793,7 @@ while (YYID (0))
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+# if YYLTYPE_IS_TRIVIAL
 #  define YY_LOCATION_PRINT(File, Loc)			\
      fprintf (File, "%d.%d-%d.%d",			\
 	      (Loc).first_line, (Loc).first_column,	\
@@ -1540,42 +1532,42 @@ yyreduce:
     {
         case 6:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 104 "parser.y"
     {concat("</h1>",5);}
     break;
 
   case 7:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 105 "parser.y"
     {concat("</h2>",5);}
     break;
 
   case 8:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 106 "parser.y"
     {concat("</h3>",5);}
     break;
 
   case 9:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 107 "parser.y"
     {concat("</h4>",5);}
     break;
 
   case 10:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 108 "parser.y"
     {concat("</h5>",5);}
     break;
 
   case 11:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 109 "parser.y"
     {
             list_level=1; 
@@ -1585,7 +1577,7 @@ yyreduce:
 
   case 12:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 112 "parser.y"
     { 
             concat("</ul>",5); 
@@ -1595,7 +1587,7 @@ yyreduce:
 
   case 14:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 116 "parser.y"
     {
             list_level=1; 
@@ -1605,7 +1597,7 @@ yyreduce:
 
   case 15:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 119 "parser.y"
     { 
             concat("</ol>",5); 
@@ -1615,302 +1607,302 @@ yyreduce:
 
   case 18:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 125 "parser.y"
     {concat("</li>",5);}
     break;
 
   case 19:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 126 "parser.y"
     {concat("</li>",5);}
     break;
 
   case 22:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 131 "parser.y"
     {concat("</li>",5);}
     break;
 
   case 23:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 132 "parser.y"
     {concat("</li>",5);}
     break;
 
   case 30:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 142 "parser.y"
     {concat2((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 31:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 143 "parser.y"
     {process_url((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 32:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 144 "parser.y"
     {process_email((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 33:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 145 "parser.y"
     {(yyvsp[(1) - (1)].ivalue) ? concat(" <strong>",9) : concat("<strong>",8);}
     break;
 
   case 34:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 146 "parser.y"
     {concat("</strong>",9);}
     break;
 
   case 35:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 147 "parser.y"
     {(yyvsp[(1) - (1)].ivalue) ? concat(" <em>",5) : concat("<em>",4);}
     break;
 
   case 36:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 148 "parser.y"
     {concat("</em>",5);}
     break;
 
   case 37:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 149 "parser.y"
     {(yyvsp[(1) - (1)].ivalue) ? concat(" <strong><em>",13) : concat("<strong><em>",12);}
     break;
 
   case 38:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 150 "parser.y"
     {(yyvsp[(1) - (1)].ivalue) ? concat(" <em><strong>",13) : concat("<em><strong>",12);}
     break;
 
   case 39:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 151 "parser.y"
     {process_inline_code((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 40:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 152 "parser.y"
     {revert_bold();}
     break;
 
   case 41:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 153 "parser.y"
     {revert_italic();}
     break;
 
   case 42:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 155 "parser.y"
     {process_ticket_link((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 43:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 156 "parser.y"
     {process_svn_link((yyvsp[(1) - (1)].svalue),0);}
     break;
 
   case 44:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 157 "parser.y"
     {process_git_link((yyvsp[(1) - (1)].svalue),0);}
     break;
 
   case 45:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 158 "parser.y"
     {process_svn_link((yyvsp[(1) - (1)].svalue),1);}
     break;
 
   case 46:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 159 "parser.y"
     {process_git_link((yyvsp[(1) - (1)].svalue),1);}
     break;
 
   case 47:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 160 "parser.y"
     {process_url_link((yyvsp[(1) - (1)].svalue),NULL);}
     break;
 
   case 48:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 161 "parser.y"
     {process_url_link((yyvsp[(1) - (1)].svalue),"http://");}
     break;
 
   case 49:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 162 "parser.y"
     {process_wiki_link((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 50:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 163 "parser.y"
     {process_anchor_link((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 51:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 164 "parser.y"
     {process_file_link((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 52:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 165 "parser.y"
     {process_image_link((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 55:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 170 "parser.y"
     {concat_escaped_char((yyvsp[(1) - (1)].ivalue));}
     break;
 
   case 56:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 177 "parser.y"
     {concat("<h1 id=\"h-",10); process_header((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 57:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 178 "parser.y"
     {concat("<h2 id=\"h-",10); process_header((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 58:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 179 "parser.y"
     {concat("<h3 id=\"h-",10); process_header((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 59:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 180 "parser.y"
     {concat("<h4 id=\"h-",10); process_header((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 60:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 181 "parser.y"
     {concat("<h5 id=\"h-",10); process_header((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 61:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 183 "parser.y"
     {process_oli((yyvsp[(1) - (1)].ivalue));}
     break;
 
   case 62:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 184 "parser.y"
     {process_uli((yyvsp[(1) - (1)].ivalue));}
     break;
 
   case 63:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 185 "parser.y"
     {concat("<br />",6);}
     break;
 
   case 64:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 188 "parser.y"
     {concat("<pre><code>",11);}
     break;
 
   case 65:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 188 "parser.y"
     {concat("</code></pre>",13);}
     break;
 
   case 67:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 190 "parser.y"
     {concat("<pre>",5);}
     break;
 
   case 68:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 190 "parser.y"
     {concat("</pre>",6);}
     break;
 
   case 69:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 191 "parser.y"
     {concat("<code>",6);}
     break;
 
   case 70:
 
-/* Line 1464 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 191 "parser.y"
     {concat("</code>",7);}
     break;
 
 
 
-/* Line 1464 of yacc.c  */
-#line 1914 "parser.tab.c"
+/* Line 1455 of yacc.c  */
+#line 1906 "parser.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2121,7 +2113,7 @@ yyreturn:
 
 
 
-/* Line 1684 of yacc.c  */
+/* Line 1675 of yacc.c  */
 #line 195 "parser.y"
 
 
@@ -2290,24 +2282,26 @@ process_svn_link(const char*target, int numbered_repo){
     const char *c;
     // can use sprintf here.. but I think it's a way slower than raw concat
     concat("<a href=\"",9);
-    concat_site_url();
-    concat("/code/",6);
-    concat(space_name,space_name_len);
-    if( numbered_repo ){
+    if( !concat_custom_vcs_url(target) ){
+      concat_site_url();
+      concat("/code/",6);
+      concat(space_name,space_name_len);
+      if( numbered_repo ){
         concat("/subversion-",12);
         while( *target >= '0' && *target <= '9' ) concat_raw_char(*target++);
         while( *target == ':' ) target++;
         concat("/changesets/",12);
-    } else {
+      } else {
         concat("/subversion/changesets/",23);
+      }
+      for(c=target; *c && *c!=']' && *c!='|'; c++) concat_raw_char(*c);
     }
-    for(c=target; *c && *c!=']' && *c!='|'; c++) concat_raw_char(*c);
     process_link_tail(target,NULL,"revision:");
 }
 
-int concat_custom_git_url(const char*rev){
+int concat_custom_vcs_url(const char*rev){
     const char *c,*p,*t;
-    if( git_url && (c = StringValuePtr(git_url)) ){
+    if( vcs_url && (c = StringValuePtr(vcs_url)) ){
         size_t l = strlen(c);
         if( l>0 ){
             if( p=strstr(c, "$REV$") ){
@@ -2330,7 +2324,7 @@ process_git_link(const char*target, int numbered_repo){
     const char *c;
     // can use sprintf here.. but I think it's a way slower than raw concat
     concat("<a href=\"",9);
-    if( !concat_custom_git_url(target) ){
+    if( !concat_custom_vcs_url(target) ){
         concat_site_url();
         concat("/code/",6);
         concat(space_name,space_name_len);
@@ -2354,9 +2348,9 @@ process_wiki_link(const char*target){
     for(c=target; *c && *c!=']' && *c!='|'; c++) concat_raw_char(*c);
     concat("\" href=\"",8);
     concat_site_url();
-    concat("/wiki/show/",11);
+    concat("/spaces/",8);
     concat(space_name,space_name_len);
-    concat_raw_char('/');
+    concat("/wiki/",6);
     for(c=target; *c && *c!=']' && *c!='|' && *c!='#'; c++) concat_raw_char( *c == ' ' ? '_' : *c );
     if( *c == '#' ){
         concat_raw_char('#');

data/ext/breakout_parser/parser.tab.h

@@ -1,9 +1,10 @@
-/* A Bison parser, made by GNU Bison 2.4.2.  */
+
+/* A Bison parser, made by GNU Bison 2.4.1.  */
 
 /* Skeleton interface for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989-1990, 2000-2006, 2009-2010 Free Software
-   Foundation, Inc.
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
    
    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
@@ -90,7 +91,7 @@
 typedef union YYSTYPE
 {
 
-/* Line 1685 of yacc.c  */
+/* Line 1676 of yacc.c  */
 #line 70 "parser.y"
 
         double dvalue;
@@ -99,8 +100,8 @@ typedef union YYSTYPE
 
 
 
-/* Line 1685 of yacc.c  */
-#line 104 "parser.tab.h"
+/* Line 1676 of yacc.c  */
+#line 105 "parser.tab.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */

data/ext/breakout_parser/parser.y

@@ -24,7 +24,7 @@ size_t space_name_len = 0;
 const char *site_url = NULL;
 size_t site_url_len = 0;
 
-extern VALUE git_url;
+extern VALUE vcs_url;
 
 int list_level = 1;
 int absolute_urls = 0;
@@ -359,24 +359,26 @@ process_svn_link(const char*target, int numbered_repo){
     const char *c;
     // can use sprintf here.. but I think it's a way slower than raw concat
     concat("<a href=\"",9);
-    concat_site_url();
-    concat("/code/",6);
-    concat(space_name,space_name_len);
-    if( numbered_repo ){
+    if( !concat_custom_vcs_url(target) ){
+      concat_site_url();
+      concat("/code/",6);
+      concat(space_name,space_name_len);
+      if( numbered_repo ){
         concat("/subversion-",12);
         while( *target >= '0' && *target <= '9' ) concat_raw_char(*target++);
         while( *target == ':' ) target++;
         concat("/changesets/",12);
-    } else {
+      } else {
         concat("/subversion/changesets/",23);
+      }
+      for(c=target; *c && *c!=']' && *c!='|'; c++) concat_raw_char(*c);
     }
-    for(c=target; *c && *c!=']' && *c!='|'; c++) concat_raw_char(*c);
     process_link_tail(target,NULL,"revision:");
 }
 
-int concat_custom_git_url(const char*rev){
+int concat_custom_vcs_url(const char*rev){
     const char *c,*p,*t;
-    if( git_url && (c = StringValuePtr(git_url)) ){
+    if( vcs_url && (c = StringValuePtr(vcs_url)) ){
         size_t l = strlen(c);
         if( l>0 ){
             if( p=strstr(c, "$REV$") ){
@@ -399,7 +401,7 @@ process_git_link(const char*target, int numbered_repo){
     const char *c;
     // can use sprintf here.. but I think it's a way slower than raw concat
     concat("<a href=\"",9);
-    if( !concat_custom_git_url(target) ){
+    if( !concat_custom_vcs_url(target) ){
         concat_site_url();
         concat("/code/",6);
         concat(space_name,space_name_len);
@@ -423,9 +425,9 @@ process_wiki_link(const char*target){
     for(c=target; *c && *c!=']' && *c!='|'; c++) concat_raw_char(*c);
     concat("\" href=\"",8);
     concat_site_url();
-    concat("/wiki/show/",11);
+    concat("/spaces/",8);
     concat(space_name,space_name_len);
-    concat_raw_char('/');
+    concat("/wiki/",6);
     for(c=target; *c && *c!=']' && *c!='|' && *c!='#'; c++) concat_raw_char( *c == ' ' ? '_' : *c );
     if( *c == '#' ){
         concat_raw_char('#');

data/ext/breakout_parser/ruby_ext.c

@@ -22,7 +22,7 @@ extern size_t in_buf_len, bufsize, space_name_len;
 extern const char *site_url;
 extern size_t site_url_len;
 
-VALUE git_url;
+VALUE vcs_url;
 
 extern int parse_links_only, absolute_urls;
 
@@ -48,9 +48,9 @@ VALUE do_parse(int argc, VALUE *argv, VALUE self) {
         }
     }
 
-    git_url = NULL;
+    vcs_url = NULL;
     if( argc > 3 && argv[3] != Qnil && argv[3] != Qfalse ){
-        git_url = argv[3];
+        vcs_url = argv[3];
     }
 
     absolute_urls = 0;

data/spec/parser_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'breakout_parser'
 require File.dirname(__FILE__) + '/obj_proxy'
 
@@ -808,12 +809,12 @@ describe 'BreakoutParser' do
 
   describe "Assembla Links" do
     a = {}
-    a["wiki:Name"]  = '<a class="wiki_link" title="Name" href="/wiki/show/test_space/Name">Name</a>'
-    a["wiki:Name With Space"] = '<a class="wiki_link" title="Name With Space" href="/wiki/show/test_space/Name_With_Space">Name With Space</a>'
-    a["Name"]       = '<a class="wiki_link" title="Name" href="/wiki/show/test_space/Name">Name</a>'
-    a["Name With Space"] = '<a class="wiki_link" title="Name With Space" href="/wiki/show/test_space/Name_With_Space">Name With Space</a>'
-    a["Name#Ref"]   = '<a class="wiki_link" title="Name#Ref" href="/wiki/show/test_space/Name#h-Ref">Name#Ref</a>'
-    a["Name#h-Ref"]   = '<a class="wiki_link" title="Name#h-Ref" href="/wiki/show/test_space/Name#h-h-Ref">Name#h-Ref</a>'
+    a["wiki:Name"]  = '<a class="wiki_link" title="Name" href="/spaces/test_space/wiki/Name">Name</a>'
+    a["wiki:Name With Space"] = '<a class="wiki_link" title="Name With Space" href="/spaces/test_space/wiki/Name_With_Space">Name With Space</a>'
+    a["Name"]       = '<a class="wiki_link" title="Name" href="/spaces/test_space/wiki/Name">Name</a>'
+    a["Name With Space"] = '<a class="wiki_link" title="Name With Space" href="/spaces/test_space/wiki/Name_With_Space">Name With Space</a>'
+    a["Name#Ref"]   = '<a class="wiki_link" title="Name#Ref" href="/spaces/test_space/wiki/Name#h-Ref">Name#Ref</a>'
+    a["Name#h-Ref"]   = '<a class="wiki_link" title="Name#h-Ref" href="/spaces/test_space/wiki/Name#h-h-Ref">Name#h-Ref</a>'
     a["#Ref"]       = '<a href="#h-Ref" title="#Ref" class="wiki_link">#Ref</a>'
     a["#привет"]    = %Q|<a href="#h-#{hex_string("привет")}" title="#привет" class="wiki_link">#привет</a>|
     a["#with  spc"] = %Q|<a href="#h-with__spc" title="#with  spc" class="wiki_link">#with  spc</a>|
@@ -849,6 +850,8 @@ describe 'BreakoutParser' do
     a["file:cVJUz6ejWr35pEab_qKWB8"] =
       '<a href="/spaces/test_space/documents/download/cVJUz6ejWr35pEab_qKWB8">file:cVJUz6ejWr35pEab_qKWB8</a>'
 
+    pat = Regexp.new('/code/test_space/(git|subversion)/changesets/')
+
     a.each do |k,v|
       it "parses [[#{k}]]" do
         parse("[[#{k}]]").should == v
@@ -878,82 +881,81 @@ describe 'BreakoutParser' do
             v.gsub('href="/',"href=\"#{site_url}/")
         end
       end
-      if v['/git/']
-        it "parses [[#{k}]] with custom git_url (String)" do
-          git_url = "http://www.ru/"
+      if v['/git/'] || v['/subversion/']
+        it "parses [[#{k}]] with custom vcs_url (String)" do
+          vcs_url = "http://www.ru/"
           rev = k.split(':').last.tr(']','')
-          parse("[[#{k}]]", :git_url => git_url).should ==
-            v.sub('/code/test_space/git/changesets/',git_url)
+          parse("[[#{k}]]", :vcs_url => vcs_url).should ==
+            v.sub(pat,vcs_url)
         end
 
-        it "parses [[#{k}]] with custom git_url (ObjProxy)" do
+        it "parses [[#{k}]] with custom vcs_url (ObjProxy)" do
           rev = k.split(':').last.tr(']','')
           @asdfg = 'http://mmm.us'
-          git_url = Breakout::ObjProxy.new do
+          vcs_url = Breakout::ObjProxy.new do
             @asdfg + '/'
           end
-          parse("[[#{k}]]", :git_url => git_url).should ==
-            v.sub('/code/test_space/git/changesets/',git_url)
+          parse("[[#{k}]]", :vcs_url => vcs_url).should ==
+            v.sub(pat,vcs_url)
         end
 
-        it "parses [[#{k}]] with custom git_url (String) + $REV$" do
-          git_url = "http://www.ru/$REV$/show"
+        it "parses [[#{k}]] with custom vcs_url (String) + $REV$" do
+          vcs_url = "http://www.ru/$REV$/show"
           rev = k.split(':').last.tr(']','')
-          parse("[[#{k}]]", :git_url => git_url).should ==
-            v.sub('/code/test_space/git/changesets/',git_url).sub(rev,'').sub('$REV$',rev)
+          parse("[[#{k}]]", :vcs_url => vcs_url).should ==
+            v.sub(pat,vcs_url).sub(rev,'').sub('$REV$',rev)
 
-          git_url = "http://www.ru/$REV$"
-          parse("[[#{k}]]", :git_url => git_url).should ==
-            v.sub('/code/test_space/git/changesets/',git_url).sub(rev,'').sub('$REV$',rev)
+          vcs_url = "http://www.ru/$REV$"
+          parse("[[#{k}]]", :vcs_url => vcs_url).should ==
+            v.sub(pat,vcs_url).sub(rev,'').sub('$REV$',rev)
 
-          git_url = "$REV$"
-          parse("[[#{k}]]", :git_url => git_url).should ==
-            v.sub('/code/test_space/git/changesets/',git_url).sub(rev,'').sub('$REV$',rev)
+          vcs_url = "$REV$"
+          parse("[[#{k}]]", :vcs_url => vcs_url).should ==
+            v.sub(pat,vcs_url).sub(rev,'').sub('$REV$',rev)
         end
 
-        it "parses [[#{k}]] with custom git_url (ObjProxy) + $REV$" do
+        it "parses [[#{k}]] with custom vcs_url (ObjProxy) + $REV$" do
           rev = k.split(':').last.tr(']','')
           @asdfg = 'http://mmm.us/$REV$/show'
-          git_url = Breakout::ObjProxy.new do
+          vcs_url = Breakout::ObjProxy.new do
             @asdfg
           end
-          parse("[[#{k}]]", :git_url => git_url).should ==
-            v.sub('/code/test_space/git/changesets/',git_url).sub(rev,'').sub('$REV$',rev)
+          parse("[[#{k}]]", :vcs_url => vcs_url).should ==
+            v.sub(pat,vcs_url).sub(rev,'').sub('$REV$',rev)
 
           @asdfg = 'http://mmm.us/$REV$'
-          parse("[[#{k}]]", :git_url => git_url).should ==
-            v.sub('/code/test_space/git/changesets/',git_url).sub(rev,'').sub('$REV$',rev)
+          parse("[[#{k}]]", :vcs_url => vcs_url).should ==
+            v.sub(pat,vcs_url).sub(rev,'').sub('$REV$',rev)
 
           @asdfg = '$REV$'
-          parse("[[#{k}]]", :git_url => git_url).should ==
-            v.sub('/code/test_space/git/changesets/',git_url).sub(rev,'').sub('$REV$',rev)
+          parse("[[#{k}]]", :vcs_url => vcs_url).should ==
+            v.sub(pat,vcs_url).sub(rev,'').sub('$REV$',rev)
         end
 
-        it "parses [[#{k}]] with NULL git_url (ObjProxy)" do
+        it "parses [[#{k}]] with NULL vcs_url (ObjProxy)" do
           rev = k.split(':').last.tr(']','')
-          git_url = Breakout::ObjProxy.new do
+          vcs_url = Breakout::ObjProxy.new do
             nil
           end
-          parse("[[#{k}]]", :git_url => git_url).should == v
+          parse("[[#{k}]]", :vcs_url => vcs_url).should == v
         end
 
-        it "parses [[#{k}]] with FALSE git_url (ObjProxy)" do
+        it "parses [[#{k}]] with FALSE vcs_url (ObjProxy)" do
           rev = k.split(':').last.tr(']','')
-          git_url = Breakout::ObjProxy.new do
+          vcs_url = Breakout::ObjProxy.new do
             false
           end
-          parse("[[#{k}]]", :git_url => git_url).should == v
+          parse("[[#{k}]]", :vcs_url => vcs_url).should == v
         end
       end
     end
 
-    it "should not instantiate ObjProxy's internal object if there's no git links in text" do
-      git_url = Breakout::ObjProxy.new do
+    it "should not instantiate ObjProxy's internal object if there are no git or svn links in text" do
+      vcs_url = Breakout::ObjProxy.new do
         raise 'should not be raised'
       end
       lambda {
-        parse("[[r:2345]]", :git_url => git_url).should ==
-          '<a href="/code/test_space/subversion/changesets/2345">revision:2345</a>'
+        parse("no revision tag", :vcs_url => vcs_url).should == 'no revision tag'
       }.should_not raise_error
     end
 
@@ -961,30 +963,30 @@ describe 'BreakoutParser' do
       # 'true' values
       [true, 1, 'x'].each do |v|
         it "should NOT convert relative url to absolute when absolute_urls = #{v.inspect} AND site_url is NULL" do
-          parse("[[url:/rel]]", :absolute_urls => v).should == 
+          parse("[[url:/rel]]", :absolute_urls => v).should ==
             '<a rel="nofollow" href="/rel">/rel</a>'
-          parse("[[url:/rel|text]]", :absolute_urls => v).should == 
+          parse("[[url:/rel|text]]", :absolute_urls => v).should ==
             '<a rel="nofollow" href="/rel">text</a>'
         end
         it "should convert relative url to absolute when absolute_urls = #{v.inspect}" do
-          parse("[[url:/rel]]", :absolute_urls => v, :site_url => 'http://www.ru').should == 
+          parse("[[url:/rel]]", :absolute_urls => v, :site_url => 'http://www.ru').should ==
             '<a rel="nofollow" href="http://www.ru/rel">/rel</a>'
-          parse("[[url:/rel|text]]", :absolute_urls => v, :site_url => 'http://www.ru').should == 
+          parse("[[url:/rel|text]]", :absolute_urls => v, :site_url => 'http://www.ru').should ==
             '<a rel="nofollow" href="http://www.ru/rel">text</a>'
         end
         it "should strip redundant '/' when absolute_urls = #{v.inspect}" do
-          parse("[[url:/rel]]", :absolute_urls => v, :site_url => 'http://www.ru/').should == 
+          parse("[[url:/rel]]", :absolute_urls => v, :site_url => 'http://www.ru/').should ==
             '<a rel="nofollow" href="http://www.ru/rel">/rel</a>'
-          parse("[[url:/rel|text]]", :absolute_urls => v, :site_url => 'http://www.ru/').should == 
+          parse("[[url:/rel|text]]", :absolute_urls => v, :site_url => 'http://www.ru/').should ==
             '<a rel="nofollow" href="http://www.ru/rel">text</a>'
         end
       end
       # 'false' values
       [false, nil].each do |v|
         it "should not convert relative url to absolute when absolute_urls = #{v.inspect}" do
-          parse("[[url:/rel]]", :absolute_urls => v).should == 
+          parse("[[url:/rel]]", :absolute_urls => v).should ==
             '<a rel="nofollow" href="/rel">/rel</a>'
-          parse("[[url:/rel|text]]", :absolute_urls => v).should == 
+          parse("[[url:/rel|text]]", :absolute_urls => v).should ==
             '<a rel="nofollow" href="/rel">text</a>'
         end
       end
@@ -1048,10 +1050,10 @@ describe 'BreakoutParser' do
 
   def parse s, h = {}
     h[:space_name] = "test_space" unless h.key?(:space_name)
-    BreakoutParser.parse(s, 
-      h[:space_name], 
-      h[:site_url], 
-      h[:git_url],
+    BreakoutParser.parse(s,
+      h[:space_name],
+      h[:site_url],
+      h[:vcs_url],
       h[:absolute_urls]
     ).strip
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: breakout_parser
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 49
   prerelease: false
   segments: 
   - 0
   - 0
-  - 20
-  version: 0.0.20
+  - 23
+  version: 0.0.23
 platform: ruby
 authors: 
 - Andrey "Zed" Zaikin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-29 00:00:00 +04:00
+date: 2011-05-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,8 +66,8 @@ homepage: http://assembla.com
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement