middleman-core 4.1.0.rc.1 → 4.1.0.rc.2

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

@@ -1,7 +1,7 @@
 # Routing extension
 module Middleman
   module CoreExtensions
-    class Routing < Extension
+    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
@@ -9,24 +9,28 @@ module Middleman
       # Expose the `page` method to config.
       expose_to_config :page
 
-      def initialize(app, options_hash={}, &block)
-        super
+      PageDescriptor = Struct.new(:path, :metadata) do
+        def execute_descriptor(app, resources)
+          normalized_path = path.dup
 
-        @page_configs = Set.new
-      end
-
-      # @return Array<Middleman::Sitemap::Resource>
-      Contract ResourceList => ResourceList
-      def manipulate_resource_list(resources)
-        resources.each do |resource|
-          @page_configs.each do |p|
-            resource.add_metadata(p[:metadata]) if Middleman::Util.path_match(p[:path], "/#{resource.path}")
+          if normalized_path.is_a?(String) && !normalized_path.include?('*')
+            # Normalize path
+            normalized_path = ::Middleman::Util.normalize_path(normalized_path)
+            if normalized_path.end_with?('/') || app.files.by_type(:source).watchers.any? { |w| (w.directory + Pathname(normalized_path)).directory? }
+              normalized_path = ::File.join(normalized_path, app.config[:index_file])
+            end
           end
+
+          normalized_path = '/' + ::Middleman::Util.strip_leading_slash(normalized_path) if normalized_path.is_a?(String)
+
+          resources
+            .select { |r| ::Middleman::Util.path_match(normalized_path, "/#{r.path}") }
+            .each { |r| r.add_metadata(metadata) }
+
+          resources
         end
       end
 
-      PageDescriptor = Struct.new(:path, :metadata)
-
       # The page method allows options to be set for a given source path, regex, or glob.
       # Options that may be set include layout, locals, andx ignore.
       #
@@ -44,28 +48,18 @@ module Middleman
       # @option opts [Hash] locals Local variables for the template. These will be available when the template renders.
       # @option opts [Hash] data Extra metadata to add to the page. This is the same as frontmatter, though frontmatter will take precedence over metadata defined here. Available via {Resource#data}.
       # @return [void]
-      Contract Or[String, Regexp], Hash => Any
+      Contract Or[String, Regexp], Hash => PageDescriptor
       def page(path, opts={})
         options = opts.dup
 
         # Default layout
         metadata = {
-          options: options,
           locals: options.delete(:locals) || {},
-          page: options.delete(:data) || {}
+          page: options.delete(:data) || {},
+          options: options
         }
 
-        if path.is_a?(String) && !path.include?('*')
-          # Normalize path
-          path = Middleman::Util.normalize_path(path)
-          if path.end_with?('/') || app.files.by_type(:source).watchers.any? { |w| (w.directory + Pathname(path)).directory? }
-            path = File.join(path, @app.config[:index_file])
-          end
-        end
-
-        path = '/' + Util.strip_leading_slash(path) if path.is_a?(String)
-
-        @page_configs << PageDescriptor.new(path, metadata)
+        PageDescriptor.new(path, metadata)
       end
     end
   end

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

@@ -3,13 +3,7 @@ require 'rack/showexceptions'
 # Support rack/showexceptions during development
 module Middleman::CoreExtensions
   class ShowExceptions < ::Middleman::Extension
-    def initialize(app, options_hash={}, &block)
-      super
-
-      return if app.config.defines_setting? :show_exceptions
-
-      app.config.define_setting :show_exceptions, ENV['TEST'] ? false : true, 'Whether to catch and display exceptions'
-    end
+    define_setting :show_exceptions, ENV['TEST'] ? false : true, 'Whether to catch and display exceptions'
 
     def ready
       app.use ::Rack::ShowExceptions if !app.build? && app.config[:show_exceptions]

data/lib/middleman-core/extension.rb

@@ -135,6 +135,23 @@ module Middleman
         config.define_setting(key, default, description, options)
       end
 
+      # @api private
+      # @return [Middleman::Configuration::ConfigurationManager] The defined global options for this extension.
+      def global_config
+        @_global_config ||= ::Middleman::Configuration::ConfigurationManager.new
+      end
+
+      # Add an global option to this extension.
+      # @see Middleman::Configuration::ConfigurationManager#define_setting
+      # @example
+      #   option :compress, false, 'Whether to compress the output'
+      # @param [Symbol] key The name of the option
+      # @param [Object] default The default value for the option
+      # @param [String] description A human-readable description of what the option does
+      def define_setting(key, default=nil, description=nil, options={})
+        global_config.define_setting(key, default, description, options)
+      end
+
       # Short-hand for simple Sitemap manipulation
       # @example A generator which returns an array of resources
       #   resources :make_resources
@@ -479,8 +496,8 @@ module Middleman
         @descriptors[k] = []
 
         define_singleton_method(:"__original_#{v}", &method(v))
-        define_singleton_method(v) do |*args, &block|
-          @descriptors[k] << method(:"__original_#{v}").call(*args, &block)
+        define_singleton_method(v) do |*args, &b|
+          @descriptors[k] << method(:"__original_#{v}").call(*args, &b)
           @app.sitemap.rebuild_resource_list!(:"first_run_change_#{v}")
         end
       end

data/lib/middleman-core/extension_manager.rb

@@ -9,6 +9,8 @@ module Middleman
       @app = app
       @activated = {}
 
+      ::Middleman::Extensions.load_settings(@app)
+
       manager = self
 
       {

data/lib/middleman-core/extensions.rb

@@ -120,6 +120,18 @@ module Middleman
           app.extensions.activate descriptor[:name]
         end
       end
+
+      def load_settings(app)
+        registered.each do |name, _|
+          begin
+            ext = load(name)
+            unless ext.global_config.all_settings.empty?
+              app.config.load_settings(ext.global_config.all_settings)
+            end
+          rescue LoadError
+          end
+        end
+      end
     end
   end
 end

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

@@ -1,8 +1,8 @@
-require 'addressable/uri'
 require 'middleman-core/util'
 require 'middleman-core/rack'
 
 class Middleman::Extensions::AssetHash < ::Middleman::Extension
+  option :sources, %w(.htm .html .php .css .js), '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 :ignore, [], 'Regexes of filenames to skip adding asset hashes to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for path rewrites'
@@ -10,29 +10,26 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
   def initialize(app, options_hash={}, &block)
     super
 
+    require 'addressable/uri'
     require 'digest/sha1'
     require 'rack/mock'
-    require 'middleman-core/middleware/inline_url_rewriter'
-  end
 
-  def after_configuration
     # Allow specifying regexes to ignore, plus always ignore apple touch icons
     @ignore = Array(options.ignore) + [/^apple-touch-icon/]
 
-    app.use ::Middleman::Middleware::InlineURLRewriter,
-            id: :asset_hash,
-            url_extensions: options.exts.sort.reverse,
-            source_extensions: %w(.htm .html .php .css .js),
-            ignore: @ignore,
-            rewrite_ignore: options.rewrite_ignore,
-            middleman_app: app,
-            proc: method(:rewrite_url)
+    app.rewrite_inline_urls id: :asset_hash,
+                            url_extensions: options.exts.sort.reverse,
+                            source_extensions: options.sources,
+                            ignore: @ignore,
+                            rewrite_ignore: options.rewrite_ignore,
+                            proc: method(:rewrite_url),
+                            after: :asset_host
   end
 
   Contract String, Or[String, Pathname], Any => Maybe[String]
   def rewrite_url(asset_path, dirpath, _request_path)
     uri = ::Addressable::URI.parse(asset_path)
-    relative_path = uri.path[0..0] != '/'
+    relative_path = !uri.path.start_with?('/')
 
     full_asset_path = if relative_path
       dirpath.join(asset_path).to_s
@@ -77,15 +74,19 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
     return if ignored_resource?(resource)
     return if resource.ignored?
 
-    # Render through the Rack interface so middleware and mounted apps get a shot
-    response = @rack_client.get(
-      URI.escape(resource.destination_path),
-      'bypass_inline_url_rewriter_asset_hash' => 'true'
-    )
+    digest = if resource.binary?
+      ::Digest::SHA1.file(resource.source_file).hexdigest[0..7]
+    else
+      # Render through the Rack interface so middleware and mounted apps get a shot
+      response = @rack_client.get(
+        ::URI.escape(resource.destination_path),
+        'bypass_inline_url_rewriter_asset_hash' => 'true'
+      )
 
-    raise "#{resource.path} should be in the sitemap!" unless response.status == 200
+      raise "#{resource.path} should be in the sitemap!" unless response.status == 200
 
-    digest = Digest::SHA1.hexdigest(response.body)[0..7]
+      ::Digest::SHA1.hexdigest(response.body)[0..7]
+    end
 
     resource.destination_path = resource.destination_path.sub(/\.(\w+)$/) { |ext| "-#{digest}#{ext}" }
     resource

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

@@ -1,5 +1,4 @@
 require 'addressable/uri'
-require 'middleman-core/middleware/inline_url_rewriter'
 
 class Middleman::Extensions::AssetHost < ::Middleman::Extension
   option :host, nil, 'The asset host to use or a Proc to determine asset host', required: true
@@ -8,15 +7,15 @@ class Middleman::Extensions::AssetHost < ::Middleman::Extension
   option :ignore, [], 'Regexes of filenames to skip adding query strings to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for host rewrites'
 
-  def ready
-    app.use ::Middleman::Middleware::InlineURLRewriter,
-            id: :asset_host,
-            url_extensions: options.exts,
-            source_extensions: options.sources,
-            ignore: options.ignore,
-            rewrite_ignore: options.rewrite_ignore,
-            middleman_app: app,
-            proc: method(:rewrite_url)
+  def initialize(app, options_hash={}, &block)
+    super
+
+    app.rewrite_inline_urls id: :asset_host,
+                            url_extensions: options.exts,
+                            source_extensions: options.sources,
+                            ignore: options.ignore,
+                            rewrite_ignore: options.rewrite_ignore,
+                            proc: method(:rewrite_url)
   end
 
   Contract String, Or[String, Pathname], Any => String

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

@@ -19,7 +19,7 @@ class Middleman::Extensions::AutomaticImageSizes < ::Middleman::Extension
         real_path = path.dup
         real_path = File.join(config[:images_dir], real_path) unless real_path.start_with?('/')
 
-        file = app.files.find(:source, real_path)
+        file = app.files.find(:source, real_path) || app.files.find(:source, real_path.gsub(/^\//, ''))
 
         if file && file[:full_path].exist?
           begin

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

@@ -8,18 +8,12 @@ class Middleman::Extensions::CacheBuster < ::Middleman::Extension
   def initialize(app, options_hash={}, &block)
     super
 
-    require 'middleman-core/middleware/inline_url_rewriter'
-  end
-
-  def after_configuration
-    app.use ::Middleman::Middleware::InlineURLRewriter,
-            id: :cache_buster,
-            url_extensions: options.exts,
-            source_extensions: options.sources,
-            ignore: options.ignore,
-            rewrite_ignore: options.rewrite_ignore,
-            middleman_app: app,
-            proc: method(:rewrite_url)
+    app.rewrite_inline_urls id: :cache_buster,
+                            url_extensions: options.exts,
+                            source_extensions: options.sources,
+                            ignore: options.ignore,
+                            rewrite_ignore: options.rewrite_ignore,
+                            proc: method(:rewrite_url)
   end
 
   Contract String, Or[String, Pathname], Any => String

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

@@ -64,10 +64,10 @@ class Middleman::Extensions::Gzip < ::Middleman::Extension
 
       total_savings += (old_size - new_size)
       size_change_word = (old_size - new_size) > 0 ? 'smaller' : 'larger'
-      builder.trigger :gzip, "#{output_filename} (#{NumberHelpers.new.number_to_human_size((old_size - new_size).abs)} #{size_change_word})"
+      builder.trigger :created, "#{output_filename} (#{NumberHelpers.new.number_to_human_size((old_size - new_size).abs)} #{size_change_word})"
     end
 
-    builder.trigger :gzip, "Total gzip savings: #{NumberHelpers.new.number_to_human_size(total_savings)}"
+    builder.trigger :gzip, '', "Total gzip savings: #{NumberHelpers.new.number_to_human_size(total_savings)}"
     I18n.locale = old_locale
   end
 

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

@@ -44,7 +44,7 @@ class Middleman::Extensions::Lorem < ::Middleman::Extension
   module LoremObject
     class << self
       # Words for use in lorem text
-      WORDS = %w(alias consequatur aut perferendis sit voluptatem accusantium doloremque aperiam eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo aspernatur aut odit aut fugit sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt neque dolorem ipsum quia dolor sit amet consectetur adipisci velit sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem ut enim ad minima veniam quis nostrum exercitationem ullam corporis nemo enim ipsam voluptatem quia voluptas sit suscipit laboriosam nisi ut aliquid ex ea commodi consequatur quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae et iusto odio dignissimos ducimus qui blanditiis praesentium laudantium totam rem voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident sed ut perspiciatis unde omnis iste natus error similique sunt in culpa qui officia deserunt mollitia animi id est laborum et dolorum fuga et harum quidem rerum facilis est et expedita distinctio nam libero tempore cum soluta nobis est eligendi optio cumque nihil impedit quo porro quisquam est qui minus id quod maxime placeat facere possimus omnis voluptas assumenda est omnis dolor repellendus temporibus autem quibusdam et aut consequatur vel illum qui dolorem eum fugiat quo voluptas nulla pariatur at vero eos et accusamus officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae itaque earum rerum hic tenetur a sapiente delectus ut aut reiciendis voluptatibus maiores doloribus asperiores repellat)
+      WORDS = %w(alias consequatur aut perferendis sit voluptatem accusantium doloremque aperiam eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo aspernatur aut odit aut fugit sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt neque dolorem ipsum quia dolor sit amet consectetur adipisci velit sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem ut enim ad minima veniam quis nostrum exercitationem ullam corporis nemo enim ipsam voluptatem quia voluptas sit suscipit laboriosam nisi ut aliquid ex ea commodi consequatur quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae et iusto odio dignissimos ducimus qui blanditiis praesentium laudantium totam rem voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident sed ut perspiciatis unde omnis iste natus error similique sunt in culpa qui officia deserunt mollitia animi id est laborum et dolorum fuga et harum quidem rerum facilis est et expedita distinctio nam libero tempore cum soluta nobis est eligendi optio cumque nihil impedit quo porro quisquam est qui minus id quod maxime placeat facere possimus omnis voluptas assumenda est omnis dolor repellendus temporibus autem quibusdam et aut consequatur vel illum qui dolorem eum fugiat quo voluptas nulla pariatur at vero eos et accusamus officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae itaque earum rerum hic tenetur a sapiente delectus ut aut reiciendis voluptatibus maiores doloribus asperiores repellat).freeze
 
       # Get one placeholder word
       # @return [String]

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

@@ -36,11 +36,11 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
     # Init
     # @param [Class] app
     # @param [Hash] options
-    Contract RespondTo[:call], ({
+    Contract RespondTo[:call], {
       ignore: ArrayOf[PATH_MATCHER],
       inline: Bool,
       compressor: Or[Proc, RespondTo[:to_proc], RespondTo[:compress]]
-    }) => Any
+    } => Any
     def initialize(app, options={})
       @app = app
       @ignore = options.fetch(:ignore)

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

@@ -28,11 +28,11 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
     # Init
     # @param [Class] app
     # @param [Hash] options
-    Contract RespondTo[:call], ({
+    Contract RespondTo[:call], {
       ignore: ArrayOf[PATH_MATCHER],
       inline: Bool,
       compressor: Or[Proc, RespondTo[:to_proc], RespondTo[:compress]]
-    }) => Any
+    } => Any
     def initialize(app, options={})
       @app = app
       @ignore = options.fetch(:ignore)

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

@@ -10,18 +10,12 @@ class Middleman::Extensions::RelativeAssets < ::Middleman::Extension
   def initialize(app, options_hash={}, &block)
     super
 
-    require 'middleman-core/middleware/inline_url_rewriter'
-  end
-
-  def ready
-    app.use ::Middleman::Middleware::InlineURLRewriter,
-            id: :asset_hash,
-            url_extensions: options.exts,
-            source_extensions: options.sources,
-            ignore: options.ignore,
-            rewrite_ignore: options.rewrite_ignore,
-            middleman_app: app,
-            proc: method(:rewrite_url)
+    app.rewrite_inline_urls id: :asset_hash,
+                            url_extensions: options.exts,
+                            source_extensions: options.sources,
+                            ignore: options.ignore,
+                            rewrite_ignore: options.rewrite_ignore,
+                            proc: method(:rewrite_url)
   end
 
   helpers do

data/lib/middleman-core/preview_server.rb

@@ -163,14 +163,16 @@ module Middleman
                                   path: root,
                                   only: match_against
 
-            # Hack around node_modules in root.
-            watcher.listener.ignore(/^node_modules/)
+            unless config[:watcher_disable]
+              # Hack around node_modules in root.
+              watcher.listener.ignore(/^node_modules/)
 
-            # Hack around sass cache in root.
-            watcher.listener.ignore(/^\.sass-cache/)
+              # Hack around sass cache in root.
+              watcher.listener.ignore(/^\.sass-cache/)
 
-            # Hack around bundler cache in root.
-            watcher.listener.ignore(/^vendor\/bundle/)
+              # Hack around bundler cache in root.
+              watcher.listener.ignore(/^vendor\/bundle/)
+            end
           end
         end
 
@@ -247,10 +249,10 @@ module Middleman
           end
         end
 
-        if is_logging
-          http_opts[:Logger] = FilteredWebrickLog.new
+        http_opts[:Logger] = if is_logging
+          FilteredWebrickLog.new
         else
-          http_opts[:Logger] = ::WEBrick::Log.new(nil, 0)
+          ::WEBrick::Log.new(nil, 0)
         end
 
         begin

data/lib/middleman-core/preview_server/server_hostname.rb

@@ -10,7 +10,7 @@ module Middleman
           true
         end
 
-        alias_method :to_browser, :to_s
+        alias to_browser to_s
       end
 
       class ServerPlainHostname < SimpleDelegator
@@ -24,7 +24,7 @@ module Middleman
           # rubocop:enable Style/CaseEquality
         end
 
-        alias_method :to_browser, :to_s
+        alias to_browser to_s
       end
 
       def self.new(string)

data/lib/middleman-core/rack.rb

@@ -138,7 +138,7 @@ module Middleman
       response[1]['Content-Encoding'] = 'gzip' if %w(.svgz .gz).include?(resource.ext)
       # Do not set Content-Type if status is 1xx, 204, 205 or 304, otherwise
       # Rack will throw an error (500)
-      if !(100..199).include?(status) && ![204, 205, 304].include?(status)
+      if !(100..199).cover?(status) && ![204, 205, 304].include?(status)
         response[1]['Content-Type'] = resource.content_type || 'application/octet-stream'
       end
       halt response