Merge pull request #68 from mamebro/use-github-markdown

Use github markdown
mamebro · Nov 25, 2013 · 4dbaa31 · 4dbaa31
2 parents 9b851a1 + f9ec886
commit 4dbaa31
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/Gemfile b/Gemfile
@@ -13,6 +13,7 @@ gem 'haml'
 gem 'faraday'
 gem 'lazy_high_charts'
 gem 'newrelic_rpm'
+gem 'github-markdown'
 
 # Gems used only for assets and not required
 # in production environments by default.

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -78,6 +78,7 @@ GEM
       multipart-post (~> 1.1)
     ffi (1.9.0)
     formatador (0.2.4)
+    github-markdown (0.6.3)
     google-analytics-rails (0.0.4)
     growl (1.0.3)
     guard (1.7.0)
@@ -232,6 +233,7 @@ DEPENDENCIES
   factory_girl_rails
   faker
   faraday
+  github-markdown
   google-analytics-rails
   growl
   guard-rspec

diff --git a/app/models/entry.rb b/app/models/entry.rb
@@ -11,14 +11,10 @@ class Entry < ActiveRecord::Base
   default_scope { order('created_at DESC') }
   paginates_per 5
 
-  # https://github.com/rtomayko/rdiscount
-  # Markdownで出力する
+  # http://rubygems.org/gems/github-markdown
+  # GitHub-Markdownで出力
   def content_as_markdown
-    markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML,
-                                       autolink: true,
-                                       space_after_headers: true,
-                                       filter_html: true)
-    markdown.render(content)
+    GitHub::Markdown.render_gfm(content)
   end
 
   def self.from_brothers_followed_by(brother)