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

data/lib/middleman-core/logger.rb

@@ -1,8 +1,6 @@
 # Use the Ruby/Rails logger
 require 'active_support/notifications'
 require 'active_support/logger'
-require 'thread'
-
 module Middleman
   # The Middleman Logger
   class Logger < ActiveSupport::Logger
@@ -17,7 +15,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
@@ -41,6 +39,7 @@ 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.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.rb

@@ -8,7 +8,6 @@ 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
@@ -18,7 +17,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
@@ -35,7 +34,7 @@ module Middleman
 
         # And now comes the check
         unless server_information.valid?
-          $stderr.puts %(== Running Middleman failed: #{server_information.reason}. Please fix that and try again.)
+          warn %(== Running Middleman failed: #{server_information.reason}. Please fix that and try again.)
           exit 1
         end
 
@@ -49,6 +48,7 @@ module Middleman
 
         @initialized ||= false
         return if @initialized
+
         @initialized = true
 
         register_signal_handlers
@@ -61,7 +61,9 @@ module Middleman
 
         if @options[:daemon]
           # To output the child PID, let's make preview server a daemon by hand
-          if child_pid = fork
+          child_pid = fork
+
+          if child_pid
             app.logger.info "== Middleman preview server is running in background with PID #{child_pid}"
             Process.detach child_pid
             exit 0
@@ -91,7 +93,7 @@ module Middleman
       def stop
         begin
           app.logger.info '== The Middleman is shutting down'
-        rescue
+        rescue StandardError
           # if the user closed their terminal STDOUT/STDERR won't exist
         end
 
@@ -107,8 +109,8 @@ module Middleman
 
         begin
           app = initialize_new_app
-        rescue => e
-          $stderr.puts "Error reloading Middleman: #{e}\n#{e.backtrace.join("\n")}"
+        rescue StandardError => e
+          warn "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
@@ -149,7 +151,7 @@ module Middleman
           ready do
             unless config[:watcher_disable]
               match_against = [
-                %r{^config\.rb$},
+                /^config\.rb$/,
                 %r{^environments/[^\.](.*)\.rb$},
                 %r{^lib/[^\.](.*)\.rb$},
                 %r{^#{config[:helpers_dir]}/[^\.](.*)\.rb$}
@@ -207,17 +209,13 @@ module Middleman
       end
 
       def possible_from_cli(key, config)
-        if @cli_options[key]
-          @cli_options[key]
-        else
-          config[key]
-        end
+        @cli_options[key] || config[key]
       end
 
       # 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
@@ -245,13 +243,14 @@ 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),
-              %w(CN #{host})
+              %w[CN localhost],
+              ['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
@@ -260,16 +259,16 @@ 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]
-          $stderr.puts %(== 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.)
+          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.)
         end
       end
 
@@ -332,7 +331,7 @@ module Middleman
 
     class FilteredWebrickLog < ::WEBrick::Log
       def log(level, data)
-        super(level, data) unless data =~ %r{Could not determine content-length of response body.}
+        super(level, data) unless data =~ /Could not determine content-length of response body./
       end
     end
   end

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(*)
-        fail NoMethodError
+        raise 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 RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+        elsif /mswin|mingw|cygwin/.match?(RbConfig::CONFIG['host_os'])
           @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
+      rescue StandardError
         false
       end
     end

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

@@ -25,7 +25,7 @@ module Middleman
         end
 
         def self.match?(type)
-          :ipv4 == type
+          type == :ipv4
         end
       end
 
@@ -36,7 +36,7 @@ module Middleman
         end
 
         def self.match?(type)
-          :ipv6 == type
+          type == :ipv6
         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_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
+      rescue StandardError
         server = TCPServer.open(0)
         port = server.addr[1]
         server.close

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 => e
+          rescue StandardError => e
             e.to_s
           end
         end

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

@@ -43,7 +43,7 @@ module Middleman
 
     # Haml Renderer
     class Haml < ::Middleman::Extension
-      def initialize(app, options={}, &block)
+      def initialize(app, options = {}, &block)
         super
 
         ::Haml::Options.defaults[:context] = nil
@@ -51,8 +51,6 @@ module Middleman
         if defined?(::Haml::TempleEngine)
           ::Haml::TempleEngine.define_options context: nil
         end
-
-        # rubocop:disable NestedMethodDefinition
         [::Haml::Filters::Sass, ::Haml::Filters::Scss, ::Haml::Filters::Markdown].each do |f|
           f.class_exec do
             def self.render_with_options(text, compiler_options)
@@ -64,7 +62,6 @@ module Middleman
             end
           end
         end
-        # rubocop:enable NestedMethodDefinition
 
         ::Tilt.prefer(::Middleman::Renderers::HamlTemplate, :haml)
 

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

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

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

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

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

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