breakout_parser 0.0.19 → 0.0.20

data/ChangeLog

@@ -1,3 +1,8 @@
+[ 0.0.20 ]
+
+    * parse "$REV$" in external repo links
+        (https://www.assembla.com/spaces/breakout/tickets/6496)
+
 [ 0.0.19 ]
 
     * skip redundant '/' in making relative urls absolute

data/ext/breakout_parser/parser.tab.c

@@ -2305,12 +2305,21 @@ process_svn_link(const char*target, int numbered_repo){
     process_link_tail(target,NULL,"revision:");
 }
 
-int concat_custom_git_url(){
-    const char *c;
+int concat_custom_git_url(const char*rev){
+    const char *c,*p,*t;
     if( git_url && (c = StringValuePtr(git_url)) ){
         size_t l = strlen(c);
         if( l>0 ){
-            concat2(c);
+            if( p=strstr(c, "$REV$") ){
+                concat(c, p-c);
+                // concat revision number
+                for(t=rev; *t && *t!=']' && *t!='|'; t++) concat_raw_char(*t);
+                concat2(p+5);
+            } else {
+                concat2(c);
+                // concat revision number
+                for(t=rev; *t && *t!=']' && *t!='|'; t++) concat_raw_char(*t);
+            }
             return 1;
         }
     }
@@ -2321,7 +2330,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() ){
+    if( !concat_custom_git_url(target) ){
         concat_site_url();
         concat("/code/",6);
         concat(space_name,space_name_len);
@@ -2333,8 +2342,8 @@ process_git_link(const char*target, int numbered_repo){
         } else {
             concat("/git/changesets/",16);
         }
+        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:");
 }
 

data/ext/breakout_parser/parser.y

@@ -374,12 +374,21 @@ process_svn_link(const char*target, int numbered_repo){
     process_link_tail(target,NULL,"revision:");
 }
 
-int concat_custom_git_url(){
-    const char *c;
+int concat_custom_git_url(const char*rev){
+    const char *c,*p,*t;
     if( git_url && (c = StringValuePtr(git_url)) ){
         size_t l = strlen(c);
         if( l>0 ){
-            concat2(c);
+            if( p=strstr(c, "$REV$") ){
+                concat(c, p-c);
+                // concat revision number
+                for(t=rev; *t && *t!=']' && *t!='|'; t++) concat_raw_char(*t);
+                concat2(p+5);
+            } else {
+                concat2(c);
+                // concat revision number
+                for(t=rev; *t && *t!=']' && *t!='|'; t++) concat_raw_char(*t);
+            }
             return 1;
         }
     }
@@ -390,7 +399,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() ){
+    if( !concat_custom_git_url(target) ){
         concat_site_url();
         concat("/code/",6);
         concat(space_name,space_name_len);
@@ -402,8 +411,8 @@ process_git_link(const char*target, int numbered_repo){
         } else {
             concat("/git/changesets/",16);
         }
+        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:");
 }
 

data/spec/parser_spec.rb

@@ -896,6 +896,39 @@ describe 'BreakoutParser' do
             v.sub('/code/test_space/git/changesets/',git_url)
         end
 
+        it "parses [[#{k}]] with custom git_url (String) + $REV$" do
+          git_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)
+
+          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)
+
+          git_url = "$REV$"
+          parse("[[#{k}]]", :git_url => git_url).should ==
+            v.sub('/code/test_space/git/changesets/',git_url).sub(rev,'').sub('$REV$',rev)
+        end
+
+        it "parses [[#{k}]] with custom git_url (ObjProxy) + $REV$" do
+          rev = k.split(':').last.tr(']','')
+          @asdfg = 'http://mmm.us/$REV$/show'
+          git_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)
+
+          @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)
+
+          @asdfg = '$REV$'
+          parse("[[#{k}]]", :git_url => git_url).should ==
+            v.sub('/code/test_space/git/changesets/',git_url).sub(rev,'').sub('$REV$',rev)
+        end
+
         it "parses [[#{k}]] with NULL git_url (ObjProxy)" do
           rev = k.split(':').last.tr(']','')
           git_url = Breakout::ObjProxy.new do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: breakout_parser
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 0
-  - 19
-  version: 0.0.19
+  - 20
+  version: 0.0.20
 platform: ruby
 authors: 
 - Andrey "Zed" Zaikin