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

Clean up extension activation, helper registration, and sprockets autoload

Browse source
This commit is contained in:
Ben Hollis 2014-05-22 23:05:15 -07:00
parent 18da7bb692
commit dd7f06968a
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
middleman-core/lib/middleman-core/core_extensions/extensions.rb
View file

@ -14,9 +14,6 @@ module Middleman
app.define_hook :build_config app.define_hook :build_config
app.define_hook :development_config app.define_hook :development_config
app.config.define_setting :autoload_sprockets, true, 'Automatically load sprockets at startup?'
app.config[:autoload_sprockets] = (ENV['AUTOLOAD_SPROCKETS'] == 'true') if ENV['AUTOLOAD_SPROCKETS']
app.extend ClassMethods app.extend ClassMethods
app.delegate :configure, to: :"self.class" app.delegate :configure, to: :"self.class"
end end
@ -89,11 +86,12 @@ module Middleman
::Middleman::Extension.clear_after_extension_callbacks ::Middleman::Extension.clear_after_extension_callbacks
if config[:autoload_sprockets] if ENV['AUTOLOAD_SPROCKETS'] != 'false'
begin begin
require 'middleman-sprockets' require 'middleman-sprockets'
activate(:sprockets) activate :sprockets
rescue LoadError rescue LoadError
# It's OK if somebody is using middleman-core without middleman-sprockets
end end
end end
@ -132,24 +130,27 @@ module Middleman
run_hook :after_configuration run_hook :after_configuration
config_context.execute_after_configuration_callbacks config_context.execute_after_configuration_callbacks
extension_instances = []
logger.debug 'Loaded extensions:' logger.debug 'Loaded extensions:'
extensions.each do |ext, klass| extensions.each do |ext_name, ext|
if ext.is_a?(Hash) if ext.is_a?(Hash)
ext.each do |k, _| ext.each do |instance_key, instance|
logger.debug "== Extension: #{k}" logger.debug "== Extension: #{ext_name} #{instance_key}"
extension_instances << instance
end end
else else
logger.debug "== Extension: #{ext}" logger.debug "== Extension: #{ext_name}"
extension_instances << ext
end
end end
if klass.is_a?(::Middleman::Extension) extension_instances.each do |ext|
# Forward Extension helpers to TemplateContext # Forward Extension helpers to TemplateContext
(klass.class.defined_helpers || []).each do |m| Array(ext.class.defined_helpers).each do |m|
@template_context_class.send(:include, m) @template_context_class.send(:include, m)
end end
::Middleman::Extension.activated_extension(klass) ::Middleman::Extension.activated_extension(ext)
end
end end
end end
end end