Revert Merge pull request #84 from MongoHQ/gfm

Compatibility with jruby was lost.
ruby-grape · Feb 4, 2014 · 598d028 · 598d028
1 parent e4cdbdd
commit 598d028
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -5,7 +5,7 @@ source "http://rubygems.org"
 
 gem 'grape', '>= 0.2.0'
 gem 'grape-entity', '>= 0.3.0'
-gem 'github-markdown'
+gem 'kramdown'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -11,7 +11,6 @@ GEM
     diff-lcs (1.1.3)
     ffi (1.9.3-java)
     git (1.2.5)
-    github-markdown (0.6.4)
     grape (0.5.0)
       activesupport
       builder
@@ -34,6 +33,7 @@ GEM
       rdoc
     json (1.7.3)
     json (1.7.3-java)
+    kramdown (0.13.7)
     method_source (0.8)
     multi_json (1.7.7)
     multi_xml (0.5.4)
@@ -83,10 +83,10 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (> 1.0.0)
-  github-markdown
   grape (>= 0.2.0)
   grape-entity (>= 0.3.0)
   jeweler (~> 1.8.4)
+  kramdown
   pry
   rack-test
   rdoc (~> 3.12)

diff --git a/lib/grape-swagger.rb b/lib/grape-swagger.rb
@@ -1,4 +1,4 @@
-require 'github/markdown'
+require 'kramdown'
 
 module Grape
   class API
@@ -182,7 +182,7 @@ def self.setup(options)
           helpers do
 
             def as_markdown(description)
-              description && @@markdown ? GitHub::Markdown.render_gfm(strip_heredoc(description)) : description
+              description && @@markdown ? Kramdown::Document.new(strip_heredoc(description)).to_html : description
             end
 
             def parse_params(params, path, method)