deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

switch to Maruku, avoid compiled extensions

Browse source
This commit is contained in:
Thomas Reynolds 2011-08-05 10:32:53 -07:00
parent 9a3f09986f
commit ee06e01b54
4 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/middleman/core_extensions/front_matter.rb
View file

@ -8,7 +8,8 @@ module Middleman::CoreExtensions::FrontMatter
::Tilt::register RDiscountTemplate, 'markdown', 'mkd', 'md' ::Tilt::register RDiscountTemplate, 'markdown', 'mkd', 'md'
::Tilt::register RedcarpetTemplate, 'markdown', 'mkd', 'md' ::Tilt::register RedcarpetTemplate, 'markdown', 'mkd', 'md'
app.set :markdown_engine, RDiscountTemplate ::Tilt::register MarukuTemplate, 'markdown', 'mkd', 'md'
app.set :markdown_engine, MarukuTemplate
::Tilt::register RedClothTemplate, 'textile' ::Tilt::register RedClothTemplate, 'textile'
::Tilt.prefer(RedClothTemplate) ::Tilt.prefer(RedClothTemplate)
@ -86,7 +87,9 @@ module Middleman::CoreExtensions::FrontMatter
class RedcarpetTemplate < ::Tilt::RedcarpetTemplate class RedcarpetTemplate < ::Tilt::RedcarpetTemplate
include Middleman::CoreExtensions::FrontMatter::YamlAware include Middleman::CoreExtensions::FrontMatter::YamlAware
end end
class MarukuTemplate < ::Tilt::MarukuTemplate
include Middleman::CoreExtensions::FrontMatter::YamlAware
end
class RedClothTemplate < ::Tilt::RedClothTemplate class RedClothTemplate < ::Tilt::RedClothTemplate
include Middleman::CoreExtensions::FrontMatter::YamlAware include Middleman::CoreExtensions::FrontMatter::YamlAware
end end

2
lib/middleman/features/blog.rb
View file

@ -1,5 +1,3 @@
require "rdiscount"
module Middleman module Middleman
module Features module Features
module Blog module Blog

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

@ -1,7 +1,7 @@
module Middleman::Renderers::Markdown module Middleman::Renderers::Markdown
class << self class << self
def registered(app) def registered(app)
app.set :markdown_engine, ::Tilt::RDiscountTemplate app.set :markdown_engine, ::Tilt::MarukuTemplate
app.after_configuration do app.after_configuration do
::Tilt.prefer(app.settings.markdown_engine) ::Tilt.prefer(app.settings.markdown_engine)
end end

4
middleman.gemspec
View file

@ -20,7 +20,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency("thin", ["~> 1.2.11"]) s.add_runtime_dependency("thin", ["~> 1.2.11"])
s.add_runtime_dependency("thor", ["~> 0.14.0"]) s.add_runtime_dependency("thor", ["~> 0.14.0"])
s.add_runtime_dependency("tilt", ["~> 1.3.1"]) s.add_runtime_dependency("tilt", ["~> 1.3.1"])
s.add_runtime_dependency("rdiscount", ["~> 1.6.8"]) s.add_runtime_dependency("maruku", ["~> 0.6.0"])
s.add_runtime_dependency("sinatra", ["~> 1.2.6"]) s.add_runtime_dependency("sinatra", ["~> 1.2.6"])
s.add_runtime_dependency("padrino-core", ["~> 0.10.1"]) s.add_runtime_dependency("padrino-core", ["~> 0.10.1"])
s.add_runtime_dependency("padrino-helpers", ["~> 0.10.1"]) s.add_runtime_dependency("padrino-helpers", ["~> 0.10.1"])
@ -29,7 +29,6 @@ Gem::Specification.new do |s|
s.add_runtime_dependency("slim", ["~> 0.9.0"]) s.add_runtime_dependency("slim", ["~> 0.9.0"])
s.add_runtime_dependency("haml", ["~> 3.1.0"]) s.add_runtime_dependency("haml", ["~> 3.1.0"])
s.add_runtime_dependency("sass", ["~> 3.1.5", '< 3.1.6']) s.add_runtime_dependency("sass", ["~> 3.1.5", '< 3.1.6'])
s.add_runtime_dependency("coffee-script", ["~> 2.2.0"])
s.add_runtime_dependency("compass", ["~> 0.11.3"]) s.add_runtime_dependency("compass", ["~> 0.11.3"])
s.add_runtime_dependency("coffee-script", ["~> 2.2.0"]) s.add_runtime_dependency("coffee-script", ["~> 2.2.0"])
s.add_runtime_dependency("sprockets", ["2.0.0.beta.12"]) s.add_runtime_dependency("sprockets", ["2.0.0.beta.12"])
@ -37,7 +36,6 @@ Gem::Specification.new do |s|
s.add_runtime_dependency("guard", ["~> 0.5.1"]) s.add_runtime_dependency("guard", ["~> 0.5.1"])
s.add_runtime_dependency("guard-livereload", ["~> 0.2.1"]) s.add_runtime_dependency("guard-livereload", ["~> 0.2.1"])
s.add_development_dependency("coffee-filter", ["~> 0.1.1"]) s.add_development_dependency("coffee-filter", ["~> 0.1.1"])
# s.add_development_dependency("jquery-rails", ["~> 1.0.12"])
s.add_development_dependency("cucumber", ["~> 1.0.2"]) s.add_development_dependency("cucumber", ["~> 1.0.2"])
s.add_development_dependency("rake", ["0.8.7"]) s.add_development_dependency("rake", ["0.8.7"])
s.add_development_dependency("rspec", ["~> 2.6.0"]) s.add_development_dependency("rspec", ["~> 2.6.0"])