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

Store#extensionless_path: Change implementation to make overrides easier

Browse source
This commit is contained in:
Jonathan Allard 2013-03-15 11:04:14 -04:00 committed by Ben Hollis
parent 0211114ecb
commit 23b6efbb06
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
middleman-core/lib/middleman-core/sitemap/store.rb
View file

@ -184,7 +184,17 @@ module Middleman
# @return [String] # @return [String]
def extensionless_path(file) def extensionless_path(file)
path = file.dup path = file.dup
path = remove_templating_extensions(path)
# If there is no extension, look for one
path = find_extension(path, file) if File.extname(path).empty?
path
end
# Removes the templating extensions, while keeping the others
# @param [String] path
# @return [String]
def remove_templating_extensions(path)
end_of_the_line = false end_of_the_line = false
while !end_of_the_line while !end_of_the_line
if !::Tilt[path].nil? if !::Tilt[path].nil?
@ -194,15 +204,19 @@ module Middleman
end end
end end
# If there is no extension, look for one path
if File.extname(path).empty? end
input_ext = File.extname(file)
if !input_ext.empty? # Finds an extension for path according to file's extension
input_ext = input_ext.split(".").last.to_sym # @param [String] path without extension
if @app.template_extensions.has_key?(input_ext) # @param [String] file path with original extensions
path << ".#{@app.template_extensions[input_ext]}" def find_extension(path, file)
end input_ext = File.extname(file)
if !input_ext.empty?
input_ext = input_ext.split(".").last.to_sym
if @app.template_extensions.has_key?(input_ext)
path << ".#{@app.template_extensions[input_ext]}"
end end
end end