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

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

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/try'
+require 'memoist'
 require 'middleman-core/contracts'
 
 # Minify CSS Extension
@@ -30,6 +32,7 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
 
   # Rack middleware to look for CSS and compress it
   class Rack
+    extend Memoist
     include Contracts
     INLINE_CSS_REGEX = /(<style[^>]*>\s*(?:\/\*<!\[CDATA\[\*\/\n)?)(.*?)((?:(?:\n\s*)?\/\*\]\]>\*\/)?\s*<\/style>)/m
 
@@ -82,8 +85,9 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
     # @param [String] path
     # @return [Boolean]
     def ignore?(path)
-      @ignore.any? { |ignore| Middleman::Util.path_match(ignore, path) }
+      @ignore.any? { |ignore| ::Middleman::Util.path_match(ignore, path) }
     end
+    memoize :ignore?
 
     # Whether this type of content can be minified
     # @param [String, nil] content_type
@@ -91,6 +95,7 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
     def minifiable?(content_type)
       @content_types.include?(content_type)
     end
+    memoize :minifiable?
 
     # Whether this type of content contains inline content that can be minified
     # @param [String, nil] content_type
@@ -98,6 +103,7 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
     def minifiable_inline?(content_type)
       @inline_content_types.include?(content_type)
     end
+    memoize :minifiable_inline?
 
     # Minify the content
     # @param [String] content
@@ -105,6 +111,7 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
     def minify(content)
       @compressor.compress(content)
     end
+    memoize :minify
 
     # Detect and minify inline content
     # @param [String] content
@@ -114,5 +121,6 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
         $1 + minify($2) + $3
       end
     end
+    memoize :minify_inline
   end
 end

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

@@ -1,4 +1,6 @@
+require 'active_support/core_ext/object/try'
 require 'middleman-core/contracts'
+require 'memoist'
 
 # Minify Javascript Extension
 class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
@@ -22,6 +24,7 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
 
   # Rack middleware to look for JS and compress it
   class Rack
+    extend Memoist
     include Contracts
     INLINE_JS_REGEX = /(<script[^>]*>\s*(?:\/\/(?:(?:<!--)|(?:<!\[CDATA\[))\n)?)(.*?)((?:(?:\n\s*)?\/\/(?:(?:-->)|(?:\]\]>)))?\s*<\/script>)/m
 
@@ -76,6 +79,7 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
     def ignore?(path)
       @ignore.any? { |ignore| Middleman::Util.path_match(ignore, path) }
     end
+    memoize :ignore?
 
     # Whether this type of content can be minified
     # @param [String, nil] content_type
@@ -83,6 +87,7 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
     def minifiable?(content_type)
       @content_types.include?(content_type)
     end
+    memoize :minifiable?
 
     # Whether this type of content contains inline content that can be minified
     # @param [String, nil] content_type
@@ -90,6 +95,7 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
     def minifiable_inline?(content_type)
       @inline_content_types.include?(content_type)
     end
+    memoize :minifiable_inline?
 
     # Minify the content
     # @param [String] content
@@ -100,6 +106,7 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
       warn "WARNING: Couldn't compress JavaScript in #{@path}: #{e.message}"
       content
     end
+    memoize :minify
 
     # Detect and minify inline content
     # @param [String] content
@@ -119,5 +126,6 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
         end
       end
     end
+    memoize :minify_inline
   end
 end

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

@@ -2,38 +2,62 @@ 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 :exts, nil, 'List of extensions that get converted to relative paths.'
   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'
+  option :ignore, [], 'Regexes of filenames to skip converting to relative paths.'
+  option :rewrite_ignore, [], 'Regexes of filenames to skip processing for path rewrites.'
+  option :helpers_only, false, 'Allow only Ruby helpers to change paths.'
 
   def initialize(app, options_hash={}, &block)
     super
 
-    app.rewrite_inline_urls id: :asset_hash,
-                            url_extensions: options.exts,
+    return if options[:helpers_only]
+
+    app.rewrite_inline_urls id: :relative_assets,
+                            url_extensions: options.exts || app.config[:asset_extensions],
                             source_extensions: options.sources,
                             ignore: options.ignore,
                             rewrite_ignore: options.rewrite_ignore,
                             proc: method(:rewrite_url)
   end
 
+  def mark_as_relative(file_path, opts, current_resource)
+    result = opts.dup
+
+    valid_exts = options.sources
+
+    return result unless current_resource
+    return result unless valid_exts.include?(current_resource.ext)
+
+    rewrite_ignores = Array(options.rewrite_ignore || [])
+
+    path = current_resource.destination_path
+    return result if rewrite_ignores.any? do |i|
+      ::Middleman::Util.path_match(i, path) || ::Middleman::Util.path_match(i, "/#{path}")
+    end
+
+    return result if Array(options.ignore || []).any? do |r|
+      ::Middleman::Util.should_ignore?(r, file_path)
+    end
+
+    result[:relative] = true unless result.key?(:relative)
+
+    result
+  end
+
   helpers do
-    # asset_url override for relative assets
-    # @param [String] path
-    # @param [String] prefix
-    # @param [Hash] options Additional options.
-    # @return [String]
     def asset_url(path, prefix='', options={})
-      options[:relative] = true unless options.key?(:relative)
+      super(path, prefix, app.extensions[:relative_assets].mark_as_relative(super, options, current_resource))
+    end
 
-      super(path, prefix, options)
+    def asset_path(kind, source, options={})
+      super(kind, source, app.extensions[:relative_assets].mark_as_relative(super, options, current_resource))
     end
   end
 
   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)
 
     return if uri.path[0..0] != '/'
 
@@ -50,4 +74,5 @@ class Middleman::Extensions::RelativeAssets < ::Middleman::Extension
 
     result
   end
+  memoize :rewrite_url
 end

data/lib/middleman-core/file_renderer.rb

@@ -59,7 +59,7 @@ module Middleman
       # Overwrite with frontmatter options
       options = options.deep_merge(options[:renderer_options]) if options[:renderer_options]
 
-      template_class = ::Tilt[path]
+      template_class = ::Middleman::Util.tilt_class(path)
 
       # Allow hooks to manipulate the template before render
       body = @app.callbacks_for(:before_render).reduce(body) do |sum, callback|
@@ -99,12 +99,12 @@ module Middleman
     def template_data_for_file
       file = @app.files.find(:source, @path)
 
-      if @app.extensions[:front_matter] || (file && !file[:types].include?(:no_frontmatter))
+      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)
+      file ? file.read : ::File.read(@path)
     end
 
     protected
@@ -122,7 +122,7 @@ module Middleman
 
         # Find all the engines which handle this extension in tilt. Look for
         # config variables of that name and merge it
-        extension_class = ::Tilt[ext]
+        extension_class = ::Middleman::Util.tilt_class(ext)
         ::Tilt.mappings.each do |mapping_ext, engines|
           next unless engines.include? extension_class
           engine_options = @app.config[mapping_ext.to_sym] || {}

data/lib/middleman-core/load_paths.rb

@@ -22,7 +22,9 @@ module Middleman
 
     # Set BUNDLE_GEMFILE and run Bundler setup. Raises an exception if there is no Gemfile
     def setup_bundler
-      ENV['BUNDLE_GEMFILE'] ||= File.join(findup('Gemfile', ENV['MM_ROOT']), 'Gemfile')
+      if found_gemfile_root = findup('Gemfile', ENV['MM_ROOT'])
+        ENV['BUNDLE_GEMFILE'] ||= File.join(found_gemfile_root, 'Gemfile')
+      end
 
       unless File.exist?(ENV['BUNDLE_GEMFILE'])
         ENV['BUNDLE_GEMFILE'] = File.expand_path('../../../../Gemfile', __FILE__)

data/lib/middleman-core/logger.rb

@@ -7,7 +7,7 @@ module Middleman
   # The Middleman Logger
   class Logger < ActiveSupport::Logger
     def self.singleton(*args)
-      if !@_logger || args.length > 0
+      if !@_logger || !args.empty?
         if args.length == 1 && (args.first.is_a?(::String) || args.first.respond_to?(:write))
           args = [0, false, args.first]
         end

data/lib/middleman-core/meta_pages/templates/index.html.erb

@@ -10,7 +10,9 @@
     <div class="container">
       <article id="main">
         <h1>Middleman Information</h1>
-
+        <p>
+          Middleman version <%= Middleman::VERSION %>
+        </p>
         <ul class="nav-list">
           <li>
             <a href="/__middleman/sitemap/">Sitemap</a>

data/lib/middleman-core/preview_server.rb

@@ -18,12 +18,13 @@ module Middleman
 
       # Start an instance of Middleman::Application
       # @return [void]
-      def start(opts={})
+      def start(opts={}, cli_options={})
         # Do not buffer output, otherwise testing of output does not work
         $stdout.sync = true
         $stderr.sync = true
 
         @options = opts
+        @cli_options = cli_options
         @server_information = ServerInformation.new
         @server_information.https = (@options[:https] == true)
 
@@ -102,6 +103,8 @@ module Middleman
       def reload
         app.logger.info '== The Middleman is reloading'
 
+        app.execute_callbacks(:reload)
+
         begin
           app = initialize_new_app
         rescue => e
@@ -131,6 +134,7 @@ module Middleman
 
       def initialize_new_app
         opts = @options.dup
+        cli_options = @cli_options.dup
 
         ::Middleman::Logger.singleton(
           opts[:debug] ? 0 : 1,
@@ -138,17 +142,9 @@ module Middleman
         )
 
         app = ::Middleman::Application.new do
-          config[:environment] = opts[:environment].to_sym if opts[:environment]
-          config[:watcher_disable] = opts[:disable_watcher]
-          config[:watcher_force_polling] = opts[:force_polling]
-          config[:watcher_latency] = opts[:latency]
-
-          config[:port] = opts[:port] if opts[:port]
-          config[:bind_address]    = opts[:bind_address]
-          config[:server_name]     = opts[:server_name]
-          config[:https]           = opts[:https] unless opts[:https].nil?
-          config[:ssl_certificate] = opts[:ssl_certificate] if opts[:ssl_certificate]
-          config[:ssl_private_key] = opts[:ssl_private_key] if opts[:ssl_private_key]
+          config[:cli_options] = cli_options.each_with_object({}) do |(k, v), sum|
+            sum[k] = v unless v == :undefined
+          end
 
           ready do
             unless config[:watcher_disable]
@@ -177,18 +173,21 @@ module Middleman
         end
 
         # store configured port to make a check later on possible
-        configured_port = app.config[:port]
+        configured_port = possible_from_cli(:port, app.config)
 
         # Use configuration values to set `bind_address` etc. in
         # `server_information`
-        server_information.use app.config
+        server_information.use(bind_address: possible_from_cli(:bind_address, app.config),
+                               port: possible_from_cli(:port, app.config),
+                               server_name: possible_from_cli(:server_name, app.config),
+                               https: possible_from_cli(:https, app.config))
 
-        app.logger.warn format('== The Middleman uses a different port "%s" then the configured one "%s" because some other server is listening on that port.', server_information.port, configured_port) unless app.config[:port] == configured_port
+        app.logger.warn format('== The Middleman uses a different port "%s" then the configured one "%s" because some other server is listening on that port.', server_information.port, configured_port) unless server_information.port == configured_port
 
-        @environment = app.config[:environment]
+        @environment = possible_from_cli(:environment, app.config)
 
-        @ssl_certificate = app.config[:ssl_certificate]
-        @ssl_private_key = app.config[:ssl_private_key]
+        @ssl_certificate = possible_from_cli(:ssl_certificate, app.config)
+        @ssl_private_key = possible_from_cli(:ssl_private_key, app.config)
 
         app.files.on_change :reload do
           $mm_reload = true
@@ -204,6 +203,14 @@ module Middleman
         app
       end
 
+      def possible_from_cli(key, config)
+        if @cli_options[key] && @cli_options[key] != :undefined
+          @cli_options[key]
+        else
+          config[key]
+        end
+      end
+
       # Trap some interupt signals and shut down smoothly
       # @return [void]
       def register_signal_handlers

data/lib/middleman-core/rack.rb

@@ -2,6 +2,7 @@ require 'rack'
 require 'rack/file'
 require 'rack/lint'
 require 'rack/head'
+require 'rack/utils'
 
 require 'middleman-core/util'
 require 'middleman-core/logger'
@@ -124,6 +125,7 @@ module Middleman
 
     # Halt request and return 404
     def not_found(res, path)
+      path = ::Rack::Utils.escape_html(path)
       res.status = 404
       res.write "<html><head></head><body><h1>File Not Found</h1><p>#{path}</p></body></html>"
       res.finish

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

@@ -76,7 +76,7 @@ module Middleman
           scope.image_tag(link, title: title, alt: alt_text)
         else
           link_string = link.dup
-          link_string << %("#{title}") if title && title.length > 0 && title != alt_text
+          link_string << %("#{title}") if title && !title.empty? && title != alt_text
           "![#{alt_text}](#{link_string})"
         end
       end
@@ -89,7 +89,7 @@ module Middleman
           scope.link_to(content, link, attributes)
         else
           link_string = link.dup
-          link_string << %("#{title}") if title && title.length > 0 && title != alt_text
+          link_string << %("#{title}") if title && !title.empty? && title != alt_text
           "[#{content}](#{link_string})"
         end
       end

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

@@ -105,10 +105,8 @@ module Middleman
   end
 end
 
-SASS_MODULE = if defined?(::SassC)
-  ::SassC
-else
-  ::Sass
+if defined?(::SassC)
+  ::SassC::Script::Functions.send :include, ::Middleman::Sass::Functions
+elsif defined?(::Sass)
+  ::Sass::Script::Functions.send :include, ::Middleman::Sass::Functions
 end
-
-SASS_MODULE::Script::Functions.send :include, ::Middleman::Sass::Functions

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

@@ -12,13 +12,9 @@ class ::Slim::Template
 
   def initialize(file, line, opts, &block)
     if opts.key?(:context)
-      context_hack = {
-        context: opts[:context]
-      }
-
       ::Slim::Embedded::SassEngine.disable_option_validator!
       %w(sass scss markdown).each do |engine|
-        ::Slim::Embedded.options[engine.to_sym] = context_hack
+        (::Slim::Embedded.options[engine.to_sym] ||= {})[:context] = opts[:context]
       end
     end
 

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

@@ -23,8 +23,8 @@ module Middleman
         ImportPathDescriptor = Struct.new(:from, :renameProc) do
           def execute_descriptor(app, resources)
             resources + ::Middleman::Util.glob_directory(File.join(from, '**/*'))
-                        .reject { |path| File.directory?(path) }
-                        .map do |path|
+                                         .reject { |path| File.directory?(path) }
+                                         .map do |path|
                           target_path = Pathname(path).relative_path_from(Pathname(from).parent).to_s
 
                           ::Middleman::Sitemap::Resource.new(

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

@@ -36,10 +36,13 @@ module Middleman
           md = metadata.dup
           should_ignore = md.delete(:ignore)
 
+          page_data = md.delete(:data) || {}
+          page_data[:id] = md.delete(:id) if md.key?(:id)
+
           r = ProxyResource.new(app.sitemap, path, target)
           r.add_metadata(
             locals: md.delete(:locals) || {},
-            page: md.delete(:data) || {},
+            page: page_data || {},
             options: md
           )
 

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

@@ -53,8 +53,7 @@ module Middleman
         def render(*)
           url = ::Middleman::Util.url_for(@store.app, @request_path,
                                           relative: false,
-                                          find_resource: true
-                                         )
+                                          find_resource: true)
 
           if output
             output.call(path, url)