middleman-core 4.1.0.rc.2 → 4.1.0

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

@@ -112,7 +112,7 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
 
         # Only compress script tags that contain JavaScript (as opposed to
         # something like jQuery templates, identified with a "text/html" type).
-        if first.include?('<script>') || first.include?('text/javascript')
+        if !first.include?('type=') || first.include?('text/javascript')
           first + minify(inline_content) + last
         else
           match

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

@@ -3,7 +3,7 @@ require 'addressable/uri'
 # Relative Assets extension
 class Middleman::Extensions::RelativeAssets < ::Middleman::Extension
   option :exts, %w(.css .png .jpg .jpeg .webp .svg .svgz .js .gif .ttf .otf .woff .woff2 .eot), 'List of extensions that get cache busters strings appended to them.'
-  option :sources, %w(.htm .html .css), 'List of extensions that are searched for relative assets.'
+  option :sources, %w(.css .htm .html .xhtml), 'List of extensions that are searched for relative assets.'
   option :ignore, [], 'Regexes of filenames to skip adding query strings to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for path rewrites'
 

data/lib/middleman-core/file_renderer.rb

@@ -51,7 +51,7 @@ module Middleman
 
       # Merge per-extension options from config
       extension = File.extname(path)
-      options = opts.merge(options_for_ext(extension))
+      options = {}.merge!(opts).merge!(options_for_ext(extension))
       options[:outvar] ||= '@_out_buf'
       options[:context] = context
       options.delete(:layout)
@@ -73,9 +73,10 @@ module Middleman
       # end
 
       # Render using Tilt
-      content = ::Middleman::Util.instrument 'render.tilt', path: path do
-        template.render(context, locs, &block)
-      end
+      # content = ::Middleman::Util.instrument 'render.tilt', path: path do
+      #   template.render(context, locs, &block)
+      # end
+      content = template.render(context, locs, &block)
 
       # Allow hooks to manipulate the result after render
       content = @app.callbacks_for(:after_render).reduce(content) do |sum, callback|
@@ -96,12 +97,14 @@ module Middleman
     # @return [String]
     Contract String
     def template_data_for_file
-      if @app.extensions[:front_matter]
-        @app.extensions[:front_matter].template_data_for_file(@path) || File.read(@path)
-      else
-        file = @app.files.find(:source, @path)
-        file.read if file
+      file = @app.files.find(:source, @path)
+
+      if @app.extensions[:front_matter] || (file && !file[:types].include?(:no_frontmatter))
+        result = @app.extensions[:front_matter].template_data_for_file(@path)
+        return result unless result.nil?
       end
+
+      file ? file.read : File.read(@path)
     end
 
     protected

data/lib/middleman-core/logger.rb

@@ -40,6 +40,7 @@ module Middleman
       return if @instrumenting.is_a?(String) && @instrumenting != 'instrument' && !message.include?(@instrumenting)
 
       evt = ::ActiveSupport::Notifications::Event.new(message, *args)
+      return unless evt.duration > 30
       info "== Instrument (#{evt.name.sub(/.middleman$/, '')}): #{evt.duration}ms\n#{args.last}"
     end
   end

data/lib/middleman-core/preview_server.rb

@@ -151,19 +151,19 @@ module Middleman
           config[:ssl_private_key] = opts[:ssl_private_key] if opts[:ssl_private_key]
 
           ready do
-            match_against = [
-              %r{^config\.rb$},
-              %r{^environments/[^\.](.*)\.rb$},
-              %r{^lib/[^\.](.*)\.rb$},
-              %r{^#{config[:helpers_dir]}/[^\.](.*)\.rb$}
-            ]
-
-            # config.rb
-            watcher = files.watch :reload,
-                                  path: root,
-                                  only: match_against
-
             unless config[:watcher_disable]
+              match_against = [
+                %r{^config\.rb$},
+                %r{^environments/[^\.](.*)\.rb$},
+                %r{^lib/[^\.](.*)\.rb$},
+                %r{^#{config[:helpers_dir]}/[^\.](.*)\.rb$}
+              ]
+
+              # config.rb
+              watcher = files.watch :reload,
+                                    path: root,
+                                    only: match_against
+
               # Hack around node_modules in root.
               watcher.listener.ignore(/^node_modules/)
 
@@ -235,8 +235,8 @@ module Middleman
 
           if ssl_certificate || ssl_private_key
             raise 'You must provide both :ssl_certificate and :ssl_private_key' unless ssl_private_key && ssl_certificate
-            http_opts[:SSLCertificate] = OpenSSL::X509::Certificate.new File.read ssl_certificate
-            http_opts[:SSLPrivateKey] = OpenSSL::PKey::RSA.new File.read ssl_private_key
+            http_opts[:SSLCertificate] = OpenSSL::X509::Certificate.new ::File.read ssl_certificate
+            http_opts[:SSLPrivateKey] = OpenSSL::PKey::RSA.new ::File.read ssl_private_key
           else
             # use a generated self-signed cert
             http_opts[:SSLCertName] = [

data/lib/middleman-core/renderers/haml.rb

@@ -30,7 +30,7 @@ module Middleman
       end
 
       def evaluate(scope, locals, &block)
-        options = @options.merge(filename: eval_file, line: line, context: @context || scope)
+        options = {}.merge!(@options).merge!(filename: eval_file, line: line, context: @context || scope)
         @engine = ::Haml::Engine.new(data, options)
         output = @engine.render(scope, locals, &block)
 
@@ -46,6 +46,7 @@ module Middleman
         ::Haml::Options.defaults[:context] = nil
         ::Haml::Options.send :attr_accessor, :context
 
+        # rubocop:disable NestedMethodDefinition
         [::Haml::Filters::Sass, ::Haml::Filters::Scss, ::Haml::Filters::Markdown].each do |f|
           f.class_exec do
             def self.render_with_options(text, compiler_options)
@@ -57,6 +58,7 @@ module Middleman
             end
           end
         end
+        # rubocop:enable NestedMethodDefinition
 
         ::Tilt.prefer(::Middleman::Renderers::HamlTemplate, :haml)
 

data/lib/middleman-core/renderers/less.rb

@@ -26,7 +26,7 @@ module Middleman
           if ::Less.const_defined? :Engine
             @engine = ::Less::Engine.new(data)
           else
-            parser  = ::Less::Parser.new(options.merge(filename: eval_file, line: line, paths: ['.', File.dirname(eval_file)]))
+            parser = ::Less::Parser.new({}.merge!(options).merge!(filename: eval_file, line: line, paths: ['.', File.dirname(eval_file)]))
             @engine = parser.parse(data)
           end
         end

data/lib/middleman-core/renderers/liquid.rb

@@ -14,7 +14,7 @@ module Middleman
       def read_template_file(template_path, _)
         file = app.files.find(:source, "_#{template_path}.liquid")
         raise ::Liquid::FileSystemError, "No such template '#{template_path}'" unless file
-        File.read(file[:full_path])
+        file.read
       end
 
       # @return Array<Middleman::Sitemap::Resource>

data/lib/middleman-core/renderers/sass.rb

@@ -1,5 +1,10 @@
 require 'sass'
 
+begin
+  require 'sassc'
+rescue LoadError
+end
+
 module Middleman
   module Renderers
     # Sass renderer
@@ -76,7 +81,7 @@ module Middleman
             filename: eval_file,
             line: line,
             syntax: syntax,
-            custom: (options[:custom] || {}).merge(
+            custom: {}.merge!(options[:custom] || {}).merge!(
               middleman_context: ctx.app,
               current_resource: ctx.current_resource
             )
@@ -92,7 +97,7 @@ module Middleman
             more_opts[:css_filename] = file.sub(/\.s[ac]ss$/, '')
           end
 
-          options.merge(more_opts)
+          {}.merge!(options).merge!(more_opts)
         end
       end
 

data/lib/middleman-core/sitemap/extensions/ignores.rb

@@ -11,7 +11,7 @@ module Middleman
         # Ignore a path or add an ignore callback
         # @param [String, Regexp] path Path glob expression, or path regex
         # @return [IgnoreDescriptor]
-        Contract Maybe[Or[String, Regexp]], Maybe[Proc] => RespondTo[:execute_descriptor]
+        Contract Or[String, Regexp, Proc] => RespondTo[:execute_descriptor]
         def ignore(path=nil, &block)
           @app.sitemap.invalidate_resources_not_ignored_cache!
           IgnoreDescriptor.new(path, block)
@@ -49,7 +49,7 @@ module Middleman
               else
                 match_path == path_clean
               end
-            elsif block_given?
+            elsif block
               block.call(match_path)
             end
           end

data/lib/middleman-core/sitemap/extensions/import.rb

@@ -12,8 +12,10 @@ module Middleman
 
         ImportFileDescriptor = Struct.new(:from, :to) do
           def execute_descriptor(app, resources)
+            source = ::Middleman::SourceFile.new(Pathname(from).relative_path_from(app.source_dir), Pathname(from), app.source_dir, Set.new([:source, :binary]), 0)
+
             resources + [
-              ::Middleman::Sitemap::Resource.new(app.sitemap, to, from)
+              ::Middleman::Sitemap::Resource.new(app.sitemap, to, source)
             ]
           end
         end

data/lib/middleman-core/sitemap/resource.rb

@@ -54,7 +54,7 @@ module Middleman
         source = Pathname(source) if source && source.is_a?(String)
 
         @file_descriptor = if source && source.is_a?(Pathname)
-          ::Middleman::SourceFile.new(source.relative_path_from(@app.source_dir), source, @app.source_dir, Set.new([:source]))
+          ::Middleman::SourceFile.new(source.relative_path_from(@app.source_dir), source, @app.source_dir, Set.new([:source]), 0)
         else
           source
         end
@@ -66,6 +66,8 @@ module Middleman
         # Page are data that is exposed through this resource's data member.
         # Note: It is named 'page' for backwards compatibility with older MM.
         @metadata = { options: {}, locals: {}, page: {} }
+
+        @page_data = nil
       end
 
       # Whether this resource has a template file
@@ -91,6 +93,7 @@ module Middleman
       #   Note: It is named 'page' for backwards compatibility with older MM.
       Contract METADATA_HASH => METADATA_HASH
       def add_metadata(meta={})
+        @page_data = nil
         @metadata.deep_merge!(meta)
       end
 
@@ -98,7 +101,7 @@ module Middleman
       # @return [Hash]
       Contract RespondTo[:indifferent_access?]
       def data
-        ::Middleman::Util.recursively_enhance(metadata[:page])
+        @page_data ||= ::Middleman::Util.recursively_enhance(metadata[:page])
       end
 
       # Options about how this resource is rendered, such as its :layout,
@@ -129,18 +132,16 @@ module Middleman
       def render(opts={}, locs={})
         return ::Middleman::FileRenderer.new(@app, file_descriptor[:full_path].to_s).template_data_for_file unless template?
 
-        # ::Middleman::Util.instrument 'render.resource', path: file_descriptor[:full_path].to_s, destination_path: destination_path do
         md   = metadata
         opts = md[:options].deep_merge(opts)
         locs = md[:locals].deep_merge(locs)
         locs[:current_path] ||= destination_path
 
         # Certain output file types don't use layouts
-        opts[:layout] = false if !opts.key?(:layout) && ext != '.html'
+        opts[:layout] = false if !opts.key?(:layout) && !@app.config.extensions_with_layout.include?(ext)
 
         renderer = ::Middleman::TemplateRenderer.new(@app, file_descriptor[:full_path].to_s)
         renderer.render(locs, opts)
-        # end
       end
 
       # A path without the directory index - so foo/index.html becomes
@@ -161,7 +162,7 @@ module Middleman
       # @return [Boolean]
       Contract Bool
       def binary?
-        !file_descriptor.nil? && ::Middleman::Util.binary?(file_descriptor[:full_path].to_s)
+        !file_descriptor.nil? && (file_descriptor[:types].include?(:binary) || ::Middleman::Util.binary?(file_descriptor[:full_path].to_s))
       end
 
       # Ignore a resource directly, without going through the whole

data/lib/middleman-core/sources.rb

@@ -3,7 +3,12 @@ require 'middleman-core/contracts'
 
 module Middleman
   # The standard "record" that contains information about a file on disk.
-  SourceFile = Struct.new :relative_path, :full_path, :directory, :types
+  SourceFile = Struct.new(:relative_path, :full_path, :directory, :types, :version) do
+    def read
+      ::Middleman::Sources.file_cache[full_path] ||= {}
+      ::Middleman::Sources.file_cache[full_path][version] ||= ::File.read(full_path)
+    end
+  end
 
   # Sources handle multiple on-disk collections of files which make up
   # a Middleman project. They are separated by `type` which can then be
@@ -36,6 +41,8 @@ module Middleman
     # Reference to the global logger.
     def_delegator :@app, :logger
 
+    cattr_accessor :file_cache
+
     # Built-in types
     # :source, :data, :locales, :reload
 
@@ -50,6 +57,8 @@ module Middleman
       @watchers = watchers
       @sorted_watchers = @watchers.dup.freeze
 
+      ::Middleman::Sources.file_cache = {}
+
       @options = options
 
       # Set of procs wanting to be notified of changes
@@ -82,7 +91,7 @@ module Middleman
                                     validator: (block_given? ? block : regex))
 
       bump_count
-      find_new_files! if @running
+      poll_once! if @running
     end
 
     # Whether this path is ignored.
@@ -175,11 +184,13 @@ module Middleman
     # @param [String] path The file path.
     # @param [Boolean] glob If the path contains wildcard or glob characters.
     # @return [Middleman::SourceFile, nil]
-    Contract Or[Symbol, ArrayOf[Symbol], SetOf[Symbol]], String, Maybe[Bool] => Maybe[SourceFile]
+    Contract Or[Symbol, ArrayOf[Symbol], SetOf[Symbol]], Or[Pathname, String], Maybe[Bool] => Maybe[SourceFile]
     def find(types, path, glob=false)
+      array_of_types = Array(types)
+
       watchers
         .lazy
-        .select { |d| Array(types).include?(d.type) }
+        .select { |d| array_of_types.include?(d.type) }
         .map { |d| d.find(path, glob) }
         .reject(&:nil?)
         .first
@@ -192,10 +203,7 @@ module Middleman
     # @return [Boolean]
     Contract Or[Symbol, ArrayOf[Symbol], SetOf[Symbol]], String => Bool
     def exists?(types, path)
-      watchers
-        .lazy
-        .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.
@@ -205,18 +213,27 @@ 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 poll all watchers for new content.
+    # Manually check for new files
     #
     # @return [void]
     Contract ArrayOf[Pathname]
     def find_new_files!
       return [] unless @update_count != @last_update_count
 
+      @last_update_count = @update_count
+      watchers.reduce([]) { |sum, w| sum + w.find_new_files! }
+    end
+
+    # Manually poll all watchers for new content.
+    #
+    # @return [void]
+    Contract ArrayOf[Pathname]
+    def poll_once!
+      return [] unless @update_count != @last_update_count
+
       @last_update_count = @update_count
       watchers.reduce([]) { |sum, w| sum + w.poll_once! }
     end
@@ -297,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

data/lib/middleman-core/sources/source_watcher.rb

@@ -1,6 +1,7 @@
 # Watcher Library
 require 'listen'
 require 'middleman-core/contracts'
+require 'digest'
 
 # Monkey patch Listen silencer so `only` works on directories too
 module Listen
@@ -48,6 +49,8 @@ module Middleman
     # Reference to lower level listener
     attr_reader :listener
 
+    IGNORED_DIRECTORIES = %w(.git node_modules .sass-cache).freeze
+
     # Construct a new SourceWatcher
     #
     # @param [Middleman::Sources] parent The parent collection.
@@ -65,6 +68,8 @@ module Middleman
       @files = {}
       @extensionless_files = {}
 
+      @frontmatter = options.fetch(:frontmatter, true)
+      @binary = options.fetch(:binary, false)
       @validator = options.fetch(:validator, proc { true })
       @ignored = options.fetch(:ignored, proc { false })
       @only = Array(options.fetch(:only, []))
@@ -177,22 +182,30 @@ module Middleman
       @listener = nil
     end
 
+    Contract ArrayOf[Pathname]
+    def find_new_files!
+      new_files = ::Middleman::Util.all_files_under(@directory.to_s, &method(:should_not_recurse?))
+                                   .reject { |p| @files.key?(p) }
+
+      update(new_files, []).flatten.map { |s| s[:full_path] }
+    end
+
     # Manually trigger update events.
     #
     # @return [void]
     Contract ArrayOf[Pathname]
     def poll_once!
-      updated = ::Middleman::Util.all_files_under(@directory.to_s)
+      updated = ::Middleman::Util.all_files_under(@directory.to_s, &method(:should_not_recurse?))
       removed = @files.keys.reject { |p| updated.include?(p) }
 
-      update(updated, removed)
+      result = update(updated, removed)
 
       if @waiting_for_existence && @directory.exist?
         @waiting_for_existence = false
         listen!
       end
 
-      updated + removed
+      result.flatten.map { |s| s[:full_path] }
     end
 
     # Work around this bug: http://bugs.ruby-lang.org/issues/4521
@@ -206,6 +219,11 @@ module Middleman
 
     protected
 
+    Contract Pathname => Bool
+    def should_not_recurse?(p)
+      IGNORED_DIRECTORIES.include?(p.basename.to_s)
+    end
+
     # The `listen` gem callback.
     #
     # @param [Array] modified List of modified files.
@@ -225,14 +243,14 @@ module Middleman
     #
     # @param [String, Pathname] path The updated file path.
     # @return [void]
-    Contract ArrayOf[Pathname], ArrayOf[Pathname] => Any
+    Contract ArrayOf[Pathname], ArrayOf[Pathname] => ArrayOf[ArrayOf[IsA['Middleman::SourceFile']]]
     def update(updated_paths, removed_paths)
       valid_updates = updated_paths
-                      .map { |p| ::Middleman::Util.path_to_source_file(p, @directory, @type, @options.fetch(:destination_dir, false)) }
+                      .map { |p| @files[p] || path_to_source_file(p, @directory, @type, @options[:destination_dir]) }
                       .select(&method(:valid?))
 
       valid_updates.each do |f|
-        add_file_to_cache(f)
+        record_file_change(f)
         logger.debug "== Change (#{f[:types].inspect}): #{f[:relative_path]}"
       end
 
@@ -245,11 +263,9 @@ module Middleman
       valid_updates |= related_updates
 
       valid_removes = removed_paths
-                      .lazy
                       .select(&@files.method(:key?))
                       .map(&@files.method(:[]))
                       .select(&method(:valid?))
-                      .to_a
                       .each do |f|
                         remove_file_from_cache(f)
                         logger.debug "== Deletion (#{f[:types].inspect}): #{f[:relative_path]}"
@@ -260,12 +276,34 @@ module Middleman
                           valid_removes,
                           self
                         ]) unless valid_updates.empty? && valid_removes.empty?
+
+      [valid_updates, valid_removes]
+    end
+
+    # Convert a path to a file resprentation.
+    #
+    # @param [Pathname] path The path.
+    # @return [Middleman::SourceFile]
+    Contract Pathname, Pathname, Symbol, Maybe[String] => ::Middleman::SourceFile
+    def path_to_source_file(path, directory, type, destination_dir)
+      types = Set.new([type])
+      types << :no_frontmatter unless @frontmatter
+      types << :binary if @binary
+
+      relative_path = path.relative_path_from(directory)
+      relative_path = File.join(destination_dir, relative_path) if destination_dir
+
+      ::Middleman::SourceFile.new(Pathname(relative_path), path, directory, types, 0)
     end
 
     Contract IsA['Middleman::SourceFile'] => Any
-    def add_file_to_cache(f)
-      @files[f[:full_path]] = f
-      @extensionless_files[strip_extensions(f[:full_path])] = f
+    def record_file_change(f)
+      if @files[f[:full_path]]
+        @files[f[:full_path]][:version] += 1
+      else
+        @files[f[:full_path]] = f
+        @extensionless_files[strip_extensions(f[:full_path])] = f
+      end
     end
 
     Contract IsA['Middleman::SourceFile'] => Any
@@ -291,7 +329,7 @@ module Middleman
       if @only.empty?
         !@ignored.call(file)
       else
-        @only.any? { |reg| reg.match(file[:relative_path].to_s) }
+        @only.any? { |reg| file[:relative_path].to_s =~ reg }
       end
     end
   end