default to redcarpet for markdown. closes #196

CHANGELOG.md

@@ -12,6 +12,7 @@
 * Unified callback solution
 * Removed Slim and Maruku from base install. Will need to be installed and required by the user (in - config.rb)
 * Activate mobile html5boilerplate template
+* Update to Redcarpet for Markdown (breaks Haml :markdown filter)
 
 2.0.14
 ====

fixtures/clean-app/source/index.html.haml

@@ -1,6 +1 @@
-%h1 Welcome
+h1 Welcome
-
-:markdown
-  ## H2
-  
-  Paragraph

fixtures/test-app/source/index.html.slim

@@ -1,9 +1,9 @@
-%h1 Welcome
+h1 Welcome
 
 = image_tag "Chrome_Logo.svg"
 = image_tag "cfb_tomb-perennial-energy.svgz"
 
-:markdown
+markdown:
   ## H2
   
   Paragraph

lib/middleman/renderers/markdown.rb

@@ -1,15 +1,8 @@
 module Middleman::Renderers::Markdown
   class << self
     def registered(app)
-      app.set :markdown_engine, nil
+      require "redcarpet"
-    
+      app.set :markdown_engine, :redcarpet
-      # TODO: Switch to Redcarpet once Haml 3.2.0 ships
-      begin
-        require "rdiscount"
-        app.set :markdown_engine, :rdiscount
-      rescue LoadError
-      end
-
       app.set :markdown_engine_prefix, ::Tilt
       
       app.after_configuration do

middleman.gemspec

@@ -36,13 +36,13 @@ Gem::Specification.new do |s|
   s.add_dependency("sprockets", ["~> 2.1.2"])
   s.add_dependency("sprockets-sass", ["~> 0.5.0"])
   s.add_dependency("guard", ["~> 0.8.8"])
+  s.add_dependency("redcarpet", ["~> 2.0.0"])
   
   # OSX
   s.add_dependency("rb-fsevent")
   
   # Development and test
   s.add_development_dependency("slim")
-  s.add_development_dependency("rdiscount")
   s.add_development_dependency("sinatra")
   s.add_development_dependency("coffee-filter", ["~> 0.1.1"])
   s.add_development_dependency("liquid", ["~> 2.2.0"])