diff --git a/lib/middleman/core_extensions/compass.rb b/lib/middleman/core_extensions/compass.rb index 97839645..fae855d5 100644 --- a/lib/middleman/core_extensions/compass.rb +++ b/lib/middleman/core_extensions/compass.rb @@ -11,7 +11,7 @@ module Middleman::CoreExtensions::Compass rescue LoadError end - app.after_feature_init do + app.after_configuration do # Support a stand-alone compass config file # Many options are overwritten by Middleman, but the config is a good # place to add: diff --git a/lib/middleman/core_extensions/features.rb b/lib/middleman/core_extensions/features.rb index 27a8bb84..802c253d 100644 --- a/lib/middleman/core_extensions/features.rb +++ b/lib/middleman/core_extensions/features.rb @@ -64,7 +64,7 @@ module Middleman::CoreExtensions::Features end # Add a block/proc to be run after features have been setup - def after_feature_init(&block) + def after_configuration(&block) @run_after_features ||= [] @run_after_features << block end diff --git a/lib/middleman/core_extensions/front_matter.rb b/lib/middleman/core_extensions/front_matter.rb index c893f1b3..919f0e9b 100644 --- a/lib/middleman/core_extensions/front_matter.rb +++ b/lib/middleman/core_extensions/front_matter.rb @@ -22,7 +22,7 @@ module Middleman::CoreExtensions::FrontMatter ::Tilt::register HamlTemplate, 'haml' ::Tilt.prefer(HamlTemplate) - app.after_feature_init do + app.after_configuration do app.before_processing do request_path = request.path_info.gsub("%20", " ") result = resolve_template(request_path, :raise_exceptions => false) diff --git a/lib/middleman/features/blog.rb b/lib/middleman/features/blog.rb index 9a456a73..394f76f0 100644 --- a/lib/middleman/features/blog.rb +++ b/lib/middleman/features/blog.rb @@ -8,7 +8,7 @@ module Middleman # Include helpers app.helpers Middleman::Features::Blog::Helpers - app.after_feature_init do + app.after_configuration do if !app.settings.respond_to? :blog_permalink app.set :blog_permalink, ":year/:month/:day/:title.html" end diff --git a/lib/middleman/renderers/markdown.rb b/lib/middleman/renderers/markdown.rb index f8435410..473610be 100644 --- a/lib/middleman/renderers/markdown.rb +++ b/lib/middleman/renderers/markdown.rb @@ -2,7 +2,7 @@ module Middleman::Renderers::Markdown class << self def registered(app) app.set :markdown_engine, ::Tilt::RDiscountTemplate - app.after_feature_init do + app.after_configuration do ::Tilt.prefer(app.settings.markdown_engine) end end