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

data/fixtures/sass-assets-path-app/config.rb

@@ -1,4 +1,4 @@
 set :sass_assets_paths, [
-  File.join(root, "assets", "stylesheets"),
-  File.join(root, "my-vendor", "stylesheets")
+  File.join(root, 'assets', 'stylesheets'),
+  File.join(root, 'my-vendor', 'stylesheets')
 ]

data/fixtures/sinatra-app/config.rb

@@ -1,14 +1,14 @@
-require "sinatra"
+require 'sinatra'
 
 class MySinatra < Sinatra::Base
-  get "/" do
-    "Hello World (Sinatra)"
+  get '/' do
+    'Hello World (Sinatra)'
   end
-  get "/derp.html" do
-    "De doo"
+  get '/derp.html' do
+    'De doo'
   end
 end
 
-map "/sinatra" do
+map '/sinatra' do
   run MySinatra
 end

data/fixtures/traversal-app/config.rb

@@ -1,5 +1,5 @@
-proxy "/sub/fake.html", "/proxied.html", ignore: true
-proxy "/sub/fake2.html", "/proxied.html", ignore: true
+proxy '/sub/fake.html', '/proxied.html', ignore: true
+proxy '/sub/fake2.html', '/proxied.html', ignore: true
 
-proxy "/directory-indexed/fake.html", "/proxied.html", ignore: true
-proxy "/directory-indexed/fake2.html", "/proxied.html", ignore: true
+proxy '/directory-indexed/fake.html', '/proxied.html', ignore: true
+proxy '/directory-indexed/fake2.html', '/proxied.html', ignore: true

data/fixtures/v4-extension-callbacks/config.rb

@@ -7,7 +7,7 @@ class ExtensionOne < ::Middleman::Extension
 
   attr_reader :extension_two_was_activated
 
-  def initialize(app, options_hash={})
+  def initialize(app, options_hash = {})
     super
 
     after_extension_activated :extension_two do
@@ -27,7 +27,7 @@ class ExtensionTwo < ::Middleman::Extension
 
   attr_reader :extension_one_was_activated
 
-  def initialize(app, options_hash={})
+  def initialize(app, options_hash = {})
     super
 
     after_extension_activated :extension_one do

data/fixtures/wildcard-app/config.rb

@@ -1 +1 @@
-page "/admin/*", layout: :admin
+page '/admin/*', layout: :admin

data/fixtures/wildcard-directory-index-app/config.rb

@@ -1,2 +1,2 @@
 activate :directory_indexes
-page "/admin/*", layout: :admin
+page '/admin/*', layout: :admin

data/lib/middleman-core.rb

@@ -1,9 +1,9 @@
-# rubocop:disable FileName
-
 # Setup our load paths
-libdir = File.expand_path(File.dirname(__FILE__))
+libdir = __dir__
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
+require 'backports/latest'
+
 # Top-level Middleman namespace
 module Middleman
   autoload :Application, 'middleman-core/application'

data/lib/middleman-core/application.rb

@@ -53,7 +53,7 @@ module Middleman
     # An anonymous subclass of ::Middleman::TemplateContext
     attr_reader :template_context_class
 
-    # An instance of the above anonymouse class.
+    # An instance of the above anonymous class.
     attr_reader :generic_template_context
 
     Contract ::Middleman::Configuration::ConfigurationManager
@@ -158,11 +158,11 @@ module Middleman
 
     # Which file extensions have a layout by default.
     # @return [Array.<String>]
-    define_setting :extensions_with_layout, %w(.htm .html .xhtml .php), 'Which file extensions have a layout by default.'
+    define_setting :extensions_with_layout, %w[.htm .html .xhtml .php], 'Which file extensions have a layout by default.'
 
     # Which file extensions are "assets."
     # @return [Array.<String>]
-    define_setting :asset_extensions, %w(.css .png .jpg .jpeg .webp .svg .svgz .js .gif .ttf .otf .woff .woff2 .eot .ico .map), 'Which file extensions are treated as assets.'
+    define_setting :asset_extensions, %w[.css .png .jpg .jpeg .webp .svg .svgz .js .gif .ttf .otf .woff .woff2 .eot .ico .map], 'Which file extensions are treated as assets.'
 
     # Default string encoding for templates and output.
     # @return [String]
@@ -182,7 +182,7 @@ module Middleman
         ignored = false
 
         file[:relative_path].ascend do |f|
-          if f.basename.to_s =~ %r{^_[^_]}
+          if /^_[^_]/.match?(f.basename.to_s)
             ignored = true
             break
           end
@@ -442,7 +442,7 @@ module Middleman
     # @param [Symbol] key Name of the attribue
     # @param value Attribute value
     # @return [void]
-    def set(key, value=nil, &block)
+    def set(key, value = nil, &block)
       logger.warn "Warning: `set :#{key}` is deprecated. Use `config[:#{key}] =` instead."
 
       value = block if block_given?

data/lib/middleman-core/builder.rb

@@ -21,17 +21,17 @@ module Middleman
     def_delegator :@app, :logger
 
     # Sort order, images, fonts, js/css and finally everything else.
-    SORT_ORDER = %w(.png .jpeg .jpg .gif .bmp .svg .svgz .webp .ico .woff .woff2 .otf .ttf .eot .js .css).freeze
+    SORT_ORDER = %w[.png .jpeg .jpg .gif .bmp .svg .svgz .webp .ico .woff .woff2 .otf .ttf .eot .js .css].freeze
 
     # Create a new Builder instance.
     # @param [Middleman::Application] app The app to build.
     # @param [Hash] opts The builder options
-    def initialize(app, opts={})
+    def initialize(app, opts = {})
       @app = app
       @source_dir = Pathname(File.join(@app.root, @app.config[:source]))
       @build_dir = Pathname(@app.config[:build_dir])
 
-      if @build_dir.expand_path.relative_path_from(@source_dir).to_s =~ /\A[.\/]+\Z/
+      if /\A[.\/]+\Z/.match?(@build_dir.expand_path.relative_path_from(@source_dir).to_s)
         raise ":build_dir (#{@build_dir}) cannot be a parent of :source_dir (#{@source_dir})"
       end
 
@@ -134,10 +134,10 @@ module Middleman
     Contract ResourceList => ResourceList
     def output_resources(resources)
       results = if @parallel
-        ::Parallel.map(resources, &method(:output_resource))
-      else
-        resources.map(&method(:output_resource))
-      end
+                  ::Parallel.map(resources, &method(:output_resource))
+                else
+                  resources.map(&method(:output_resource))
+                end
 
       @has_error = true if results.any? { |r| r == false }
 
@@ -146,11 +146,11 @@ module Middleman
           next unless p.exist?
 
           # handle UTF-8-MAC filename on MacOS
-          cleaned_name = if RUBY_PLATFORM =~ /darwin/
-            p.to_s.encode('UTF-8', 'UTF-8-MAC')
-          else
-            p
-          end
+          cleaned_name = if RUBY_PLATFORM.match?(/darwin/)
+                           p.to_s.encode('UTF-8', 'UTF-8-MAC')
+                         else
+                           p
+                         end
 
           @to_clean.delete(Pathname(cleaned_name))
         end
@@ -199,14 +199,14 @@ module Middleman
       source = write_tempfile(output_file, source.to_s) if source.is_a? String
 
       method, source_path = if source.is_a? Tempfile
-        [::FileUtils.method(:mv), source.path]
-      else
-        [::FileUtils.method(:cp), source.to_s]
-      end
+                              [::FileUtils.method(:mv), source.path]
+                            else
+                              [::FileUtils.method(:cp), source.to_s]
+                            end
 
       mode = which_mode(output_file, source_path)
 
-      if mode == :created || mode == :updated
+      if %i[created updated].include? mode
         ::FileUtils.mkdir_p(output_file.dirname)
         method.call(source_path, output_file.to_s)
       end
@@ -239,7 +239,7 @@ module Middleman
               return false
             end
           end
-        rescue => e
+        rescue StandardError => e
           trigger(:error, output_file, "#{e}\n#{e.backtrace.join("\n")}")
           return false
         end
@@ -267,7 +267,7 @@ module Middleman
 
       # handle UTF-8-MAC filename on MacOS
       @to_clean = @to_clean.map do |path|
-        if RUBY_PLATFORM =~ /darwin/
+        if RUBY_PLATFORM.match?(/darwin/)
           Pathname(path.to_s.encode('UTF-8', 'UTF-8-MAC'))
         else
           Pathname(path)
@@ -295,7 +295,7 @@ module Middleman
     end
 
     Contract Symbol, Or[String, Pathname], Maybe[String] => Any
-    def trigger(event_type, target, extra=nil)
+    def trigger(event_type, target, extra = nil)
       @events[event_type] ||= []
       @events[event_type] << target
 

data/lib/middleman-core/callback_manager.rb

@@ -47,7 +47,7 @@ module Middleman
     end
 
     Contract Or[Symbol, ArrayOf[Symbol]], Maybe[ArrayOf[Any]], Maybe[RespondTo[:instance_exec]] => Any
-    def execute(keys, args=[], scope=self)
+    def execute(keys, args = [], scope = self)
       callbacks = callbacks_for(keys)
       callbacks_count = callbacks.length + @subscribers.length
 

data/lib/middleman-core/config_context.rb

@@ -16,7 +16,7 @@ module Middleman
       @template_context_class = template_context_class
 
       @callbacks = ::Middleman::CallbackManager.new
-      @callbacks.install_methods!(self, [:before_build, :after_build, :configure, :after_configuration, :ready])
+      @callbacks.install_methods!(self, %i[before_build after_build configure after_configuration ready])
 
       # Trigger internal callbacks when app level are executed.
       app.subscribe_to_callbacks(&method(:execute_callbacks))
@@ -49,7 +49,7 @@ module Middleman
       instance_eval File.read(other_config), other_config, 1
     end
 
-    def set(key, default=nil, &block)
+    def set(key, default = nil, &block)
       config.define_setting(key, default) unless config.defines_setting?(key)
       @app.config[key] = block_given? ? block : default
     end

data/lib/middleman-core/configuration.rb

@@ -43,15 +43,15 @@ module Middleman
         if defines_setting?(method) && args.empty?
           self[method]
         elsif method.to_s =~ /^(\w+)=$/ && args.size == 1
-          self[$1.to_sym] = args[0]
+          self[Regexp.last_match(1).to_sym] = args[0]
         else
           super
         end
       end
 
       # Needed so that method_missing makes sense
-      def respond_to?(method, include_private=false)
-        super || defines_setting?(method) || (method =~ /^(\w+)=$/ && defines_setting?($1))
+      def respond_to?(method, include_private = false)
+        super || defines_setting?(method) || (method =~ /^(\w+)=$/ && defines_setting?(Regexp.last_match(1)))
       end
 
       # Does this configuration manager know about the setting identified by key?
@@ -71,7 +71,7 @@ module Middleman
       # @param [String] description A human-readable description of what the option does
       # @param [Hash] options Additional options.
       # @return [ConfigSetting]
-      def define_setting(key, default=nil, description=nil, options={})
+      def define_setting(key, default = nil, description = nil, options = {})
         raise "Setting #{key} doesn't exist" if @finalized
         raise "Setting #{key} already defined" if @settings.key?(key)
         raise 'Setting key must be a Symbol' unless key.is_a? Symbol
@@ -127,7 +127,7 @@ module Middleman
       # Additional config.
       attr_accessor :options
 
-      def initialize(key, default, description, options={})
+      def initialize(key, default, description, options = {})
         @value_set = false
         self.key = key
         self.default = default

data/lib/middleman-core/contracts.rb

@@ -29,10 +29,10 @@ else
 
     # rubocop:disable MethodName
     def Contract(*); end
+    # rubocop:enable MethodName
 
     class Callable
-      def self.[](*)
-      end
+      def self.[](*); end
     end
 
     class Bool

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

@@ -34,7 +34,7 @@ module Middleman
           end
         end
 
-        def initialize(app, options_hash={}, &block)
+        def initialize(app, options_hash = {}, &block)
           super
 
           @leaves = Set.new

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

@@ -13,7 +13,7 @@ module Middleman
           @data = data
         end
 
-        def value(_ctx=nil)
+        def value(_ctx = nil)
           @data
         end
 

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

@@ -2,9 +2,9 @@ module Middleman
   module CoreExtensions
     module Collections
       class LazyCollectorStep < BasicObject
-        DELEGATE = [:hash, :eql?].freeze
+        DELEGATE = %i[hash eql?].freeze
 
-        def initialize(name, args, block, parent=nil)
+        def initialize(name, args, block, parent = nil)
           @name = name
           @args = args
           @block = block
@@ -19,19 +19,19 @@ module Middleman
           @parent.leaves
         end
 
-        def value(ctx=nil)
+        def value(ctx = nil)
           data = @parent.value(ctx)
 
           original_block = @block
 
           if original_block
             b = if ctx
-              ::Proc.new do |*args|
-                ctx.instance_exec(*args, &original_block)
-              end
-            else
-              original_block
-            end
+                  ::Proc.new do |*args|
+                    ctx.instance_exec(*args, &original_block)
+                  end
+                else
+                  original_block
+                end
           end
 
           data.send(@name, *@args.deep_dup, &b)

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

@@ -8,12 +8,12 @@ module Middleman
         return to_enum(__method__, per_page) unless block_given?
 
         parts = if per_page.respond_to? :call
-          per_page.call(dup)
-        else
-          each_slice(per_page).reduce([]) do |sum, items|
-            sum << items
-          end
-        end
+                  per_page.call(dup)
+                else
+                  each_slice(per_page).reduce([]) do |sum, items|
+                    sum << items
+                  end
+                end
 
         num_pages = parts.length
         collection = self

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

@@ -19,7 +19,7 @@ module Middleman
       # The regex which tells Middleman which files are for data
       DATA_FILE_MATCHER = /^(.*?)[\w-]+\.(yml|yaml|json)$/
 
-      def initialize(app, config={}, &block)
+      def initialize(app, config = {}, &block)
         super
 
         @data_store = DataStore.new(app, DATA_FILE_MATCHER)
@@ -68,7 +68,7 @@ module Middleman
         # @param [Hash] content The content for this data
         # @return [Hash]
         Contract Symbol, Or[Hash, Array] => Hash
-        def store(name=nil, content=nil)
+        def store(name = nil, content = nil)
           @local_sources[name.to_s] = content unless name.nil? || content.nil?
           @local_sources
         end
@@ -79,7 +79,7 @@ module Middleman
         # @param [Proc] proc The callback which will return data
         # @return [Hash]
         Contract Maybe[Symbol], Maybe[Proc] => Hash
-        def callbacks(name=nil, proc=nil)
+        def callbacks(name = nil, proc = nil)
           @callback_sources[name.to_s] = proc unless name.nil? || proc.nil?
           @callback_sources
         end
@@ -102,9 +102,9 @@ module Middleman
           extension = File.extname(data_path)
           basename  = File.basename(data_path, extension)
 
-          return unless %w(.yaml .yml .json).include?(extension)
+          return unless %w[.yaml .yml .json].include?(extension)
 
-          if %w(.yaml .yml).include?(extension)
+          if %w[.yaml .yml].include?(extension)
             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'
@@ -153,10 +153,10 @@ module Middleman
         Contract Or[String, Symbol] => Maybe[Or[Array, IsA['Middleman::Util::EnhancedHash']]]
         def data_for_path(path)
           response = if store.key?(path.to_s)
-            store[path.to_s]
-          elsif callbacks.key?(path.to_s)
-            callbacks[path.to_s].call
-          end
+                       store[path.to_s]
+                     elsif callbacks.key?(path.to_s)
+                       callbacks[path.to_s].call
+                     end
 
           ::Middleman::Util.recursively_enhance(response)
         end
@@ -179,7 +179,7 @@ module Middleman
         end
 
         # Needed so that method_missing makes sense
-        def respond_to?(method, include_private=false)
+        def respond_to?(method, include_private = false)
           super || key?(method)
         end
 

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

@@ -20,7 +20,7 @@ end
 class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
   define_setting :relative_links, false, 'Whether to generate relative links instead of absolute ones'
 
-  def initialize(app, options_hash={}, &block)
+  def initialize(app, options_hash = {}, &block)
     super
 
     require 'active_support/core_ext/object/to_query'
@@ -38,7 +38,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
   # The helpers
   helpers do
     # Make all block content html_safe
-    def content_tag(name, content=nil, options=nil, &block)
+    def content_tag(name, content = nil, options = nil, &block)
       # safe_content_tag(name, content, options, &block)
       if block_given?
         options = content if content.is_a?(Hash)
@@ -64,11 +64,13 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     end
 
     def capture_html(*args, &block)
-      result = if handler = auto_find_proper_handler(&block)
-        handler.capture_from_template(*args, &block)
-      else
-        yield(*args)
-      end
+      handler = auto_find_proper_handler(&block)
+
+      result = if handler
+                 handler.capture_from_template(*args, &block)
+               else
+                 yield(*args)
+               end
 
       ::ActiveSupport::SafeBuffer.new.safe_concat(result)
     end
@@ -140,14 +142,14 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     # @param [Symbol] asset_ext The type of asset
     # @param [String] asset_dir Where to look for assets
     # @return [void]
-    def auto_tag(asset_ext, asset_dir=nil)
+    def auto_tag(asset_ext, asset_dir = nil)
       if asset_dir.nil?
         asset_dir = case asset_ext
-        when :js
-          config[:js_dir]
-        when :css
-          config[:css_dir]
-        end
+                    when :js
+                      config[:js_dir]
+                    when :css
+                      config[:css_dir]
+                    end
       end
 
       # If the basename of the request as no extension, assume we are serving a
@@ -161,7 +163,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     # Generate body css classes based on the current path
     #
     # @return [String]
-    def page_classes(path=current_path.dup, options={})
+    def page_classes(path = current_path.dup, options = {})
       if path.is_a? Hash
         options = path
         path = current_path.dup
@@ -191,7 +193,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     # @param [String] source The path to the file
     # @param [Hash] options Data to pass through.
     # @return [String]
-    def asset_path(kind, source, options={})
+    def asset_path(kind, source, options = {})
       options_with_resource = {}.merge!(options).merge!(current_resource: current_resource)
       ::Middleman::Util.asset_path(app, kind, source, options_with_resource)
     end
@@ -202,7 +204,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     # @param [String] prefix The type prefix (such as "images")
     # @param [Hash] options Additional options.
     # @return [String] The fully qualified asset url
-    def asset_url(path, prefix='', options={})
+    def asset_url(path, prefix = '', options = {})
       options_with_resource = {}.merge!(options).merge!(current_resource: current_resource)
       ::Middleman::Util.asset_url(app, path, prefix, options_with_resource)
     end
@@ -210,7 +212,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     # Given a source path (referenced either absolutely or relatively)
     # 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={})
+    def url_for(path_or_resource, options = {})
       options_with_resource = {}.merge!(options).merge!(current_resource: current_resource)
       ::Middleman::Util.url_for(app, path_or_resource, options_with_resource)
     end
@@ -236,7 +238,9 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
         raise ArgumentError, 'Too many arguments to link_to(url, options={}, &block)'
       end
 
-      if url = args[url_arg_index]
+      url = args[url_arg_index]
+
+      if url
         options = args[options_index] || {}
         raise ArgumentError, 'Options must be a hash' unless options.is_a?(Hash)
 
@@ -252,14 +256,14 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
 
     # Modified Padrino form_for that uses Middleman's url_for
     # to transform the URL.
-    def form_tag(url, options={}, &block)
+    def form_tag(url, options = {}, &block)
       url = url_for(url, options)
       super
     end
 
     # Modified Padrino image_tag so that it finds the paths for srcset
     # using asset_path for the images listed in the srcset param
-    def image_tag(path, params={})
+    def image_tag(path, params = {})
       params.symbolize_keys!
 
       if params.key?(:srcset)
@@ -278,8 +282,8 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
       super(path, params)
     end
 
-    def partial(template, options={}, &block)
-      including_parent_locals = {}
+    def partial(template, options = {}, &block)
+      including_parent_locals = Middleman::Util::EnhancedHash.new
       including_parent_locals.merge!(@locs || {})
       including_parent_locals.merge!(options[:locals] || {})