middleman-core 4.5.1 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d17dfddbf442da6e1bbf5be0c19bab7de0b71357264de5bb3a421ef932ef0912
-  data.tar.gz: 6b20f531c4b57ecf0f35d7573708e8714e79c4c9b82806235243a9ae1b192029
+  metadata.gz: 4f75b57d4f7b5046290d41e0748282ab8fa02a2b230be9fb5045242432f2a72d
+  data.tar.gz: 4aba8ff90a5e723281990b3a1a7341509c1aa8891d231ecc3fe3ad39de29c7e9
 SHA512:
-  metadata.gz: a345b95ff2e21b871351e163ced5c4148459b4cd24e34e3686b3e4c29d7070b3170e3ad92b0c108a532c873637eba6272f4fcbfea3091e7abf2c25eda2fbd6d0
-  data.tar.gz: 282d36c604c623fd5d0856bb8b559a52bbb381bd09f1df1d68cfa37676826a10b7a6f6d7f674b4c783b93d0cb4cff0b1660a6db55f0b116a1a5cf9dc1a330304
+  metadata.gz: 3e63cf33f58076d4b2d8ebcaf7803157236a86443e273ea0400d93aa6a8456c7e641ca0552a6ed9197f3494ba045dd22c8fafef293f6aad5273d1bc9cc8cc5b6
+  data.tar.gz: d2012044ebe3eaf1aaba82208b945d03fc18bc9830373cc5603242bc90eef9183c852ad0c7e2cf2ad6e047b7eace0c14228ca77e152c32579d34f9e5d4cfe393

data/.simplecov

@@ -2,6 +2,4 @@ SimpleCov.configure do
   add_filter '/fixtures/'
   add_filter '/features/'
   add_filter '/spec/'
-  add_filter '/step_definitions/'
-  add_filter '/lib/vendored-middleman-deps/'
 end

data/.yardopts

@@ -1,6 +1,5 @@
 lib/**/*.rb
---exclude lib/vendored-middleman-deps/
 --exclude lib/middleman-core/step_definitions
 --no-private
 --hide-void-return
---markup=markdown
+--markup=markdown

data/Rakefile

@@ -1,3 +1,3 @@
 RAKE_ROOT = __FILE__.freeze
 GEM_NAME = ENV['NAME'] || 'middleman-core'
-require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
+require File.expand_path("#{File.dirname(__FILE__)}/../gem_rake_helper")

data/features/builder.feature

@@ -55,7 +55,7 @@ Feature: Builder
   Scenario: Builded text file(ex: html, css, xml, txt)'s permission is 0644
     Given a successfully built app at "large-build-app"
     When I cd to "build"
-    Then the mode of filesystem object "index.html" should match "0644"
-    And the mode of filesystem object "stylesheets/static.css" should match "0644"
-    And the mode of filesystem object "feed.xml" should match "0644"
-    And the mode of filesystem object ".htaccess" should match "0644"
+    Then the file named "index.html" should have permissions "0644"
+    And the file named "stylesheets/static.css" should have permissions "0644"
+    And the file named "feed.xml" should have permissions "0644"
+    And the file named ".htaccess" should have permissions "0644"

data/features/content_type.feature

@@ -7,7 +7,7 @@ Feature: Setting the right content type for files
     When I go to "/images/blank.gif"
     Then the content type should be "image/gif"
     When I go to "/javascripts/app.js"
-    Then the content type should be "application/javascript"
+    Then the content type should be "text/javascript"
     When I go to "/stylesheets/site.css"
     Then the content type should be "text/css"
     When I go to "/README"

data/features/data.feature

@@ -83,6 +83,11 @@ Feature: Local Data API
     Then I should see "title2:More"
     Then I should see "title3:Stuff"
 
+  Scenario: Using data with aliases
+    Given the Server is running at "data-with-aliases-app"
+    When I go to "/test1.html"
+    Then I should see "Welcome"
+
   Scenario: Using data postscript
     Given the Server is running at "nested-data-app"
     When I go to "/extracontent.html"

data/features/front-matter.feature

@@ -80,6 +80,27 @@ Feature: YAML Front Matter
     When I go to "/front-matter-change.html"
     Then I should see "Hello World"
 
+  Scenario: A template should handle YAML with types
+    Given the Server is running at "frontmatter-app"
+    And the file "source/front-matter-types.html.erb" has the contents
+      """
+      ---
+      date_matter: 2020-01-01
+      time_matter: 2020-12-31 13:14:15 +0000
+      symbol_matter: :a_symbol
+      regexp_matter: !ruby/regexp /a|b/
+      ---
+      Date: <%= current_page.data.date_matter.strftime('%d %m %Y') %>
+      Time: <%= current_page.data.time_matter.strftime('%d %m %Y %H::%M::%S %z') %>
+      Symbol: <%= current_page.data.symbol_matter.is_a? Symbol %>
+      Regexp: <%= "za" =~ current_page.data.regexp_matter %>
+      """
+    When I go to "/front-matter-types.html"
+    Then I should see "Date: 01 01 2020"
+    Then I should see "Time: 31 12 2020 13::14::15 +0000"
+    Then I should see "Symbol: true"
+    Then I should see "Regexp: 1"
+
   Scenario: Rendering raw (template-less) (toml)
     Given the Server is running at "frontmatter-app"
     When I go to "/raw-front-matter-toml.html"

data/features/minify_javascript.feature

@@ -19,23 +19,23 @@ Feature: Minify Javascript
       })();
     </script>
     <script>
-      ;(function() {
-        this;
-        should();
-        too();
-      })();
+    ;(function() {
+      this;
+      should();
+      too();
+    })();
     </script>
     <script type='text/javascript'>
-      //<!--
-      ;(function() {
-        one;
-        line();
-        here();
-      })();
-      //-->
+    //<!--
+    ;(function() {
+      one;
+      line();
+      here();
+    })();
+    //-->
     </script>
     <script type='text/html'>
-      I'm a jQuery {{template}}.
+    I'm a jQuery {{template}}.
     </script>
     """
 
@@ -66,23 +66,23 @@ Feature: Minify Javascript
       })();
     </script>
     <script>
-      ;(function() {
-        this;
-        should();
-        too();
-      })();
+    ;(function() {
+      this;
+      should();
+      too();
+    })();
     </script>
     <script type='text/javascript'>
-      //<!--
-      ;(function() {
-        one;
-        line();
-        here();
-      })();
-      //-->
+    //<!--
+    ;(function() {
+      one;
+      line();
+      here();
+    })();
+    //-->
     </script>
     <script type='text/html'>
-      I'm a jQuery {{template}}.
+    I'm a jQuery {{template}}.
     </script>
     """
 
@@ -108,15 +108,15 @@ Feature: Minify Javascript
       Hello
     </script>
     <script>
-      Hello
+    Hello
     </script>
     <script type='text/javascript'>
-      //<!--
+    //<!--
     Hello
-      //-->
+    //-->
     </script>
     <script type='text/html'>
-      I'm a jQuery {{template}}.
+    I'm a jQuery {{template}}.
     </script>
     """
 
@@ -131,18 +131,18 @@ Feature: Minify Javascript
     Then I should see:
     """
     <script>
-      !function(){should(),all.be(),on={one:line}}();
+      should(),all.be(),on={one:line};
     </script>
     <script>
-      !function(){should(),too()}();
+    should(),too();
     </script>
     <script type='text/javascript'>
-      //<!--
-    !function(){one,line(),here()}();
-      //-->
+    //<!--
+    one,line(),here();
+    //-->
     </script>
     <script type='text/html'>
-      I'm a jQuery {{template}}.
+    I'm a jQuery {{template}}.
     </script>
     """
 
@@ -159,11 +159,11 @@ Feature: Minify Javascript
     <?='Hello'?>
 
     <script>
-      !function(){should(),all.be(),on={one:line}}();
+      should(),all.be(),on={one:line};
     </script>
     <script type='text/javascript'>
       //<!--
-    !function(){one,line(),here()}();
+    one,line(),here();
       //-->
     </script>
     <script type='text/html'>
@@ -263,4 +263,3 @@ Feature: Minify Javascript
     And the Server is running at "passthrough-app"
     When I go to "/javascripts/coffee_test.js"
     Then I should see "11" lines
-

data/features/preview_changes.feature

@@ -27,3 +27,14 @@ Feature: Preview Changes
     And the file "source/a-page.html.erb" is removed
     When I go to "/a-page.html"
     Then I should see "File Not Found"
+
+  Scenario: A template with apostrophe is reloaded during preview
+    Given the Server is running at "preview-app"
+    And the file "source/a-page.html.erb" has the contents
+      """
+      Matz's Ruby Interpreter
+      """
+    When I go to "/a-page.html"
+    Then I should see "Matz's Ruby Interpreter"
+    When I go to "/a-page.html"
+    Then I should see "Matz's Ruby Interpreter"

data/features/sass_in_slim.feature

@@ -15,7 +15,7 @@ Feature: Sass/SCSS support in Slim
       """
     Given the Server is running at "sass-in-slim-app"
     When I go to "/sass_filter/"
-    Then I should see "text/css"
+    Then I should see "<style>"
     Then I should see ".sass"
     Then I should see "margin:0"
 
@@ -35,6 +35,6 @@ Feature: Sass/SCSS support in Slim
       """
     Given the Server is running at "sass-in-slim-app"
     When I go to "/scss_filter/"
-    Then I should see "text/css"
+    Then I should see "<style>"
     Then I should see ".scss"
     Then I should see "margin:0"

data/features/support/env.rb

@@ -7,6 +7,14 @@ SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/../..'))
 
 SimpleCov.start
 
+require "rspec"
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.max_formatted_output_length = nil
+  end
+end
+
 PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
 require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-core')
 require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-core', 'step_definitions')

data/fixtures/data-with-aliases-app/config.rb

@@ -0,0 +1,3 @@
+data.pages.each do |p|
+  proxy p.from, p.to, locals: { content: p.content }
+end

data/fixtures/data-with-aliases-app/data/pages.yml

@@ -0,0 +1,9 @@
+-
+  from: "/test1.html"
+  to:   "/index.html"
+  content: &greeting 'Welcome'
+
+-
+  from: "/test2.html"
+  to:   "/index.html"
+  content: *greeting

data/fixtures/data-with-aliases-app/source/index.html.erb

@@ -0,0 +1 @@
+<p><%= content %></p>

data/fixtures/data-with-aliases-app/source/layout.erb

@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/fixtures/generator-test/config.rb

@@ -1,16 +1,3 @@
-###
-# Compass
-###
-
-# Susy grids in Compass
-# First: gem install compass-susy-plugin
-# require 'susy'
-
-# Change Compass configuration
-# compass_config do |config|
-#   config.output_style = :compact
-# end
-
 ###
 # Page options, layouts, aliases and proxies
 ###
@@ -53,7 +40,7 @@
 
 # Production configuration
 configure :production do
-  # For example, change the Compass output style for deployment
+  # Minify CSS
   # activate :minify_css
 
   # Minify Javascript

data/fixtures/sinatra-app/config.rb

@@ -1,6 +1,8 @@
 require "sinatra"
 
 class MySinatra < Sinatra::Base
+  set :host_authorization, { permitted_hosts: "www.example.com" }
+
   get "/" do
     "Hello World (Sinatra)"
   end

data/lib/middleman-core/application.rb

@@ -300,8 +300,6 @@ module Middleman
         Encoding.default_external = config[:encoding]
       end
 
-      prune_tilt_templates!
-
       # After extensions have worked after_config
       execute_callbacks(:after_configuration)
 
@@ -343,17 +341,6 @@ module Middleman
       config_context.instance_eval File.read(env_config), env_config, 1
     end
 
-    # Clean up missing Tilt exts
-    def prune_tilt_templates!
-      ::Tilt.default_mapping.lazy_map.each_key do |key|
-        begin
-          ::Tilt[".#{key}"]
-        rescue LoadError, NameError
-          ::Tilt.default_mapping.lazy_map.delete(key)
-        end
-      end
-    end
-
     # Whether we're in a specific mode
     # @param [Symbol] key
     # @return [Boolean]

data/lib/middleman-core/builder.rb

@@ -87,7 +87,7 @@ module Middleman
       !@has_error
     end
 
-    # Pre-request CSS to give Compass a chance to build sprites
+    # Pre-request CSS to give Sass a chance to build sprites
     # @return [Array<Resource>] List of css resources that were output.
     Contract ResourceList
     def prerender_css
@@ -99,9 +99,9 @@ module Middleman
       end
 
       ::Middleman::Util.instrument 'builder.prerender.check-files' do
-        # Double-check for compass sprites
+        # Double-check for Sass sprites
         unless @app.files.find_new_files!.empty?
-          logger.debug '== Checking for Compass sprites'
+          logger.debug '== Checking for Sass sprites'
           @app.sitemap.ensure_resource_list_updated!
         end
       end

data/lib/middleman-core/contracts.rb

@@ -27,7 +27,6 @@ else
       base.extend self
     end
 
-    # rubocop:disable MethodName
     def Contract(*); end
 
     class Callable

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

@@ -3,7 +3,7 @@ require 'middleman-core/core_extensions/collections/lazy_step'
 module Middleman
   module CoreExtensions
     module Collections
-      class LazyCollectorRoot < BasicObject
+      class LazyCollectorRoot
         def initialize(parent)
           @data = nil
           @parent = parent

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

@@ -1,7 +1,7 @@
 module Middleman
   module CoreExtensions
     module Collections
-      class LazyCollectorStep < BasicObject
+      class LazyCollectorStep
         DELEGATE = [:hash, :eql?].freeze
 
         def initialize(name, args, block, parent=nil)

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

@@ -10,7 +10,7 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
     require 'uglifier'
     ::Uglifier.new
   }, 'Set the JS compressor to use.'
-  option :content_types, %w(application/javascript), 'Content types of resources that contain JS'
+  option :content_types, %w(text/javascript), 'Content types of resources that contain JS'
   option :inline_content_types, %w(text/html text/php), 'Content types of resources that contain inline JS'
 
   def ready

data/lib/middleman-core/file_renderer.rb

@@ -67,15 +67,9 @@ module Middleman
       end
 
       # Read compiled template from disk or cache
-      template = ::Tilt.new(path, 1, options) { body }
-      # template = cache.fetch(:compiled_template, extension, options, body) do
-      #   ::Tilt.new(path, 1, options) { body }
-      # end
+      template = ::Tilt.new(path, 1, options) { body.dup }
 
       # Render using Tilt
-      # content = ::Middleman::Util.instrument 'render.tilt', path: path do
-      #   template.render(context, locs, &block)
-      # end
       content = template.render(context, locs, &block)
 
       # Allow hooks to manipulate the result after render

data/lib/middleman-core/preview_server/server_hostname.rb

@@ -19,9 +19,7 @@ module Middleman
         end
 
         def self.match?(name)
-          # rubocop:disable Style/CaseEquality
           name != 'localhost' && /^(?=.{1,255}$)[0-9A-Za-z](?:(?:[0-9A-Za-z]|-){0,61}[0-9A-Za-z])?\.?$/ === name
-          # rubocop:enable Style/CaseEquality
         end
 
         alias to_browser to_s

data/lib/middleman-core/preview_server.rb

@@ -8,7 +8,6 @@ require 'middleman-core/preview_server/server_information'
 require 'middleman-core/preview_server/server_url'
 require 'middleman-core/preview_server/server_information_callback_proxy'
 
-# rubocop:disable GlobalVars
 module Middleman
   class PreviewServer
     class << self
@@ -315,7 +314,9 @@ module Middleman
         @webrick ||= setup_webrick(@options[:debug] || false)
 
         rack_app = ::Middleman::Rack.new(@app).to_app
-        @webrick.mount '/', ::Rack::Handler::WEBrick, rack_app
+
+        require "rackup/handler/webrick"
+        @webrick.mount '/', ::Rackup::Handler::WEBrick, rack_app
       end
 
       # Detach the current Middleman::Application instance

data/lib/middleman-core/rack.rb

@@ -1,5 +1,5 @@
 require 'rack'
-require 'rack/file'
+require 'rack/files'
 require 'rack/lint'
 require 'rack/head'
 require 'rack/utils'
@@ -106,7 +106,7 @@ module Middleman
       # If this path is a binary file, send it immediately
       return send_file(resource, env) if resource.binary?
 
-      res['Content-Type'] = resource.content_type || 'text/plain'
+      res['content-type'] = resource.content_type || 'text/plain'
 
       begin
         # Write out the contents of the page
@@ -134,7 +134,7 @@ module Middleman
 
     # Immediately send static file
     def send_file(resource, env)
-      file     = ::Rack::File.new nil
+      file     = ::Rack::Files.new nil
       path     = resource.file_descriptor[:full_path]
       if !file.respond_to?(:path=)
         request  = ::Rack::Request.new(env)
@@ -144,11 +144,11 @@ module Middleman
         response = file.serving(env)
       end
       status = response[0]
-      response[1]['Content-Encoding'] = 'gzip' if %w(.svgz .gz).include?(resource.ext)
-      # Do not set Content-Type if status is 1xx, 204, 205 or 304, otherwise
+      response[1]['content-encoding'] = 'gzip' if %w(.svgz .gz).include?(resource.ext)
+      # Do not set content-type if status is 1xx, 204, 205 or 304, otherwise
       # Rack will throw an error (500)
       if !(100..199).cover?(status) && ![204, 205, 304].include?(status)
-        response[1]['Content-Type'] = resource.content_type || 'application/octet-stream'
+        response[1]['content-type'] = resource.content_type || 'application/octet-stream'
       end
       halt response
     end

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

@@ -21,14 +21,10 @@ module Middleman
         # Make the current Middleman app accessible to the template
         cattr_accessor :middleman_app
 
-        # Add exception messaging
-        # @param [Class] context
-        # @param [Hash] locals
-        # @return [String]
-        def evaluate(context, locals, &block)
+        def prepare
           return super unless middleman_app.server?
 
-          begin
+          @output = begin
             super
           rescue ::ExecJS::RuntimeError => e
             e.to_s

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

@@ -6,14 +6,26 @@ module Middleman
         ::Tilt.prefer(Template, :erb)
       end
 
-      class Template < ::Tilt::ErubisTemplate
+      class Template < ::Tilt::ErubiTemplate
+        def initialize(*args, &block)
+          super
+
+          @context = @options[:context]
+        end
+
         ##
-        # In preamble we need a flag `__in_erb_template` and SafeBuffer for padrino apps.
+        # In preamble we need a flag `__in_erb_template` for padrino apps.
         #
         def precompiled_preamble(locals)
           original = super
           "__in_erb_template = true\n" << original
-          # .rpartition("\n").first << "#{@outvar} = _buf = ActiveSupport::SafeBuffer.new\n"
+        end
+
+        ##
+        # Force the template the use the configured encoding.
+        #
+        def precompiled_template(locals)
+          super.dup.force_encoding(@context.app.config[:encoding])
         end
       end
     end

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

@@ -23,7 +23,7 @@ module Middleman
       def initialize(*args, &block)
         super
 
-        @context = @options[:context] if @options.key?(:context)
+        @context = @options[:context]
       end
 
       def prepare; end
@@ -62,7 +62,6 @@ module Middleman
           ::Haml::TempleEngine.define_options context: nil
         end
 
-        # rubocop:disable NestedMethodDefinition
         [::Haml::Filters::Sass, ::Haml::Filters::Scss, ::Haml::Filters::Markdown].each do |f|
           f.class_exec do
             if respond_to?(:template_class) # Haml 5 and older
@@ -93,7 +92,6 @@ module Middleman
             end
           end
         end
-        # rubocop:enable NestedMethodDefinition
 
         ::Tilt.prefer(::Middleman::Renderers::HamlTemplate, :haml)
 

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

@@ -4,20 +4,16 @@ module Middleman
   module Renderers
     # Our own Kramdown Tilt template that simply uses our custom renderer.
     class KramdownTemplate < ::Tilt::KramdownTemplate
-      def initialize(*args, &block)
-        super
+      private
 
-        @context = @options[:context] if @options.key?(:context)
-      end
-
-      def evaluate(context, *)
+      def _prepare_output
+        @context = @options[:context]
         MiddlemanKramdownHTML.scope = @context || context
 
-        @output ||= begin
-          output, warnings = MiddlemanKramdownHTML.convert(@engine.root, @engine.options)
-          @engine.warnings.concat(warnings)
-          output
-        end
+        @engine = Kramdown::Document.new(data, options)
+        output, warnings = MiddlemanKramdownHTML.convert(@engine.root, @engine.options)
+        @engine.warnings.concat(warnings)
+        output
       end
     end