middleman-core 4.3.0.rc.4 → 4.3.0

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

@@ -2,16 +2,16 @@ require 'active_support/core_ext/object/try'
 require 'middleman-core/contracts'
 require 'memoist'
 
-# Minify JavaScript Extension
-class Middleman::Extensions::MinifyJavaScript < ::Middleman::Extension
+# Minify Javascript Extension
+class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
   option :inline, false, 'Whether to minify JS inline within HTML files'
   option :ignore, [], 'Patterns to avoid minifying'
   option :compressor, proc {
     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), '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)
@@ -49,7 +49,7 @@ class Middleman::Extensions::MinifyJavaScript < ::Middleman::Extension
     end
 
     # Rack interface
-    # @param [Rack::Environment] env
+    # @param [Rack::Environmemt] env
     # @return [Array]
     def call(env)
       status, headers, response = @app.call(env)
@@ -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 = Regexp.last_match(1)
-        inline_content = Regexp.last_match(2)
-        last = Regexp.last_match(3)
+        first = $1
+        inline_content = $2
+        last = $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/extensions.rb

@@ -49,9 +49,8 @@ module Middleman
       #        you the ability to require other files only when the
       #        extension is first activated.
       # @return [void]
-      def register(name, extension_class = nil, options = {}, &block)
+      def register(name, extension_class=nil, options={}, &block)
         raise 'Extension name must be a symbol' unless name.is_a?(Symbol)
-
         # If we've already got an extension registered under this name, bail out
         # raise "There is a already an extension registered with the name '#{name}'" if registered.key?(name)
 
@@ -62,12 +61,12 @@ module Middleman
         end
 
         registered[name] = if block_given?
-                             block
-                           elsif extension_class && extension_class.ancestors && extension_class.ancestors.include?(::Middleman::Extension)
-                             extension_class
-                           else
-                             raise 'You must provide a Middleman::Extension or a block that returns a Middleman::Extension'
-                           end
+          block
+        elsif extension_class && extension_class.ancestors.include?(::Middleman::Extension)
+          extension_class
+        else
+          raise 'You must provide a Middleman::Extension or a block that returns a Middleman::Extension'
+        end
 
         return unless options[:auto_activate]
 

data/lib/middleman-core/file_renderer.rb

@@ -32,23 +32,22 @@ module Middleman
     def render(locs, opts, context, &block)
       path = @path.dup
 
-      # Detect the rendering engine from the extension
+      # Detect the remdering engine from the extension
       extension = File.extname(path)
       engine = extension[1..-1].to_sym
 
       # Store last engine for later (could be inside nested renders)
-      engine_was = context.current_engine
-      context.current_engine = engine
+      context.current_engine, engine_was = engine, context.current_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,6 +5,7 @@ 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
@@ -21,31 +22,27 @@ module Middleman
 
     # Set BUNDLE_GEMFILE and run Bundler setup. Raises an exception if there is no Gemfile
     def setup_bundler
-      found_gemfile_root = findup('Gemfile', ENV['MM_ROOT'])
-
-      if found_gemfile_root
+      if found_gemfile_root = findup('Gemfile', ENV['MM_ROOT'])
         ENV['BUNDLE_GEMFILE'] ||= File.join(found_gemfile_root, 'Gemfile')
       end
 
       unless File.exist?(ENV['BUNDLE_GEMFILE'])
-        ENV['BUNDLE_GEMFILE'] = File.expand_path('../../../Gemfile', __dir__)
+        ENV['BUNDLE_GEMFILE'] = File.expand_path('../../../../Gemfile', __FILE__)
       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(
-        :default,
-        (ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development').to_sym
-      )
+      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
     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

data/lib/middleman-core/logger.rb

@@ -1,11 +1,13 @@
 # Use the Ruby/Rails logger
 require 'active_support/notifications'
 require 'active_support/logger'
+require 'thread'
+
 module Middleman
   # The Middleman Logger
   class Logger < ActiveSupport::Logger
     def self.singleton(*args)
-      if !@_logger || !args.empty?
+      if !@_logger || !args || !args.empty?
         if args.length == 1 && (args.first.is_a?(::String) || args.first.respond_to?(:write))
           args = [0, false, args.first]
         end
@@ -15,7 +17,7 @@ module Middleman
       @_logger
     end
 
-    def initialize(log_level = 1, is_instrumenting = false, target = $stdout)
+    def initialize(log_level=1, is_instrumenting=false, target=$stdout)
       super(target)
 
       self.level = log_level
@@ -39,7 +41,6 @@ module Middleman
 
       evt = ::ActiveSupport::Notifications::Event.new(message, *args)
       return unless evt.duration > 30
-
       info "== Instrument (#{evt.name.sub(/.middleman$/, '')}): #{evt.duration}ms\n#{args.last}"
     end
   end

data/lib/middleman-core/meta_pages/sitemap_resource.rb

@@ -1,4 +1,6 @@
 require 'padrino-helpers'
+require 'padrino-helpers/output_helpers'
+require 'padrino-helpers/tag_helpers'
 
 module Middleman
   module MetaPages

data/lib/middleman-core/meta_pages/sitemap_tree.rb

@@ -59,7 +59,7 @@ module Middleman
 
         if path_parts.size == 1
           sitemap_class = SitemapResource
-          # Allow special sitemap resources to use custom metadata view classes
+          # Allow special sitemap resources to use custom metadata view calsses
           sitemap_class = resource.meta_pages_class if resource.respond_to? :meta_pages_class
 
           @children[first_part] = sitemap_class.new(resource)

data/lib/middleman-core/meta_pages.rb

@@ -93,7 +93,7 @@ module Middleman
       private
 
       # Render a template with the given name and locals
-      def template(template_name, locals = {})
+      def template(template_name, locals={})
         template_path = File.join(File.dirname(__FILE__), 'meta_pages', 'templates', template_name)
         content = Tilt.new(template_path).render(::Object.new, locals)
         response(content)

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

@@ -46,7 +46,7 @@ module Middleman
         # @param [Information] information
         #   The information to be validated
         def validate(information)
-          return if information.bind_address.blank? || information.local_network_interfaces.include?(information.bind_address.to_s) || %w[0.0.0.0 ::].any? { |b| information.bind_address == b } || IPAddr.new('127.0.0.0/8').include?(information.bind_address.to_s)
+          return if information.bind_address.blank? || information.local_network_interfaces.include?(information.bind_address.to_s) || %w(0.0.0.0 ::).any? { |b| information.bind_address == b } || IPAddr.new('127.0.0.0/8').include?(information.bind_address.to_s)
 
           information.valid = false
           information.reason = format('Bind address "%s" is not available on your system. Please use one of %s', information.bind_address, information.local_network_interfaces.map { |i| %("#{i}") }.join(', '))

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

@@ -27,7 +27,7 @@ module Middleman
       #
       # @param [Integer] port
       #   The port to listen on
-      def initialize(opts = {})
+      def initialize(opts={})
         @bind_address = ServerIpAddress.new(opts[:bind_address])
         @server_name  = ServerHostname.new(opts[:server_name])
         @port         = opts[:port]
@@ -56,7 +56,7 @@ module Middleman
       end
 
       def resolve_me(*)
-        raise NoMethodError
+        fail NoMethodError
       end
 
       # Get network information
@@ -100,7 +100,7 @@ module Middleman
         after_init
       end
 
-      def self.matches?(opts = {})
+      def self.matches?(opts={})
         opts[:bind_address].blank? && opts[:server_name].blank?
       end
 
@@ -116,7 +116,7 @@ module Middleman
           @site_addresses << hostname
 
           network_interface = ServerIpAddress.new((local_network_interfaces & hostname_ips).first)
-        elsif /mswin|mingw|cygwin/.match?(RbConfig::CONFIG['host_os'])
+        elsif RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
           @server_name = hostname
           @site_addresses << hostname
         elsif !resolved_name.blank?
@@ -146,7 +146,7 @@ module Middleman
     # This is used if bind address is 0.0.0.0, the server name needs to be
     # blank
     class AllIpv4Interfaces < AllInterfaces
-      def self.matches?(opts = {})
+      def self.matches?(opts={})
         opts[:bind_address] == '0.0.0.0' && opts[:server_name].blank?
       end
 
@@ -164,7 +164,7 @@ module Middleman
 
     # This is used if bind address is ::, the server name needs to be blank
     class AllIpv6Interfaces < AllInterfaces
-      def self.matches?(opts = {})
+      def self.matches?(opts={})
         opts[:bind_address] == '::' && opts[:server_name].blank?
       end
 
@@ -189,7 +189,7 @@ module Middleman
         @site_addresses << bind_address
       end
 
-      def self.matches?(opts = {})
+      def self.matches?(opts={})
         !opts[:bind_address].blank? && opts[:server_name].blank?
       end
 
@@ -222,7 +222,7 @@ module Middleman
         self
       end
 
-      def self.matches?(opts = {})
+      def self.matches?(opts={})
         opts[:bind_address].blank? && !opts[:server_name].blank?
       end
     end
@@ -240,8 +240,8 @@ module Middleman
         @checks << Checks::ServerNameResolvesToBindAddress.new
       end
 
-      def self.matches?(opts = {})
-        !opts[:bind_address].blank? && !opts[:server_name].blank? && !%w[:: 0.0.0.0].include?(opts[:bind_address])
+      def self.matches?(opts={})
+        !opts[:bind_address].blank? && !opts[:server_name].blank? && !%w(:: 0.0.0.0).include?(opts[:bind_address])
       end
 
       def resolve_me(*); end
@@ -250,7 +250,7 @@ module Middleman
     # If the server name is either an ipv4 or ipv6 address, e.g. 127.0.0.1 or
     # ::1, use this one
     class ServerNameIsIpInformation < BasicInformation
-      def initialize(opts = {})
+      def initialize(opts={})
         super
 
         ip = ServerIpAddress.new(server_name.to_s)
@@ -261,11 +261,11 @@ module Middleman
 
       def resolve_me(*); end
 
-      def self.matches?(opts = {})
+      def self.matches?(opts={})
         ip = IPAddr.new(opts[:server_name])
 
         ip.ipv4? || ip.ipv6?
-      rescue StandardError
+      rescue
         false
       end
     end

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

@@ -25,7 +25,7 @@ module Middleman
         end
 
         def self.match?(type)
-          type == :ipv4
+          :ipv4 == type
         end
       end
 
@@ -36,7 +36,7 @@ module Middleman
         end
 
         def self.match?(type)
-          type == :ipv6
+          :ipv6 == type
         end
       end
 
@@ -57,7 +57,7 @@ module Middleman
       #
       # @param [Symbol] type
       #   The type of interface which should be returned
-      def network_interfaces(type = :all)
+      def network_interfaces(type=:all)
         types.find { |t| t.match? type.to_sym }.new.network_interfaces
       end
     end

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

@@ -22,7 +22,7 @@ module Middleman
 
       attr_writer :https
 
-      def initialize(opts = {})
+      def initialize(opts={})
         @resolver     = opts.fetch(:resolver, DnsResolver.new)
         @validator    = opts.fetch(:validator, ServerInformationValidator.new)
         @network_interface_inventory = opts.fetch(:network_interface_inventory, NetworkInterfaceInventory.new)

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

@@ -7,7 +7,7 @@ module Middleman
     # * server name
     # * site_addresses
     #
-    # All information is "duped" and the callback is not meant to be used to
+    # All information is "dupped" and the callback is not meant to be used to
     # modify these information.
     class ServerInformationCallbackProxy
       attr_reader :server_name, :port, :site_addresses, :listeners

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

@@ -10,7 +10,7 @@ module Middleman
 
       public
 
-      def initialize(opts = {})
+      def initialize(opts={})
         @hosts = opts.fetch(:hosts)
         @port  = opts.fetch(:port)
         @https = opts.fetch(:https, false)

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

@@ -17,7 +17,7 @@ module Middleman
         server.close
 
         try_port
-      rescue StandardError
+      rescue
         server = TCPServer.open(0)
         port = server.addr[1]
         server.close

data/lib/middleman-core/preview_server.rb

@@ -8,6 +8,7 @@ require 'middleman-core/preview_server/server_information'
 require 'middleman-core/preview_server/server_url'
 require 'middleman-core/preview_server/server_information_callback_proxy'
 
+# rubocop:disable GlobalVars
 module Middleman
   class PreviewServer
     class << self
@@ -17,7 +18,7 @@ module Middleman
 
       # Start an instance of Middleman::Application
       # @return [void]
-      def start(opts = {}, cli_options = {})
+      def start(opts={}, cli_options={})
         # Do not buffer output, otherwise testing of output does not work
         $stdout.sync = true
         $stderr.sync = true
@@ -34,7 +35,7 @@ module Middleman
 
         # And now comes the check
         unless server_information.valid?
-          warn %(== Running Middleman failed: #{server_information.reason}. Please fix that and try again.)
+          $stderr.puts %(== Running Middleman failed: #{server_information.reason}. Please fix that and try again.)
           exit 1
         end
 
@@ -48,7 +49,6 @@ module Middleman
 
         @initialized ||= false
         return if @initialized
-
         @initialized = true
 
         register_signal_handlers
@@ -61,9 +61,7 @@ module Middleman
 
         if @options[:daemon]
           # To output the child PID, let's make preview server a daemon by hand
-          child_pid = fork
-
-          if child_pid
+          if child_pid = fork
             app.logger.info "== Middleman preview server is running in background with PID #{child_pid}"
             Process.detach child_pid
             exit 0
@@ -93,7 +91,7 @@ module Middleman
       def stop
         begin
           app.logger.info '== The Middleman is shutting down'
-        rescue StandardError
+        rescue
           # if the user closed their terminal STDOUT/STDERR won't exist
         end
 
@@ -109,8 +107,8 @@ module Middleman
 
         begin
           app = initialize_new_app
-        rescue StandardError => e
-          warn "Error reloading Middleman: #{e}\n#{e.backtrace.join("\n")}"
+        rescue => e
+          $stderr.puts "Error reloading Middleman: #{e}\n#{e.backtrace.join("\n")}"
           app.logger.info '== The Middleman is still running the application from before the error'
           return
         end
@@ -151,7 +149,7 @@ module Middleman
           ready do
             unless config[:watcher_disable]
               match_against = [
-                /^config\.rb$/,
+                %r{^config\.rb$},
                 %r{^environments/[^\.](.*)\.rb$},
                 %r{^lib/[^\.](.*)\.rb$},
                 %r{^#{config[:helpers_dir]}/[^\.](.*)\.rb$}
@@ -201,21 +199,25 @@ module Middleman
 
         # Add in the meta pages application
         meta_app = Middleman::MetaPages::Application.new(app)
-        app.map '/__middleman' do |rack|
-          rack.run meta_app
+        app.map '/__middleman' do
+          run meta_app
         end
 
         app
       end
 
       def possible_from_cli(key, config)
-        @cli_options[key] || config[key]
+        if @cli_options[key]
+          @cli_options[key]
+        else
+          config[key]
+        end
       end
 
-      # Trap some interrupt signals and shut down smoothly
+      # Trap some interupt signals and shut down smoothly
       # @return [void]
       def register_signal_handlers
-        %w[INT HUP TERM QUIT].each do |sig|
+        %w(INT HUP TERM QUIT).each do |sig|
           next unless Signal.list[sig]
 
           Signal.trap(sig) do
@@ -243,14 +245,13 @@ module Middleman
 
           if ssl_certificate || ssl_private_key
             raise 'You must provide both :ssl_certificate and :ssl_private_key' unless ssl_private_key && ssl_certificate
-
             http_opts[:SSLCertificate] = OpenSSL::X509::Certificate.new ::File.read ssl_certificate
             http_opts[:SSLPrivateKey] = OpenSSL::PKey::RSA.new ::File.read ssl_private_key
           else
             # use a generated self-signed cert
             http_opts[:SSLCertName] = [
-              %w[CN localhost],
-              ['CN', host]
+              %w(CN localhost),
+              %w(CN #{host})
             ].uniq
             cert, key = create_self_signed_cert(1024, [['CN', server_information.server_name]], server_information.site_addresses, 'Middleman Preview Server')
             http_opts[:SSLCertificate] = cert
@@ -259,16 +260,15 @@ module Middleman
         end
 
         http_opts[:Logger] = if is_logging
-                               FilteredWebrickLog.new
-                             else
-                               ::WEBrick::Log.new(nil, 0)
-                             end
+          FilteredWebrickLog.new
+        else
+          ::WEBrick::Log.new(nil, 0)
+        end
 
         begin
           ::WEBrick::HTTPServer.new(http_opts)
         rescue Errno::EADDRINUSE
-          port = http_opts[:Port]
-          warn %(== Port #{port} is already in use. This could mean another instance of middleman is already running. Please make sure port #{port} is free and start `middleman server` again, or choose another port by running `middleman server —-port=#{port + 1}` instead.)
+          $stderr.puts %(== Port "#{http_opts[:Port]}" is in use. This should not have happened. Please start "middleman server" again.)
         end
       end
 
@@ -331,7 +331,7 @@ module Middleman
 
     class FilteredWebrickLog < ::WEBrick::Log
       def log(level, data)
-        super(level, data) unless data =~ /Could not determine content-length of response body./
+        super(level, data) unless data =~ %r{Could not determine content-length of response body.}
       end
     end
   end

data/lib/middleman-core/rack.rb

@@ -143,7 +143,7 @@ module Middleman
         response = file.serving(env)
       end
       status = response[0]
-      response[1]['Content-Encoding'] = 'gzip' if %w[.svgz .gz].include?(resource.ext)
+      response[1]['Content-Encoding'] = 'gzip' if %w(.svgz .gz).include?(resource.ext)
       # Do not set Content-Type if status is 1xx, 204, 205 or 304, otherwise
       # Rack will throw an error (500)
       if !(100..199).cover?(status) && ![204, 205, 304].include?(status)

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

@@ -6,7 +6,7 @@ module Middleman
     # CoffeeScript Renderer
     class CoffeeScript < ::Middleman::Extension
       # Setup extension
-      def initialize(app, options = {}, &block)
+      def initialize(app, options={}, &block)
         super
 
         # Tell Tilt to use it as well (for inline scss blocks)
@@ -32,7 +32,7 @@ module Middleman
             super
           rescue ::ExecJS::RuntimeError => e
             e.to_s
-          rescue StandardError => e
+          rescue => e
             e.to_s
           end
         end