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

accept both .yaml and .yml data sources

Browse source
This commit is contained in:
Thomas Reynolds 2011-09-12 10:13:13 -07:00
parent 4f86fcd89f
commit dbaae67d1a
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/middleman/core_extensions/data.rb
View file

@ -35,9 +35,14 @@ module Middleman::CoreExtensions::Data
else else
file_path = File.join(@app.root, @app.data_dir, "#{path}.yml") file_path = File.join(@app.root, @app.data_dir, "#{path}.yml")
if File.exists? file_path if File.exists? file_path
response = YAML.load_file(file_path) response = YAML.load_file(file_path)
else
file_path = File.join(@app.root, @app.data_dir, "#{path}.yaml")
response = YAML.load_file(file_path) if File.exists? file_path
end end
end end
response
end end
def method_missing(path) def method_missing(path)
@ -64,9 +69,9 @@ module Middleman::CoreExtensions::Data
data[k] = data_for_path(k) data[k] = data_for_path(k)
end end
yaml_path = File.join(@app.root, @app.data_dir, "*.yml") yaml_path = File.join(@app.root, @app.data_dir, "*.{yaml,yml}")
Dir[yaml_path].each do |f| Dir[yaml_path].each do |f|
p = f.split("/").last.gsub(".yml", "") p = f.split("/").last.gsub(".yml", "").gsub(".yaml", "")
data[p] = data_for_path(p) data[p] = data_for_path(p)
end end