middleman-core 4.3.0.rc.1 → 4.3.0.rc.2

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
+          rescue StandardError
             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,13 +7,12 @@ 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)
@@ -41,12 +40,12 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
   end
 
   def reload!
-    if @current_thread
-      logger.info "== Stopping: `#{options[:command]}`"
+    return unless @current_thread
 
-      @current_thread.stop
-      @current_thread = nil
-    end
+    logger.info "== Stopping: `#{options[:command]}`"
+
+    @current_thread.stop
+    @current_thread = nil
   end
 
   def watch_command!(async)
@@ -58,9 +57,12 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
     @current_thread.start
 
     watch_thread = Thread.new do
-      while buf = @current_thread.io.gets
+      buf = @current_thread.io.gets
+
+      while buf
         without_newline = buf.sub(/\n$/, '')
         logger.info "== External: #{without_newline}" unless without_newline.empty?
+        buf = @current_thread.io.gets
       end
 
       @current_thread.wait
@@ -80,9 +82,12 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
   private
 
   def print_command(stdout)
-    while buf = stdout.gets
+    buf = stdout.gets
+
+    while buf
       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

@@ -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,13 +18,12 @@ 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)
@@ -43,8 +42,11 @@ class Middleman::Extensions::Gzip < ::Middleman::Extension
     out_queue = Queue.new
     num_threads.times.each do
       Thread.new do
-        while path = in_queue.pop
+        path = in_queue.pop
+
+        while path
           out_queue << gzip_file(path.to_s)
+          path = in_queue.pop
         end
       end
     end
@@ -63,7 +65,7 @@ class Middleman::Extensions::Gzip < ::Middleman::Extension
       next unless output_filename
 
       total_savings += (old_size - new_size)
-      size_change_word = (old_size - new_size) > 0 ? 'smaller' : 'larger'
+      size_change_word = (old_size - new_size).positive? ? '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(20) + 1990
-        m = rand(12) + 1
-        d = rand(31) + 1
+      def date(fmt = '%a %b %d, %Y')
+        y = rand(1990..2009)
+        m = rand(1..12)
+        d = rand(1..31)
         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

@@ -10,8 +10,8 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
     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,7 +23,7 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
   end
 
   class SassCompressor
-    def self.compress(style, options={})
+    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
@@ -44,7 +44,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)
@@ -66,10 +66,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 +118,7 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
     # @return [String]
     def minify_inline(content)
       content.gsub(INLINE_CSS_REGEX) do
-        $1 + minify($2) + $3
+        Regexp.last_match(1) + minify(Regexp.last_match(2)) + Regexp.last_match(3)
       end
     end
     memoize :minify_inline

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

@@ -10,8 +10,8 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
     require 'uglifier'
     ::Uglifier.new
   }, 'Set the JS compressor to use.'
-  option :content_types, %w(application/javascript application/ld+json), 'Content types of resources that contain JS'
-  option :inline_content_types, %w(text/html text/php), 'Content types of resources that contain inline JS'
+  option :content_types, %w[application/javascript application/ld+json], '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
     # Setup Rack middleware to minify JS
@@ -36,7 +36,7 @@ class Middleman::Extensions::MinifyJavascript < ::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)
@@ -58,10 +58,10 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
       @path = env['PATH_INFO']
 
       minified = if @inline && minifiable_inline?(type)
-        minify_inline(::Middleman::Util.extract_response_text(response))
-      elsif minifiable?(type) && !ignore?(@path)
-        minify(::Middleman::Util.extract_response_text(response))
-      end
+                   minify_inline(::Middleman::Util.extract_response_text(response))
+                 elsif minifiable?(type) && !ignore?(@path)
+                   minify(::Middleman::Util.extract_response_text(response))
+                 end
 
       if minified
         headers['Content-Length'] = minified.bytesize.to_s
@@ -113,9 +113,9 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
     # @return [String]
     def minify_inline(content)
       content.gsub(INLINE_JS_REGEX) do |match|
-        first = $1
-        inline_content = $2
-        last = $3
+        first = Regexp.last_match(1)
+        inline_content = Regexp.last_match(2)
+        last = Regexp.last_match(3)
 
         # Only compress script tags that contain JavaScript (as opposed to
         # something like jQuery templates, identified with a "text/html" type).

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

@@ -3,12 +3,12 @@ require 'addressable/uri'
 # Relative Assets extension
 class Middleman::Extensions::RelativeAssets < ::Middleman::Extension
   option :exts, nil, 'List of extensions that get converted to relative paths.'
-  option :sources, %w(.css .htm .html .xhtml), 'List of extensions that are searched for relative assets.'
+  option :sources, %w[.css .htm .html .xhtml], 'List of extensions that are searched for relative assets.'
   option :ignore, [], 'Regexes of filenames to skip converting to relative paths.'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for path rewrites.'
   option :helpers_only, false, 'Allow only Ruby helpers to change paths.'
 
-  def initialize(app, options_hash={}, &block)
+  def initialize(app, options_hash = {}, &block)
     super
 
     return if options[:helpers_only]
@@ -46,11 +46,11 @@ class Middleman::Extensions::RelativeAssets < ::Middleman::Extension
   end
 
   helpers do
-    def asset_url(path, prefix='', options={})
+    def asset_url(path, prefix = '', options = {})
       super(path, prefix, app.extensions[:relative_assets].mark_as_relative(super, options, current_resource))
     end
 
-    def asset_path(kind, source, options={})
+    def asset_path(kind, source, options = {})
       super(kind, source, app.extensions[:relative_assets].mark_as_relative(super, options, current_resource))
     end
   end
@@ -64,10 +64,10 @@ class Middleman::Extensions::RelativeAssets < ::Middleman::Extension
     relative_path = uri.host.nil?
 
     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
 
     current_dir = Pathname(request_path).dirname
     result = Pathname(full_asset_path).relative_path_from(current_dir).to_s

data/lib/middleman-core/file_renderer.rb

@@ -37,17 +37,18 @@ module Middleman
       engine = extension[1..-1].to_sym
 
       # Store last engine for later (could be inside nested renders)
-      context.current_engine, engine_was = engine, context.current_engine
+      engine_was = context.current_engine
+      context.current_engine = engine
 
       # Save current buffer for later
       buf_was = context.save_buffer
 
       # Read from disk or cache the contents of the file
       body = if opts[:template_body]
-        opts.delete(:template_body)
-      else
-        template_data_for_file
-      end
+               opts.delete(:template_body)
+             else
+               template_data_for_file
+             end
 
       # Merge per-extension options from config
       extension = File.extname(path)

data/lib/middleman-core/load_paths.rb

@@ -5,7 +5,6 @@ module Middleman
   class << self
     def setup_load_paths
       @_is_setup ||= begin
-
         # Only look for config.rb if MM_ROOT isn't set
         if !ENV['MM_ROOT'] && (found_path = findup('config.rb'))
           ENV['MM_ROOT'] = found_path
@@ -22,27 +21,28 @@ module Middleman
 
     # Set BUNDLE_GEMFILE and run Bundler setup. Raises an exception if there is no Gemfile
     def setup_bundler
-      if found_gemfile_root = findup('Gemfile', ENV['MM_ROOT'])
+      found_gemfile_root = findup('Gemfile', ENV['MM_ROOT'])
+
+      if found_gemfile_root
         ENV['BUNDLE_GEMFILE'] ||= File.join(found_gemfile_root, 'Gemfile')
       end
 
       unless File.exist?(ENV['BUNDLE_GEMFILE'])
-        ENV['BUNDLE_GEMFILE'] = File.expand_path('../../../../Gemfile', __FILE__)
+        ENV['BUNDLE_GEMFILE'] = File.expand_path('../../../Gemfile', __dir__)
       end
 
-      if File.exist?(ENV['BUNDLE_GEMFILE'])
-        require 'bundler/setup'
-        Bundler.require
-      else
-        raise "Couldn't find your Gemfile. Middleman projects require a Gemfile for specifying dependencies."
-      end
+      raise "Couldn't find your Gemfile. Middleman projects require a Gemfile for specifying dependencies." unless File.exist?(ENV['BUNDLE_GEMFILE'])
+
+      require 'bundler/setup'
+      Bundler.require
     end
 
     # Recursive method to find a file in parent directories
-    def findup(filename, cwd=Dir.pwd)
+    def findup(filename, cwd = Dir.pwd)
       cwd = Pathname(cwd)
       return cwd.to_s if (cwd + filename).exist?
       return false if cwd.root?
+
       findup(filename, cwd.parent)
     end
   end