Merge pull request #176 from cyberarm/questions_formatting

PragTob · PragTob · commit 18c8c5f5402a · 2013-10-20T12:34:08.000-07:00
Use Redcarpet for markdown formatting of user input
diff --git a/Gemfile b/Gemfile
@@ -34,7 +34,7 @@ gem 'simple_form',    git: "https://github.com/bitzesty/bootstrap_form.git"
 gem "semantic_menu",  git: "git://github.com/michaek/semantic_menu.git"
 
 gem 'will_paginate'    # Pagination
-gem 'rdiscount'   # Markdown
+gem 'redcarpet', '~> 3.0'   # Markdown
 
 group :development do
   # Use unicorn as the web server
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -181,10 +181,9 @@ GEM
       thor (~> 0.14.6)
     raindrops (0.8.0)
     rake (10.1.0)
-    rdiscount (1.6.8)
     rdoc (3.12.2)
       json (~> 1.4)
-    redcarpet (2.1.0)
+    redcarpet (3.0.0)
     responders (0.6.5)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -215,7 +214,7 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    slop (2.4.3)
+    slop (2.4.4)
     sprockets (2.0.4)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -268,7 +267,7 @@ DEPENDENCIES
   pg
   pry
   rails (= 3.1.11)
-  rdiscount
+  redcarpet (~> 3.0)
   rspec-rails
   sass-rails (~> 3.1.0)
   semantic_menu!
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -2,4 +2,8 @@ module ApplicationHelper
   def program_path program
     "/users/#{program.author_username}/programs/#{program.slug}"
   end
+
+  def markdown(text)
+    Redcarpet::Markdown.new(Redcarpet::Render::HTML.new(hard_wrap: true), autolink: true).render(text).html_safe
+  end
 end
diff --git a/app/models/deleted_user.rb b/app/models/deleted_user.rb
@@ -10,4 +10,4 @@ def email
   def to_param
     'deleted_user'
   end
-end
+end
diff --git a/app/views/answers/_list.html.haml b/app/views/answers/_list.html.haml
@@ -3,8 +3,7 @@
     .meta
       #{link_to list.user.username, user_path(list.user)} says
   .description
-    :markdown
-      #{list.description}
+    =markdown(list.description)
 
   .links
     - if can? :update, list
diff --git a/app/views/blog/index.html.haml b/app/views/blog/index.html.haml
@@ -13,6 +13,5 @@
       = post.created_at.strftime("Posted %B %d, %Y at %l:%M %p")
 
     .content
-      :markdown
-        #{post.content}
+      =markdown(post.content)
     
diff --git a/app/views/blog/show.html.haml b/app/views/blog/show.html.haml
@@ -11,5 +11,4 @@
     = @post.created_at.strftime("Posted %B %d, %Y at %l:%M %p")
     
   .content
-    :markdown
-      #{@post.content}
+    =markdown(@post.content)
diff --git a/app/views/lessons/show.html.haml b/app/views/lessons/show.html.haml
@@ -10,5 +10,4 @@
 #lesson-content
   = lesson_categories @lesson
 
-  :markdown
-    #{@lesson.output}
+  =markdown(@lesson.output)
diff --git a/app/views/questions/new.html.haml b/app/views/questions/new.html.haml
@@ -1,4 +1,4 @@
 - content_for :title do
   New Question
 
-= render 'form'
+= render 'form'
diff --git a/app/views/questions/show.html.haml b/app/views/questions/show.html.haml
@@ -26,8 +26,7 @@
 
 
 .description
-  :markdown
-    #{resource.description}
+  =markdown(resource.description)
 
 %h2= pluralize(resource.answers.count, "response")
 %ul.answers
diff --git a/app/views/static/faq.html.haml b/app/views/static/faq.html.haml
@@ -82,4 +82,4 @@
 
     ## Thanks!
 
-    Special thanks goes out to Eric Affleck for writing this FAQ.
+    Special thanks goes out to Eric Affleck for writing this FAQ.
