From c9c7db5a53f7b18a4a568827f0f08342d25a2f5b Mon Sep 17 00:00:00 2001
From: risk <technoweenie@gmail.com>
Date: Thu, 21 Jul 2011 16:17:09 -0700
Subject: [PATCH] add backwards compatible Gollum::Wiki.markup_class

---
 lib/gollum/wiki.rb | 10 ++++++++++
 test/test_wiki.rb  | 14 ++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/lib/gollum/wiki.rb b/lib/gollum/wiki.rb
index 39213d84..28437fac 100644
--- a/lib/gollum/wiki.rb
+++ b/lib/gollum/wiki.rb
@@ -66,6 +66,16 @@ module Gollum
           end
       end
 
+      def markup_class
+        markup_classes[:default]
+      end
+
+      def markup_class=(default)
+        new_classes     = Hash.new default
+        @markup_classes = Hash.new(default).update(markup_classes)
+        default
+      end
+
       # Gets the default sanitization options for current pages used by
       # instances of this Wiki.
       def sanitization
diff --git a/test/test_wiki.rb b/test/test_wiki.rb
index 5b9b486c..fd37c56c 100644
--- a/test/test_wiki.rb
+++ b/test/test_wiki.rb
@@ -4,6 +4,20 @@ require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 context "Wiki" do
   setup do
     @wiki = Gollum::Wiki.new(testpath("examples/lotr.git"))
+    Gollum::Wiki.markup_classes = nil
+  end
+
+  test "#markup_class gets default markup" do
+    assert_equal Gollum::Markup, Gollum::Wiki.markup_class
+  end
+
+  test "#markup_class= doesn't clobber alternate markups" do
+    custom = Class.new(Gollum::Markup)
+    Gollum::Wiki.markup_class = custom
+
+    assert_equal custom, Gollum::Wiki.markup_class
+    assert_equal custom, Gollum::Wiki.markup_classes[:orgmode]
+    assert_equal Gollum::MarkupGFM, Gollum::Wiki.markup_classes[:markdown]
   end
 
   test "repo path" do