Merge pull request gollum#303 from rwfowler/asciidocLinks

Fix for gollum#52 - Disable internal link processing for asciidoc
alsemyonov · May 1, 2012 · 8fbbe40 · 8fbbe40
2 parents b7fb4c5 + f73c925
commit 8fbbe40
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/lib/gollum/markup.rb b/lib/gollum/markup.rb
@@ -116,6 +116,9 @@ def process_tex(data)
     #
     # Returns the placeholder'd String data.
     def extract_tags(data)
+      if @format == :asciidoc
+        return data
+      end
       data.gsub!(/(.?)\[\[(.+?)\]\]([^\[]?)/m) do
         if $1 == "'" && $3 != "'"
           "[[#{$2}]]#{$3}"

diff --git a/test/test_markup.rb b/test/test_markup.rb
@@ -588,6 +588,19 @@ def assert_markup_highlights_code(markup_class, rendered)
     compare(content, output, 'md')
   end
 
+  #########################################################################
+  # Asciidoc
+  #########################################################################
+
+  test "asciidoc header" do 
+    compare("= Book Title\n\n== Heading", '<div class="sect1"><h2 id="wiki-_heading">Heading</h2><div class="sectionbody"></div></div>', 'asciidoc')
+  end
+
+  test "internal links with asciidoc" do 
+    compare("= Book Title\n\n[[anid]]\n== Heading", '<div class="sect1"><h2 id="wiki-anid">Heading</h2><div class="sectionbody"></div></div>', 'asciidoc')
+  end
+
+
   #########################################################################
   #
   # Helpers