middleman-core 3.3.2 → 3.3.3

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

@@ -4,16 +4,15 @@ module Middleman
   module Renderers
     module AsciiDoc
       class << self
-
         def registered(app)
           app.config.define_setting :asciidoc, {
-            :safe => :safe,
-            :backend => :html5,
-            :attributes => %W(showtitle env=middleman env-middleman middleman-version=#{::Middleman::VERSION})
+            safe: :safe,
+            backend: :html5,
+            attributes: %W(showtitle env=middleman env-middleman middleman-version=#{::Middleman::VERSION})
           }, 'AsciiDoc engine options (Hash)'
           app.config.define_setting :asciidoc_attributes, [], 'AsciiDoc custom attributes (Array)'
           app.before_configuration do
-            template_extensions :adoc => :html
+            template_extensions adoc: :html
           end
 
           app.after_configuration do
@@ -24,7 +23,7 @@ module Middleman
             sitemap.provides_metadata(/\.adoc$/) do |path|
               # read the AsciiDoc header only to set page options and data
               # header values can be accessed via app.data.page.<name> in the layout
-              doc = Asciidoctor.load_file path, :safe => :safe, :parse_header_only => true
+              doc = Asciidoctor.load_file path, safe: :safe, parse_header_only: true
 
               opts = {}
               if doc.attr? 'page-layout'
@@ -35,24 +34,24 @@ module Middleman
                   opts[:layout] = layout
                 end
               end
-              opts[:layout_engine] = (doc.attr 'page-layout-engine') if (doc.attr? 'page-layout-engine')
-              # TODO override attributes to set docfile, docdir, docname, etc
+              opts[:layout_engine] = (doc.attr 'page-layout-engine') if doc.attr? 'page-layout-engine'
+              # TODO: override attributes to set docfile, docdir, docname, etc
               # alternative is to set :renderer_options, which get merged into options by the rendering extension
-              #opts[:attributes] = config[:asciidoc][:attributes].dup
-              #opts[:attributes].concat %W(docfile=#{path} docdir=#{File.dirname path} docname=#{(File.basename path).sub(/\.adoc$/, '')})
+              # opts[:attributes] = config[:asciidoc][:attributes].dup
+              # opts[:attributes].concat %W(docfile=#{path} docdir=#{File.dirname path} docname=#{(File.basename path).sub(/\.adoc$/, '')})
 
               page = {}
               page[:title] = doc.doctitle
               page[:date] = (doc.attr 'date') unless (doc.attr 'date').nil?
-              # TODO grab all the author information
+              # TODO: grab all the author information
               page[:author] = (doc.attr 'author') unless (doc.attr 'author').nil?
 
-              {:options => opts, :page => ::Middleman::Util.recursively_enhance(page)}
+              { options: opts, page: ::Middleman::Util.recursively_enhance(page) }
             end
           end
         end
 
-        alias :included :registered
+        alias_method :included, :registered
       end
     end
   end

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

@@ -3,10 +3,8 @@ require 'coffee_script'
 
 module Middleman
   module Renderers
-
     # CoffeeScript Renderer
     module CoffeeScript
-
       # Setup extension
       class << self
         # Once registered
@@ -16,11 +14,11 @@ module Middleman
           ::Tilt.prefer(DebuggingCoffeeScriptTemplate)
 
           app.before_configuration do
-            template_extensions :coffee => :js
+            template_extensions coffee: :js
             DebuggingCoffeeScriptTemplate.middleman_app = self
           end
         end
-        alias :included :registered
+        alias_method :included, :registered
       end
 
       # A Template for Tilt which outputs debug messages

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

@@ -4,11 +4,10 @@ module Middleman
     module ERb
       # Setup extension
       class << self
-
         # once registered
         def registered(app)
           app.before_configuration do
-            template_extensions :erb => :html
+            template_extensions erb: :html
           end
 
           # After config
@@ -16,7 +15,7 @@ module Middleman
             ::Tilt.prefer(Template, :erb)
           end
         end
-        alias :included :registered
+        alias_method :included, :registered
       end
 
       class Template < ::Tilt::ErubisTemplate
@@ -26,7 +25,7 @@ module Middleman
         def precompiled_preamble(locals)
           original = super
           "__in_erb_template = true\n" << original
-          #.rpartition("\n").first << "#{@outvar} = _buf = ActiveSupport::SafeBuffer.new\n"
+          # .rpartition("\n").first << "#{@outvar} = _buf = ActiveSupport::SafeBuffer.new\n"
         end
       end
     end

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

@@ -13,16 +13,14 @@ end
 
 module Middleman
   module Renderers
-
     # Haml Renderer
     module Haml
-
       # Setup extension
       class << self
         # Once registered
         def registered(app)
           app.before_configuration do
-            template_extensions :haml => :html
+            template_extensions haml: :html
           end
 
           # Add haml helpers to context
@@ -33,7 +31,7 @@ module Middleman
             init_haml_helpers
           end
         end
-        alias :included :registered
+        alias_method :included, :registered
       end
     end
   end

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

@@ -2,10 +2,9 @@ require 'kramdown'
 
 module Middleman
   module Renderers
-
     # Our own Kramdown Tilt template that simply uses our custom renderer.
     class KramdownTemplate < ::Tilt::KramdownTemplate
-      def evaluate(scope, locals, &block)
+      def evaluate(*)
         @output ||= begin
           output, warnings = MiddlemanKramdownHTML.convert(@engine.root, @engine.options)
           @engine.warnings.concat(warnings)
@@ -18,7 +17,7 @@ module Middleman
     class MiddlemanKramdownHTML < ::Kramdown::Converter::Html
       cattr_accessor :middleman_app
 
-      def convert_img(el, indent)
+      def convert_img(el, _)
         attrs = el.attr.dup
 
         link = attrs.delete('src')
@@ -32,7 +31,7 @@ module Middleman
           mail_addr = el.attr['href'].sub(/\Amailto:/, '')
           href = obfuscate('mailto') << ':' << obfuscate(mail_addr)
           content = obfuscate(content) if content == mail_addr
-          return %Q{<a href="#{href}">#{content}</a>}
+          return %Q(<a href="#{href}">#{content}</a>)
         end
 
         attr = el.attr.dup

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

@@ -2,20 +2,17 @@ require 'less'
 
 module Middleman
   module Renderers
-
     # Sass renderer
     module Less
-
       # Setup extension
       class << self
-
         # Once registered
         def registered(app)
           # Default less options
           app.config.define_setting :less, {}, 'LESS compiler options'
 
           app.before_configuration do
-            template_extensions :less => :css
+            template_extensions less: :css
           end
 
           app.after_configuration do
@@ -27,23 +24,20 @@ module Middleman
           ::Tilt.prefer(LocalLoadingLessTemplate)
         end
 
-        alias :included :registered
+        alias_method :included, :registered
       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(options.merge :filename => eval_file, :line => line, :paths => ['.', File.dirname(eval_file)])
+            parser  = ::Less::Parser.new(options.merge filename: eval_file, line: line, paths: ['.', File.dirname(eval_file)])
             @engine = parser.parse(data)
           end
         end
-
       end
-
     end
   end
 end

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

@@ -3,17 +3,14 @@ require 'liquid'
 
 module Middleman
   module Renderers
-
     # Liquid Renderer
     module Liquid
-
       # Setup extension
       class << self
-
         # Once registerd
         def registered(app)
           app.before_configuration do
-            template_extensions :liquid => :html
+            template_extensions liquid: :html
           end
 
           # After config, setup liquid partial paths
@@ -21,15 +18,14 @@ module Middleman
             ::Liquid::Template.file_system = ::Liquid::LocalFileSystem.new(source_dir)
 
             # Convert data object into a hash for liquid
-            sitemap.provides_metadata %r{\.liquid$} do |path|
-              { :locals => { :data => data.to_h } }
+            sitemap.provides_metadata %r{\.liquid$} do
+              { locals: { data: data.to_h } }
             end
           end
         end
 
-        alias :included :registered
+        alias_method :included, :registered
       end
     end
-
   end
 end

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

@@ -1,12 +1,9 @@
 module Middleman
   module Renderers
-
     # Markdown renderer
     module Markdown
-
       # Setup extension
       class << self
-
         # Once registered
         def registered(app)
           # Set our preference for a markdown engine
@@ -14,11 +11,11 @@ module Middleman
           app.config.define_setting :markdown_engine_prefix, ::Tilt, 'The parent module for markdown template engines'
 
           app.before_configuration do
-            template_extensions :markdown => :html,
-                                :mdown    => :html,
-                                :md       => :html,
-                                :mkd      => :html,
-                                :mkdn     => :html
+            template_extensions markdown: :html,
+                                mdown: :html,
+                                md: :html,
+                                mkd: :html,
+                                mkdn: :html
           end
 
           # Once configuration is parsed
@@ -35,7 +32,7 @@ module Middleman
                 require 'middleman-core/renderers/kramdown'
                 ::Tilt.prefer(::Middleman::Renderers::KramdownTemplate, *markdown_exts)
                 MiddlemanKramdownHTML.middleman_app = self
-              elsif !config[:markdown_engine].nil?
+              elsif config[:markdown_engine]
                 # Map symbols to classes
                 markdown_engine_klass = if config[:markdown_engine].is_a? Symbol
                   engine = config[:markdown_engine].to_s
@@ -58,9 +55,8 @@ module Middleman
           end
         end
 
-        alias :included :registered
+        alias_method :included, :registered
       end
     end
-
   end
 end

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

@@ -2,20 +2,18 @@ require 'redcarpet'
 
 module Middleman
   module Renderers
-
     class RedcarpetTemplate < ::Tilt::RedcarpetTemplate::Redcarpet2
-
       # because tilt has decided to convert these
       # in the wrong direction
       ALIASES = {
-        :escape_html => :filter_html
+        escape_html: :filter_html
       }
 
       # Overwrite built-in Tilt version.
       # Don't overload :renderer option with smartypants
       # Support renderer-level options
       def generate_renderer
-        return options.delete(:renderer) if options.has_key?(:renderer)
+        return options.delete(:renderer) if options.key?(:renderer)
 
         covert_options_to_aliases!
 
@@ -32,8 +30,8 @@ module Middleman
         # Renderer Options
         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.inject({}) do |sum, opt|
-          sum[opt] = options.delete(opt) if options.has_key?(opt)
+        render_options = possible_render_opts.reduce({}) do |sum, opt|
+          sum[opt] = options.delete(opt) if options.key?(opt)
           sum
         end
 
@@ -42,11 +40,11 @@ module Middleman
 
       private
 
-        def covert_options_to_aliases!
-          ALIASES.each do |aka, actual|
-            options[actual] = options.delete(aka) if options.has_key? aka
-          end
+      def covert_options_to_aliases!
+        ALIASES.each do |aka, actual|
+          options[actual] = options.delete(aka) if options.key? aka
         end
+      end
     end
 
     # Custom Redcarpet renderer that uses our helpers for images and links
@@ -61,23 +59,23 @@ module Middleman
 
       def image(link, title, alt_text)
         if !@local_options[:no_images]
-          middleman_app.image_tag(link, :title => title, :alt => alt_text)
+          middleman_app.image_tag(link, title: title, alt: alt_text)
         else
           link_string = link.dup
-          link_string << %Q{"#{title}"} if title && title.length > 0 && title != alt_text
+          link_string << %Q("#{title}") if title && title.length > 0 && title != alt_text
           %Q{![#{alt_text}](#{link_string})}
         end
       end
 
       def link(link, title, content)
         if !@local_options[:no_links]
-          attributes = { :title => title }
-          attributes.merge!( @local_options[:link_attributes] ) if @local_options[:link_attributes]
+          attributes = { title: title }
+          attributes.merge!(@local_options[:link_attributes]) if @local_options[:link_attributes]
 
-          middleman_app.link_to(content, link, attributes )
+          middleman_app.link_to(content, link, attributes)
         else
           link_string = link.dup
-          link_string << %Q{"#{title}"} if title && title.length > 0 && title != alt_text
+          link_string << %Q("#{title}") if title && title.length > 0 && title != alt_text
           %Q{[#{content}](#{link_string})}
         end
       end

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

@@ -1,23 +1,49 @@
 require 'sass'
 require 'compass/import-once'
 
+GLOB = /\*|\[.+\]/
+
+# Hack around broken sass globs when combined with import-once
+# Targets compass-import-once 1.0.4
+# Tracking issue: https://github.com/chriseppstein/compass/issues/1529
+module Compass
+  module ImportOnce
+    module Importer
+      def find_relative(uri, base, options, *args)
+        if uri =~ GLOB
+          force_import = true
+        else
+          uri, force_import = handle_force_import(uri)
+        end
+        maybe_replace_with_dummy_engine(super(uri, base, options, *args), options, force_import)
+      end
+
+      def find(uri, options, *args)
+        if uri =~ GLOB
+          force_import = true
+        else
+          uri, force_import = handle_force_import(uri)
+        end
+        maybe_replace_with_dummy_engine(super(uri, options, *args), options, force_import)
+      end
+    end
+  end
+end
+
 module Middleman
   module Renderers
-
     # Sass renderer
     module Sass
-
       # Setup extension
       class << self
-
         # Once registered
         def registered(app)
           # Default sass options
           app.config.define_setting :sass, {}, 'Sass engine options'
 
           app.before_configuration do
-            template_extensions :scss => :css,
-                                :sass => :css
+            template_extensions scss: :css,
+                                sass: :css
           end
 
           # Tell Tilt to use it as well (for inline sass blocks)
@@ -31,18 +57,15 @@ module Middleman
           ::Compass::ImportOnce.activate!
         end
 
-        alias :included :registered
+        alias_method :included, :registered
       end
 
       # A SassTemplate for Tilt which outputs debug messages
       class SassPlusCSSFilenameTemplate < ::Tilt::SassTemplate
-
         def initialize(*args, &block)
           super
 
-          if @options.has_key?(:context)
-            @context = @options[:context]
-          end
+          @context = @options[:context] if @options.key?(:context)
         end
 
         # Define the expected syntax for the template
@@ -55,23 +78,22 @@ module Middleman
 
         # Add exception messaging
         # @param [Class] context
-        # @param [Hash] locals
         # @return [String]
-        def evaluate(context, locals, &block)
+        def evaluate(context, _)
           @context ||= context
           @engine = ::Sass::Engine.new(data, sass_options)
 
           begin
             @engine.render
           rescue ::Sass::SyntaxError => e
-            ::Sass::SyntaxError.exception_to_css(e, :full_exception => true)
+            ::Sass::SyntaxError.exception_to_css(e, full_exception: true)
           end
         end
 
         # Change Sass path, for url functions, to the build folder if we're building
         # @return [Hash]
         def sass_options
-          more_opts = { :filename => eval_file, :line => line, :syntax => syntax }
+          more_opts = { filename: eval_file, line: line, syntax: syntax }
 
           if @context.is_a?(::Middleman::Application) && file
             location_of_sass_file = @context.source_dir
@@ -87,7 +109,6 @@ module Middleman
 
       # SCSS version of the above template
       class ScssPlusCSSFilenameTemplate < SassPlusCSSFilenameTemplate
-
         # Define the expected syntax for the template
         # @return [Symbol]
         def syntax