middleman-core 4.3.0.rc.4 → 4.3.0

data/lib/middleman-core/extension.rb

@@ -53,16 +53,15 @@ module Middleman
   #
   # Common lifecycle events can be handled by extensions simply by implementing an appropriately-named method:
   #
-  # * {#before_configuration}
   # * {#after_configuration}
-  # * {#before_build}
   # * {#after_build}
-  # * {#ready}
+  # * {#before_build}
   #
   # There are also some less common hooks that can be listened to from within an extension's `initialize` method:
   #
-  # * `app.before_render { |body, path, locs, template_class| ... }` - Manipulate template sources before they are rendered.
-  # * `app.after_render { |content, path, locs, template_class| ... }` - Manipulate output text after a template has been rendered. It is also common to install a Rack middleware to do this instead.
+  # * `app.before_render {|body, path, locs, template_class| ... }` - Manipulate template sources before they are rendered.
+  # * `app.after_render {|content, path, locs, template_class| ... }` - Manipulate output text after a template has been rendered. It is also common to install a Rack middleware to do this instead.
+  # * `app.ready { ... }` - Run code once Middleman is ready to serve or build files (after `after_configuration`).
 
   #
   # @see http://middlemanapp.com/advanced/custom/ Middleman Custom Extensions Documentation
@@ -135,7 +134,7 @@ module Middleman
       # @param [Symbol] key The name of the option
       # @param [Object] default The default value for the option
       # @param [String] description A human-readable description of what the option does
-      def option(key, default = nil, description = nil, options = {})
+      def option(key, default=nil, description=nil, options={})
         config.define_setting(key, default, description, options)
       end
 
@@ -152,7 +151,7 @@ module Middleman
       # @param [Symbol] key The name of the option
       # @param [Object] default The default value for the option
       # @param [String] description A human-readable description of what the option does
-      def define_setting(key, default = nil, description = nil, options = {})
+      def define_setting(key, default=nil, description=nil, options={})
         global_config.define_setting(key, default, description, options)
       end
 
@@ -204,12 +203,12 @@ module Middleman
       #   expose_to_application global_name: :local_name
       # @example with Array:
       #   expose_to_application :method1, :method2
-      # @param [Array<Symbol>, Hash<Symbol, Symbol>] symbols An optional list of symbols representing instance methods to exposed.
+      # @param [Array<Sumbol>, Hash<Symbol, Symbol>] symbols An optional list of symbols representing instance methods to exposed.
       # @return [void]
       def expose_to_application(*symbols)
         self.exposed_to_application ||= {}
 
-        if symbols.first&.is_a?(Hash)
+        if symbols.first && symbols.first.is_a?(Hash)
           self.exposed_to_application.merge!(symbols.first)
         elsif symbols.is_a? Array
           symbols.each do |sym|
@@ -224,12 +223,12 @@ module Middleman
       #   expose_to_config global_name: :local_name
       # @example with Array:
       #   expose_to_config :method1, :method2
-      # @param [Array<Symbol>, Hash<Symbol, Symbol>] symbols An optional list of symbols representing instance methods to exposed.
+      # @param [Array<Sumbol>, Hash<Symbol, Symbol>] symbols An optional list of symbols representing instance methods to exposed.
       # @return [void]
       def expose_to_config(*symbols)
         self.exposed_to_config ||= {}
 
-        if symbols.first&.is_a?(Hash)
+        if symbols.first && symbols.first.is_a?(Hash)
           self.exposed_to_config.merge!(symbols.first)
         elsif symbols.is_a? Array
           symbols.each do |sym|
@@ -244,12 +243,12 @@ module Middleman
       #   expose_to_template global_name: :local_name
       # @example with Array:
       #   expose_to_template :method1, :method2
-      # @param [Array<Symbol>, Hash<Symbol, Symbol>] symbols An optional list of symbols representing instance methods to exposed.
+      # @param [Array<Sumbol>, Hash<Symbol, Symbol>] symbols An optional list of symbols representing instance methods to exposed.
       # @return [void]
       def expose_to_template(*symbols)
         self.exposed_to_template ||= {}
 
-        if symbols.first&.is_a?(Hash)
+        if symbols.first && symbols.first.is_a?(Hash)
           self.exposed_to_template.merge!(symbols.first)
         elsif symbols.is_a? Array
           symbols.each do |sym|
@@ -282,8 +281,7 @@ module Middleman
       # @return [void]
       def activated_extension(instance)
         name = instance.class.ext_name
-        return unless @_extension_activation_callbacks&.key?(name)
-
+        return unless @_extension_activation_callbacks && @_extension_activation_callbacks.key?(name)
         @_extension_activation_callbacks[name].each do |block|
           block.arity == 1 ? block.call(instance) : block.call
         end
@@ -308,7 +306,7 @@ module Middleman
     # @param [Hash] options_hash The raw options hash. Subclasses should not manipulate this directly - it will be turned into {#options}.
     # @yield An optional block that can be used to customize options before the extension is activated.
     # @yieldparam [Middleman::Configuration::ConfigurationManager] options Extension options
-    def initialize(app, options_hash = {}, &block)
+    def initialize(app, options_hash={}, &block)
       @_helpers = []
       @app = app
 
@@ -424,18 +422,18 @@ module Middleman
     def generate_resources(resources)
       generator_defs = self.class.resources_generators.reduce({}) do |sum, g|
         resource_definitions = if g.is_a? Hash
-                                 g
-                               elsif g.is_a? Symbol
-                                 definition = method(g)
-
-                                 if definition.arity.zero?
-                                   send(g)
-                                 else
-                                   send(g, resources)
-                                 end
-                               else
-                                 {}
-                               end
+          g
+        elsif g.is_a? Symbol
+          definition = method(g)
+
+          if definition.arity == 0
+            send(g)
+          else
+            send(g, resources)
+          end
+        else
+          {}
+        end
 
         sum.merge!(resource_definitions)
       end
@@ -444,11 +442,11 @@ module Middleman
         if g.is_a? Symbol
           definition = method(g)
 
-          g = if definition.arity.zero?
-                send(g)
-              else
-                send(g, resources)
-              end
+          g = if definition.arity == 0
+            send(g)
+          else
+            send(g, resources)
+          end
         end
 
         ::Middleman::Sitemap::StringResource.new(
@@ -493,7 +491,7 @@ module Middleman
   end
 
   class ConfigExtension < Extension
-    def initialize(app, config = {}, &block)
+    def initialize(app, config={}, &block)
       @descriptors = {}
       @ready = false
 

data/lib/middleman-core/extension_manager.rb

@@ -24,10 +24,6 @@ module Middleman
       @app.after_configuration_eval(&method(:activate_all))
     end
 
-    def active?(key)
-      @activated.key?(key)
-    end
-
     def auto_activate(key)
       ::Middleman::Extensions.auto_activate(key, @app)
     end
@@ -50,7 +46,7 @@ module Middleman
     # @param [Hash] options Options to pass to the extension
     # @yield [Middleman::Configuration::ConfigurationManager] Extension options that can be modified before the extension is initialized.
     # @return [void]
-    def activate(ext_name, options = {}, &block)
+    def activate(ext_name, options={}, &block)
       begin
         extension = ::Middleman::Extensions.load(ext_name)
       rescue LoadError => e
@@ -64,7 +60,7 @@ module Middleman
         @activated[ext_name] ||= {}
         key = "instance_#{@activated[ext_name].keys.length}"
         @activated[ext_name][key] = extension.new(@app, options, &block)
-      elsif active?(ext_name)
+      elsif @activated.key?(ext_name)
         raise "#{ext_name} has already been activated and cannot be re-activated."
       else
         @activated[ext_name] = extension.new(@app, options, &block)

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

@@ -2,13 +2,13 @@ require 'middleman-core/util'
 require 'middleman-core/rack'
 
 class Middleman::Extensions::AssetHash < ::Middleman::Extension
-  option :sources, %w[.css .htm .html .js .php .xhtml], 'List of extensions that are searched for hashable assets.'
+  option :sources, %w(.css .htm .html .js .php .xhtml), 'List of extensions that are searched for hashable assets.'
   option :exts, nil, 'List of extensions that get asset hashes appended to them.'
   option :ignore, [], 'Regexes of filenames to skip adding asset hashes to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for path rewrites'
   option :prefix, '', 'Prefix for hash'
 
-  def initialize(app, options_hash = {}, &block)
+  def initialize(app, options_hash={}, &block)
     super
 
     require 'addressable/uri'
@@ -20,7 +20,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
 
     # Exclude .ico from the default list because browsers expect it
     # to be named "favicon.ico"
-    @exts = options.exts || (app.config[:asset_extensions] - %w[.ico])
+    @exts = options.exts || (app.config[:asset_extensions] - %w(.ico))
 
     app.rewrite_inline_urls id: :asset_hash,
                             url_extensions: @exts.sort.reverse,
@@ -37,14 +37,12 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
     relative_path = !uri.path.start_with?('/')
 
     full_asset_path = if relative_path
-                        dirpath.join(asset_path).to_s
-                      else
-                        asset_path
-                      end
-
-    asset_page = app.sitemap.find_resource_by_destination_path(full_asset_path) || app.sitemap.find_resource_by_path(full_asset_path)
+      dirpath.join(asset_path).to_s
+    else
+      asset_path
+    end
 
-    return unless asset_page
+    return unless asset_page = app.sitemap.find_resource_by_destination_path(full_asset_path) || app.sitemap.find_resource_by_path(full_asset_path)
 
     replacement_path = "/#{asset_page.destination_path}"
     replacement_path = Pathname.new(replacement_path).relative_path_from(dirpath).to_s if relative_path
@@ -65,9 +63,9 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
     # This is so by the time we get around to the text files (which may reference
     # images and fonts) the static assets' hashes are already calculated.
     resources.sort_by do |a|
-      if %w[.svg .svgz].include? a.ext
+      if %w(.svg .svgz).include? a.ext
         0
-      elsif %w[.js .css].include? a.ext
+      elsif %w(.js .css).include? a.ext
         1
       else
         -1
@@ -82,18 +80,18 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
     return if resource.ignored?
 
     digest = if resource.binary?
-               ::Digest::SHA1.file(resource.source_file).hexdigest[0..7]
-             else
-               # Render through the Rack interface so middleware and mounted apps get a shot
-               response = @rack_client.get(
-                 ::URI.escape(resource.destination_path),
-                 'bypass_inline_url_rewriter_asset_hash' => 'true'
-               )
-
-               raise "#{resource.path} should be in the sitemap!" unless response.status == 200
-
-               ::Digest::SHA1.hexdigest(response.body)[0..7]
-             end
+      ::Digest::SHA1.file(resource.source_file).hexdigest[0..7]
+    else
+      # Render through the Rack interface so middleware and mounted apps get a shot
+      response = @rack_client.get(
+        ::URI.escape(resource.destination_path),
+        'bypass_inline_url_rewriter_asset_hash' => 'true'
+      )
+
+      raise "#{resource.path} should be in the sitemap!" unless response.status == 200
+
+      ::Digest::SHA1.hexdigest(response.body)[0..7]
+    end
 
     resource.destination_path = resource.destination_path.sub(/\.(\w+)$/) { |ext| "-#{options.prefix}#{digest}#{ext}" }
     resource

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

@@ -3,11 +3,11 @@ require 'addressable/uri'
 class Middleman::Extensions::AssetHost < ::Middleman::Extension
   option :host, nil, 'The asset host to use or a Proc to determine asset host', required: true
   option :exts, nil, 'List of extensions that get cache busters strings appended to them.'
-  option :sources, %w[.css .htm .html .js .php .xhtml], 'List of extensions that are searched for bustable assets.'
+  option :sources, %w(.css .htm .html .js .php .xhtml), 'List of extensions that are searched for bustable assets.'
   option :ignore, [], 'Regexes of filenames to skip adding query strings to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for host rewrites'
 
-  def initialize(app, options_hash = {}, &block)
+  def initialize(app, options_hash={}, &block)
     super
 
     app.rewrite_inline_urls id: :asset_host,
@@ -24,16 +24,16 @@ class Middleman::Extensions::AssetHost < ::Middleman::Extension
     relative_path = uri.path[0..0] != '/'
 
     full_asset_path = if relative_path
-                        dirpath.join(asset_path).to_s
-                      else
-                        asset_path
-                      end
+      dirpath.join(asset_path).to_s
+    else
+      asset_path
+    end
 
     asset_prefix = if options[:host].is_a?(Proc)
-                     options[:host].call(full_asset_path)
-                   elsif options[:host].is_a?(String)
-                     options[:host]
-                   end
+      options[:host].call(full_asset_path)
+    elsif options[:host].is_a?(String)
+      options[:host]
+    end
 
     File.join(asset_prefix, full_asset_path)
   end

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

@@ -4,7 +4,7 @@ class Middleman::Extensions::AutomaticAltTags < ::Middleman::Extension
     # Override default image_tag helper to automatically insert alt tag
     # containing image name.
 
-    def image_tag(path, params = {})
+    def image_tag(path, params={})
       unless path.include?('://')
         params[:alt] ||= ''
 

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

@@ -1,6 +1,6 @@
 # Automatic Image Sizes extension
 class Middleman::Extensions::AutomaticImageSizes < ::Middleman::Extension
-  def initialize(app, options_hash = {}, &block)
+  def initialize(app, options_hash={}, &block)
     super
 
     # Include 3rd-party fastimage library
@@ -14,7 +14,7 @@ class Middleman::Extensions::AutomaticImageSizes < ::Middleman::Extension
     # @param [String] path
     # @param [Hash] params
     # @return [String]
-    def image_tag(path, params = {})
+    def image_tag(path, params={})
       if !params.key?(:width) && !params.key?(:height) && !path.include?('://')
         real_path = path.dup
         real_path = File.join(config[:images_dir], real_path) unless real_path.start_with?('/')
@@ -36,7 +36,7 @@ class Middleman::Extensions::AutomaticImageSizes < ::Middleman::Extension
             params[:height] = height
           rescue FastImage::UnknownImageType
             # No message, it's just not supported
-          rescue StandardError
+          rescue
             warn "Couldn't determine dimensions for image #{path}: #{$ERROR_INFO.message}"
           end
         end

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

@@ -1,11 +1,11 @@
 # The Cache Buster extension
 class Middleman::Extensions::CacheBuster < ::Middleman::Extension
   option :exts, nil, 'List of extensions that get cache busters strings appended to them.'
-  option :sources, %w[.css .htm .html .js .php .xhtml], 'List of extensions that are searched for bustable assets.'
+  option :sources, %w(.css .htm .html .js .php .xhtml), 'List of extensions that are searched for bustable assets.'
   option :ignore, [], 'Regexes of filenames to skip adding query strings to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for path rewrites'
 
-  def initialize(app, options_hash = {}, &block)
+  def initialize(app, options_hash={}, &block)
     super
 
     app.rewrite_inline_urls id: :cache_buster,

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

@@ -11,7 +11,7 @@ class Middleman::Extensions::DirectoryIndexes < ::Middleman::Extension
     index_file = app.config[:index_file]
     new_index_path = "/#{index_file}"
 
-    extensions = %w[.htm .html .php .xhtml]
+    extensions = %w(.htm .html .php .xhtml)
 
     resources.each do |resource|
       # Check if it would be pointless to reroute

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

@@ -7,12 +7,13 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
   option :latency, 0.25, 'Latency between refreshes of source'
   option :disable_background_execution, false, "Don't run the command in a separate background thread"
 
-  def initialize(app, config = {}, &block)
+  def initialize(app, config={}, &block)
     super
 
     return if app.mode?(:config)
 
     require 'servolux'
+    require 'thread'
     require 'fileutils'
 
     source_path = File.expand_path(options[:source], app.root)
@@ -40,12 +41,12 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
   end
 
   def reload!
-    return unless @current_thread
+    if @current_thread
+      logger.info "== Stopping: `#{options[:command]}`"
 
-    logger.info "== Stopping: `#{options[:command]}`"
-
-    @current_thread.stop
-    @current_thread = nil
+      @current_thread.stop
+      @current_thread = nil
+    end
   end
 
   def watch_command!(async)
@@ -57,12 +58,9 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
     @current_thread.start
 
     watch_thread = Thread.new do
-      buf = @current_thread.io.gets
-
-      while buf
+      while buf = @current_thread.io.gets
         without_newline = buf.sub(/\n$/, '')
         logger.info "== External: #{without_newline}" unless without_newline.empty?
-        buf = @current_thread.io.gets
       end
 
       @current_thread.wait
@@ -82,12 +80,9 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
   private
 
   def print_command(stdout)
-    buf = stdout.gets
-
-    while buf
+    while buf = stdout.gets
       without_newline = buf.sub(/\n$/, '')
       logger.info "== External: #{without_newline}" unless without_newline.empty?
-      buf = stdout.gets
     end
   end
 end

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

@@ -1,7 +1,7 @@
 # This extension Gzips assets and pages when building.
 # Gzipped assets and pages can be served directly by Apache or
 # Nginx with the proper configuration, and pre-zipping means that we
-# can use a more aggressive compression level at no CPU cost per request.
+# can use a more agressive compression level at no CPU cost per request.
 #
 # Use Nginx's gzip_static directive, or AddEncoding and mod_rewrite in Apache
 # to serve your Gzipped files whenever the normal (non-.gz) filename is requested.
@@ -10,7 +10,7 @@
 # to .css, .htm, .html, .js, and .xhtml
 #
 class Middleman::Extensions::Gzip < ::Middleman::Extension
-  option :exts, %w[.css .htm .html .js .svg .xhtml], 'File extensions to Gzip when building.'
+  option :exts, %w(.css .htm .html .js .svg .xhtml), 'File extensions to Gzip when building.'
   option :ignore, [], 'Patterns to avoid gzipping'
   option :overwrite, false, 'Overwrite original files instead of adding .gz extension.'
 
@@ -18,12 +18,13 @@ class Middleman::Extensions::Gzip < ::Middleman::Extension
     include ::Padrino::Helpers::NumberHelpers
   end
 
-  def initialize(app, options_hash = {})
+  def initialize(app, options_hash={})
     super
 
     require 'zlib'
     require 'stringio'
     require 'find'
+    require 'thread'
   end
 
   def after_build(builder)
@@ -42,11 +43,8 @@ class Middleman::Extensions::Gzip < ::Middleman::Extension
     out_queue = Queue.new
     num_threads.times.each do
       Thread.new do
-        path = in_queue.pop
-
-        while path
+        while path = in_queue.pop
           out_queue << gzip_file(path.to_s)
-          path = in_queue.pop
         end
       end
     end
@@ -65,7 +63,7 @@ class Middleman::Extensions::Gzip < ::Middleman::Extension
       next unless output_filename
 
       total_savings += (old_size - new_size)
-      size_change_word = (old_size - new_size).positive? ? 'smaller' : 'larger'
+      size_change_word = (old_size - new_size) > 0 ? 'smaller' : 'larger'
       builder.trigger :created, "#{output_filename} (#{NumberHelpers.new.number_to_human_size((old_size - new_size).abs)} #{size_change_word})"
     end
 

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

@@ -11,7 +11,7 @@ class Middleman::Extensions::Lorem < ::Middleman::Extension
     # @param [String] size
     # @param [Hash] options
     # @return [String]
-    def placekitten(size, options = {})
+    def placekitten(size, options={})
       options[:domain] = 'http://placekitten.com'
       lorem.image(size, options)
     end
@@ -44,7 +44,7 @@ class Middleman::Extensions::Lorem < ::Middleman::Extension
   module LoremObject
     class << self
       # Words for use in lorem text
-      WORDS = %w[alias consequatur aut perferendis sit voluptatem accusantium doloremque aperiam eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo aspernatur aut odit aut fugit sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt neque dolorem ipsum quia dolor sit amet consectetur adipisci velit sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem ut enim ad minima veniam quis nostrum exercitationem ullam corporis nemo enim ipsam voluptatem quia voluptas sit suscipit laboriosam nisi ut aliquid ex ea commodi consequatur quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae et iusto odio dignissimos ducimus qui blanditiis praesentium laudantium totam rem voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident sed ut perspiciatis unde omnis iste natus error similique sunt in culpa qui officia deserunt mollitia animi id est laborum et dolorum fuga et harum quidem rerum facilis est et expedita distinctio nam libero tempore cum soluta nobis est eligendi optio cumque nihil impedit quo porro quisquam est qui minus id quod maxime placeat facere possimus omnis voluptas assumenda est omnis dolor repellendus temporibus autem quibusdam et aut consequatur vel illum qui dolorem eum fugiat quo voluptas nulla pariatur at vero eos et accusamus officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae itaque earum rerum hic tenetur a sapiente delectus ut aut reiciendis voluptatibus maiores doloribus asperiores repellat].freeze
+      WORDS = %w(alias consequatur aut perferendis sit voluptatem accusantium doloremque aperiam eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo aspernatur aut odit aut fugit sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt neque dolorem ipsum quia dolor sit amet consectetur adipisci velit sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem ut enim ad minima veniam quis nostrum exercitationem ullam corporis nemo enim ipsam voluptatem quia voluptas sit suscipit laboriosam nisi ut aliquid ex ea commodi consequatur quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae et iusto odio dignissimos ducimus qui blanditiis praesentium laudantium totam rem voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident sed ut perspiciatis unde omnis iste natus error similique sunt in culpa qui officia deserunt mollitia animi id est laborum et dolorum fuga et harum quidem rerum facilis est et expedita distinctio nam libero tempore cum soluta nobis est eligendi optio cumque nihil impedit quo porro quisquam est qui minus id quod maxime placeat facere possimus omnis voluptas assumenda est omnis dolor repellendus temporibus autem quibusdam et aut consequatur vel illum qui dolorem eum fugiat quo voluptas nulla pariatur at vero eos et accusamus officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae itaque earum rerum hic tenetur a sapiente delectus ut aut reiciendis voluptatibus maiores doloribus asperiores repellat).freeze
 
       # Get one placeholder word
       # @return [String]
@@ -94,10 +94,10 @@ class Middleman::Extensions::Lorem < ::Middleman::Extension
       # Get a placeholder date
       # @param [String] fmt
       # @return [String]
-      def date(fmt = '%a %b %d, %Y')
-        y = rand(1990..2009)
-        m = rand(1..12)
-        d = rand(1..31)
+      def date(fmt='%a %b %d, %Y')
+        y = rand(20) + 1990
+        m = rand(12) + 1
+        d = rand(31) + 1
         Time.local(y, m, d).strftime(fmt)
       end
 
@@ -135,7 +135,7 @@ class Middleman::Extensions::Lorem < ::Middleman::Extension
       # @return [String]
       def email
         delimiters = ['_', '-', '']
-        domains = %w[gmail.com yahoo.com hotmail.com email.com live.com me.com mac.com aol.com fastmail.com mail.com]
+        domains = %w(gmail.com yahoo.com hotmail.com email.com live.com me.com mac.com aol.com fastmail.com mail.com)
         username = name.gsub(/[^\w]/, delimiters[rand(delimiters.size)])
         "#{username}@#{domains[rand(domains.size)]}".downcase
       end
@@ -144,10 +144,10 @@ class Middleman::Extensions::Lorem < ::Middleman::Extension
       # @param [String] size
       # @param [Hash] options
       # @return [String]
-      def image(size, options = {})
+      def image(size, options={})
         domain           = options[:domain] || 'http://placehold.it'
         src              = "#{domain}/#{size}"
-        hex              = %w[a b c d e f 0 1 2 3 4 5 6 7 8 9]
+        hex              = %w(a b c d e f 0 1 2 3 4 5 6 7 8 9)
         background_color = options[:background_color]
         color            = options[:color]
 

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

@@ -1,17 +1,17 @@
 require 'active_support/core_ext/object/try'
 require 'memoist'
 require 'middleman-core/contracts'
+require 'sassc'
 
 # Minify CSS Extension
 class Middleman::Extensions::MinifyCss < ::Middleman::Extension
   option :inline, false, 'Whether to minify CSS inline within HTML files'
   option :ignore, [], 'Patterns to avoid minifying'
   option :compressor, proc {
-    require 'sass'
     SassCompressor
   }, 'Set the CSS compressor to use.'
-  option :content_types, %w[text/css], 'Content types of resources that contain CSS'
-  option :inline_content_types, %w[text/html text/php], 'Content types of resources that contain inline CSS'
+  option :content_types, %w(text/css), 'Content types of resources that contain CSS'
+  option :inline_content_types, %w(text/html text/php), 'Content types of resources that contain inline CSS'
 
   def ready
     # Setup Rack middleware to minify CSS
@@ -23,10 +23,12 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
   end
 
   class SassCompressor
-    def self.compress(style, options = {})
-      root_node = ::Sass::SCSS::CssParser.new(style, 'middleman-css-input', 1).parse
-      root_node.options = {}.merge!(options).merge!(style: :compressed)
-      root_node.render.strip
+    COMPRESSED_OPTIONS = { style: :compressed }.freeze
+
+    def self.compress(style, options={})
+      options = options.merge(COMPRESSED_OPTIONS)
+
+      ::SassC::Engine.new(style, options).render.strip
     end
   end
 
@@ -44,7 +46,7 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
       inline: Bool,
       compressor: Or[Proc, RespondTo[:to_proc], RespondTo[:compress]]
     } => Any
-    def initialize(app, options = {})
+    def initialize(app, options={})
       @app = app
       @ignore = options.fetch(:ignore)
       @inline = options.fetch(:inline)
@@ -57,7 +59,7 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
     end
 
     # Rack interface
-    # @param [Rack::Environment] env
+    # @param [Rack::Environmemt] env
     # @return [Array]
     def call(env)
       status, headers, response = @app.call(env)
@@ -66,10 +68,10 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
       path = env['PATH_INFO']
 
       minified = if @inline && minifiable_inline?(content_type)
-                   minify_inline(::Middleman::Util.extract_response_text(response))
-                 elsif minifiable?(content_type) && !ignore?(path)
-                   minify(::Middleman::Util.extract_response_text(response))
-                 end
+        minify_inline(::Middleman::Util.extract_response_text(response))
+      elsif minifiable?(content_type) && !ignore?(path)
+        minify(::Middleman::Util.extract_response_text(response))
+      end
 
       if minified
         headers['Content-Length'] = minified.bytesize.to_s
@@ -118,7 +120,7 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
     # @return [String]
     def minify_inline(content)
       content.gsub(INLINE_CSS_REGEX) do
-        Regexp.last_match(1) + minify(Regexp.last_match(2)) + Regexp.last_match(3)
+        $1 + minify($2) + $3
       end
     end
     memoize :minify_inline