middleman-core 4.0.0.beta.2 → 4.0.0.rc.1

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

@@ -1,24 +1,18 @@
-require 'active_support/core_ext/hash/keys'
+# Core Pathname library used for traversal
 require 'pathname'
 
-# Parsing YAML frontmatter
-require 'yaml'
+# DbC
+require 'middleman-core/contracts'
+
+require 'active_support/core_ext/hash/keys'
 
-# Parsing JSON frontmatter
-require 'active_support/json'
+require 'middleman-core/util/data'
 
 # Extensions namespace
 module Middleman::CoreExtensions
   class FrontMatter < ::Middleman::Extension
     # Try to run after routing but before directory_indexes
-    self.resource_list_manipulator_priority = 90
-
-    YAML_ERRORS = [StandardError]
-
-    # https://github.com/tenderlove/psych/issues/23
-    if defined?(Psych) && defined?(Psych::SyntaxError)
-      YAML_ERRORS << Psych::SyntaxError
-    end
+    self.resource_list_manipulator_priority = 10
 
     def initialize(app, options_hash={}, &block)
       super
@@ -34,9 +28,9 @@ module Middleman::CoreExtensions
     Contract ResourceList => ResourceList
     def manipulate_resource_list(resources)
       resources.each do |resource|
-        next if resource.source_file.nil?
+        next if resource.file_descriptor.nil?
 
-        fmdata = data(resource.source_file[:full_path].to_s).first.dup
+        fmdata = data(resource.file_descriptor[:full_path].to_s).first.dup
 
         # Copy over special options
         # TODO: Should we make people put these under "options" instead of having
@@ -71,7 +65,7 @@ module Middleman::CoreExtensions
 
       return [{}, nil] unless file
 
-      @cache[file[:full_path]] ||= frontmatter_and_content(file[:full_path])
+      @cache[file[:full_path]] ||= ::Middleman::Util::Data.parse(file[:full_path])
     end
 
     Contract ArrayOf[IsA['Middleman::SourceFile']], ArrayOf[IsA['Middleman::SourceFile']] => Any
@@ -80,93 +74,5 @@ module Middleman::CoreExtensions
         @cache.delete(file[:full_path])
       end
     end
-
-    # Get the frontmatter and plain content from a file
-    # @param [String] path
-    # @return [Array<Middleman::Util::IndifferentHash, String>]
-    Contract Pathname => [Hash, Maybe[String]]
-    def frontmatter_and_content(full_path)
-      data = {}
-
-      return [data, nil] if ::Middleman::Util.binary?(full_path)
-
-      # Avoid weird race condition when a file is renamed.
-      content = begin
-        File.read(full_path)
-      rescue ::EOFError
-      rescue ::IOError
-      rescue ::Errno::ENOENT
-        ''
-      end
-
-      begin
-        if content =~ /\A.*coding:/
-          lines = content.split(/\n/)
-          lines.shift
-          content = lines.join("\n")
-        end
-
-        result = parse_yaml_front_matter(content, full_path) || parse_json_front_matter(content, full_path)
-        return result if result
-      rescue
-        # Probably a binary file, move on
-      end
-
-      [data, content]
-    end
-
-    private
-
-    # Parse YAML frontmatter out of a string
-    # @param [String] content
-    # @return [Array<Hash, String>]
-    Contract String, Pathname => Maybe[[Hash, String]]
-    def parse_yaml_front_matter(content, full_path)
-      yaml_regex = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
-      if content =~ yaml_regex
-        content = content.sub(yaml_regex, '')
-
-        begin
-          data = YAML.load($1) || {}
-          data = data.symbolize_keys
-        rescue *YAML_ERRORS => e
-          app.logger.error "YAML Exception parsing #{full_path}: #{e.message}"
-          return nil
-        end
-      else
-        return nil
-      end
-
-      [data, content]
-    rescue
-      [{}, content]
-    end
-
-    # Parse JSON frontmatter out of a string
-    # @param [String] content
-    # @return [Array<Hash, String>]
-    Contract String, Pathname => Maybe[[Hash, String]]
-    def parse_json_front_matter(content, full_path)
-      json_regex = /\A(;;;\s*\n.*?\n?)^(;;;\s*$\n?)/m
-
-      if content =~ json_regex
-        content = content.sub(json_regex, '')
-
-        begin
-          json = ($1 + $2).sub(';;;', '{').sub(';;;', '}')
-          data = ::ActiveSupport::JSON.decode(json).symbolize_keys
-        rescue => e
-          app.logger.error "JSON Exception parsing #{full_path}: #{e.message}"
-          return nil
-        end
-
-      else
-        return nil
-      end
-
-      [data, content]
-    rescue
-      [{}, content]
-    end
   end
 end

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

@@ -11,7 +11,7 @@ module Middleman::CoreExtensions
       app.config.define_setting :show_exceptions, ENV['TEST'] ? false : true, 'Whether to catch and display exceptions'
     end
 
-    def after_configuration
+    def ready
       app.use ::Rack::ShowExceptions if !app.build? && app.config[:show_exceptions]
     end
   end

data/lib/middleman-core/extension_manager.rb

@@ -3,13 +3,14 @@ module Middleman
     extend Forwardable
 
     def_delegator :@app, :logger
-    def_delegators :@activated, :[]
+    def_delegators :@activated, :[], :each
 
     def initialize(app)
       @app = app
       @activated = {}
 
       manager = self
+
       {
         before_sitemap: :before_sitemap,
         initialized: :before_configuration

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

@@ -1,5 +1,6 @@
 require 'addressable/uri'
 require 'middleman-core/util'
+require 'middleman-core/rack'
 
 class Middleman::Extensions::AssetHash < ::Middleman::Extension
   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.'
@@ -16,7 +17,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
   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,

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

@@ -7,7 +7,7 @@ class Middleman::Extensions::AssetHost < ::Middleman::Extension
   option :sources, %w(.htm .html .php .css .js), 'List of extensions that are searched for bustable assets.'
   option :ignore, [], 'Regexes of filenames to skip adding query strings to'
 
-  def after_configuration
+  def ready
     app.use ::Middleman::Middleware::InlineURLRewriter,
             id: :asset_host,
             url_extensions: options.exts,

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

@@ -16,7 +16,7 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
                     latency: options[:latency]
   end
 
-  def after_configuration
+  def ready
     if app.build?
       logger.info "== Executing: `#{options[:command]}`"
       watch_command!
@@ -33,5 +33,8 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
         logger.info "== External: #{without_newline}" if without_newline.length > 0
       end
     end
+  rescue ::Errno::ENOENT => e
+    logger.error "== External: Command failed with message: #{e.message}"
+    exit(1)
   end
 end

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

@@ -9,7 +9,7 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
     SassCompressor
   }, 'Set the CSS compressor to use.'
 
-  def after_configuration
+  def ready
     # Setup Rack middleware to minify CSS
     app.use Rack, compressor: options[:compressor],
                   ignore: Array(options[:ignore]) + [/\.min\./],

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

@@ -9,7 +9,7 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
     ::Uglifier.new
   }, 'Set the JS compressor to use.'
 
-  def after_configuration
+  def ready
     # Setup Rack middleware to minify CSS
     app.use Rack, compressor: options[:compressor],
                   ignore: Array(options[:ignore]) + [/\.min\./],

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

@@ -12,7 +12,7 @@ class Middleman::Extensions::RelativeAssets < ::Middleman::Extension
     require 'middleman-core/middleware/inline_url_rewriter'
   end
 
-  def after_configuration
+  def ready
     app.use ::Middleman::Middleware::InlineURLRewriter,
             id: :asset_hash,
             url_extensions: options.exts,

data/lib/middleman-core/extensions.rb

@@ -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.flat_map(&:name)
+        @auto_activate.values.map(&:to_a).flatten.map(&:name)
       end
 
       # @api private

data/lib/middleman-core/file_renderer.rb

@@ -53,6 +53,7 @@ module Middleman
       extension = File.extname(path)
       options = opts.merge(options_for_ext(extension))
       options[:outvar] ||= '@_out_buf'
+      options[:context] = context
       options.delete(:layout)
 
       # Overwrite with frontmatter options
@@ -66,9 +67,10 @@ module Middleman
       end
 
       # Read compiled template from disk or cache
-      template = cache.fetch(:compiled_template, extension, options, body) do
-        ::Tilt.new(path, 1, options) { body }
-      end
+      template = ::Tilt.new(path, 1, options) { body }
+      # template = cache.fetch(:compiled_template, extension, options, body) do
+      #   ::Tilt.new(path, 1, options) { body }
+      # end
 
       # Render using Tilt
       content = ::Middleman::Util.instrument 'render.tilt', path: path do
@@ -76,7 +78,7 @@ module Middleman
       end
 
       # Allow hooks to manipulate the result after render
-      content = @app.callbacks_for(:before_render).reduce(content) do |sum, callback|
+      content = @app.callbacks_for(:after_render).reduce(content) do |sum, callback|
         callback.call(sum, path, locs, template_class) || sum
       end
 

data/lib/middleman-core/meta_pages/sitemap_resource.rb

@@ -39,7 +39,7 @@ module Middleman
         build_path = 'Not built' if ignored?
         props['Build Path'] = build_path if @resource.path != build_path
         props['URL'] = content_tag(:a, @resource.url, href: @resource.url) unless ignored?
-        props['Source File'] = @resource.source_file ? @resource.source_file[:full_path].to_s.sub(/^#{Regexp.escape(ENV['MM_ROOT'] + '/')}/, '') : 'Dynamic'
+        props['Source File'] = @resource.file_descriptor ? @resource.file_descriptor[:full_path].to_s.sub(/^#{Regexp.escape(ENV['MM_ROOT'] + '/')}/, '') : 'Dynamic'
 
         data = @resource.data
         props['Data'] = data.inspect unless data.empty?

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

@@ -29,22 +29,22 @@
 
     <h2 id="extensions">Extensions</h2>
     <ul class="extensions">
-      <% extension_config.each do |ext_name, configs| %>
-      <li>
-        <% registered_extensions.delete(ext_name) %>
-
-        <span class="extension active">:<%= ext_name %></span>
-
-
-        <% if configs && !configs.empty? %>
-        <ul class="settings">
-          <% configs.each do |setting| %>
-          <li class="setting"><%= setting.render %></li>
+      <% [extension_config, auto_activated_config].each do |extensions| %>
+        <% extensions.each do |ext_name, configs| %>
+        <li>
+          <% registered_extensions.delete(ext_name) %>
+
+          <span class="extension active">:<%= ext_name %></span>
+
+          <% if configs && !configs.empty? %>
+          <ul class="settings">
+            <% configs.each do |setting| %>
+            <li class="setting"><%= setting.render %></li>
+            <% end %>
+          </ul>
           <% end %>
-        </ul>
+        </li>
         <% end %>
-      </li>
-
       <% end %>
 
       <% registered_extensions.keys.each do |ext_name| %>

data/lib/middleman-core/meta_pages.rb

@@ -61,9 +61,13 @@ module Middleman
       def config(_)
         global_config = @middleman.config.all_settings.map { |c| ConfigSetting.new(c) }
         extension_config = {}
+        auto_activated_config = {}
 
         @middleman.extensions.each do |ext_name, extension|
-          next if ::Middleman::Extension.auto_activated.include? ext_name
+          if ::Middleman::Extensions.auto_activated.include? ext_name
+            auto_activated_config[ext_name] = extension_options(extension)
+            next
+          end
 
           if extension.is_a?(Hash)
             # Multiple instance extension
@@ -82,6 +86,7 @@ module Middleman
         template('config.html.erb',
                  global_config: global_config,
                  extension_config: extension_config,
+                 auto_activated_config: auto_activated_config,
                  registered_extensions: Middleman::Extensions.registered.dup)
       end
 

data/lib/middleman-core/preview_server.rb

@@ -1,6 +1,7 @@
 require 'webrick'
 require 'webrick/https'
 require 'openssl'
+require 'socket'
 require 'middleman-core/meta_pages'
 require 'middleman-core/logger'
 require 'middleman-core/rack'
@@ -123,9 +124,18 @@ module Middleman
             ]
 
             # config.rb
-            files.watch :reload,
+            watcher = files.watch :reload,
                         path: root,
                         only: match_against
+
+            # Hack around node_modules in root.
+            watcher.listener.ignore(/^node_modules/)
+
+            # Hack around sass cache in root.
+            watcher.listener.ignore(/^\.sass-cache/)
+
+            # Hack around bundler cache in root.
+            watcher.listener.ignore(/^vendor\/bundle/)
           end
         end
 
@@ -200,7 +210,7 @@ module Middleman
         begin
           ::WEBrick::HTTPServer.new(http_opts)
         rescue Errno::EADDRINUSE
-          logger.error "== Port #{port} is unavailable. Either close the instance of Middleman already running on #{port} or start this Middleman on a new port with: --port=#{port.to_i + 1}"
+          logger.error "== Port #{port} is unavailable. Either close the instance of Middleman already running on #{port} or start this Middleman on a new port with: --port=#{unused_tcp_port}"
           exit(1)
         end
       end
@@ -234,6 +244,15 @@ module Middleman
         scheme = https? ? 'https' : 'http'
         URI("#{scheme}://#{host}:#{@port}")
       end
+
+      # Returns unused TCP port
+      # @return [Fixnum]
+      def unused_tcp_port
+        server = TCPServer.open(0)
+        port = server.addr[1]
+        server.close
+        port
+      end
     end
 
     class FilteredWebrickLog < ::WEBrick::Log

data/lib/middleman-core/rack.rb

@@ -4,6 +4,7 @@ require 'rack/lint'
 require 'rack/head'
 
 require 'middleman-core/util'
+require 'middleman-core/logger'
 require 'middleman-core/template_renderer'
 
 # CSSPIE HTC File
@@ -73,8 +74,9 @@ module Middleman
     # message.
     #
     # @param env
+    # @param [Rack::Request] req
     # @param [Rack::Response] res
-    def process_request(env, _, res)
+    def process_request(env, req, res)
       start_time = Time.now
 
       request_path = URI.decode(env['PATH_INFO'].dup)
@@ -100,7 +102,7 @@ module Middleman
 
       begin
         # Write out the contents of the page
-        res.write resource.render
+        res.write resource.render({}, { rack: { request: req } })
 
         # Valid content is a 200 status
         res.status = 200
@@ -124,7 +126,7 @@ module Middleman
     # Immediately send static file
     def send_file(resource, env)
       file      = ::Rack::File.new nil
-      file.path = resource.source_file[:full_path]
+      file.path = resource.file_descriptor[:full_path]
       response = file.serving(env)
       status = response[0]
       response[1]['Content-Encoding'] = 'gzip' if %w(.svgz .gz).include?(resource.ext)

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

@@ -20,29 +20,45 @@ module Middleman
     # thus making it impossible to pass our Middleman instance
     # in. So we have to resort to heavy hackery :(
     class HamlTemplate < ::Tilt::HamlTemplate
+      def initialize(*args, &block)
+        super
+
+        @context = @options[:context] if @options.key?(:context)
+      end
+
       def prepare
       end
 
       def evaluate(scope, locals, &block)
-        ::Middleman::Renderers::Haml.last_haml_scope = scope
-
-        options = @options.merge(filename: eval_file, line: line)
+        options = @options.merge(filename: eval_file, line: line, context: @context || scope)
         @engine = ::Haml::Engine.new(data, options)
         output = @engine.render(scope, locals, &block)
 
-        ::Middleman::Renderers::Haml.last_haml_scope = nil
-
         output
       end
     end
 
     # Haml Renderer
     class Haml < ::Middleman::Extension
-      cattr_accessor :last_haml_scope
 
       def initialize(app, options={}, &block)
         super
 
+        ::Haml::Options.defaults[:context] = nil
+        ::Haml::Options.send :attr_accessor, :context
+
+        [::Haml::Filters::Sass, ::Haml::Filters::Scss, ::Haml::Filters::Markdown].each do |f|
+          f.class_exec do
+            def self.render_with_options(text, compiler_options)
+              modified_options = options.dup
+              modified_options[:context] = compiler_options[:context]
+
+              text = template_class.new(nil, 1, modified_options) {text}.render
+              super(text, compiler_options)
+            end
+          end
+        end
+
         ::Tilt.prefer(::Middleman::Renderers::HamlTemplate, :haml)
 
         # Add haml helpers to context

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

@@ -4,10 +4,16 @@ module Middleman
   module Renderers
     # Our own Kramdown Tilt template that simply uses our custom renderer.
     class KramdownTemplate < ::Tilt::KramdownTemplate
-      def evaluate(scope, *)
-        @output ||= begin
-          MiddlemanKramdownHTML.scope = (defined?(::Middleman::Renderers::Haml) && ::Middleman::Renderers::Haml.last_haml_scope) ? ::Middleman::Renderers::Haml.last_haml_scope : scope
+      def initialize(*args, &block)
+        super
+
+        @context = @options[:context] if @options.key?(:context)
+      end
 
+      def evaluate(context, *)
+        MiddlemanKramdownHTML.scope = @context || context
+
+        @output ||= begin
           output, warnings = MiddlemanKramdownHTML.convert(@engine.root, @engine.options)
           @engine.warnings.concat(warnings)
           output
@@ -38,6 +44,7 @@ module Middleman
 
         attr = el.attr.dup
         link = attr.delete('href')
+
         scope.link_to(content, link, attr)
       end
     end

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

@@ -23,11 +23,30 @@ module Middleman
         return resources unless app.extensions[:data]
 
         resources.each do |resource|
-          next if resource.source_file.nil?
-          next unless resource.source_file[:relative_path].to_s =~ %r{\.liquid$}
+          next if resource.file_descriptor.nil?
+          next unless resource.file_descriptor[:relative_path].to_s =~ %r{\.liquid$}
 
           # Convert data object into a hash for liquid
-          resource.add_metadata locals: { data: app.extensions[:data].data_store.to_h }
+          resource.add_metadata locals: {
+            data: stringify_recursive(app.extensions[:data].data_store.to_h)
+          }
+        end
+      end
+
+      def stringify_recursive(hash)
+        {}.tap do |h|
+          hash.each { |key, value| h[key.to_s] = map_value(value) }
+        end
+      end
+
+      def map_value(thing)
+        case thing
+        when Hash
+          stringify_recursive(thing)
+        when Array
+          thing.map { |v| map_value(v) }
+        else
+          thing
         end
       end
     end

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

@@ -10,6 +10,12 @@ module Middleman
         escape_html: :filter_html
       }
 
+      def initialize(*args, &block)
+        super
+
+        @context = @options[:context] if @options.key?(:context)
+      end
+
       # Overwrite built-in Tilt version.
       # Don't overload :renderer option with smartypants
       # Support renderer-level options
@@ -40,11 +46,7 @@ module Middleman
 
       def evaluate(scope, _)
         @output ||= begin
-          if defined?(::Middleman::Renderers::Haml)
-            MiddlemanRedcarpetHTML.scope = ::Middleman::Renderers::Haml.last_haml_scope || scope
-          else
-            MiddlemanRedcarpetHTML.scope = scope
-          end
+          MiddlemanRedcarpetHTML.scope = @context || scope
 
           @engine.render(data)
         end

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

@@ -94,11 +94,7 @@ module Middleman
         # Change Sass path, for url functions, to the build folder if we're building
         # @return [Hash]
         def sass_options
-          ctx = if defined?(::Middleman::Renderers::Haml)
-            ::Middleman::Renderers::Haml.last_haml_scope || @context
-          else
-            @context
-          end
+          ctx = @context
 
           more_opts = {
             load_paths: ctx.config[:sass_assets_paths],

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

@@ -7,9 +7,24 @@ module SafeTemplate
   end
 end
 
-class Slim::Template
+class ::Slim::Template
   include SafeTemplate
 
+  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
+      end
+    end
+
+    super
+  end
+
   def precompiled_preamble(locals)
     "__in_slim_template = true\n" << super
   end
@@ -32,17 +47,6 @@ module Middleman
           disable_escape: true
         )
       end
-
-      def after_configuration
-        context_hack = {
-          context: app.template_context_class.new(app)
-        }
-
-        ::Slim::Embedded::SassEngine.disable_option_validator!
-        %w(sass scss markdown).each do |engine|
-          ::Slim::Embedded.options[engine.to_sym] = context_hack
-        end
-      end
     end
   end
 end

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

@@ -3,6 +3,8 @@ module Middleman
     module Extensions
       # Class to handle managing ignores
       class Ignores < Extension
+        self.resource_list_manipulator_priority = 0
+
         # Expose `create_ignore` as `app.ignore`
         expose_to_application ignore: :create_ignore
 

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

@@ -5,6 +5,8 @@ module Middleman
   module Sitemap
     module Extensions
       class OnDisk < Extension
+        self.resource_list_manipulator_priority = 0
+
         def initialize(app, config={}, &block)
           super