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

Merge pull request #836 from tricknotes/directory-as-a-data-key

Browse source 
Support directory name as a data key
This commit is contained in:
Thomas Reynolds 2013-03-25 09:53:58 -07:00
parent 420b4c6087 1e64e8022e
commit 8aa652713a
5 changed files with 40 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
middleman-core/features/data.feature
View file

@ -5,18 +5,23 @@ Feature: Local Data API
Given the Server is running at "basic-data-app"
When I go to "/data.html"
Then I should see "One:Two"
Scenario: Rendering json
Given the Server is running at "basic-data-app"
When I go to "/data3.html"
Then I should see "One:Two"
Scenario: Using data in config.rb
Given the Server is running at "data-app"
When I go to "/test1.html"
Then I should see "Welcome"
Scenario: Using data2 in config.rb
Given the Server is running at "data-app"
When I go to "/test2.html"
Then I should see "Welcome"
Then I should see "Welcome"
Scenario: Using nested data
Given the Server is running at "nested-data-app"
When I go to "/test.html"
Then I should see "test:Hello"

1
middleman-core/fixtures/nested-data-app/config.rb Normal file
View file

@ -0,0 +1 @@
set :layout, false

1
middleman-core/fixtures/nested-data-app/data/examples/test.yml Normal file
View file

@ -0,0 +1 @@
title: "Hello"

1
middleman-core/fixtures/nested-data-app/source/test.html.erb Normal file
View file

@ -0,0 +1 @@
<%= data.examples.map { |k, r| [k, r.title].join(":") }.join %>

33
middleman-core/lib/middleman-core/core_extensions/data.rb
View file

@ -92,19 +92,30 @@ module Middleman
# @param [String] file The file to be re-parsed
# @return [void]
def touch_file(file)
file = File.expand_path(file, @app.root)
root = Pathname(@app.root)
full_path = root + file
extension = File.extname(file)
basename = File.basename(file, extension)
data_path = full_path.relative_path_from(root + @app.config[:data_dir])
if %w(.yaml .yml).include?(extension)
data = YAML.load_file(file)
data = YAML.load_file(full_path)
elsif extension == ".json"
data = ActiveSupport::JSON.decode(File.read(file))
data = ActiveSupport::JSON.decode(full_path.read)
else
return
end
@local_data[basename] = ::Middleman::Util.recursively_enhance(data)
data_branch = @local_data
path = data_path.to_s.split(File::SEPARATOR)[0..-2]
path.each do |dir|
data_branch[dir] ||= ::Middleman::Util.recursively_enhance({})
data_branch = data_branch[dir]
end
data_branch[basename] = ::Middleman::Util.recursively_enhance(data)
end
# Remove a given file from the internal cache
@ -112,9 +123,21 @@ module Middleman
# @param [String] file The file to be cleared
# @return [void]
def remove_file(file)
root = Pathname(@app.root)
full_path = root + file
extension = File.extname(file)
basename = File.basename(file, extension)
@local_data.delete(basename) if @local_data.has_key?(basename)
data_path = full_path.relative_path_from(root + @app.config[:data_dir])
data_branch = @local_data
path = data_path.to_s.split(File::SEPARATOR)[0..-2]
path.each do |dir|
data_branch = data_branch[dir]
end
data_branch.delete(basename) if data_branch.has_key?(basename)
end
# Get a hash from either internal static data or a callback