Browse Source

Merge pull request #452 from PetroFeed/markdown_scenario_description

Support for markdown on scenario description.
Andrew Cantino 10 years ago
parent
commit
25f4d748fc

+ 0 - 1
Gemfile

@@ -123,4 +123,3 @@ else
   gem 'unicorn', platform: :ruby_18
   gem 'rails_12factor', platform: :ruby_18
 end
-

+ 7 - 0
app/helpers/markdown_helper.rb

@@ -0,0 +1,7 @@
+module MarkdownHelper
+
+  def markdown(text)
+    Kramdown::Document.new(text, :auto_ids => false).to_html.html_safe
+  end
+
+end

+ 1 - 1
app/views/scenario_imports/_step_two.html.erb

@@ -30,7 +30,7 @@
     </div>
 
     <% if @scenario_import.parsed_data["description"].present? %>
-      <blockquote><%= @scenario_import.parsed_data["description"] %></blockquote>
+      <blockquote><%= markdown(@scenario_import.parsed_data["description"]) %></blockquote>
     <% end %>
 
   </div>

+ 1 - 1
app/views/scenarios/show.html.erb

@@ -6,7 +6,7 @@
       </div>
 
       <% if @scenario.description.present? %>
-        <blockquote><%= @scenario.description %></blockquote>
+        <blockquote><%= markdown(@scenario.description) %></blockquote>
       <% end %>
 
       <%= render 'agents/table', :returnTo => scenario_path(@scenario) %>

+ 14 - 0
spec/helpers/markdown_helper_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe MarkdownHelper do
+
+  describe '#markdown' do
+
+    it 'renders HTML from a markdown text' do
+      markdown('# Header').should =~ /<h1>Header<\/h1>/
+      markdown('## Header 2').should =~ /<h2>Header 2<\/h2>/
+    end
+
+  end
+
+end