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

a first stab at partials_dir setting

Browse source 
re #252
This commit is contained in:
Artem Baguinski 2013-04-05 13:58:41 +02:00
parent 023ea9f34e
commit 91e7033d54
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
middleman-core/lib/middleman-core/application.rb
View file

@ -87,6 +87,10 @@ module Middleman
# @return [String] # @return [String]
config.define_setting :fonts_dir, "fonts", 'Location of fonts within source' config.define_setting :fonts_dir, "fonts", 'Location of fonts within source'
# Location of partials within source. Used by renderers.
# @return [String]
config.define_setting :partials_dir, "", 'Location of partials within source'
# Where to build output files # Where to build output files
# @return [String] # @return [String]
config.define_setting :build_dir, "build", 'Where to build output files' config.define_setting :build_dir, "build", 'Where to build output files'

21
middleman-core/lib/middleman-core/core_extensions/rendering.rb
View file

@ -196,27 +196,26 @@ module Middleman
engine = File.extname(resource.source_file)[1..-1].to_sym engine = File.extname(resource.source_file)[1..-1].to_sym
# Look for partials relative to the current path # Look for partials relative to the current path
if current_dir != self.source_dir relative_dir = File.join(current_dir.sub(%r{^#{self.source_dir}/?}, ""), data)
relative_dir = File.join(current_dir.sub("#{self.source_dir}/", ""), data)
# Try to use the current engine first # Try to use the current engine first
found_partial, found_engine = resolve_template(relative_dir, :preferred_engine => engine, :try_without_underscore => true) found_partial, found_engine = resolve_template(relative_dir, :preferred_engine => engine, :try_without_underscore => true)
# Fall back to any engine available # Fall back to any engine available
if !found_partial if !found_partial
found_partial, found_engine = resolve_template(relative_dir, :try_without_underscore => true) found_partial, found_engine = resolve_template(relative_dir, :try_without_underscore => true)
end
end end
end end
# Look in the root for the partial with the current engine # Look in the partials_dir for the partial with the current engine
partials_path = File.join(config[:partials_dir], data)
if !found_partial && !engine.nil? if !found_partial && !engine.nil?
found_partial, found_engine = resolve_template(data, :preferred_engine => engine, :try_without_underscore => true) found_partial, found_engine = resolve_template(partials_path, :preferred_engine => engine, :try_without_underscore => true)
end end
# Look in the root with any engine # Look in the root with any engine
if !found_partial if !found_partial
found_partial, found_engine = resolve_template(data, :try_without_underscore => true) found_partial, found_engine = resolve_template(partials_path, :try_without_underscore => true)
end end
# Render the partial if found, otherwide throw exception # Render the partial if found, otherwide throw exception