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

make json a valid data format

Browse source
This commit is contained in:
Thomas Reynolds 2011-09-12 10:20:34 -07:00
parent dbaae67d1a
commit bc7ee29486
5 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,5 @@
require "yaml"
require "active_support/json"
require "thor"
module Middleman::CoreExtensions::Data
@ -38,7 +39,12 @@ module Middleman::CoreExtensions::Data
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
if File.exists? file_path
response = YAML.load_file(file_path)
else
file_path = File.join(@app.root, @app.data_dir, "#{path}.json")
response = ActiveSupport::JSON.decode(File.read(file_path)) if File.exists? file_path
end
end
end
@ -75,6 +81,12 @@ module Middleman::CoreExtensions::Data
data[p] = data_for_path(p)
end
json_path = File.join(@app.root, @app.data_dir, "*.json")
Dir[json_path].each do |f|
p = f.split("/").last.gsub(".json", "")
data[p] = data_for_path(p)
end
data
end