middleman-core 4.5.1 → 4.6.0

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

@@ -1,36 +1,20 @@
-require 'less'
-
 module Middleman
   module Renderers
     # Sass renderer
     class Less < ::Middleman::Extension
-      define_setting :less, {}, 'LESS compiler options'
-
-      def initialize(app, options={}, &block)
-        super
-
-        # Tell Tilt to use it as well (for inline sass blocks)
-        ::Tilt.register 'less', LocalLoadingLessTemplate
-        ::Tilt.prefer(LocalLoadingLessTemplate)
-      end
-
-      def after_configuration
-        app.files.by_type(:source).watchers.each do |source|
-          ::Less.paths << (source.directory + app.config[:css_dir]).to_s
-        end
-      end
-
       # A SassTemplate for Tilt which outputs debug messages
-      class LocalLoadingLessTemplate < ::Tilt::LessTemplate
-        def prepare
-          if ::Less.const_defined? :Engine
-            @engine = ::Less::Engine.new(data)
-          else
-            parser = ::Less::Parser.new({}.merge!(options).merge!(filename: eval_file, line: line, paths: ['.', File.dirname(eval_file)]))
-            @engine = parser.parse(data)
-          end
+      class DummyLessTemplate < ::Tilt::Template
+        def evaluate(scope, locals, &block)
+          raise <<~ERROR
+            The builtin less renderer has been removed from middleman.
+            To continue using less, make sure to setup an external pipeline.
+            See external pipeline documentation at https://middlemanapp.com/advanced/external-pipeline
+            for more information.
+          ERROR
         end
       end
+
+      ::Tilt.register 'less', DummyLessTemplate
     end
   end
 end

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

@@ -11,7 +11,7 @@ module Middleman
       end
 
       # Called by Liquid to retrieve a template file
-      def read_template_file(template_path, _)
+      def read_template_file(template_path, _ = nil)
         file = app.files.find(:source, "_#{template_path}.liquid")
         raise ::Liquid::FileSystemError, "No such template '#{template_path}'" unless file
         file.read

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

@@ -10,13 +10,12 @@ module Middleman
         escape_html: :filter_html
       }.freeze
 
-      def initialize(*args, &block)
-        super
+      private
 
-        @context = @options[:context] if @options.key?(:context)
+      def _prepare_output
+        Redcarpet::Markdown.new(generate_renderer, options).render(data)
       end
 
-      # Overwrite built-in Tilt version.
       # Don't overload :renderer option with smartypants
       # Support renderer-level options
       def generate_renderer
@@ -26,6 +25,7 @@ module Middleman
 
         # Pick a renderer
         renderer = MiddlemanRedcarpetHTML
+        renderer.scope = options[:context]
 
         if options.delete(:smartypants)
           # Support SmartyPants
@@ -44,16 +44,6 @@ module Middleman
         renderer.new(render_options)
       end
 
-      def evaluate(scope, _)
-        @output ||= begin
-          MiddlemanRedcarpetHTML.scope = @context || scope
-
-          @engine.render(data)
-        end
-      end
-
-      private
-
       def covert_options_to_aliases!
         ALIASES.each do |aka, actual|
           options[actual] = options.delete(aka) if options.key? aka

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

@@ -29,26 +29,19 @@ module Middleman
 
       # A SassTemplate for Tilt which outputs debug messages
       class SassPlusCSSFilenameTemplate < ::Tilt::SassTemplate
-        def initialize(*args, &block)
-          super
-
-          @context = @options[:context] if @options.key?(:context)
-        end
-
         # Define the expected syntax for the template
         # @return [Symbol]
         def syntax
           :sass
         end
 
-        def prepare; end
+        private
 
         # Add exception messaging
         # @param [Class] context
         # @return [String]
-        def evaluate(context, _)
-          @context ||= context
-
+        def _prepare_output
+          @context = @options[:context]
           @engine = ::SassC::Engine.new(data, sass_options)
 
           begin

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

@@ -29,7 +29,7 @@ module Middleman
       #   background: image-url("image.jpg", $digest: true); // background: url("/assets/image-27a8f1f96afd8d4c67a59eb9447f45bd.jpg");
       #
       def image_url(source, options={}, _cache_buster=nil)
-        # Work with the Compass #image_url API
+        # Work with the Sass #image_url API
         if options.respond_to? :value
           case options.value
           when true
@@ -66,7 +66,7 @@ module Middleman
       #   src: font-url("image.jpg", $digest: true);  // src: url("/assets/font-27a8f1f96afd8d4c67a59eb9447f45bd.ttf");
       #
       def font_url(source, options={})
-        # Work with the Compass #font_url API
+        # Work with the Sass #font_url API
         if options.respond_to? :value
           case options.value
           when true

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

@@ -39,9 +39,17 @@ module Middleman
         ::Slim::Engine.set_options(
           buffer: '@_out_buf',
           use_html_safe: true,
-          generator: ::Temple::Generators::RailsOutputBuffer,
           disable_escape: true
         )
+        begin
+          require "action_view"
+        rescue LoadError
+          # Don't add generator option if action_view is not available, since it depends on it
+        else
+          ::Slim::Engine.set_options(
+            generator: ::Temple::Generators::RailsOutputBuffer,
+          )
+        end
       end
     end
   end

data/lib/middleman-core/sources/source_watcher.rb

@@ -335,7 +335,7 @@ module Middleman
 
     Contract Pathname => Pathname
     def strip_extensions(p)
-      p = p.sub_ext('') while ::Tilt[p.to_s] || p.extname == '.html'
+      p = p.sub_ext('') while Middleman::Util.tilt_class(p.to_s) || p.extname == '.html'
       Pathname(p.to_s + '.*')
     end
 

data/lib/middleman-core/step_definitions/commandline_steps.rb

@@ -1,28 +1,28 @@
 When /^I stop (?:middleman|all commands) if the output( of the last command)? contains:$/ do |last_command, expected|
   begin
-    Timeout.timeout(exit_timeout) do
+    Timeout.timeout(aruba.config.exit_timeout) do
       loop do
-        fail "You need to start middleman interactively first." unless @interactive
+        fail "You need to start middleman interactively first." unless last_command_started
 
-        if unescape(@interactive.output) =~ Regexp.new(unescape(expected))
-          only_processes.each { |p| p.terminate }
+        if unescape_text(last_command_started.output) =~ Regexp.new(unescape_text(expected))
+          all_commands.each { |p| p.terminate }
           break
         end
 
         sleep 0.1
       end
     end
-  rescue ChildProcess::TimeoutError, TimeoutError
-    @interactive.terminate
+  rescue ChildProcess::TimeoutError, Timeout::Error
+    last_command_started.terminate
   ensure
-    announcer.stdout @interactive.stdout
-    announcer.stderr @interactive.stderr
+    aruba.announcer.announce :stdout, last_command_started.stdout
+    aruba.announcer.announce :stderr, last_command_started.stderr
   end
 end
 
 # Make it just a long running process
 Given /`(.*?)` is running in background/ do |cmd|
-  run(cmd, 120)
+  run_command(cmd, exit_timeout: 120)
 end
 
 Given /I have a local hosts file with:/ do |string|
@@ -49,10 +49,10 @@ Given /I start a dns server with:/ do |string|
     )
   )
 
-  set_env 'PATH', File.expand_path(File.join(current_dir, 'bin')) + ':' + ENV['PATH']
+  set_environment_variable 'PATH', File.expand_path(File.join(aruba.current_directory, 'bin')) + ':' + ENV['PATH']
   write_file db_file, string
 
-  @dns_server = run("dns_server.rb #{db_file} #{port}", 120)
+  @dns_server = run_command("dns_server.rb #{db_file} #{port}", exit_timeout: 120)
 end
 
 Given /I start a mdns server with:/ do |string|
@@ -68,10 +68,10 @@ Given /I start a mdns server with:/ do |string|
     )
   )
 
-  set_env 'PATH', File.expand_path(File.join(current_dir, 'bin')) + ':' + ENV['PATH']
+  set_environment_variable 'PATH', File.expand_path(File.join(aruba.current_directory, 'bin')) + ':' + ENV['PATH']
   write_file db_file, string
 
-  @mdns_server = run("dns_server.rb #{db_file} #{port}", 120)
+  @mdns_server = run_command("dns_server.rb #{db_file} #{port}", exit_timeout: 120)
 end
 
 Given /I start a mdns server for the local hostname/ do
@@ -80,5 +80,5 @@ end
 
 # Make sure each and every process is really dead
 After do
-  only_processes.each { |p| p.terminate }
+  all_commands.each { |p| p.terminate }
 end

data/lib/middleman-core/step_definitions.rb

@@ -16,6 +16,9 @@ module ArubaMonkeypatch
 end
 World(ArubaMonkeypatch)
 
+# The Capybara monkey-patch that switches between RSpec::Matchers#all and Capybara::DSL#all
+World(Capybara::RSpecMatcherProxies)
+
 Before do
   @aruba_timeout_seconds = RUBY_PLATFORM == 'java' ? 120 : 60
 end

data/lib/middleman-core/template_renderer.rb

@@ -119,10 +119,10 @@ module Middleman
 
       if defined?(::I18n)
         old_locale = ::I18n.locale
-        ::I18n.locale = options[:locale] if options[:locale]
+        ::I18n.locale = options.delete(:locale) if options[:locale]
 
         # Backwards compat
-        ::I18n.locale = options[:lang] if options[:lang]
+        ::I18n.locale = options.delete(:lang) if options[:lang]
       end
 
       # Sandboxed class for template eval

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

@@ -2,7 +2,6 @@ require 'yaml'
 require 'json'
 require 'toml'
 require 'pathname'
-require 'backports/2.1.0/array/to_h'
 require 'hashie'
 require 'memoist'
 
@@ -118,16 +117,16 @@ module Middleman
       # @return [Hash]
       Contract String, Pathname => Hash
       def parse_yaml(content, full_path)
-        permitted_classes = [Date, Symbol]
+        permitted_classes = [Date, Time, DateTime, Symbol, Regexp]
         c = begin
           ::Middleman::Util.instrument 'parse.yaml' do
             allowed_parameters = ::YAML.method(:safe_load).parameters
             if allowed_parameters.include? [:key, :permitted_classes]
-              ::YAML.safe_load(content, permitted_classes: permitted_classes)
+              ::YAML.safe_load(content, permitted_classes: permitted_classes, aliases: true)
             elsif allowed_parameters.include? [:key, :whitelist_classes]
-              ::YAML.safe_load(content, whitelist_classes: permitted_classes)
+              ::YAML.safe_load(content, whitelist_classes: permitted_classes, aliases: true)
             else
-              ::YAML.safe_load(content, permitted_classes)
+              ::YAML.safe_load(content, permitted_classes, [], true)
             end
           end
         rescue StandardError, ::Psych::SyntaxError => error

data/lib/middleman-core/util/paths.rb

@@ -7,7 +7,6 @@ require 'tilt'
 
 require 'middleman-core/contracts'
 
-# rubocop:disable ModuleLength
 module Middleman
   module Util
     extend Memoist
@@ -24,6 +23,8 @@ module Middleman
     Contract String => Any
     def tilt_class(path)
       ::Tilt[path]
+    rescue LoadError
+      nil
     end
     memoize :tilt_class
 

data/lib/middleman-core/util.rb

@@ -1,3 +1,9 @@
+if RUBY_VERSION < "3.2"
+  require "active_support/version"
+
+  require "logger" if ActiveSupport.version < Gem::Version.new("8.0.0")
+end
+
 require 'active_support/all'
 
 require 'middleman-core/application'

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.5.1'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.6.0'.freeze unless const_defined?(:VERSION)
 end

data/lib/middleman-core.rb

@@ -1,5 +1,3 @@
-# rubocop:disable FileName
-
 # Setup our load paths
 libdir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)

data/middleman-core.gemspec

@@ -1,6 +1,4 @@
-# -*- encoding: utf-8 -*-
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
-require File.expand_path('../lib/middleman-core/version', __FILE__)
+require_relative './lib/middleman-core/version'
 
 Gem::Specification.new do |s|
   s.name        = 'middleman-core'
@@ -11,18 +9,22 @@ Gem::Specification.new do |s|
   s.email       = ['me@tdreyno.com', 'ben@benhollis.net', 'karlfreeman@gmail.com']
   s.homepage    = 'https://middlemanapp.com'
   s.summary     = 'Hand-crafted frontend development'
-  s.description = 'A static site generator. Provides dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle.'
+  s.description = 'A static site generator. Provides dozens of templating languages (Haml, Sass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle.'
 
   s.files        = `git ls-files -z`.split("\0")
   s.test_files   = `git ls-files -z -- {fixtures,features}/*`.split("\0")
-  s.require_path = 'lib'
-  s.required_ruby_version = '>= 2.5.0'
+
+  s.required_ruby_version = '>= 2.7.0'
 
   # Core
   s.add_dependency('bundler', '~> 2.0')
-  s.add_dependency('rack', ['>= 1.4.5', '< 3'])
-  s.add_dependency('tilt', ['~> 2.0.9'])
-  s.add_dependency('erubis')
+  s.add_dependency('rack', '>= 3')
+  s.add_dependency('rackup')
+  s.add_dependency('tilt', ['~> 2.2'])
+  s.add_dependency('erubi')
+  s.add_dependency('haml', ['>= 4.0.5'])
+  s.add_dependency('coffee-script', ['~> 2.2'])
+  s.add_dependency('kramdown', ['~> 2.4'])
   s.add_dependency('fast_blank')
   s.add_dependency('parallel')
   s.add_dependency('servolux')
@@ -31,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_dependency('webrick')
 
   # Helpers
-  s.add_dependency('activesupport', ['>= 6.1', '< 7.1'])
+  s.add_dependency('activesupport', ['>= 6.1'])
   s.add_dependency('padrino-helpers', ['~> 0.15.0'])
   s.add_dependency("addressable", ["~> 2.4"])
   s.add_dependency('memoist', ['~> 0.14'])
@@ -40,7 +42,7 @@ Gem::Specification.new do |s|
   s.add_dependency('listen', ['~> 3.0'])
 
   # i18n
-  s.add_dependency('i18n', ['~> 1.6.0'])
+  s.add_dependency('i18n', '>= 1.6', '< 1.15')
 
   # Automatic Image Sizes
   s.add_dependency('fastimage', ['~> 2.0'])
@@ -49,14 +51,13 @@ Gem::Specification.new do |s|
   s.add_dependency('sassc', ['~> 2.0'])
 
   # Minify JS
-  s.add_dependency('uglifier', ['~> 3.0'])
+  s.add_dependency('uglifier', ['>= 3', '< 5'])
   s.add_dependency('execjs', ['~> 2.0'])
 
   # Testing
-  s.add_dependency('contracts', ['~> 0.13', '< 0.17'])
+  s.add_dependency('contracts')
 
   # Hash stuff
-  s.add_dependency('hashie', ['~> 3.4'])
+  s.add_dependency('hashie', '>= 3.4', '< 6.0')
   s.add_dependency('hamster', ['~> 3.0'])
-  s.add_dependency('backports', ['~> 3.6'])
 end

data/spec/spec_helper.rb

@@ -9,17 +9,17 @@ end
 
 require_relative 'support/given'
 
-# encoding: utf-8
 RSpec.configure do |config|
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
 
   config.default_formatter = 'doc' if config.files_to_run.one?
 
-  #  config.profile_examples = 10
   config.order = :random
   Kernel.srand config.seed
 
+  config.color = true
+
   config.expect_with :rspec do |expectations|
     expectations.syntax = :expect
   end