middleman-core-with-external-sources-watch-fix 4.1.0 → 4.1.10

data/lib/middleman-core/core_extensions/i18n.rb

@@ -102,7 +102,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
       locale_suffix = ::I18n.locale
 
       extname = File.extname(partial_name)
-      maybe_static = extname.length > 0
+      maybe_static = !extname.empty?
       suffixed_partial_name = if maybe_static
         partial_name.sub(extname, ".#{locale_suffix}#{extname}")
       else
@@ -213,6 +213,8 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
   def on_file_changed(_updated_files, _removed_files)
     ::I18n.load_path |= app.files.by_type(:locales).files.map { |p| p[:full_path].to_s }
     ::I18n.reload!
+
+    @app.sitemap.rebuild_resource_list!(:touched_locale_file)
   end
 
   def configure_i18n

data/lib/middleman-core/core_extensions/inline_url_rewriter.rb

@@ -1,6 +1,6 @@
 require 'rack'
 require 'rack/response'
-require 'addressable/uri'
+require 'memoist'
 require 'middleman-core/util'
 require 'middleman-core/contracts'
 
@@ -11,13 +11,12 @@ module Middleman
 
       expose_to_application rewrite_inline_urls: :add
 
-      IGNORE_DESCRIPTOR = Or[Regexp, RespondTo[:call], String]
       REWRITER_DESCRIPTOR = {
         id: Symbol,
         proc: Or[Proc, Method],
         url_extensions: ArrayOf[String],
         source_extensions: ArrayOf[String],
-        ignore: ArrayOf[IGNORE_DESCRIPTOR],
+        ignore: ArrayOf[::Middleman::Util::IGNORE_DESCRIPTOR],
         after: Maybe[Symbol]
       }.freeze
 
@@ -33,6 +32,8 @@ module Middleman
       end
 
       def after_configuration
+        return if @rewriters.empty?
+
         rewriters = @rewriters.values.sort do |a, b|
           if b[:after] && b[:after] == a[:id]
             1
@@ -45,6 +46,7 @@ module Middleman
       end
 
       class Rack
+        extend Memoist
         include Contracts
 
         Contract RespondTo[:call], {
@@ -55,6 +57,17 @@ module Middleman
           @rack_app = app
           @middleman_app = options.fetch(:middleman_app)
           @rewriters = options.fetch(:rewriters)
+
+          all_source_exts = @rewriters
+                            .reduce([]) { |sum, rewriter| sum + rewriter[:source_extensions] }
+                            .flatten
+                            .uniq
+          @source_exts_regex_text = Regexp.union(all_source_exts).to_s
+
+          @all_asset_exts = @rewriters
+                            .reduce([]) { |sum, rewriter| sum + rewriter[:url_extensions] }
+                            .flatten
+                            .uniq
         end
 
         def call(env)
@@ -63,27 +76,16 @@ module Middleman
           # Allow configuration or upstream request to skip all rewriting
           return [status, headers, response] if env['bypass_inline_url_rewriter'] == 'true'
 
-          all_source_exts = @rewriters
-                            .reduce([]) { |sum, rewriter| sum + rewriter[:source_extensions] }
-                            .flatten
-                            .uniq
-          source_exts_regex_text = Regexp.union(all_source_exts).to_s
-
-          all_asset_exts = @rewriters
-                           .reduce([]) { |sum, rewriter| sum + rewriter[:url_extensions] }
-                           .flatten
-                           .uniq
-
           path = ::Middleman::Util.full_path(env['PATH_INFO'], @middleman_app)
 
-          return [status, headers, response] unless path =~ /(^\/$)|(#{source_exts_regex_text}$)/
+          return [status, headers, response] unless path =~ /(^\/$)|(#{@source_exts_regex_text}$)/
           return [status, headers, response] unless body = ::Middleman::Util.extract_response_text(response)
 
           dirpath = ::Pathname.new(File.dirname(path))
 
           rewritten = ::Middleman::Util.instrument 'inline_url_rewriter', path: path do
-            ::Middleman::Util.rewrite_paths(body, path, all_asset_exts) do |asset_path|
-              uri = ::Addressable::URI.parse(asset_path)
+            ::Middleman::Util.rewrite_paths(body, path, @all_asset_exts, @middleman_app) do |asset_path|
+              uri = ::Middleman::Util.parse_uri(asset_path)
 
               relative_path = uri.host.nil?
 
@@ -106,7 +108,7 @@ module Middleman
                 next unless source_exts.include?(::File.extname(path))
 
                 ignore = rewriter.fetch(:ignore)
-                next if ignore.any? { |r| should_ignore?(r, full_asset_path) }
+                next if ignore.any? { |r| ::Middleman::Util.should_ignore?(r, full_asset_path) }
 
                 rewrite_ignore = Array(rewriter[:rewrite_ignore] || [])
                 next if rewrite_ignore.any? { |i| ::Middleman::Util.path_match(i, path) }
@@ -127,23 +129,6 @@ module Middleman
             headers
           ).finish
         end
-
-        Contract IGNORE_DESCRIPTOR, String => Bool
-        def should_ignore?(validator, value)
-          if validator.is_a? Regexp
-            # Treat as Regexp
-            !!(value =~ validator)
-          elsif validator.respond_to? :call
-            # Treat as proc
-            validator.call(value)
-          elsif validator.is_a? String
-            # Treat as glob
-            File.fnmatch(value, validator)
-          else
-            # If some unknown thing, don't ignore
-            false
-          end
-        end
       end
     end
   end

data/lib/middleman-core/core_extensions/routing.rb

@@ -4,7 +4,7 @@ module Middleman
     class Routing < ConfigExtension
       # This should always run late, but not as late as :directory_indexes,
       # so it can add metadata to any pages generated by other extensions
-      self.resource_list_manipulator_priority = 10
+      self.resource_list_manipulator_priority = [10, 130]
 
       # Expose the `page` method to config.
       expose_to_config :page
@@ -25,7 +25,7 @@ module Middleman
 
           resources
             .select { |r| ::Middleman::Util.path_match(normalized_path, "/#{r.path}") }
-            .each { |r| r.add_metadata(metadata) }
+            .each { |r| r.add_metadata(metadata, true) }
 
           resources
         end
@@ -52,10 +52,13 @@ module Middleman
       def page(path, opts={})
         options = opts.dup
 
+        page_data = options.delete(:data) || {}
+        page_data[:id] = options.delete(:id) if options.key?(:id)
+
         # Default layout
         metadata = {
           locals: options.delete(:locals) || {},
-          page: options.delete(:data) || {},
+          page: page_data,
           options: options
         }
 

data/lib/middleman-core/extension.rb

@@ -1,4 +1,5 @@
 require 'forwardable'
+require 'memoist'
 require 'active_support/core_ext/class/attribute'
 require 'middleman-core/configuration'
 require 'middleman-core/contracts'
@@ -66,6 +67,8 @@ module Middleman
   # @see http://middlemanapp.com/advanced/custom/ Middleman Custom Extensions Documentation
   class Extension
     extend Forwardable
+    extend Memoist
+
     include Contracts
 
     def_delegator :@app, :logger
@@ -402,11 +405,11 @@ module Middleman
         ext.after_configuration if ext.respond_to?(:after_configuration)
 
         if ext.respond_to?(:manipulate_resource_list)
-          ext.app.sitemap.register_resource_list_manipulator(ext.class.ext_name, ext, ext.class.resource_list_manipulator_priority)
+          ext.app.sitemap.register_resource_list_manipulators(ext.class.ext_name, ext, ext.class.resource_list_manipulator_priority)
         end
 
         if ext.class.resources_generators && !ext.class.resources_generators.empty?
-          ext.app.sitemap.register_resource_list_manipulator(
+          ext.app.sitemap.register_resource_list_manipulators(
             :"#{ext.class.ext_name}_generator",
             ext,
             ext.class.resource_list_manipulator_priority,
@@ -490,15 +493,14 @@ module Middleman
   class ConfigExtension < Extension
     def initialize(app, config={}, &block)
       @descriptors = {}
-      @wrapped = {}
+      @ready = false
 
       self.class.exposed_to_config.each do |k, v|
         @descriptors[k] = []
 
         define_singleton_method(:"__original_#{v}", &method(v))
         define_singleton_method(v) do |*args, &b|
-          @descriptors[k] << method(:"__original_#{v}").call(*args, &b)
-          @app.sitemap.rebuild_resource_list!(:"first_run_change_#{v}")
+          proxy_method_call(k, v, args, &b)
         end
       end
 
@@ -506,11 +508,24 @@ module Middleman
     end
 
     def after_configuration
+      context = self
+
       self.class.exposed_to_config.each do |k, v|
-        ::Middleman::CoreExtensions::Collections::StepContext.add_to_context(k, &method(:"__original_#{v}"))
+        ::Middleman::CoreExtensions::Collections::StepContext.add_to_context(k) do |*args, &b|
+          r = context.method(:"__original_#{v}").call(*args, &b)
+          descriptors << r if r.respond_to?(:execute_descriptor)
+        end
       end
     end
 
+    def ready
+      @ready = true
+
+      # @descriptors.each do |k, v|
+      #   @descriptors[k] = []
+      # end
+    end
+
     # Update the main sitemap resource list
     # @return Array<Middleman::Sitemap::Resource>
     Contract ResourceList => ResourceList
@@ -519,5 +534,25 @@ module Middleman
         c.execute_descriptor(app, sum)
       end
     end
+
+    Contract Symbol, Symbol, ArrayOf[Any], Maybe[Proc] => Any
+    def proxy_method_call(k, v, args, &b)
+      if @ready
+        ctx = ::Middleman::CoreExtensions::Collections::StepContext.current
+        r = method(:"__original_#{v}").call(*args, &b)
+
+        if r.respond_to?(:execute_descriptor)
+          if ctx
+            ctx.descriptors << r
+          else
+            @descriptors[k] << r
+            @app.sitemap.rebuild_resource_list!(:"first_run_change_#{v}")
+          end
+        end
+      else
+        @descriptors[k] << method(:"__original_#{v}").call(*args, &b)
+        @app.sitemap.rebuild_resource_list!(:"first_run_change_#{v}")
+      end
+    end
   end
 end

data/lib/middleman-core/extensions.rb

@@ -52,7 +52,7 @@ module Middleman
       def register(name, extension_class=nil, options={}, &block)
         raise 'Extension name must be a symbol' unless name.is_a?(Symbol)
         # If we've already got an extension registered under this name, bail out
-        raise "There is already an extension registered with the name '#{name}'" if registered.key?(name)
+        # raise "There is a already an extension registered with the name '#{name}'" if registered.key?(name)
 
         # If the extension is defined with a block, grab options out of the "extension_class" parameter.
         if extension_class && block_given? && options.empty? && extension_class.is_a?(Hash)
@@ -106,7 +106,7 @@ module Middleman
       # A flattened list of all extensions which are automatically activated
       # @return [Array<Symbol>] A list of extension names which are automatically activated.
       def auto_activated
-        @auto_activate.values.map(&:to_a).flat_map(&:name)
+        @auto_activate.values.map(&:to_a).flatten.map(&:name)
       end
 
       # @api private

data/lib/middleman-core/extensions/asset_hash.rb

@@ -3,9 +3,10 @@ require 'middleman-core/rack'
 
 class Middleman::Extensions::AssetHash < ::Middleman::Extension
   option :sources, %w(.css .htm .html .js .php .xhtml), 'List of extensions that are searched for hashable assets.'
-  option :exts, %w(.jpg .jpeg .png .gif .webp .js .css .otf .woff .woff2 .eot .ttf .svg .svgz), 'List of extensions that get asset hashes appended to them.'
+  option :exts, nil, 'List of extensions that get asset hashes appended to them.'
   option :ignore, [], 'Regexes of filenames to skip adding asset hashes to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for path rewrites'
+  option :prefix, '', 'Prefix for hash'
 
   def initialize(app, options_hash={}, &block)
     super
@@ -17,8 +18,12 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
     # Allow specifying regexes to ignore, plus always ignore apple touch icons
     @ignore = Array(options.ignore) + [/^apple-touch-icon/]
 
+    # Exclude .ico from the default list because browsers expect it
+    # to be named "favicon.ico"
+    @exts = options.exts || (app.config[:asset_extensions] - %w(.ico))
+
     app.rewrite_inline_urls id: :asset_hash,
-                            url_extensions: options.exts.sort.reverse,
+                            url_extensions: @exts.sort.reverse,
                             source_extensions: options.sources,
                             ignore: @ignore,
                             rewrite_ignore: options.rewrite_ignore,
@@ -28,7 +33,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
 
   Contract String, Or[String, Pathname], Any => Maybe[String]
   def rewrite_url(asset_path, dirpath, _request_path)
-    uri = ::Addressable::URI.parse(asset_path)
+    uri = ::Middleman::Util.parse_uri(asset_path)
     relative_path = !uri.path.start_with?('/')
 
     full_asset_path = if relative_path
@@ -70,7 +75,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
 
   Contract IsA['Middleman::Sitemap::Resource'] => Maybe[IsA['Middleman::Sitemap::Resource']]
   def manipulate_single_resource(resource)
-    return unless options.exts.include?(resource.ext)
+    return unless @exts.include?(resource.ext)
     return if ignored_resource?(resource)
     return if resource.ignored?
 
@@ -88,7 +93,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
       ::Digest::SHA1.hexdigest(response.body)[0..7]
     end
 
-    resource.destination_path = resource.destination_path.sub(/\.(\w+)$/) { |ext| "-#{digest}#{ext}" }
+    resource.destination_path = resource.destination_path.sub(/\.(\w+)$/) { |ext| "-#{options.prefix}#{digest}#{ext}" }
     resource
   end
 

data/lib/middleman-core/extensions/asset_host.rb

@@ -2,7 +2,7 @@ require 'addressable/uri'
 
 class Middleman::Extensions::AssetHost < ::Middleman::Extension
   option :host, nil, 'The asset host to use or a Proc to determine asset host', required: true
-  option :exts, %w(.css .png .jpg .jpeg .webp .svg .svgz .js .gif), 'List of extensions that get cache busters strings appended to them.'
+  option :exts, nil, 'List of extensions that get cache busters strings appended to them.'
   option :sources, %w(.css .htm .html .js .php .xhtml), 'List of extensions that are searched for bustable assets.'
   option :ignore, [], 'Regexes of filenames to skip adding query strings to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for host rewrites'
@@ -11,7 +11,7 @@ class Middleman::Extensions::AssetHost < ::Middleman::Extension
     super
 
     app.rewrite_inline_urls id: :asset_host,
-                            url_extensions: options.exts,
+                            url_extensions: options.exts || app.config[:asset_extensions],
                             source_extensions: options.sources,
                             ignore: options.ignore,
                             rewrite_ignore: options.rewrite_ignore,
@@ -20,7 +20,7 @@ class Middleman::Extensions::AssetHost < ::Middleman::Extension
 
   Contract String, Or[String, Pathname], Any => String
   def rewrite_url(asset_path, dirpath, _request_path)
-    uri = ::Addressable::URI.parse(asset_path)
+    uri = ::Middleman::Util.parse_uri(asset_path)
     relative_path = uri.path[0..0] != '/'
 
     full_asset_path = if relative_path
@@ -37,4 +37,5 @@ class Middleman::Extensions::AssetHost < ::Middleman::Extension
 
     File.join(asset_prefix, full_asset_path)
   end
+  memoize :rewrite_url
 end

data/lib/middleman-core/extensions/cache_buster.rb

@@ -1,6 +1,6 @@
 # The Cache Buster extension
 class Middleman::Extensions::CacheBuster < ::Middleman::Extension
-  option :exts, %w(.css .png .jpg .jpeg .webp .svg .svgz .js .gif), 'List of extensions that get cache busters strings appended to them.'
+  option :exts, nil, 'List of extensions that get cache busters strings appended to them.'
   option :sources, %w(.css .htm .html .js .php .xhtml), 'List of extensions that are searched for bustable assets.'
   option :ignore, [], 'Regexes of filenames to skip adding query strings to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for path rewrites'
@@ -9,7 +9,7 @@ class Middleman::Extensions::CacheBuster < ::Middleman::Extension
     super
 
     app.rewrite_inline_urls id: :cache_buster,
-                            url_extensions: options.exts,
+                            url_extensions: options.exts || app.config[:asset_extensions],
                             source_extensions: options.sources,
                             ignore: options.ignore,
                             rewrite_ignore: options.rewrite_ignore,

data/lib/middleman-core/extensions/directory_indexes.rb

@@ -11,16 +11,22 @@ class Middleman::Extensions::DirectoryIndexes < ::Middleman::Extension
     index_file = app.config[:index_file]
     new_index_path = "/#{index_file}"
 
+    extensions = %w(.htm .html .php .xhtml)
+
     resources.each do |resource|
       # Check if it would be pointless to reroute
       next if resource.destination_path == index_file ||
               resource.destination_path.end_with?(new_index_path) ||
-              File.extname(index_file) != resource.ext
+              !extensions.include?(resource.ext)
 
       # Check if file metadata (options set by "page" in config.rb or frontmatter) turns directory_index off
       next if resource.options[:directory_index] == false
 
-      resource.destination_path = resource.destination_path.chomp(File.extname(index_file)) + new_index_path
+      extensions.each do |ext|
+        resource.destination_path = resource.destination_path.chomp(ext)
+      end
+
+      resource.destination_path += new_index_path
     end
   end
 end

data/lib/middleman-core/extensions/external_pipeline.rb

@@ -10,33 +10,79 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
   def initialize(app, config={}, &block)
     super
 
+    return if app.mode?(:config)
+
+    require 'servolux'
     require 'thread'
+    require 'fileutils'
+
+    source_path = File.expand_path(options[:source], app.root)
+
+    # Make sure it exists, or `listen` will explode.
+    ::FileUtils.mkdir_p(source_path)
 
     @watcher = app.files.watch :source,
-                               path: File.expand_path(options[:source], app.root),
+                               path: source_path,
                                latency: options[:latency],
                                frontmatter: false
 
+    @current_thread = nil
+    app.reload(&method(:reload!))
+
     logger.info "== Executing: `#{options[:command]}`"
 
     if app.build? || options[:disable_background_execution]
-      watch_command!
+      watch_command!(false)
+
+      @watcher.poll_once!
     else
-      ::Thread.new { watch_command! }
+      watch_command!(true)
+    end
+  end
+
+  def reload!
+    if @current_thread
+      logger.info "== Stopping: `#{options[:command]}`"
+
+      @current_thread.stop
+      @current_thread = nil
     end
   end
 
-  def watch_command!
-    ::IO.popen(options[:command], 'r') do |pipe|
-      while buf = pipe.gets
+  def watch_command!(async)
+    @current_thread = ::Servolux::Child.new(
+      command: options[:command],
+      suspend: 2
+    )
+
+    @current_thread.start
+
+    watch_thread = Thread.new do
+      while buf = @current_thread.io.gets
         without_newline = buf.sub(/\n$/, '')
-        logger.info "== External: #{without_newline}" if without_newline.length > 0
+        logger.info "== External: #{without_newline}" unless without_newline.empty?
+      end
+
+      @current_thread.wait
+
+      if !@current_thread.exitstatus.nil? && @current_thread.exitstatus != 0
+        logger.error '== External: Command failed with non-zero exit status'
+        exit(1)
       end
     end
 
-    @watcher.poll_once!
+    watch_thread.join unless async
   rescue ::Errno::ENOENT => e
     logger.error "== External: Command failed with message: #{e.message}"
     exit(1)
   end
+
+  private
+
+  def print_command(stdout)
+    while buf = stdout.gets
+      without_newline = buf.sub(/\n$/, '')
+      logger.info "== External: #{without_newline}" unless without_newline.empty?
+    end
+  end
 end