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

Subtle tweaks

Browse source
This commit is contained in:
Thomas Reynolds 2015-05-02 22:44:38 -07:00
parent b9f0330869
commit d1211cc089
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
middleman-core/lib/middleman-core/sitemap/extensions/on_disk.rb
View file

@ -5,21 +5,18 @@ module Middleman
module Sitemap module Sitemap
module Extensions module Extensions
class OnDisk < Extension class OnDisk < Extension
attr_accessor :waiting_for_ready
def initialize(app, config={}, &block) def initialize(app, config={}, &block)
super super
@file_paths_on_disk = Set.new @file_paths_on_disk = Set.new
scoped_self = self
@waiting_for_ready = true @waiting_for_ready = true
end
@app.ready do def ready
scoped_self.waiting_for_ready = false @waiting_for_ready = false
# Make sure the sitemap is ready for the first request
sitemap.ensure_resource_list_updated! # Make sure the sitemap is ready for the first request
end app.sitemap.ensure_resource_list_updated!
end end
Contract Any Contract Any
@ -27,6 +24,7 @@ module Middleman
app.files.on_change(:source, &method(:update_files)) app.files.on_change(:source, &method(:update_files))
end end
Contract IsA['Middleman::SourceFile'] => Bool
def ignored?(file) def ignored?(file)
@app.config[:ignored_sitemap_matchers].any? do |_, callback| @app.config[:ignored_sitemap_matchers].any? do |_, callback|
callback.call(file, @app) callback.call(file, @app)
@ -48,9 +46,10 @@ module Middleman
# Force sitemap rebuild so the next request is ready to go. # Force sitemap rebuild so the next request is ready to go.
# Skip this during build because the builder will control sitemap refresh. # Skip this during build because the builder will control sitemap refresh.
@app.sitemap.ensure_resource_list_updated! unless waiting_for_ready || @app.build? @app.sitemap.ensure_resource_list_updated! unless @waiting_for_ready || @app.build?
end end
Contract ArrayOf[IsA['Middleman::SourceFile']]
def files_for_sitemap def files_for_sitemap
@app.files.by_type(:source).files.reject(&method(:ignored?)) @app.files.by_type(:source).files.reject(&method(:ignored?))
end end