middleman-core 4.3.0.rc.4 → 4.3.0

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

@@ -30,10 +30,6 @@ module Middleman
 
       def evaluate(scope, locals, &block)
         options = {}.merge!(@options).merge!(filename: eval_file, line: line, context: @context || scope)
-        if options.include?(:outvar)
-          options[:buffer] = options.delete(:outvar)
-          options[:save_buffer] = true
-        end
         @engine = ::Haml::Engine.new(data, options)
         output = @engine.render(scope, locals, &block)
 
@@ -43,14 +39,13 @@ module Middleman
 
     # Haml Renderer
     class Haml < ::Middleman::Extension
-      def initialize(app, options = {}, &block)
+      def initialize(app, options={}, &block)
         super
 
         ::Haml::Options.defaults[:context] = nil
         ::Haml::Options.send :attr_accessor, :context
-        if defined?(::Haml::TempleEngine)
-          ::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
             def self.render_with_options(text, compiler_options)
@@ -62,6 +57,7 @@ module Middleman
             end
           end
         end
+        # rubocop:enable NestedMethodDefinition
 
         ::Tilt.prefer(::Middleman::Renderers::HamlTemplate, :haml)
 

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

@@ -6,7 +6,7 @@ module Middleman
     class Less < ::Middleman::Extension
       define_setting :less, {}, 'LESS compiler options'
 
-      def initialize(app, options = {}, &block)
+      def initialize(app, options={}, &block)
         super
 
         # Tell Tilt to use it as well (for inline sass blocks)

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

@@ -11,10 +11,9 @@ module Middleman
       end
 
       # Called by Liquid to retrieve a template file
-      def read_template_file(template_path)
+      def read_template_file(template_path, _)
         file = app.files.find(:source, "_#{template_path}.liquid")
         raise ::Liquid::FileSystemError, "No such template '#{template_path}'" unless file
-
         file.read
       end
 
@@ -25,7 +24,7 @@ module Middleman
 
         resources.each do |resource|
           next if resource.file_descriptor.nil?
-          next unless resource.file_descriptor[:full_path].to_s =~ /\.liquid$/
+          next unless resource.file_descriptor[:full_path].to_s =~ %r{\.liquid$}
 
           # Convert data object into a hash for liquid
           resource.add_metadata locals: {

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

@@ -7,7 +7,7 @@ module Middleman
 
       # Once configuration is parsed
       def after_configuration
-        markdown_exts = %w[markdown mdown md mkd mkdn]
+        markdown_exts = %w(markdown mdown md mkd mkdn)
 
         begin
           # Look for the user's preferred engine
@@ -20,12 +20,12 @@ module Middleman
           elsif app.config[:markdown_engine]
             # Map symbols to classes
             markdown_engine_klass = if app.config[:markdown_engine].is_a? Symbol
-                                      engine = app.config[:markdown_engine].to_s
-                                      engine = engine == 'rdiscount' ? 'RDiscount' : engine.camelize
-                                      app.config[:markdown_engine_prefix].const_get("#{engine}Template")
-                                    else
-                                      app.config[:markdown_engine_prefix]
-                                    end
+              engine = app.config[:markdown_engine].to_s
+              engine = engine == 'rdiscount' ? 'RDiscount' : engine.camelize
+              app.config[:markdown_engine_prefix].const_get("#{engine}Template")
+            else
+              app.config[:markdown_engine_prefix]
+            end
 
             # Tell tilt to use that engine
             ::Tilt.prefer(markdown_engine_klass, *markdown_exts)

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

@@ -35,7 +35,7 @@ module Middleman
         end
 
         # Renderer Options
-        possible_render_opts = %i[filter_html no_images no_links no_styles safe_links_only with_toc_data hard_wrap xhtml prettify link_attributes]
+        possible_render_opts = [:filter_html, :no_images, :no_links, :no_styles, :safe_links_only, :with_toc_data, :hard_wrap, :xhtml, :prettify, :link_attributes]
 
         render_options = possible_render_opts.each_with_object({}) do |opt, sum|
           sum[opt] = options.delete(opt) if options.key?(opt)
@@ -65,7 +65,7 @@ module Middleman
     class MiddlemanRedcarpetHTML < ::Redcarpet::Render::HTML
       cattr_accessor :scope
 
-      def initialize(options = {})
+      def initialize(options={})
         @local_options = options.dup
 
         super

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

@@ -1,32 +1,20 @@
-require 'sass'
-
-begin
-  require 'sassc'
-rescue LoadError
-end
+require 'sassc'
 
 module Middleman
   module Renderers
     # Sass renderer
     class Sass < ::Middleman::Extension
-      DEFAULT_SASS_CACHE_LOCATION = './.sass-cache'.freeze
-
       opts = { output_style: :nested }
       opts[:line_comments] = false if ENV['TEST']
       define_setting :sass, opts, 'Sass engine options'
       define_setting :sass_assets_paths, [], 'Paths to extra SASS/SCSS files'
       define_setting :sass_source_maps, nil, 'Whether to inline sourcemap into Sass'
-      define_setting :sass_cache_location, ENV['SASS_CACHE_LOCATION'] || DEFAULT_SASS_CACHE_LOCATION, 'Where to store sass cache files'
 
       # Setup extension
-      def initialize(app, options = {}, &block)
+      def initialize(app, options={}, &block)
         super
 
-        logger.info '== Preferring use of LibSass' if defined?(::SassC)
-
-        if app.config[:sass_cache_location] == DEFAULT_SASS_CACHE_LOCATION
-          app.files.ignore :sass_cache, :source, /(^|\/)\.sass-cache\//
-        end
+        app.files.ignore :sass_cache, :source, /(^|\/)\.sass-cache\//
 
         # Tell Tilt to use it as well (for inline sass blocks)
         ::Tilt.register 'sass', SassPlusCSSFilenameTemplate
@@ -61,32 +49,41 @@ module Middleman
         def evaluate(context, _)
           @context ||= context
 
-          sass_module = if defined?(::SassC)
-                          ::SassC
-                        else
-                          ::Sass
-                        end
-
-          @engine = sass_module::Engine.new(data, sass_options)
+          @engine = ::SassC::Engine.new(data, sass_options)
 
           begin
             @engine.render
-          rescue sass_module::SyntaxError => e
-            ::Sass::SyntaxError.exception_to_css(e)
+          rescue ::SassC::SyntaxError => e
+            exception_to_css(e)
           end
         end
 
+        def exception_to_css(e)
+          header = "#{e.class}: #{e.message}"
+
+          <<~END
+            /*
+            #{header.gsub('*/', '*\\/')}
+
+            Backtrace:\n#{e.backtrace.join("\n").gsub('*/', '*\\/')}
+            */
+            body:before {
+              white-space: pre;
+              font-family: monospace;
+              content: "#{header.gsub('"', '\"').gsub("\n", '\\A ')}"; }
+          END
+        end
+
         # Change Sass path, for url functions, to the build folder if we're building
         # @return [Hash]
         def sass_options
           ctx = @context
 
           more_opts = {
-            load_paths: ::Sass.load_paths | ctx.app.config[:sass_assets_paths],
+            load_paths: ctx.app.config[:sass_assets_paths],
             filename: eval_file,
             line: line,
             syntax: syntax,
-            cache_location: ctx.app.config[:sass_cache_location],
             custom: {}.merge!(options[:custom] || {}).merge!(
               middleman_context: ctx.app,
               current_resource: ctx.current_resource

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

@@ -14,9 +14,9 @@ module Middleman
       #   background: url(image-path("image.jpg"));                // background: url("/assets/image.jpg");
       #   background: url(image-path("image.jpg", $digest: true)); // background: url("/assets/image-27a8f1f96afd8d4c67a59eb9447f45bd.jpg");
       #
-      def image_path(source, options = {})
+      def image_path(source, options={})
         p = ::Middleman::Util.asset_path(middleman_context, :images, source.value, map_options(options))
-        ::Sass::Script::String.new p.to_s, :string
+        ::SassC::Script::Value::String.new p.to_s, :string
       end
 
       # Using Middleman::Util#asset_path, return the url CSS
@@ -28,7 +28,7 @@ module Middleman
       #   background: image-url("image.jpg");                // background: url("/assets/image.jpg");
       #   background: image-url("image.jpg", $digest: true); // background: url("/assets/image-27a8f1f96afd8d4c67a59eb9447f45bd.jpg");
       #
-      def image_url(source, options = {}, _cache_buster = nil)
+      def image_url(source, options={}, _cache_buster=nil)
         # Work with the Compass #image_url API
         if options.respond_to? :value
           case options.value
@@ -38,7 +38,8 @@ module Middleman
             options = {}
           end
         end
-        ::Sass::Script::String.new "url(#{image_path(source, options)})"
+
+        ::SassC::Script::Value::String.new "url(#{image_path(source, options)})"
       end
 
       # Using Middleman::Util#asset_path, return the full path
@@ -50,9 +51,9 @@ module Middleman
       #   src: url(font-path("font.ttf"));                // src: url("/assets/font.ttf");
       #   src: url(font-path("font.ttf", $digest: true)); // src: url("/assets/font-27a8f1f96afd8d4c67a59eb9447f45bd.ttf");
       #
-      def font_path(source, options = {})
+      def font_path(source, options={})
         p = ::Middleman::Util.asset_path(middleman_context, :fonts, source.value, map_options(options))
-        ::Sass::Script::String.new p.to_s, :string
+        ::SassC::Script::Value::String.new p.to_s, :string
       end
 
       # Using Middleman::Util#asset_path, return the url CSS
@@ -64,7 +65,7 @@ module Middleman
       #   src: font-url("font.ttf");                  // src: url("/assets/font.ttf");
       #   src: font-url("image.jpg", $digest: true);  // src: url("/assets/font-27a8f1f96afd8d4c67a59eb9447f45bd.ttf");
       #
-      def font_url(source, options = {})
+      def font_url(source, options={})
         # Work with the Compass #font_url API
         if options.respond_to? :value
           case options.value
@@ -74,7 +75,7 @@ module Middleman
             options = {}
           end
         end
-        ::Sass::Script::String.new "url(#{font_path(source, options)})"
+        ::SassC::Script::Value::String.new "url(#{font_path(source, options)})"
       end
 
       protected
@@ -92,10 +93,10 @@ module Middleman
 
       # Returns an options hash where the keys are symbolized
       # and the values are unwrapped Sass literals.
-      def map_options(options = {}) # :nodoc:
-        ::Sass::Util.map_hash(options) do |key, value|
-          [key.to_sym, value.respond_to?(:value) ? value.value : value]
-        end
+      def map_options(options={}) # :nodoc:
+        # ::Sass::Util.map_hash(options) do |key, value|
+        #   [key.to_sym, value.respond_to?(:value) ? value.value : value]
+        # end
 
         options[:current_resource] = current_resource
 
@@ -105,8 +106,4 @@ module Middleman
   end
 end
 
-if defined?(::SassC)
-  ::SassC::Script::Functions.send :include, ::Middleman::Sass::Functions
-elsif defined?(::Sass)
-  ::Sass::Script::Functions.send :include, ::Middleman::Sass::Functions
-end
+::SassC::Script::Functions.send :include, ::Middleman::Sass::Functions

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

@@ -13,7 +13,7 @@ class ::Slim::Template
   def initialize(file, line, opts, &block)
     if opts.key?(:context)
       ::Slim::Embedded::SassEngine.disable_option_validator!
-      %w[sass scss markdown].each do |engine|
+      %w(sass scss markdown).each do |engine|
         (::Slim::Embedded.options[engine.to_sym] ||= {})[:context] = opts[:context]
       end
     end
@@ -31,7 +31,7 @@ module Middleman
     # Slim renderer
     class Slim < ::Middleman::Extension
       # Setup extension
-      def initialize(_app, _options = {}, &_block)
+      def initialize(_app, _options={}, &_block)
         super
 
         # Setup Slim options to work with partials

data/lib/middleman-core/sitemap/extensions/ignores.rb

@@ -12,7 +12,7 @@ module Middleman
         # @param [String, Regexp] path Path glob expression, or path regex
         # @return [IgnoreDescriptor]
         Contract Or[String, Regexp, Proc] => RespondTo[:execute_descriptor]
-        def ignore(path = nil, &block)
+        def ignore(path=nil, &block)
           @app.sitemap.invalidate_resources_not_ignored_cache!
 
           if path.is_a? Regexp
@@ -34,7 +34,7 @@ module Middleman
 
         IgnoreDescriptor = Struct.new(:path, :block) do
           def execute_descriptor(_app, resources)
-            resources.each do |r|
+            resources.map do |r|
               # Ignore based on the source path (without template extensions)
               if ignored?(r.normalized_path)
                 r.ignore!
@@ -42,6 +42,8 @@ module Middleman
                 # This allows files to be ignored by their source file name (with template extensions)
                 r.ignore!
               end
+
+              r
             end
           end
 

data/lib/middleman-core/sitemap/extensions/import.rb

@@ -12,7 +12,7 @@ module Middleman
 
         ImportFileDescriptor = Struct.new(:from, :to) do
           def execute_descriptor(app, resources)
-            source = ::Middleman::SourceFile.new(Pathname(from).relative_path_from(app.source_dir), Pathname(from), app.source_dir, Set.new(%i[source binary]), 0)
+            source = ::Middleman::SourceFile.new(Pathname(from).relative_path_from(app.source_dir), Pathname(from), app.source_dir, Set.new([:source, :binary]), 0)
 
             resources + [
               ::Middleman::Sitemap::Resource.new(app.sitemap, to, source)

data/lib/middleman-core/sitemap/extensions/on_disk.rb

@@ -7,7 +7,7 @@ module Middleman
       class OnDisk < Extension
         self.resource_list_manipulator_priority = 0
 
-        def initialize(app, config = {}, &block)
+        def initialize(app, config={}, &block)
           super
 
           @file_paths_on_disk = Set.new

data/lib/middleman-core/sitemap/extensions/proxies.rb

@@ -22,7 +22,7 @@ module Middleman
         # @option opts [Hash] data Extra metadata to add to the page. This is the same as frontmatter, though frontmatter will take precedence over metadata defined here. Available via {Resource#data}.
         # @return [ProxyDescriptor]
         Contract String, String, Maybe[Hash] => RespondTo[:execute_descriptor]
-        def proxy(path, target, opts = {})
+        def proxy(path, target, opts={})
           ProxyDescriptor.new(
             ::Middleman::Util.normalize_path(path),
             ::Middleman::Util.normalize_path(target),
@@ -75,7 +75,6 @@ module Middleman
 
         target = ::Middleman::Util.normalize_path(target)
         raise "You can't proxy #{path} to itself!" if target == path
-
         @target = target
       end
 

data/lib/middleman-core/sitemap/extensions/redirects.rb

@@ -29,7 +29,7 @@ module Middleman
         # @param [String] path
         # @param [Hash] opts The :to value gives a target path
         Contract String, { to: Or[String, ::Middleman::Sitemap::Resource] }, Maybe[Proc] => RedirectDescriptor
-        def redirect(path, opts = {}, &block)
+        def redirect(path, opts={}, &block)
           RedirectDescriptor.new(path, opts[:to], block_given? ? block : nil)
         end
       end

data/lib/middleman-core/sitemap/extensions/request_endpoints.rb

@@ -27,7 +27,7 @@ module Middleman
         # @param [Hash] opts The :path value gives a request path if it
         # differs from the output path
         Contract String, Or[{ path: String }, Proc] => EndpointDescriptor
-        def endpoint(path, opts = {}, &block)
+        def endpoint(path, opts={}, &block)
           if block_given?
             EndpointDescriptor.new(path, path, block)
           else

data/lib/middleman-core/sitemap/extensions/traversal.rb

@@ -4,93 +4,39 @@ module Middleman
       module Traversal
         def traversal_root
           root = if !@app.extensions[:i18n]
-                   '/'
-                 else
-                   @app.extensions[:i18n].path_root(::I18n.locale)
-                 end
+            '/'
+          else
+            @app.extensions[:i18n].path_root(::I18n.locale)
+          end
 
           root.sub(/^\//, '')
         end
 
         # This resource's parent resource
         # @return [Middleman::Sitemap::Resource, nil]
-        def parent(_recurse = false)
-          max_recursion = @app.config[:max_traversal_recursion] || 99
-          parent_helper(path, max_recursion)
-        end
-
-        def parent_helper(child_path, max_recursion)
-          # What is the configured format for index pages.
-          index_file = @app.config[:index_file]
-          parts = child_path.split('/')
-          # Reduce the path by the current page to get the parent level path.
-          current_page = parts.pop
-          # Does the current page has the name of an index file?
-          is_index = current_page == index_file
-          # Is the `current_page` in the traversal root?
-          # Note: `traversal_root` is `/` for non localized pages and `/[lang]/` for
-          # localized pages.
-          at_traversal_root = !(child_path =~ /^#{traversal_root}#{current_page}$/).nil?
-
-          # Check that we have any path parts left after the pop because if we
-          # don't, `current_page` is either root or another file under root.
-          # Also, if we are `at_traversal_root`, we consider this root.
-          if parts.empty? || at_traversal_root
-            # If this `is_index`, the `current_page` is root and there is no parent.
-            return nil if is_index
+        def parent
+          root = path.sub(/^#{::Regexp.escape(traversal_root)}/, '')
+          parts = root.split('/')
 
-            # `current_page` must be a page under root, let's return the root
-            # index page of the `traversal_root` (`/` or `/[lang]/`).
-            return @store.find_resource_by_path("#{traversal_root}#{index_file}")
-          end
-
-          # Get the index file for the parent path parts, e.g.: `/blog/index.html`
-          # for `/blog/`.
-          index_by_parts = proc do |subparts|
-            found = @store.find_resource_by_destination_path("#{subparts.join('/')}/#{index_file}")
-            return found unless found.nil?
-          end
+          tail = parts.pop
+          is_index = (tail == @app.config[:index_file])
 
-          # Get a file that has the name of the parent path parts e.g.:
-          # `/blog.html` for `/blog/`.
-          file_by_parts = proc do |subparts|
-            test_expr = Regexp.escape(subparts.join('/'))
-            # eponymous reverse-lookup
-            found = @store.resources.find do |candidate|
-              candidate.path =~ %r{^#{test_expr}(?:\.[a-zA-Z0-9]+|\/)$}
-            end
-            return found unless found.nil?
+          if parts.empty?
+            return is_index ? nil : @store.find_resource_by_path(@app.config[:index_file])
           end
 
-          # Try to find a file matching the parent path name and return it.
-          # E.g. `parts == ['en', 'blog']`, we try to find: `/en/blog.html`
-          file_by_parts.call(parts)
-
-          # Try to find an non-localized parent instead if `traversal_root`
-          # indicates the path is localized and there are still more parts
-          # remaining, and return it.
-          # E.g. `parts == ['en', 'blog']`, we try to find: `/blog.html`
-          if traversal_root != '/' && parts.length > 1
-            file_by_parts.call(parts[1..-1])
+          test_expr = parts.join('\\/')
+          # eponymous reverse-lookup
+          found = @store.resources.find do |candidate|
+            candidate.path =~ %r{^#{test_expr}(?:\.[a-zA-Z0-9]+|\/)$}
           end
 
-          # Now let's drop the last part of the path to try to find an index
-          # file in the path above `current_page`'s path and return it.
-          # E.g. `parts == ['en', 'blog']`, we try to find: `/en/index.html`
-          parts.pop if is_index
-          index_by_parts.call(parts)
-
-          # Lastly, check for an non-localized index index file in the path
-          # above `current_page`'s path and return it.
-          # E.g. `parts == ['en', 'blog']`, we try to find: `/index.html`
-          if traversal_root == "#{parts.first}/"
-            index_by_parts.call(parts[1..-1] || '')
-          end
-          if !parts.empty? && max_recursion.positive?
-            return parent_helper(parts.join('/'), max_recursion - 1)
+          if found
+            found
+          else
+            parts.pop if is_index
+            @store.find_resource_by_destination_path("#{parts.join('/')}/#{@app.config[:index_file]}")
           end
-
-          nil
         end
 
         # This resource's child resources
@@ -99,12 +45,12 @@ module Middleman
           return [] unless directory_index?
 
           base_path = if eponymous_directory?
-                        eponymous_directory_path
-                      else
-                        path.sub(@app.config[:index_file].to_s, '')
-                      end
+            eponymous_directory_path
+          else
+            path.sub(@app.config[:index_file].to_s, '')
+          end
 
-          prefix = /^#{base_path.sub("/", "\\/")}/
+          prefix = %r{^#{base_path.sub("/", "\\/")}}
 
           @store.resources.select do |sub_resource|
             if sub_resource.path == path || sub_resource.path !~ prefix
@@ -127,7 +73,6 @@ module Middleman
         # @return [Array<Middleman::Sitemap::Resource>]
         def siblings
           return [] unless parent
-
           parent.children.reject { |p| p == self }
         end
 

data/lib/middleman-core/sitemap/resource.rb

@@ -45,19 +45,19 @@ module Middleman
       # @param [String] path
       # @param [String] source
       Contract IsA['Middleman::Sitemap::Store'], String, Maybe[Or[IsA['Middleman::SourceFile'], String]] => Any
-      def initialize(store, path, source = nil)
+      def initialize(store, path, source=nil)
         @store       = store
         @app         = @store.app
         @path        = path
         @ignored     = false
 
-        source = Pathname(source) if source&.is_a?(String)
+        source = Pathname(source) if source && source.is_a?(String)
 
-        @file_descriptor = if source&.is_a?(Pathname)
-                             ::Middleman::SourceFile.new(source.relative_path_from(@app.source_dir), source, @app.source_dir, Set.new([:source]), 0)
-                           else
-                             source
-                           end
+        @file_descriptor = if source && source.is_a?(Pathname)
+          ::Middleman::SourceFile.new(source.relative_path_from(@app.source_dir), source, @app.source_dir, Set.new([:source]), 0)
+        else
+          source
+        end
 
         @destination_path = @path
 
@@ -75,7 +75,6 @@ module Middleman
       Contract Bool
       def template?
         return false if file_descriptor.nil?
-
         !::Middleman::Util.tilt_class(file_descriptor[:full_path].to_s).nil?
       end
 
@@ -98,14 +97,14 @@ module Middleman
       #   Page are data that is exposed through this resource's data member.
       #   Note: It is named 'page' for backwards compatibility with older MM.
       Contract METADATA_HASH, Maybe[Bool] => METADATA_HASH
-      def add_metadata(meta = {}, reverse = false)
+      def add_metadata(meta={}, reverse=false)
         @page_data = nil
 
         @metadata = if reverse
-                      meta.deep_merge(@metadata)
-                    else
-                      @metadata.deep_merge(meta)
-                    end
+          meta.deep_merge(@metadata)
+        else
+          @metadata.deep_merge(meta)
+        end
       end
 
       # Data about this resource, populated from frontmatter or extensions.
@@ -140,7 +139,7 @@ module Middleman
       # Render this resource
       # @return [String]
       Contract Hash, Hash => String
-      def render(opts = {}, locs = {})
+      def render(opts={}, locs={})
         return ::Middleman::FileRenderer.new(@app, file_descriptor[:full_path].to_s).template_data_for_file unless template?
 
         md   = metadata
@@ -219,14 +218,14 @@ module Middleman
       Contract String => String
       def make_implicit_page_id(path)
         @id ||= begin
-          prok = @app.config[:page_id_generator]
-
-          return prok.call(path) if prok
+          if prok = @app.config[:page_id_generator]
+            return prok.call(path)
+          end
 
           basename = if ext == '.html'
-                       File.basename(path, ext)
-                     else
-                       File.basename(path)
+            File.basename(path, ext)
+          else
+            File.basename(path)
                      end
 
           # Remove leading dot or slash if present
@@ -236,7 +235,7 @@ module Middleman
     end
 
     class StringResource < Resource
-      def initialize(store, path, contents = nil, &block)
+      def initialize(store, path, contents=nil, &block)
         @request_path = path
         @contents = block_given? ? block : contents
         super(store, path)