middleman-core 4.0.0.alpha.6 → 4.0.0.beta.1

data/lib/middleman-core/extension.rb

@@ -1,3 +1,4 @@
+require 'forwardable'
 require 'active_support/core_ext/class/attribute'
 require 'middleman-core/configuration'
 require 'middleman-core/contracts'
@@ -81,6 +82,30 @@ module Middleman
     #   @return [Array<Module>] a list of all the helper modules this extension provides. Set these using {#helpers}.
     class_attribute :defined_helpers, instance_reader: false, instance_writer: false
 
+    # @!attribute exposed_to_application
+    #   @!scope class
+    #   @api private
+    #   @return [Hash<Symbol, Symbol>] a list of all the methods modules this extension exposes to app. Set these using {#expose_to_application}.
+    class_attribute :exposed_to_application, instance_reader: false, instance_writer: false
+
+    # @!attribute exposed_to_config
+    #   @!scope class
+    #   @api private
+    #   @return [Hash<Symbol, Symbol>] a list of all the methods modules this extension exposes to config. Set these using {#expose_to_config}.
+    class_attribute :exposed_to_config, instance_reader: false, instance_writer: false
+
+    # @!attribute exposed_to_template
+    #   @!scope class
+    #   @api private
+    #   @return [Hash<Symbol, Symbol>] a list of all the methods modules this extension exposes to templates. Set these using {#expose_to_template}.
+    class_attribute :exposed_to_template, instance_reader: false, instance_writer: false
+
+    # @!attribute exposed_to_template
+    #   @!scope class
+    #   @api private
+    #   @return [Array<Any>] a list of method generators.
+    class_attribute :resources_generators, instance_reader: false, instance_writer: false
+
     # @!attribute ext_name
     #   @!scope class
     #   @return [Symbol] the name this extension is registered under. This is the symbol used to activate the extension.
@@ -110,6 +135,19 @@ module Middleman
         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
+      # @example A generator which maps a path to a method
+      #   resources make_resource: :make_it
+      # @example A generator which maps a path to a string
+      #   resources make_resource: 'Hello'
+      # @param [Array] generators The generator definitions
+      def resources(*generators)
+        self.resources_generators ||= []
+        self.resources_generators += generators
+      end
+
       # Declare helpers to be added the global Middleman application.
       # This accepts either a list of modules to add on behalf
       # of this extension, or a block whose contents will all
@@ -137,6 +175,68 @@ module Middleman
         self.defined_helpers += modules
       end
 
+      # Takes a method within this extension and exposes it globally
+      # on the main `app` instance. Used for very low-level extensions
+      # which many other extensions depend upon. Such as Data and
+      # File watching.
+      # @example with Hash:
+      #   expose_to_application global_name: :local_name
+      # @example with Array:
+      #   expose_to_application :method1, :method2
+      # @param [Array<Sumbol>, Hash<Symbol, Symbol>] symbols An optional list of symbols representing instance methods to exposed.
+      # @return [void]
+      def expose_to_application(*symbols)
+        self.exposed_to_application ||= {}
+
+        if symbols.first && symbols.first.is_a?(Hash)
+          self.exposed_to_application.merge!(symbols.first)
+        elsif symbols.is_a? Array
+          symbols.each do |sym|
+            self.exposed_to_application[sym] = sym
+          end
+        end
+      end
+
+      # Takes a method within this extension and exposes it inside the scope
+      # of the config.rb sandbox.
+      # @example with Hash:
+      #   expose_to_config global_name: :local_name
+      # @example with Array:
+      #   expose_to_config :method1, :method2
+      # @param [Array<Sumbol>, Hash<Symbol, Symbol>] symbols An optional list of symbols representing instance methods to exposed.
+      # @return [void]
+      def expose_to_config(*symbols)
+        self.exposed_to_config ||= {}
+
+        if symbols.first && symbols.first.is_a?(Hash)
+          self.exposed_to_config.merge!(symbols.first)
+        elsif symbols.is_a? Array
+          symbols.each do |sym|
+            self.exposed_to_config[sym] = sym
+          end
+        end
+      end
+
+      # Takes a method within this extension and exposes it inside the scope
+      # of the templating engine. Like `helpers`, but scoped.
+      # @example with Hash:
+      #   expose_to_template global_name: :local_name
+      # @example with Array:
+      #   expose_to_template :method1, :method2
+      # @param [Array<Sumbol>, Hash<Symbol, Symbol>] symbols An optional list of symbols representing instance methods to exposed.
+      # @return [void]
+      def expose_to_template(*symbols)
+        self.exposed_to_template ||= {}
+
+        if symbols.first && symbols.first.is_a?(Hash)
+          self.exposed_to_template.merge!(symbols.first)
+        elsif symbols.is_a? Array
+          symbols.each do |sym|
+            self.exposed_to_template[sym] = sym
+          end
+        end
+      end
+
       # Reset all {Extension.after_extension_activated} callbacks.
       # @api private
       # @return [void]
@@ -190,6 +290,7 @@ module Middleman
       @_helpers = []
       @app = app
 
+      expose_methods
       setup_options(options_hash, &block)
 
       # Bind app hooks to local methods
@@ -197,6 +298,7 @@ module Middleman
       bind_after_configuration
       bind_before_build
       bind_after_build
+      bind_ready
     end
 
     # @!method before_configuration
@@ -216,6 +318,10 @@ module Middleman
     #   Respond to the `after_build` event.
     #   If an `after_build` method is implemented, that method will be run after the builder runs.
 
+    # @!method ready
+    #   Respond to the `ready` event.
+    #   If an `ready` method is implemented, that method will be run after the app has finished booting up.
+
     # @!method manipulate_resource_list(resources)
     #   Manipulate the resource list by transforming or adding {Sitemap::Resource}s.
     #   Sitemap manipulation is a powerful way of interacting with a project, since it can modify each {Sitemap::Resource} or generate new {Sitemap::Resources}. This method is used in a pipeline where each sitemap manipulator is run in turn, with each one being fed the output of the previous manipulator. See the source of built-in Middleman extensions like {Middleman::Extensions::DirectoryIndexes} and {Middleman::Extensions::AssetHash} for examples of how to use this.
@@ -226,8 +332,28 @@ module Middleman
     #   @param [Array<Sitemap::Resource>] resources A list of all the resources known to the sitemap.
     #   @return [Array<Sitemap::Resource>] The transformed list of resources.
 
+    def add_exposed_to_context(context)
+      (self.class.exposed_to_template || {}).each do |k, v|
+        context.define_singleton_method(k, &method(v))
+      end
+    end
+
     private
 
+    def expose_methods
+      (self.class.exposed_to_application || {}).each do |k, v|
+        app.define_singleton_method(k, &method(v))
+      end
+
+      (self.class.exposed_to_config || {}).each do |k, v|
+        app.config_context.define_singleton_method(k, &method(v))
+      end
+
+      (self.class.defined_helpers || []).each do |m|
+        app.template_context_class.send(:include, m)
+      end
+    end
+
     # @yield An optional block that can be used to customize options before the extension is activated.
     # @yieldparam Middleman::Configuration::ConfigurationManager] options Extension options
     def setup_options(options_hash)
@@ -260,6 +386,53 @@ module Middleman
         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)
         end
+
+        if ext.class.resources_generators && !ext.class.resources_generators.empty?
+          ext.app.sitemap.register_resource_list_manipulator(
+            :"#{ext.class.ext_name}_generator",
+            ext,
+            ext.class.resource_list_manipulator_priority,
+            :generate_resources
+          )
+        end
+      end
+    end
+
+    def generate_resources(resources)
+      generator_defs = self.class.resources_generators.reduce({}) do |sum, g|
+        resource_definitions = if g.is_a? Hash
+          g
+        elsif g.is_a? Symbol
+          definition = method(g)
+
+          if definition.arity == 0
+            send(g)
+          else
+            send(g, resources)
+          end
+        else
+          {}
+        end
+
+        sum.merge(resource_definitions)
+      end
+
+      resources + generator_defs.map do |path, g|
+        if g.is_a? Symbol
+          definition = method(g)
+
+          g = if definition.arity == 0
+            send(g)
+          else
+            send(g, resources)
+          end
+        end
+
+        ::Middleman::Sitemap::StringResource.new(
+          app.sitemap,
+          path,
+          g
+        )
       end
     end
 
@@ -283,10 +456,16 @@ module Middleman
       @app.after_build do |builder|
         if ext.method(:after_build).arity == 1
           ext.after_build(builder)
+        elsif ext.method(:after_build).arity == 2
+          ext.after_build(builder, builder.thor)
         else
           ext.after_build
         end
       end
     end
+
+    def bind_ready
+      @app.ready(&method(:ready)) if respond_to?(:ready)
+    end
   end
 end

data/lib/middleman-core/extension_manager.rb

@@ -55,7 +55,7 @@ module Middleman
 
     def activate_all
       logger.debug 'Loaded extensions:'
-      instances = @activated.each_with_object([]) do |(ext_name, ext), sum|
+      @instances = @activated.each_with_object([]) do |(ext_name, ext), sum|
         if ext.is_a?(Hash)
           ext.each do |instance_key, instance|
             logger.debug "== Extension: #{ext_name} #{instance_key}"
@@ -67,14 +67,15 @@ module Middleman
         end
       end
 
-      instances.each do |ext|
-        # Forward Extension helpers to TemplateContext
-        Array(ext.class.defined_helpers).each do |m|
-          @app.template_context_class.send(:include, m)
-        end
-
+      @instances.each do |ext|
         ::Middleman::Extension.activated_extension(ext)
       end
     end
+
+    def add_exposed_to_context(context)
+      @instances.each do |ext|
+        ext.add_exposed_to_context(context)
+      end
+    end
   end
 end

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

@@ -1,7 +1,8 @@
+require 'addressable/uri'
 require 'middleman-core/util'
 
 class Middleman::Extensions::AssetHash < ::Middleman::Extension
-  option :exts, %w(.jpg .jpeg .png .gif .webp .js .css .otf .woff .eot .ttf .svg), 'List of extensions that get asset hashes appended to them.'
+  option :exts, %w(.jpg .jpeg .png .gif .webp .js .css .otf .woff .woff2 .eot .ttf .svg), 'List of extensions that get asset hashes appended to them.'
   option :ignore, [], 'Regexes of filenames to skip adding asset hashes to'
 
   def initialize(app, options_hash={}, &block)
@@ -9,7 +10,6 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
 
     require 'digest/sha1'
     require 'rack/mock'
-    require 'uri'
     require 'middleman-core/middleware/inline_url_rewriter'
   end
 
@@ -28,7 +28,8 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
 
   Contract String, Or[String, Pathname], Any => Maybe[String]
   def rewrite_url(asset_path, dirpath, _request_path)
-    relative_path = Pathname.new(asset_path).relative?
+    uri = ::Addressable::URI.parse(asset_path)
+    relative_path = uri.path[0..0] != '/'
 
     full_asset_path = if relative_path
       dirpath.join(asset_path).to_s
@@ -36,10 +37,11 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
       asset_path
     end
 
-    return unless asset_page = app.sitemap.find_resource_by_path(full_asset_path)
+    return unless asset_page = app.sitemap.find_resource_by_destination_path(full_asset_path) || app.sitemap.find_resource_by_path(full_asset_path)
 
     replacement_path = "/#{asset_page.destination_path}"
     replacement_path = Pathname.new(replacement_path).relative_path_from(dirpath).to_s if relative_path
+
     replacement_path
   end
 
@@ -56,7 +58,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
     # This is so by the time we get around to the text files (which may reference
     # images and fonts) the static assets' hashes are already calculated.
     resources.sort_by do |a|
-      if %w(.svg).include? a.ext
+      if %w(.svg .svgz).include? a.ext
         0
       elsif %w(.js .css).include? a.ext
         1
@@ -73,9 +75,10 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
     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'
-                                )
+    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
 
@@ -87,6 +90,8 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
 
   Contract IsA['Middleman::Sitemap::Resource'] => Bool
   def ignored_resource?(resource)
-    @ignore.any? { |ignore| Middleman::Util.path_match(ignore, resource.destination_path) }
+    @ignore.any? do |ignore|
+      Middleman::Util.path_match(ignore, resource.destination_path)
+    end
   end
 end

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

@@ -1,3 +1,4 @@
+require 'addressable/uri'
 require 'middleman-core/middleware/inline_url_rewriter'
 
 class Middleman::Extensions::AssetHost < ::Middleman::Extension
@@ -18,7 +19,8 @@ class Middleman::Extensions::AssetHost < ::Middleman::Extension
 
   Contract String, Or[String, Pathname], Any => String
   def rewrite_url(asset_path, dirpath, _request_path)
-    relative_path = Pathname.new(asset_path).relative?
+    uri = ::Addressable::URI.parse(asset_path)
+    relative_path = uri.path[0..0] != '/'
 
     full_asset_path = if relative_path
       dirpath.join(asset_path).to_s

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

@@ -12,6 +12,7 @@
 class Middleman::Extensions::Gzip < ::Middleman::Extension
   option :exts, %w(.js .css .html .htm), 'File extensions to Gzip when building.'
   option :ignore, [], 'Patterns to avoid gzipping'
+  option :overwrite, false, 'Overwrite original files instead of adding .gz extension.'
 
   class NumberHelpers
     include ::Padrino::Helpers::NumberHelpers
@@ -73,11 +74,11 @@ class Middleman::Extensions::Gzip < ::Middleman::Extension
   Contract String => [Maybe[String], Maybe[Num], Maybe[Num]]
   def gzip_file(path)
     input_file = File.open(path, 'rb').read
-    output_filename = path + '.gz'
+    output_filename = options.overwrite ? path : path + '.gz'
     input_file_time = File.mtime(path)
 
     # Check if the right file's already there
-    if File.exist?(output_filename) && File.mtime(output_filename) == input_file_time
+    if !options.overwrite && File.exist?(output_filename) && File.mtime(output_filename) == input_file_time
       return [nil, nil, nil]
     end
 

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

@@ -152,8 +152,8 @@ class Middleman::Extensions::Lorem < ::Middleman::Extension
         color            = options[:color]
 
         if options[:random_color]
-          background_color = hex.shuffle[0...6].join
-          color = hex.shuffle[0...6].join
+          background_color = hex.sample(6).join
+          color = hex.sample(6).join
         end
 
         src << "/#{background_color.sub(/^#/, '')}" if background_color

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

@@ -1,6 +1,8 @@
+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), 'List of extensions that get cache busters strings appended to them.'
+  option :exts, %w(.css .png .jpg .jpeg .webp .svg .svgz .js .gif .ttf .otf .woff .woff2), '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 :ignore, [], 'Regexes of filenames to skip adding query strings to'
 
@@ -22,7 +24,11 @@ class Middleman::Extensions::RelativeAssets < ::Middleman::Extension
 
   Contract String, Or[String, Pathname], Any => Maybe[String]
   def rewrite_url(asset_path, dirpath, request_path)
-    relative_path = Pathname.new(asset_path).relative?
+    uri = ::Addressable::URI.parse(asset_path)
+
+    return if uri.path[0..0] != '/'
+
+    relative_path = uri.host.nil?
 
     full_asset_path = if relative_path
       dirpath.join(asset_path).to_s
@@ -30,9 +36,9 @@ class Middleman::Extensions::RelativeAssets < ::Middleman::Extension
       asset_path
     end
 
-    return unless !full_asset_path.include?('//') && !asset_path.start_with?('data:')
-
     current_dir = Pathname(request_path).dirname
-    Pathname(full_asset_path).relative_path_from(current_dir).to_s
+    result = Pathname(full_asset_path).relative_path_from(current_dir).to_s
+
+    result
   end
 end

data/lib/middleman-core/file_renderer.rb

@@ -28,7 +28,7 @@ module Middleman
     # @param [Hash] opts
     # @param [Class] context
     # @return [String]
-    Contract Hash, Hash, Any, Proc => String
+    Contract Hash, Hash, Any, Maybe[Proc] => String
     def render(locs={}, opts={}, context, &block)
       path = @path.dup
 
@@ -102,7 +102,7 @@ module Middleman
     # Get the template data from a path
     # @param [String] path
     # @return [String]
-    Contract None => String
+    Contract String
     def template_data_for_file
       if @app.extensions[:front_matter]
         @app.extensions[:front_matter].template_data_for_file(@path) || ''

data/lib/middleman-core/logger.rb

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

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

@@ -1,7 +1,8 @@
-require 'middleman-core/util'
-require 'middleman-core/contracts'
 require 'rack'
 require 'rack/response'
+require 'addressable/uri'
+require 'middleman-core/util'
+require 'middleman-core/contracts'
 
 module Middleman
   module Middleware
@@ -51,10 +52,13 @@ module Middleman
 
         if path =~ /(^\/$)|(#{@source_exts_regex_text}$)/
           if body = ::Middleman::Util.extract_response_text(response)
+
             dirpath = Pathname.new(File.dirname(path))
 
             rewritten = ::Middleman::Util.rewrite_paths(body, path, @exts) do |asset_path|
-              relative_path = Pathname.new(asset_path).relative?
+              uri = ::Addressable::URI.parse(asset_path)
+
+              relative_path = uri.host.nil?
 
               full_asset_path = if relative_path
                 dirpath.join(asset_path).to_s
@@ -76,7 +80,7 @@ module Middleman
         [status, headers, response]
       end
 
-      Contract IGNORE_DESCRIPTOR => Bool
+      Contract IGNORE_DESCRIPTOR, String => Bool
       def should_ignore?(validator, value)
         if validator.is_a? Regexp
           # Treat as Regexp
@@ -89,6 +93,7 @@ module Middleman
           File.fnmatch(value, validator)
         else
           # If some unknown thing, don't ignore
+          false
         end
       end
     end

data/lib/middleman-core/preview_server.rb

@@ -6,8 +6,6 @@ require 'middleman-core/rack'
 # rubocop:disable GlobalVars
 module Middleman
   module PreviewServer
-    DEFAULT_PORT = 4567
-
     class << self
       extend Forwardable
 
@@ -17,9 +15,7 @@ module Middleman
       # Start an instance of Middleman::Application
       # @return [void]
       def start(opts={})
-        @options = opts.dup.freeze
-        @host = @options[:host] || '0.0.0.0'
-        @port = @options[:port] || DEFAULT_PORT
+        @options = opts
 
         mount_instance(new_app)
         logger.info "== The Middleman is standing watch at #{uri}"
@@ -75,6 +71,10 @@ module Middleman
         end
 
         unmount_instance
+
+        @webrick.shutdown
+        @webrick = nil
+
         mount_instance(app)
 
         logger.info '== The Middleman has reloaded'
@@ -90,7 +90,7 @@ module Middleman
       private
 
       def new_app
-        opts = @options
+        opts = @options.dup
 
         ::Middleman::Logger.singleton(
           opts[:debug] ? 0 : 1,
@@ -103,6 +103,9 @@ module Middleman
           config[:watcher_force_polling] = opts[:force_polling]
           config[:watcher_latency] = opts[:latency]
 
+          config[:host] = opts[:host] if opts[:host]
+          config[:port] = opts[:port] if opts[:port]
+
           ready do
             match_against = [
               %r{^config\.rb$},
@@ -114,12 +117,13 @@ module Middleman
             # config.rb
             files.watch :reload,
                         path: root,
-                        ignored: proc { |file|
-                          match_against.none? { |m| file[:relative_path].to_s.match(m) }
-                        }
+                        only: match_against
           end
         end
 
+        @host = app.config[:host]
+        @port = app.config[:port]
+
         app.files.on_change :reload do
           $mm_reload = true
           @webrick.stop

data/lib/middleman-core/rack.rb

@@ -82,6 +82,7 @@ module Middleman
         request_path.force_encoding('UTF-8')
       end
       request_path = ::Middleman::Util.full_path(request_path, @middleman)
+      full_request_path = File.join(env['SCRIPT_NAME'], request_path) # Path including rack mount
 
       # Run before callbacks
       @middleman.run_hook :before
@@ -90,7 +91,7 @@ module Middleman
       resource = @middleman.sitemap.find_resource_by_destination_path(request_path.gsub(' ', '%20'))
 
       # Return 404 if not in sitemap
-      return not_found(res, request_path) unless resource && !resource.ignored?
+      return not_found(res, full_request_path) unless resource && !resource.ignored?
 
       # If this path is a binary file, send it immediately
       return send_file(resource, env) if resource.binary?

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

@@ -48,6 +48,12 @@ module Middleman
         # Add haml helpers to context
         ::Middleman::TemplateContext.send :include, ::Haml::Helpers
       end
+
+      def add_exposed_to_context(context)
+        super
+
+        context.init_haml_helpers if context.respond_to?(:init_haml_helpers)
+      end
     end
   end
 end

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

@@ -6,7 +6,7 @@ module Middleman
     class KramdownTemplate < ::Tilt::KramdownTemplate
       def evaluate(scope, *)
         @output ||= begin
-          MiddlemanKramdownHTML.scope = ::Middleman::Renderers::Haml.last_haml_scope || scope
+          MiddlemanKramdownHTML.scope = (defined?(::Middleman::Renderers::Haml) && ::Middleman::Renderers::Haml.last_haml_scope) ? ::Middleman::Renderers::Haml.last_haml_scope : scope
 
           output, warnings = MiddlemanKramdownHTML.convert(@engine.root, @engine.options)
           @engine.warnings.concat(warnings)

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

@@ -1,4 +1,5 @@
 require 'redcarpet'
+require 'active_support/core_ext/module/attribute_accessors'
 
 module Middleman
   module Renderers

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

@@ -105,7 +105,7 @@ module Middleman
             filename: eval_file,
             line: line,
             syntax: syntax,
-            custom: { middleman_context: ctx.app }
+            custom: (options[:custom] || {}).merge(middleman_context: ctx.app)
           }
 
           if ctx.is_a?(::Middleman::TemplateContext) && file

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

@@ -24,6 +24,7 @@ module Middleman
         super
 
         # Setup Slim options to work with partials
+        ::Slim::Engine.disable_option_validator!
         ::Slim::Engine.set_options(
           buffer: '@_out_buf',
           use_html_safe: true,

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

@@ -3,12 +3,15 @@ module Middleman
     module Extensions
       # Class to handle managing ignores
       class Ignores < Extension
+        # Expose `create_ignore` as `app.ignore`
+        expose_to_application ignore: :create_ignore
+
+        # Expose `create_ignore` to config as `ignore`
+        expose_to_config ignore: :create_ignore
+
         def initialize(app, config={}, &block)
           super
 
-          @app.add_to_config_context(:ignore, &method(:create_ignore))
-          @app.define_singleton_method(:ignore, &method(:create_ignore))
-
           # Array of callbacks which can ass ignored
           @ignored_callbacks = Set.new
 
@@ -18,7 +21,7 @@ module Middleman
         # Ignore a path or add an ignore callback
         # @param [String, Regexp] path Path glob expression, or path regex
         # @return [void]
-        Contract Maybe[Or[String, Regexp]], Proc => Any
+        Contract Maybe[Or[String, Regexp]], Maybe[Proc] => Any
         def create_ignore(path=nil, &block)
           if path.is_a? Regexp
             @ignored_callbacks << proc { |p| p =~ path }