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

Perf work and Parallel builds

Browse source
This commit is contained in:
Thomas Reynolds 2016-01-22 15:57:07 -08:00
parent b8c0fd34e7
commit c7a4618166
21 changed files with 63 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

11
middleman-core/lib/middleman-core/sources.rb
View file

@ -189,6 +189,7 @@ module Middleman
array_of_types = Array(types)
watchers
.lazy
.select { |d| array_of_types.include?(d.type) }
.map { |d| d.find(path, glob) }
.reject(&:nil?)
@ -202,9 +203,7 @@ module Middleman
# @return [Boolean]
Contract Or[Symbol, ArrayOf[Symbol], SetOf[Symbol]], String => Bool
def exists?(types, path)
watchers
.select { |d| Array(types).include?(d.type) }
.any? { |d| d.exists?(path) }
watchers.any? { |d| Array(types).include?(d.type) && d.exists?(path) }
end
# Check if a file for a given type exists.
@ -214,9 +213,7 @@ module Middleman
# @return [Boolean]
Contract Or[Symbol, ArrayOf[Symbol], SetOf[Symbol]], String => Maybe[HANDLER]
def watcher_for_path(types, path)
watchers
.select { |d| Array(types).include?(d.type) }
.find { |d| d.exists?(path) }
watchers.detect { |d| Array(types).include?(d.type) && d.exists?(path) }
end
# Manually check for new files
@ -317,7 +314,7 @@ module Middleman
def matches?(validator, file)
path = file[:relative_path]
if validator.is_a? Regexp
!!validator.match(path.to_s)
!!(path.to_s =~ validator)
else
!!validator.call(path, @app)
end