middleman-core 4.1.0.rc.2 → 4.1.0

data/lib/middleman-core/contracts.rb

@@ -1,23 +1,112 @@
-require 'contracts'
-require 'hamster'
+if ENV['CONTRACTS'] != 'false'
+  require 'contracts'
+  require 'hamster'
 
-module Contracts
-  class IsA
-    def self.[](val)
-      @lookup ||= {}
-      @lookup[val] ||= new(val)
+  module Contracts
+    class IsA
+      def self.[](val)
+        @lookup ||= {}
+        @lookup[val] ||= new(val)
+      end
+
+      def initialize(val)
+        @val = val
+      end
+
+      def valid?(val)
+        val.is_a? @val.constantize
+      end
+    end
+
+    VectorOf = Contracts::CollectionOf::Factory.new(::Hamster::Vector)
+    ResourceList = Contracts::ArrayOf[IsA['Middleman::Sitemap::Resource']]
+  end
+else
+  module Contracts
+    def self.included(base)
+      base.extend self
+    end
+
+    # rubocop:disable MethodName
+    def Contract(*)
+    end
+
+    class Callable
+      def self.[](*)
+      end
+    end
+
+    class Bool
+    end
+
+    class Num
+    end
+
+    class Pos
+    end
+
+    class Neg
+    end
+
+    class Any
+    end
+
+    class None
+    end
+
+    class Or < Callable
+    end
+
+    class Xor < Callable
+    end
+
+    class And < Callable
+    end
+
+    class Not < Callable
+    end
+
+    class RespondTo < Callable
+    end
+
+    class Send < Callable
     end
 
-    def initialize(val)
-      @val = val
+    class Exactly < Callable
     end
 
-    def valid?(val)
-      val.is_a? @val.constantize
+    class ArrayOf < Callable
+    end
+
+    class ResourceList < Callable
+    end
+
+    class Args < Callable
+    end
+
+    class HashOf < Callable
+    end
+
+    class Bool
+    end
+
+    class Maybe < Callable
+    end
+
+    class IsA < Callable
+    end
+
+    class SetOf < Callable
+    end
+
+    class Frozen < Callable
+    end
+
+    class VectorOf < Callable
     end
   end
+end
 
-  VectorOf = ::Contracts::CollectionOf::Factory.new(::Hamster::Vector)
-  ResourceList = ::Contracts::ArrayOf[IsA['Middleman::Sitemap::Resource']]
+module Contracts
   PATH_MATCHER = Or[String, RespondTo[:match], RespondTo[:call], RespondTo[:to_s]]
 end

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

@@ -8,7 +8,7 @@ module Middleman
     class Data < Extension
       attr_reader :data_store
 
-      define_setting :data_dir, 'data', 'The directory data files are stored in'
+      define_setting :data_dir, ENV['MM_DATA_DIR'] || 'data', 'The directory data files are stored in'
 
       # Make the internal `data_store` method available as `app.data`
       expose_to_application data: :data_store
@@ -57,6 +57,7 @@ module Middleman
           @app = app
           @data_file_matcher = data_file_matcher
           @local_data = {}
+          @local_data_enhanced = nil
           @local_sources = {}
           @callback_sources = {}
         end
@@ -99,13 +100,13 @@ module Middleman
           extension = File.extname(data_path)
           basename  = File.basename(data_path, extension)
 
+          return unless %w(.yaml .yml .json).include?(extension)
+
           if %w(.yaml .yml).include?(extension)
-            data, postscript = ::Middleman::Util::Data.parse(file[:full_path], @app.config[:frontmatter_delims], :yaml)
+            data, postscript = ::Middleman::Util::Data.parse(file, @app.config[:frontmatter_delims], :yaml)
             data[:postscript] = postscript if !postscript.nil? && data.is_a?(Hash)
           elsif extension == '.json'
-            data, _postscript = ::Middleman::Util::Data.parse(file[:full_path], @app.config[:frontmatter_delims], :json)
-          else
-            return
+            data, _postscript = ::Middleman::Util::Data.parse(file, @app.config[:frontmatter_delims], :json)
           end
 
           data_branch = @local_data
@@ -117,6 +118,8 @@ module Middleman
           end
 
           data_branch[basename] = data
+
+          @local_data_enhanced = nil
         end
 
         # Remove a given file from the internal cache
@@ -137,6 +140,8 @@ module Middleman
           end
 
           data_branch.delete(basename) if data_branch.key?(basename)
+
+          @local_data_enhanced = nil
         end
 
         # Get a hash from either internal static data or a callback
@@ -151,8 +156,7 @@ module Middleman
             callbacks[path.to_s].call
           end
 
-          response = ::Middleman::Util.recursively_enhance(response)
-          response
+          ::Middleman::Util.recursively_enhance(response)
         end
 
         # "Magically" find namespaces of data if they exist
@@ -162,7 +166,8 @@ module Middleman
         def method_missing(path)
           if @local_data.key?(path.to_s)
             # Any way to cache this?
-            return ::Middleman::Util.recursively_enhance(@local_data[path.to_s])
+            @local_data_enhanced ||= ::Middleman::Util.recursively_enhance(@local_data)
+            return @local_data_enhanced[path.to_s]
           else
             result = data_for_path(path)
             return result if result
@@ -198,11 +203,11 @@ module Middleman
         def to_h
           data = {}
 
-          store.each do |k, _|
+          store.each_key do |k|
             data[k] = data_for_path(k)
           end
 
-          callbacks.each do |k, _|
+          callbacks.each_key do |k|
             data[k] = data_for_path(k)
           end
 

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

@@ -113,7 +113,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
       path_options = {}
       path_options[:relative] = options.delete(:relative) if options.key?(:relative)
 
-      sources.flatten.inject(::ActiveSupport::SafeBuffer.new) do |all, source|
+      sources.flatten.reduce(::ActiveSupport::SafeBuffer.new) do |all, source|
         all << tag(:link, {
           href: asset_path(:css, source, path_options)
         }.update(options))
@@ -127,7 +127,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
       path_options = {}
       path_options[:relative] = options.delete(:relative) if options.key?(:relative)
 
-      sources.flatten.inject(::ActiveSupport::SafeBuffer.new) do |all, source|
+      sources.flatten.reduce(::ActiveSupport::SafeBuffer.new) do |all, source|
         all << content_tag(:script, nil, {
           src: asset_path(:js, source, path_options)
         }.update(options))
@@ -152,7 +152,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
       # If the basename of the request as no extension, assume we are serving a
       # directory and join index_file to the path.
       path = File.join(asset_dir, current_resource.path)
-      path = path.sub(/#{Regexp.escape(File.extname(path))}$/, ".#{asset_ext}")
+      path = path[0..-(File.extname(path).length + 1)] + ".#{asset_ext}"
 
       yield path if sitemap.find_resource_by_path(path)
     end
@@ -191,7 +191,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     # @param [Hash] options Data to pass through.
     # @return [String]
     def asset_path(kind, source, options={})
-      options_with_resource = options.merge(current_resource: current_resource)
+      options_with_resource = {}.merge!(options).merge!(current_resource: current_resource)
       ::Middleman::Util.asset_path(app, kind, source, options_with_resource)
     end
 
@@ -202,7 +202,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     # @param [Hash] options Additional options.
     # @return [String] The fully qualified asset url
     def asset_url(path, prefix='', options={})
-      options_with_resource = options.merge(current_resource: current_resource)
+      options_with_resource = {}.merge!(options).merge!(current_resource: current_resource)
       ::Middleman::Util.asset_url(app, path, prefix, options_with_resource)
     end
 
@@ -210,7 +210,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     # or a Resource, this will produce the nice URL configured for that
     # path, respecting :relative_links, directory indexes, etc.
     def url_for(path_or_resource, options={})
-      options_with_resource = options.merge(current_resource: current_resource)
+      options_with_resource = {}.merge!(options).merge!(current_resource: current_resource)
       ::Middleman::Util.url_for(app, path_or_resource, options_with_resource)
     end
 
@@ -276,5 +276,14 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
 
       super(path, params)
     end
+
+    def partial(template, options={}, &block)
+      including_parent_locals = {}
+      including_parent_locals.merge!(@locs || {})
+      including_parent_locals.merge!(options[:locals] || {})
+
+      options[:locals] = including_parent_locals
+      super(template, options, &block)
+    end
   end
 end

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

@@ -47,7 +47,7 @@ module Middleman
       # @return [void]
       Contract Any
       def before_configuration
-        @sources.find_new_files!
+        @sources.poll_once!
       end
 
       # After we config, find new files since config can change paths.
@@ -60,7 +60,7 @@ module Middleman
         end
 
         @sources.start!
-        @sources.find_new_files!
+        @sources.poll_once!
       end
 
       protected

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

@@ -14,6 +14,12 @@ module Middleman::CoreExtensions
     # Try to run after routing but before directory_indexes
     self.resource_list_manipulator_priority = 20
 
+    # Set textual delimiters that denote the start and end of frontmatter
+    define_setting :frontmatter_delims, {
+      json: [%w(;;; ;;;)],
+      yaml: [%w(--- ---), %w(--- ...)]
+    }, 'Allowed frontmatter delimiters'
+
     def initialize(app, options_hash={}, &block)
       super
 
@@ -29,8 +35,8 @@ module Middleman::CoreExtensions
     def manipulate_resource_list(resources)
       resources.each do |resource|
         next if resource.binary?
-        next if resource.ignored?
         next if resource.file_descriptor.nil?
+        next if resource.file_descriptor[:types].include?(:no_frontmatter)
 
         fmdata = data(resource.file_descriptor[:full_path].to_s).first.dup
 
@@ -67,8 +73,10 @@ module Middleman::CoreExtensions
 
       return [{}, nil] unless file
 
-      @cache[file[:full_path]] ||= ::Middleman::Util::Data.parse(
-        file[:full_path],
+      return @cache[file[:full_path]] if @cache.key?(file[:full_path])
+
+      @cache[file[:full_path]] = ::Middleman::Util::Data.parse(
+        file,
         app.config[:frontmatter_delims]
       )
     end

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

@@ -203,7 +203,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
     if (options[:mount_at_root] == locale) || (options[:mount_at_root].nil? && locales[0] == locale)
       '/'
     else
-      replacement = options[:locale_map].fetch(locale, locale)
+      replacement = options[:locale_map][locale] || locale
       options[:path].sub(':locale', replacement.to_s).sub(':lang', replacement.to_s) # Backward compat
     end
   end

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

@@ -108,7 +108,7 @@ module Middleman
                 ignore = rewriter.fetch(:ignore)
                 next if ignore.any? { |r| should_ignore?(r, full_asset_path) }
 
-                rewrite_ignore = Array(rewriter.fetch(:rewrite_ignore, []))
+                rewrite_ignore = Array(rewriter[:rewrite_ignore] || [])
                 next if rewrite_ignore.any? { |i| ::Middleman::Util.path_match(i, path) }
 
                 proc = rewriter.fetch(:proc)
@@ -132,7 +132,7 @@ module Middleman
         def should_ignore?(validator, value)
           if validator.is_a? Regexp
             # Treat as Regexp
-            !value.match(validator).nil?
+            !!(value =~ validator)
           elsif validator.respond_to? :call
             # Treat as proc
             validator.call(value)

data/lib/middleman-core/extension.rb

@@ -432,7 +432,7 @@ module Middleman
           {}
         end
 
-        sum.merge(resource_definitions)
+        sum.merge!(resource_definitions)
       end
 
       resources + generator_defs.map do |path, g|

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

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

@@ -2,7 +2,7 @@ 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 :sources, %w(.css .htm .html .js .php .xhtml), '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'

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

@@ -3,7 +3,7 @@ require 'addressable/uri'
 class Middleman::Extensions::AssetHost < ::Middleman::Extension
   option :host, nil, 'The asset host to use or a Proc to determine asset host', required: true
   option :exts, %w(.css .png .jpg .jpeg .webp .svg .svgz .js .gif), 'List of extensions that get cache busters strings appended to them.'
-  option :sources, %w(.htm .html .php .css .js), 'List of extensions that are searched for bustable assets.'
+  option :sources, %w(.css .htm .html .js .php .xhtml), 'List of extensions that are searched for bustable assets.'
   option :ignore, [], 'Regexes of filenames to skip adding query strings to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for host rewrites'
 

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) || app.files.find(:source, real_path.gsub(/^\//, ''))
+        file = app.files.find(:source, real_path) || app.files.find(:source, real_path.sub(/^\//, ''))
 
         if file && file[:full_path].exist?
           begin

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

@@ -1,7 +1,7 @@
 # The Cache Buster extension
 class Middleman::Extensions::CacheBuster < ::Middleman::Extension
   option :exts, %w(.css .png .jpg .jpeg .webp .svg .svgz .js .gif), 'List of extensions that get cache busters strings appended to them.'
-  option :sources, %w(.htm .html .php .css .js), 'List of extensions that are searched for bustable assets.'
+  option :sources, %w(.css .htm .html .js .php .xhtml), 'List of extensions that are searched for bustable 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/extensions/external_pipeline.rb

@@ -14,7 +14,8 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
 
     @watcher = app.files.watch :source,
                                path: File.expand_path(options[:source], app.root),
-                               latency: options[:latency]
+                               latency: options[:latency],
+                               frontmatter: false
 
     logger.info "== Executing: `#{options[:command]}`"
 

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

@@ -7,10 +7,10 @@
 # to serve your Gzipped files whenever the normal (non-.gz) filename is requested.
 #
 # Pass the :exts options to customize which file extensions get zipped (defaults
-# to .html, .htm, .js and .css.
+# to .css, .htm, .html, .js, and .xhtml
 #
 class Middleman::Extensions::Gzip < ::Middleman::Extension
-  option :exts, %w(.js .css .html .htm .svg), 'File extensions to Gzip when building.'
+  option :exts, %w(.css .htm .html .js .svg .xhtml), 'File extensions to Gzip when building.'
   option :ignore, [], 'Patterns to avoid gzipping'
   option :overwrite, false, 'Overwrite original files instead of adding .gz extension.'
 

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

@@ -23,7 +23,7 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
   class SassCompressor
     def self.compress(style, options={})
       root_node = ::Sass::SCSS::CssParser.new(style, 'middleman-css-input', 1).parse
-      root_node.options = options.merge(style: :compressed)
+      root_node.options = {}.merge!(options).merge!(style: :compressed)
       root_node.render.strip
     end
   end