Properly clear frontmatter cache when files change, and calculate frontmatter in the right order so resource_list_manipulators can see it.
This commit is contained in:
parent
7ad0f51d1a
commit
fc9c5e5fa2
|
@ -24,4 +24,19 @@ Feature: Setting page settings through frontmatter
|
|||
When I go to "/ignored/index.html"
|
||||
Then I should see "File Not Found"
|
||||
When I go to "/no_index/index.html"
|
||||
Then I should see "File Not Found"
|
||||
Then I should see "File Not Found"
|
||||
|
||||
Scenario: Changing frontmatter in preview server
|
||||
Given the Server is running at "frontmatter-settings-app"
|
||||
When I go to "/ignored/index.html"
|
||||
Then I should see "File Not Found"
|
||||
And the file "source/ignored.html.erb" has the contents
|
||||
"""
|
||||
---
|
||||
ignored: false
|
||||
---
|
||||
|
||||
This file is no longer ignored.
|
||||
"""
|
||||
When I go to "/ignored/index.html"
|
||||
Then I should see "This file is no longer ignored."
|
||||
|
|
|
@ -140,6 +140,10 @@ module Middleman
|
|||
# Setup custom rendering
|
||||
register Middleman::CoreExtensions::Rendering
|
||||
|
||||
# Parse YAML from templates. Must be before sitemap so sitemap
|
||||
# extensions see updated frontmatter!
|
||||
register Middleman::CoreExtensions::FrontMatter
|
||||
|
||||
# Sitemap
|
||||
register Middleman::Sitemap
|
||||
|
||||
|
@ -158,9 +162,6 @@ module Middleman
|
|||
# i18n
|
||||
register Middleman::CoreExtensions::I18n
|
||||
|
||||
# Parse YAML from templates
|
||||
register Middleman::CoreExtensions::FrontMatter
|
||||
|
||||
# Built-in Extensions
|
||||
|
||||
# Provide Apache-style index.html files for directories
|
||||
|
|
|
@ -15,14 +15,16 @@ module Middleman::CoreExtensions
|
|||
# Parsing JSON frontmatter
|
||||
require "active_support/json"
|
||||
|
||||
app.after_configuration do
|
||||
::Middleman::Sitemap::Resource.send :include, ResourceInstanceMethods
|
||||
|
||||
app.send :include, InstanceMethods
|
||||
app.send :include, InstanceMethods
|
||||
|
||||
app.before_configuration do
|
||||
files.changed { |file| frontmatter_manager.clear_data(file) }
|
||||
files.deleted { |file| frontmatter_manager.clear_data(file) }
|
||||
|
||||
end
|
||||
|
||||
app.after_configuration do
|
||||
::Middleman::Sitemap::Resource.send :include, ResourceInstanceMethods
|
||||
|
||||
sitemap.register_resource_list_manipulator(
|
||||
:frontmatter,
|
||||
frontmatter_manager
|
||||
|
@ -54,9 +56,15 @@ module Middleman::CoreExtensions
|
|||
@cache[p] ||= frontmatter_and_content(p)
|
||||
end
|
||||
|
||||
def clear_data(path)
|
||||
p = normalize_path(File.expand_path(path, @app.root))
|
||||
@cache.delete(p)
|
||||
def clear_data(file)
|
||||
# Copied from Sitemap::Store#file_to_path, but without
|
||||
# removing the file extension
|
||||
file = File.expand_path(file, @app.root)
|
||||
prefix = @app.source_dir.sub(/\/$/, "") + "/"
|
||||
return unless file.include?(prefix)
|
||||
path = file.sub(prefix, "")
|
||||
|
||||
@cache.delete(path)
|
||||
end
|
||||
|
||||
# Parse YAML frontmatter out of a string
|
||||
|
|
Loading…
Reference in a new issue