kotovalexarian-likes-github/middleman--middleman
1
0
Fork 0
mirror of https://github.com/middleman/middleman.git synced 2022-11-09 12:20:27 -05:00
Code Releases Activity

maruku is abandonware, default to rdiscount

Browse source
This commit is contained in:
Thomas Reynolds 2011-11-30 10:11:08 -08:00
parent 46ddfe747f
commit dd0836b9d5
4 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fixtures/test-app/config.rb
View file

@ -1,4 +1,3 @@
require "maruku"
require "slim" require "slim"
require "liquid" require "liquid"
require "coffee-filter" require "coffee-filter"

2
lib/middleman/base.rb
View file

@ -251,7 +251,7 @@ class Middleman::Base
self.class.superclass.defaults.each { |k,v| set(k,v) } self.class.superclass.defaults.each { |k,v| set(k,v) }
# Evaluate a passed block if given # Evaluate a passed block if given
yield if block_given? instance_exec(&block) if block_given?
# Build expanded source path once paths have been parsed # Build expanded source path once paths have been parsed
set :source_dir, File.join(root, source) set :source_dir, File.join(root, source)

6
lib/middleman/renderers/markdown.rb
View file

@ -3,16 +3,12 @@ module Middleman::Renderers::Markdown
def registered(app) def registered(app)
app.set :markdown_engine, nil app.set :markdown_engine, nil
begin # TODO: Switch to Redcarpet once Haml 3.2.0 ships
require "maruku"
app.set :markdown_engine, :maruku
rescue LoadError
begin begin
require "rdiscount" require "rdiscount"
app.set :markdown_engine, :rdiscount app.set :markdown_engine, :rdiscount
rescue LoadError rescue LoadError
end end
end
app.set :markdown_engine_prefix, ::Tilt app.set :markdown_engine_prefix, ::Tilt

2
middleman.gemspec
View file

@ -42,7 +42,7 @@ Gem::Specification.new do |s|
# Development and test # Development and test
s.add_development_dependency("slim") s.add_development_dependency("slim")
s.add_development_dependency("maruku") s.add_development_dependency("rdiscount")
s.add_development_dependency("coffee-filter", ["~> 0.1.1"]) s.add_development_dependency("coffee-filter", ["~> 0.1.1"])
s.add_development_dependency("liquid", ["~> 2.2.0"]) s.add_development_dependency("liquid", ["~> 2.2.0"])
s.add_development_dependency("cucumber", ["~> 1.1.0"]) s.add_development_dependency("cucumber", ["~> 1.1.0"])