Switch from Maruku to Redcarpet

* Rename helper method to avoid naming collision. Signed-off-by: Alex Coles <alex@alexbcoles.com>
eurucamp · Jul 16, 2012 · 48cad19 · 48cad19
1 parent 3e647cc
commit 48cad19
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -13,6 +13,8 @@ gem 'sitemap_generator'
 gem 'coffee-script'
 gem 'bourbon'
 gem 'nokogiri'
+gem 'redcarpet'
+gem 'pygments.rb'
 
 gem 'html5-boilerplate', :require => 'html5-boilerplate',
                          :git     => 'git://github.com/edenspiekermann/compass-html5-boilerplate.git',

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -59,6 +59,7 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.2.8)
+    blankslate (2.1.2.4)
     bourbon (2.1.1)
       sass (>= 3.1)
     builder (3.0.0)
@@ -120,6 +121,8 @@ GEM
     padrino-helpers (0.10.7)
       i18n (~> 0.6)
       padrino-core (= 0.10.7)
+    pygments.rb (0.2.13)
+      rubypython (~> 0.5.3)
     rack (1.4.1)
     rack-contrib (1.1.0)
       rack (>= 0.9.1)
@@ -134,8 +137,12 @@ GEM
     rb-fsevent (0.9.1)
     rb-inotify (0.8.8)
       ffi (>= 0.5.0)
+    redcarpet (2.1.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
+    rubypython (0.5.3)
+      blankslate (>= 2.1.2.3)
+      ffi (~> 1.0.7)
     rubyzip (0.9.9)
     sinatra (1.3.2)
       rack (~> 1.3, >= 1.3.6)
@@ -173,8 +180,10 @@ DEPENDENCIES
   middleman!
   middleman-blog!
   nokogiri
+  pygments.rb
   rack-contrib
   rack-rewrite
   rake (~> 0.9.2)
+  redcarpet
   sass!
   sitemap_generator
diff --git a/config.rb b/config.rb
@@ -4,6 +4,8 @@
 require 'active_support/core_ext/string'
 require 'app/helpers/html5_boilerplate_helper'
 
+set :markdown_engine, :redcarpet
+
 ###
 # Blog settings
 ###

diff --git a/lib/custom_tag_helpers.rb b/lib/custom_tag_helpers.rb
@@ -15,8 +15,8 @@ def to_s
 
 module CustomTagHelpers
 
-  def md(text)
-    Maruku.new(text).to_html
+  def md2html(text)
+    Redcarpet::Markdown.new(Redcarpet::Render::HTML).render(text)
   end
 
   def wrapped(el = :div, attrs = {}, &block)

diff --git a/source/speakers.html.haml b/source/speakers.html.haml
@@ -14,7 +14,7 @@ body_class: speakers
         %h3= link_to speaker.name, speaker.url
         %div= link_to speaker.company, speaker.company_url
         %div= link_to "@#{speaker.twitter}", "http://twitter.com/#{speaker.twitter}"
-        %p= md speaker.bio
+        %p= md2html speaker.bio
 
         %h4 #{speaker.talk_title}
-        %p= md speaker.talk_summary
+        %p= md2html speaker.talk_summary