From 2dd41cbfac0247669c150efe7b21dd44b7815d00 Mon Sep 17 00:00:00 2001
From: bootstraponline <cafe@bootstraponline.com>
Date: Tue, 25 Sep 2012 21:52:54 -0600
Subject: [PATCH] New pygments has issues.

Revert "Update pygments. Solves #225 #490 #517"

This reverts commit c0c77c5ba7200f290944a09ba7dacb595b31fe48.

Revert "Fix pygments.rb tests."

This reverts commit 1f2165e68b14da617caa72706e41d39dddf0461f.
---
 gollum.gemspec      |  2 +-
 test/test_markup.rb | 22 ++++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/gollum.gemspec b/gollum.gemspec
index 1ed247b2..f1c7194d 100644
--- a/gollum.gemspec
+++ b/gollum.gemspec
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency('grit', "~> 2.5.0")
   s.add_dependency('github-markup', [">= 0.7.0", "< 1.0.0"])
   s.add_dependency('github-markdown')
-  s.add_dependency('pygments.rb', "~> 0.3.0")
+  s.add_dependency('pygments.rb', "~> 0.2.0")
   s.add_dependency('escape_utils', "0.2.4")
   s.add_dependency('sinatra', "~> 1.0")
   s.add_dependency('mustache', [">= 0.11.2", "< 1.0.0"])
diff --git a/test/test_markup.rb b/test/test_markup.rb
index 0a78f7b9..faa00936 100644
--- a/test/test_markup.rb
+++ b/test/test_markup.rb
@@ -196,7 +196,15 @@ context "Markup" do
           DATA
       ), commit_details)
     output = @wiki.page(page).formatted_data
-    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>}.strip # remove trailing \n
+    expected = (<<-'HTML'
+<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>
+</pre>
+</div>
+
+</code></pre>
+HTML
+).strip # remove trailing \n
     assert_equal expected, output
   end
 
@@ -412,7 +420,9 @@ context "Markup" do
 
   test "code blocks" do
     content = "a\n\n```ruby\nx = 1\n```\n\nb"
-    output = %Q{<p>a</p>\n\n<div class=\"highlight\"><pre><span class=\"n\">x</span> <span class=\"o\">=</span> <span class=\"mi\">1</span>\n</pre></div>\n\n<p>b</p>}
+    output = "<p>a</p>\n\n<div class=\"highlight\">\n<pre>" +
+             "<span class=\"n\">x</span> <span class=\"o\">=</span> " +
+             "<span class=\"mi\">1</span>\n</pre>\n</div>\n\n\n<p>b</p>"
 
     index = @wiki.repo.index
     index.add("Bilbo-Baggins.md", content)
@@ -425,7 +435,9 @@ context "Markup" do
 
   test "code blocks with carriage returns" do
     content = "a\r\n\r\n```ruby\r\nx = 1\r\n```\r\n\r\nb"
-    output = %Q{<p>a</p>\n\n<div class=\"highlight\"><pre><span class=\"n\">x</span> <span class=\"o\">=</span> <span class=\"mi\">1</span>\n</pre></div>\n\n<p>b</p>}
+    output = "<p>a</p>\n\n<div class=\"highlight\">\n<pre>" +
+             "<span class=\"n\">x</span> <span class=\"o\">=</span> " +
+             "<span class=\"mi\">1</span>\n</pre>\n</div>\n\n\n<p>b</p>"
 
     index = @wiki.repo.index
     index.add("Bilbo-Baggins.md", content)
@@ -456,7 +468,9 @@ context "Markup" do
 
   test "code blocks with multibyte caracters indent" do
     content = "a\n\n```ruby\ns = 'やくしまるえつこ'\n```\n\nb"
-    output = %Q{<p>a</p>\n\n<div class=\"highlight\"><pre><span class=\"n\">s</span> <span class=\"o\">=</span> <span class=\"s1\">'\343\202\204\343\201\217\343\201\227\343\201\276\343\202\213\343\201\210\343\201\244\343\201\223'</span>\n</pre></div>\n\n<p>b</p>}
+    output = "<p>a</p>\n\n<div class=\"highlight\">\n<pre><span class=\"n\">" +
+             "s</span> <span class=\"o\">=</span> <span class=\"s1\">'やくしまるえつこ'" +
+             "</span>\n</pre>\n</div>\n\n\n<p>b</p>"
     index = @wiki.repo.index
     index.add("Bilbo-Baggins.md", content)
     index.commit("Add alpha.jpg")