lib/awestruct/handlers/base_tilt_handler.rb in awestruct-0.5.7 vs lib/awestruct/handlers/base_tilt_handler.rb in awestruct-0.6.0.RC1
- old
+ new
@@ -12,11 +12,11 @@
# if no portions of the path are registered to a Tilt template or the
# Tilt template cannot be loaded.
def match(path)
matcher = ::Tilt[File.basename(path)]
if matcher.nil?
- $LOG.debug(%(Copying #{path})) if Awestruct::Engine.instance.config.verbose
+ $LOG.debug(%(Copying #{path})) if Awestruct::Engine.instance.config.verbose && Awestruct::Engine.instance.config.debug
return false
end
# We have our own extra integration with Asciidoctor
return false if matcher.name.include? 'Asciidoctor'
@@ -140,13 +140,12 @@
rescue => e
error_page = context[:page]
if error_page[:__is_layout] == true || context[:__is_layout] == true
ExceptionHelper.log_message "An error during rendering layout file #{context[:__effective_page].relative_source_path} for #{error_page.relative_source_path} occurred."
ExceptionHelper.log_building_error e, error_page.source_path
-
elsif error_page.is_partial?
- ExceptionHelper.log_message "An error during rendering partial file #{error_page.relative_source_path} for #{error_page[:real_page].relative_source_path} occurred."
- ExceptionHelper.log_building_error e, error_page[:real_page].source_path
+ ExceptionHelper.log_message "An error during rendering partial file #{error_page.source_path} for #{error_page[:output_page].relative_source_path} occurred."
+ ExceptionHelper.log_building_error e, error_page[:output_page].source_path
else
ExceptionHelper.log_message "An error during rendering #{error_page.relative_source_path} occurred."
ExceptionHelper.log_building_error e, error_page.source_path
end
ExceptionHelper.log_message "Please see .awestruct/error.log for more information"