Create an about page whose text is in Markdown

- Add redcarpet as a dependency - Create generic markdown template
pgpio · Dec 16, 2013 · 49c27a8 · 49c27a8
1 parent 2f8c074
commit 49c27a8
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -10,6 +10,7 @@ gem 'openpgp'
 gem 'rack-less', :require => 'rack/less'
 gem 'rack-test', :require => 'rack/test', :group => 'test'
 gem 'rake'
+gem 'redcarpet'
 gem 'rr', :group => 'test'
 gem 'shotgun', :group => 'development'
 gem 'sinatra', :require => 'sinatra/base'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -36,6 +36,7 @@ GEM
     rack-test (0.6.2)
       rack (>= 1.0)
     rake (10.1.0)
+    redcarpet (3.0.0)
     ref (1.0.5)
     rr (1.1.2)
     shotgun (0.9)
@@ -67,6 +68,7 @@ DEPENDENCIES
   rack-less
   rack-test
   rake
+  redcarpet
   rr
   shotgun
   sinatra

diff --git a/app/controllers.rb b/app/controllers.rb
@@ -4,7 +4,8 @@ class PgpIo::App < Sinatra::Application
   end
 
   get "/about" do
-    erb :about, :layout => :'layouts/main'
+    @text = markdown :about
+    erb :markdown, :layout => :'layouts/main'
   end
 
   # Append to a location

diff --git a/app/views/about.erb b/app/views/about.erb
diff --git a/app/views/about.md b/app/views/about.md
@@ -0,0 +1 @@
+This is our about page.
diff --git a/app/views/markdown.erb b/app/views/markdown.erb
@@ -0,0 +1,3 @@
+<div class="markdown">
+  <%= @text %>
+</div>