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

Include :locales and :data in live-reloadable types

Browse source
This commit is contained in:
Johnny Shields 2015-12-06 21:58:18 +09:00 committed by Thomas Reynolds
parent 79b5e82b3c
commit 308ea6db5a
1 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,6 +14,9 @@ module Middleman
extend Forwardable extend Forwardable
include Contracts include Contracts
# Types which trigger a livereload
LIVERELOAD_TYPES = [:source, :locales, :data]
Matcher = Or[Regexp, RespondTo[:call]] Matcher = Or[Regexp, RespondTo[:call]]
# A reference to the current app. # A reference to the current app.
@ -165,15 +168,15 @@ module Middleman
# Find a file given a type and path. # Find a file given a type and path.
# #
# @param [Symbol] type The file "type". # @param [Symbol,Array<Symbol>] types A list of file "type".
# @param [String] path The file path. # @param [String] path The file path.
# @param [Boolean] glob If the path contains wildcard or glob characters. # @param [Boolean] glob If the path contains wildcard or glob characters.
# @return [Middleman::SourceFile, nil] # @return [Middleman::SourceFile, nil]
Contract Symbol, String, Maybe[Bool] => Maybe[SourceFile] Contract Or[Symbol, ArrayOf[Symbol]], String, Maybe[Bool] => Maybe[SourceFile]
def find(type, path, glob=false) def find(types, path, glob=false)
watchers watchers
.lazy .lazy
.select { |d| d.type == type } .select { |d| Array(types).include?(d.type) }
.map { |d| d.find(path, glob) } .map { |d| d.find(path, glob) }
.reject(&:nil?) .reject(&:nil?)
.first .first
@ -181,26 +184,26 @@ module Middleman
# Check if a file for a given type exists. # Check if a file for a given type exists.
# #
# @param [Symbol] type The file "type". # @param [Symbol,Array<Symbol>] types The list of file "type".
# @param [String] path The file path relative to it's source root. # @param [String] path The file path relative to it's source root.
# @return [Boolean] # @return [Boolean]
Contract Symbol, String => Bool Contract Or[Symbol, ArrayOf[Symbol]], String => Bool
def exists?(type, path) def exists?(types, path)
watchers watchers
.lazy .lazy
.select { |d| d.type == type } .select { |d| Array(types).include?(d.type) }
.any? { |d| d.exists?(path) } .any? { |d| d.exists?(path) }
end end
# Check if a file for a given type exists. # Check if a file for a given type exists.
# #
# @param [Symbol] type The file "type". # @param [Symbol,Array<Symbol>] types The list of file "type".
# @param [String] path The file path relative to it's source root. # @param [String] path The file path relative to it's source root.
# @return [Boolean] # @return [Boolean]
Contract SetOf[Symbol], String => Maybe[HANDLER] Contract Or[Symbol, ArrayOf[Symbol]], String => Maybe[HANDLER]
def watcher_for_path(types, path) def watcher_for_path(types, path)
watchers watchers
.select { |d| types.include?(d.type) } .select { |d| Array(types).include?(d.type) }
.find { |d| d.exists?(path) } .find { |d| d.exists?(path) }
end end
@ -238,19 +241,21 @@ module Middleman
# Add callback to be run on file change or deletion # Add callback to be run on file change or deletion
# #
# @param [Symbol] type The change type. # @param [Symbol,Array<Symbol>] types The change types to register the callback.
# @return [void] # @return [void]
Contract Symbol, Proc => Any Contract Or[Symbol, ArrayOf[Symbol]], Proc => Any
def on_change(type, &block) def on_change(types, &block)
Array(types).each do |type|
@on_change_callbacks = @on_change_callbacks.push(CallbackDescriptor.new(type, block)) @on_change_callbacks = @on_change_callbacks.push(CallbackDescriptor.new(type, block))
end end
end
# Backwards compatible change handler. # Backwards compatible change handler.
# #
# @param [nil,Regexp] matcher A Regexp to match the change path against # @param [nil,Regexp] matcher A Regexp to match the change path against
Contract Maybe[Matcher] => Any Contract Maybe[Matcher] => Any
def changed(matcher=nil, &block) def changed(matcher=nil, &block)
on_change :source do |updated, _removed| on_change LIVERELOAD_TYPES do |updated, _removed|
updated updated
.select { |f| matcher.nil? ? true : matches?(matcher, f) } .select { |f| matcher.nil? ? true : matches?(matcher, f) }
.each { |f| block.call(f[:relative_path]) } .each { |f| block.call(f[:relative_path]) }
@ -262,7 +267,7 @@ module Middleman
# @param [nil,Regexp] matcher A Regexp to match the change path against # @param [nil,Regexp] matcher A Regexp to match the change path against
Contract Maybe[Matcher] => Any Contract Maybe[Matcher] => Any
def deleted(matcher=nil, &block) def deleted(matcher=nil, &block)
on_change :source do |_updated, removed| on_change LIVERELOAD_TYPES do |_updated, removed|
removed removed
.select { |f| matcher.nil? ? true : matches?(matcher, f) } .select { |f| matcher.nil? ? true : matches?(matcher, f) }
.each { |f| block.call(f[:relative_path]) } .each { |f| block.call(f[:relative_path]) }
@ -274,7 +279,7 @@ module Middleman
# @param [Pathname,String] path The path to check. # @param [Pathname,String] path The path to check.
Contract Or[Pathname, String] => Bool Contract Or[Pathname, String] => Bool
def ignored?(path) def ignored?(path)
descriptor = find(:source, path) descriptor = find(LIVERELOAD_TYPES, path)
!descriptor || globally_ignored?(descriptor) !descriptor || globally_ignored?(descriptor)
end end