From fa16c8960c8e356143c6424583dd3631b00fd408 Mon Sep 17 00:00:00 2001
From: bootstraponline <code@bootstraponline.com>
Date: Sat, 27 Oct 2012 17:58:14 -0600
Subject: [PATCH] Fix #560

---
 lib/gollum/markup.rb |  4 ++++
 test/test_markup.rb  | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/lib/gollum/markup.rb b/lib/gollum/markup.rb
index cb1bb7b4..a4dbf9f5 100644
--- a/lib/gollum/markup.rb
+++ b/lib/gollum/markup.rb
@@ -81,6 +81,10 @@ module Gollum
       data.gsub!(/<p><\/p>/) do
         ''
       end
+      # fix 4 space indented code blocks
+      data.gsub!(/<pre>\s*<code>(.+)<\/code>\s*<\/pre>/m) do
+        "<pre><code>#{$1}</code></pre>"
+      end
       data
     end
 
diff --git a/test/test_markup.rb b/test/test_markup.rb
index 9dc477fd..9d033945 100644
--- a/test/test_markup.rb
+++ b/test/test_markup.rb
@@ -208,7 +208,7 @@ context "Markup" do
           DATA
       ), commit_details)
     output = @wiki.page(page).formatted_data
-    expected = %Q{<pre>\n  <code>      <div class=\"highlight\"><pre><span class=\"n\">rot13</span><span class=\"p\">=</span><span class=\"s\">'tr '</span><span class=\"o\">\\</span><span class=\"s\">''</span><span class=\"n\">A</span><span class=\"o\">-</span><span class=\"n\">Za</span><span class=\"o\">-</span><span class=\"n\">z</span><span class=\"o\">'\\</span><span class=\"s\">''</span> <span class=\"s\">'\\''N-ZA-Mn-za-m'</span><span class=\"o\">\\</span><span class=\"s\">'</span>\n</pre></div>\n</code>\n</pre>}
+    expected = %Q{<pre><code>      <div class=\"highlight\"><pre><span class=\"n\">rot13</span><span class=\"p\">=</span><span class=\"s\">'tr '</span><span class=\"o\">\\</span><span class=\"s\">''</span><span class=\"n\">A</span><span class=\"o\">-</span><span class=\"n\">Za</span><span class=\"o\">-</span><span class=\"n\">z</span><span class=\"o\">'\\</span><span class=\"s\">''</span> <span class=\"s\">'\\''N-ZA-Mn-za-m'</span><span class=\"o\">\\</span><span class=\"s\">'</span>\n</pre></div>\n</code></pre>}
     assert_equal expected, output
   end
 
@@ -249,10 +249,20 @@ context "Markup" do
     assert_equal expected, output
   end
 
+  test "four space indented code block" do
+    page = 'test_four'
+    @wiki.write_page(page, :markdown,
+      %(    test
+    test), commit_details)
+    output = @wiki.page(page).formatted_data
+    expected = %(<pre><code>test\ntest\n</code></pre>)
+    assert_equal expected, output
+  end
+
   test "wiki link within code block" do
     @wiki.write_page("Potato", :markdown, "    sed -i '' 's/[[:space:]]*$//'", commit_details)
     page = @wiki.page("Potato")
-    assert_equal "<pre>\n  <code>sed -i '' 's/[[:space:]]*$//'\n</code>\n</pre>", page.formatted_data
+    assert_equal "<pre><code>sed -i '' 's/[[:space:]]*$//'\n</code></pre>", page.formatted_data
   end
 
   test "piped wiki link within code block" do