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

Merge remote-tracking branch 'origin/v3-stable'

Browse source 
Conflicts:
	middleman-core/lib/middleman-core/extension.rb
This commit is contained in:
Ben Hollis 2014-03-03 22:10:50 -08:00
parent ca45440ffe f5b3720ef8
commit c9a640a3e2
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
middleman-core/lib/middleman-core/core_extensions.rb
View file

@ -35,7 +35,6 @@ require 'middleman-more/core_extensions/i18n'
begin begin
require 'middleman-more/core_extensions/compass' require 'middleman-more/core_extensions/compass'
rescue LoadError rescue LoadError
$stderr.puts "Compass not installed: #{$!}"
end end
### ###

3
middleman-core/lib/middleman-core/extension.rb
View file

@ -1,7 +1,8 @@
require 'active_support/core_ext/class/attribute'
require 'active_support/core_ext/module/delegation' require 'active_support/core_ext/module/delegation'
require 'active_support/core_ext/class/attribute'
module Middleman module Middleman
class Extension class Extension
class_attribute :supports_multiple_instances, :instance_reader => false, :instance_writer => false class_attribute :supports_multiple_instances, :instance_reader => false, :instance_writer => false
class_attribute :defined_helpers, :instance_reader => false, :instance_writer => false class_attribute :defined_helpers, :instance_reader => false, :instance_writer => false

4
middleman-core/lib/middleman-core/renderers/markdown.rb
View file

@ -47,10 +47,14 @@ module Middleman
::Tilt.prefer(markdown_engine_klass, *markdown_exts) ::Tilt.prefer(markdown_engine_klass, *markdown_exts)
end end
rescue LoadError rescue LoadError
# If they just left it at the default engine and don't happen to have it,
# then they're using middleman-core bare and we shouldn't bother them.
if config.setting(:markdown_engine).value_set?
logger.warn "Requested Markdown engine (#{config[:markdown_engine]}) not found. Maybe the gem needs to be installed and required?" logger.warn "Requested Markdown engine (#{config[:markdown_engine]}) not found. Maybe the gem needs to be installed and required?"
end end
end end
end end
end
alias :included :registered alias :included :registered
end end