middleman-core 4.3.0.rc.4 → 4.3.0

data/fixtures/padrino-helpers-app/config.rb

@@ -1,7 +1,7 @@
 helpers do
   def title
     content_tag :h1 do
-      'Title'
+      "Title"
     end
   end
 end

data/fixtures/page-classes-app/config.rb

@@ -1,2 +1,2 @@
-page '/sub1/page-classes.html', layout: false
-page '/sub1/sub2/page-classes.html', layout: false
+page "/sub1/page-classes.html", layout: false
+page "/sub1/sub2/page-classes.html", layout: false

data/fixtures/page-helper-layout-block-app/config.rb

@@ -1,4 +1,4 @@
-page '/path/*', layout: 'alt'
+page "/path/*", layout: "alt"
 
 # Doesn't work, and shouldn't
 # page "/path/*" do

data/fixtures/page-id-app/config-proc.rb

@@ -1,7 +1,7 @@
-%w[1 2 3].each do |n|
-  proxy "/#{n}.html", '/index.html', id: "page#{n}"
+%w(1 2 3).each do |n|
+  proxy "/#{n}.html", "/index.html", id: "page#{n}"
 end
 
-page '/overwrites/*', id: :"something-else"
+page "/overwrites/*", id: :"something-else"
 
-config[:page_id_generator] = ->(path) { path + '-foo' }
+config[:page_id_generator] = ->(path){ path + "-foo" }

data/fixtures/page-id-app/config.rb

@@ -1,5 +1,5 @@
-%w[1 2 3].each do |n|
-  proxy "/#{n}.html", '/index.html', id: "page#{n}"
+%w(1 2 3).each do |n|
+  proxy "/#{n}.html", "/index.html", id: "page#{n}"
 end
 
-page '/overwrites/*', id: :"something-else"
+page "/overwrites/*", id: :"something-else"

data/fixtures/paginate-app/source/blog/2011-01-01-test-article.html.markdown

@@ -1,6 +1,6 @@
 ---
 title: "Test Article"
-date: "2011-01-01"
+date: 2011-01-01
 tags: foo
 ---
 Test Article Content

data/fixtures/paginate-app/source/blog/2011-01-02-test-article.html.markdown

@@ -1,6 +1,6 @@
 ---
 title: "Test Article"
-date: "2011-01-02"
+date: 2011-01-02
 tags: foo
 ---
 Test Article Content

data/fixtures/paginate-app/source/blog/2011-01-03-test-article.html.markdown

@@ -1,6 +1,6 @@
 ---
 title: "Test Article"
-date: "2011-01-03"
+date: 2011-01-03
 tags: bar
 ---
 Test Article Content

data/fixtures/paginate-app/source/blog/2011-01-04-test-article.html.markdown

@@ -1,6 +1,6 @@
 ---
 title: "Test Article"
-date: "2011-01-04"
+date: 2011-01-04
 tags: bar
 ---
 Test Article Content

data/fixtures/paginate-app/source/blog/2011-01-05-test-article.html.markdown

@@ -1,6 +1,6 @@
 ---
 title: "Test Article"
-date: "2011-01-05"
+date: 2011-01-05
 tags: bar
 ---
 Test Article Content

data/fixtures/paginate-app/source/blog/2011-02-01-test-article.html.markdown

@@ -1,6 +1,6 @@
 ---
 title: "Test Article"
-date: "2011-02-01"
+date: 2011-02-01
 tags: bar
 ---
 Test Article Content

data/fixtures/paginate-app/source/blog/2011-02-02-test-article.html.markdown

@@ -1,6 +1,6 @@
 ---
 title: "Test Article"
-date: "2011-02-02"
+date: 2011-02-02
 tags: bar
 ---
 Test Article Content

data/fixtures/partials-app/source/_locals.erb

@@ -1 +1 @@
-Local vars are '<%= locals['foo'] %>', '<%= locals[:bar] %>' and '<%= baz %>'
+Local var is <%= foo %>

data/fixtures/partials-app/source/locals.html.erb

@@ -1 +1 @@
-<%= partial 'locals', locals: { foo: 'foo', 'bar' => 'bar', 'baz': 'baz' } %>
+<%= partial 'locals', locals: { foo: 'bar' } %>

data/fixtures/proxy-pages-app/config.rb

@@ -1,17 +1,18 @@
-proxy '/fake.html', '/real.html', layout: false
-proxy 'fake2.html', '/real.html', layout: false
-proxy 'fake3.html', 'real.html', layout: false
-proxy '/fake4.html', 'real.html', layout: false
+# -*- coding: utf-8 -*-
+proxy "/fake.html", "/real.html", layout: false
+proxy "fake2.html", "/real.html", layout: false
+proxy "fake3.html", "real.html", layout: false
+proxy "/fake4.html", "real.html", layout: false
 
-proxy '/target_ignore.html', '/should_be_ignored3.html', ignore: true
-proxy 'target_ignore2.html', '/should_be_ignored6.html', ignore: true
-proxy 'target_ignore3.html', 'should_be_ignored7.html', ignore: true
-proxy '/target_ignore4.html', 'should_be_ignored8.html', ignore: true
+proxy "/target_ignore.html", "/should_be_ignored3.html", ignore: true
+proxy "target_ignore2.html", "/should_be_ignored6.html", ignore: true
+proxy "target_ignore3.html", "should_be_ignored7.html", ignore: true
+proxy "/target_ignore4.html", "should_be_ignored8.html", ignore: true
 
-%w[one two].each do |num|
-  proxy "/fake/#{num}.html", '/real/index.html', ignore: true, locals: { num: num }
-  proxy "fake2/#{num}.html", '/real/index.html', ignore: true, locals: { num: num }
-  proxy "fake3/#{num}.html", 'real/index.html', ignore: true, locals: { num: num }
+%w(one two).each do |num|
+  proxy "/fake/#{num}.html", "/real/index.html", ignore: true, locals: { num: num }
+  proxy "fake2/#{num}.html", "/real/index.html", ignore: true, locals: { num: num }
+  proxy "fake3/#{num}.html", "real/index.html", ignore: true, locals: { num: num }
 end
 
-proxy '明日がある.html', '/real.html', layout: false
+proxy "明日がある.html", "/real.html", layout: false

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/scss-app/source/stylesheets/error.css.sass

@@ -0,0 +1 @@
+@include invalid-mixin;

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/rack.rb

@@ -2,4 +2,11 @@ require 'middleman-core/load_paths'
 ::Middleman.setup_load_paths
 
 require 'middleman-core'
+require 'middleman-core/rack'
 require 'middleman-core/application'
+
+module Middleman
+  def self.server
+    ::Middleman::Rack.new(::Middleman::Application.new)
+  end
+end

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 anonymous class.
+    # An instance of the above anonymouse 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 /^_[^_]/.match?(f.basename.to_s)
+          if f.basename.to_s =~ %r{^_[^_]}
             ignored = true
             break
           end
@@ -345,14 +345,13 @@ module Middleman
 
     # Clean up missing Tilt exts
     def prune_tilt_templates!
-      mapping = ::Tilt.default_mapping
-      mapping.lazy_map.each_key do |key|
+      ::Tilt.default_mapping.lazy_map.each_key do |key|
         begin
-          mapping[key]
+          ::Tilt[".#{key}"]
         rescue LoadError, NameError
+          ::Tilt.default_mapping.lazy_map.delete(key)
         end
       end
-      mapping.lazy_map.clear
     end
 
     # Whether we're in a specific mode
@@ -439,10 +438,10 @@ module Middleman
     #
     # @deprecated Prefer accessing settings through "config".
     #
-    # @param [Symbol] key Name of the attribute
+    # @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 /\A[.\/]+\Z/.match?(@build_dir.expand_path.relative_path_from(@source_dir).to_s)
+      if @build_dir.expand_path.relative_path_from(@source_dir).to_s =~ /\A[.\/]+\Z/
         raise ":build_dir (#{@build_dir}) cannot be a parent of :source_dir (#{@source_dir})"
       end
 
@@ -133,40 +133,11 @@ module Middleman
 
     Contract ResourceList => ResourceList
     def output_resources(resources)
-      res_count = resources.count
-
-      return resources if res_count.zero?
-
       results = if @parallel
-                  processes = ::Parallel.processor_count
-                  processes = processes < res_count ? processes : res_count
-                  min_parts = res_count / processes
-                  remainder = res_count % processes
-                  offset = 0
-                  ranges = []
-
-                  while offset < res_count
-                    end_r = offset + min_parts
-
-                    if remainder.positive?
-                      end_r += 1
-                      remainder -= 1
-                    end
-
-                    range = offset...end_r
-                    offset = end_r
-                    ranges << range
-                  end
-
-                  outputs = Parallel.map(ranges, in_processes: processes) do |r|
-                    resources[r].map!(&method(:output_resource))
-                  end
-
-                  outputs.flatten!
-                  outputs
-                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 }
 
@@ -175,11 +146,11 @@ module Middleman
           next unless p.exist?
 
           # handle UTF-8-MAC filename on MacOS
-          cleaned_name = if RUBY_PLATFORM.match?(/darwin/)
-                           p.to_s.encode('UTF-8', 'UTF-8-MAC')
-                         else
-                           p
-                         end
+          cleaned_name = if RUBY_PLATFORM =~ /darwin/
+            p.to_s.encode('UTF-8', 'UTF-8-MAC')
+          else
+            p
+          end
 
           @to_clean.delete(Pathname(cleaned_name))
         end
@@ -213,8 +184,8 @@ module Middleman
                           ])
       file.binmode
       file.write(contents)
-      File.chmod(0o644, file)
       file.close
+      File.chmod(0o644, file)
       file
     end
 
@@ -228,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 %i[created updated].include? mode
+      if mode == :created || mode == :updated
         ::FileUtils.mkdir_p(output_file.dirname)
         method.call(source_path, output_file.to_s)
       end
@@ -268,7 +239,7 @@ module Middleman
               return false
             end
           end
-        rescue StandardError => e
+        rescue => e
           trigger(:error, output_file, "#{e}\n#{e.backtrace.join("\n")}")
           return false
         end
@@ -296,7 +267,7 @@ module Middleman
 
       # handle UTF-8-MAC filename on MacOS
       @to_clean = @to_clean.map do |path|
-        if RUBY_PLATFORM.match?(/darwin/)
+        if RUBY_PLATFORM =~ /darwin/
           Pathname(path.to_s.encode('UTF-8', 'UTF-8-MAC'))
         else
           Pathname(path)
@@ -324,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, %i[before_build after_build configure after_configuration ready])
+      @callbacks.install_methods!(self, [: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[Regexp.last_match(1).to_sym] = args[0]
+          self[$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?(Regexp.last_match(1)))
+      def respond_to?(method, include_private=false)
+        super || defines_setting?(method) || (method =~ /^(\w+)=$/ && defines_setting?($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/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 = %i[hash eql?].freeze
+        DELEGATE = [: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/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