middleman-core 3.3.2 → 3.3.3

data/lib/middleman-core/core_extensions/show_exceptions.rb

@@ -5,10 +5,8 @@ require 'rack/showexceptions'
 module Middleman
   module CoreExtensions
     module ShowExceptions
-
       # Setup extension
       class << self
-
         # Once registered
         def registered(app)
           # Whether to catch and display exceptions
@@ -18,9 +16,7 @@ module Middleman
           # When in dev
           app.configure :development do
             # Include middlemare
-            if config[:show_exceptions]
-              use ::Rack::ShowExceptions
-            end
+            use ::Rack::ShowExceptions if config[:show_exceptions]
           end
         end
       end

data/lib/middleman-core/extension.rb

@@ -2,11 +2,10 @@ require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/class/attribute'
 
 module Middleman
-
   class Extension
-    class_attribute :supports_multiple_instances, :instance_reader => false, :instance_writer => false
-    class_attribute :defined_helpers, :instance_reader => false, :instance_writer => false
-    class_attribute :ext_name, :instance_reader => false, :instance_writer => false
+    class_attribute :supports_multiple_instances, instance_reader: false, instance_writer: false
+    class_attribute :defined_helpers, instance_reader: false, instance_writer: false
+    class_attribute :ext_name, instance_reader: false, instance_writer: false
 
     class << self
       def config
@@ -24,7 +23,7 @@ module Middleman
       def helpers(*m, &block)
         self.defined_helpers ||= []
 
-        if block
+        if block_given?
           mod = Module.new
           mod.module_eval(&block)
           m = [mod]
@@ -34,10 +33,10 @@ module Middleman
       end
 
       def extension_name
-        self.ext_name || self.name.underscore.split('/').last.to_sym
+        ext_name || name.underscore.split('/').last.to_sym
       end
 
-      def register(n=self.extension_name)
+      def register(n=extension_name)
         ::Middleman::Extensions.register(n, self)
       end
 
@@ -59,7 +58,7 @@ module Middleman
         name = instance.class.extension_name
         return unless @_extension_activation_callbacks && @_extension_activation_callbacks[name]
         @_extension_activation_callbacks[name].each do |block|
-          block.arity == 1 ? block.call(instance) : block.call()
+          block.arity == 1 ? block.call(instance) : block.call
         end
       end
     end
@@ -67,7 +66,7 @@ module Middleman
     attr_accessor :options
     attr_reader :app
 
-    delegate :after_extension_activated, :to => :"::Middleman::Extension"
+    delegate :after_extension_activated, to: :"::Middleman::Extension"
 
     def initialize(klass, options_hash={}, &block)
       @_helpers = []
@@ -91,9 +90,9 @@ module Middleman
       end
     end
 
-  protected
+    protected
 
-    def setup_options(options_hash, &block)
+    def setup_options(options_hash)
       @options = self.class.config.dup
       @options.finalize!
 
@@ -128,10 +127,9 @@ module Middleman
     def bind_after_configuration
       ext = self
       @klass.after_configuration do
-        if ext.respond_to?(:after_configuration)
-          ext.after_configuration
-        end
+        ext.after_configuration if ext.respond_to?(:after_configuration)
 
+        # rubocop:disable IfUnlessModifier
         if ext.respond_to?(:manipulate_resource_list)
           ext.app.sitemap.register_resource_list_manipulator(ext.class.extension_name, ext)
         end
@@ -142,7 +140,7 @@ module Middleman
       ext = self
       if ext.respond_to?(:before_build)
         @klass.before_build do |builder|
-          if ext.method(:before_build).arity === 1
+          if ext.method(:before_build).arity == 1
             ext.before_build(builder)
           else
             ext.before_build
@@ -155,7 +153,7 @@ module Middleman
       ext = self
       if ext.respond_to?(:after_build)
         @klass.after_build do |builder|
-          if ext.method(:after_build).arity === 1
+          if ext.method(:after_build).arity == 1
             ext.after_build(builder)
           else
             ext.after_build

data/lib/middleman-core/extensions.rb

@@ -1,7 +1,5 @@
 module Middleman
-
   module Extensions
-
     class << self
       def registered
         @_registered ||= {}
@@ -24,7 +22,7 @@ module Middleman
       def register(name, namespace=nil, &block)
         # If we've already got a matching extension that passed the
         # version check, bail out.
-        return if registered.has_key?(name.to_sym) &&
+        return if registered.key?(name.to_sym) &&
         !registered[name.to_sym].is_a?(String)
 
         registered[name.to_sym] = if block_given?
@@ -36,11 +34,11 @@ module Middleman
 
       def load(name)
         name = name.to_sym
-        return nil unless registered.has_key?(name)
+        return nil unless registered.key?(name)
 
         extension = registered[name]
         if extension.is_a?(Proc)
-          extension = extension.call() || nil
+          extension = extension.call || nil
           registered[name] = extension
         end
 
@@ -92,7 +90,7 @@ module Middleman
     # @return [Boolean] Whether the file exists
     def spec_has_file?(spec, path)
       full_path = File.join(spec.full_gem_path, path)
-      File.exists?(full_path)
+      File.exist?(full_path)
     end
   end
 end

data/lib/middleman-core/load_paths.rb

@@ -2,7 +2,6 @@
 require 'pathname'
 
 module Middleman
-
   class << self
     def setup_load_paths
       @_is_setup ||= begin
@@ -20,12 +19,12 @@ module Middleman
           root_gemfile = File.expand_path('Gemfile', ENV['MM_ROOT'])
           ENV['BUNDLE_GEMFILE'] ||= root_gemfile
 
-          if !File.exists?(ENV['BUNDLE_GEMFILE'])
+          unless File.exist?(ENV['BUNDLE_GEMFILE'])
             git_gemfile = Pathname.new(__FILE__).expand_path.parent.parent.parent + 'Gemfile'
             ENV['BUNDLE_GEMFILE'] = git_gemfile.to_s
           end
 
-          if File.exists?(ENV['BUNDLE_GEMFILE'])
+          if File.exist?(ENV['BUNDLE_GEMFILE'])
             is_bundler_setup = true
             require 'bundler/setup'
           end
@@ -45,12 +44,10 @@ module Middleman
     end
 
     # Recursive method to find config.rb
-    def locate_root(cwd = Pathname.new(Dir.pwd))
+    def locate_root(cwd=Pathname.new(Dir.pwd))
       return cwd.to_s if (cwd + 'config.rb').exist?
       return false if cwd.root?
       locate_root(cwd.parent)
     end
-
   end
-
 end

data/lib/middleman-core/logger.rb

@@ -4,10 +4,8 @@ require 'active_support/logger'
 require 'thread'
 
 module Middleman
-
   # The Middleman Logger
   class Logger < ActiveSupport::Logger
-
     def self.singleton(*args)
       if !@_logger || args.length > 0
         if args.length == 1 && (args.first.is_a?(::String) || args.first.respond_to?(:write))
@@ -42,7 +40,7 @@ module Middleman
       return if @instrumenting.is_a?(String) && @instrumenting != 'instrument' && !message.include?(@instrumenting)
 
       evt = ActiveSupport::Notifications::Event.new(message, *args)
-      self.info "== Instrument (#{evt.name.sub(/.middleman$/, '')}): #{evt.duration}ms"
+      info "== Instrument (#{evt.name.sub(/.middleman$/, '')}): #{evt.duration}ms"
     end
   end
 end

data/lib/middleman-core/meta_pages.rb

@@ -19,7 +19,7 @@ module Middleman
         meta_pages = self
         @rack_app = Rack::Builder.new do
           # Serve assets from metadata/assets
-          use Rack::Static, :urls => ['/assets'], :root => File.join(File.dirname(__FILE__), 'meta_pages')
+          use Rack::Static, urls: ['/assets'], root: File.join(File.dirname(__FILE__), 'meta_pages')
 
           map '/' do
             run meta_pages.method(:index)
@@ -40,12 +40,12 @@ module Middleman
       end
 
       # The index page
-      def index(env)
+      def index(_)
         template('index.html.erb')
       end
 
       # Inspect the sitemap
-      def sitemap(env)
+      def sitemap(_)
         resources = @middleman.inst.sitemap.resources(true)
 
         sitemap_tree = SitemapTree.new
@@ -54,12 +54,12 @@ module Middleman
           sitemap_tree.add_resource resource
         end
 
-        template('sitemap.html.erb', :sitemap_tree => sitemap_tree)
+        template('sitemap.html.erb', sitemap_tree: sitemap_tree)
       end
 
       # Inspect configuration
-      def config(env)
-        global_config = @middleman.inst.config.all_settings.map {|c| ConfigSetting.new(c) }
+      def config(_)
+        global_config = @middleman.inst.config.all_settings.map { |c| ConfigSetting.new(c) }
         extension_config = {}
 
         @middleman.inst.extensions.each do |ext_name, extension|
@@ -80,9 +80,9 @@ module Middleman
         end
 
         template('config.html.erb',
-                 :global_config => global_config,
-                 :extension_config => extension_config,
-                 :registered_extensions => Middleman::Extensions.registered.dup)
+                 global_config: global_config,
+                 extension_config: extension_config,
+                 registered_extensions: Middleman::Extensions.registered.dup)
       end
 
       private
@@ -96,11 +96,11 @@ module Middleman
 
       # Respond to an HTML request
       def response(content)
-        [ 200, {'Content-Type' => 'text/html'}, Array(content) ]
+        [200, { 'Content-Type' => 'text/html' }, Array(content)]
       end
 
       def extension_options(extension)
-        extension.options.all_settings.map {|c| ConfigSetting.new(c) }
+        extension.options.all_settings.map { |c| ConfigSetting.new(c) }
       end
     end
   end

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

@@ -15,17 +15,17 @@ module Middleman
         content = ''
         key_classes = ['key']
         key_classes << 'modified' if @setting.value_set?
-        content << content_tag(:span, @setting.key.pretty_inspect.strip, :class => key_classes.join(' '))
+        content << content_tag(:span, @setting.key.pretty_inspect.strip, class: key_classes.join(' '))
         content << ' = '
-        content << content_tag(:span, @setting.value.pretty_inspect.strip, :class => 'value')
+        content << content_tag(:span, @setting.value.pretty_inspect.strip, class: 'value')
         if @setting.default && @setting.value_set? && @setting.default != @setting.value
-          content << content_tag(:span, :class => 'default') do
+          content << content_tag(:span, class: 'default') do
             "(Default: #{@setting.default.inspect})"
           end
         end
 
         if @setting.description
-          content << content_tag(:p, :class => 'description') do
+          content << content_tag(:p, class: 'description') do
             @setting.description
           end
         end

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

@@ -14,7 +14,7 @@ module Middleman
       def render
         classes = 'resource-details'
         classes << ' ignored' if @resource.ignored?
-        content_tag :div, :class => classes do
+        content_tag :div, class: classes do
           content_tag :table do
             content = ''
             resource_properties.each do |label, value|
@@ -38,7 +38,7 @@ module Middleman
         build_path = @resource.destination_path
         build_path = 'Not built' if ignored?
         props['Build Path'] = build_path if @resource.path != build_path
-        props['URL'] = content_tag(:a, @resource.url, :href => @resource.url) unless ignored?
+        props['URL'] = content_tag(:a, @resource.url, href: @resource.url) unless ignored?
         props['Source File'] = @resource.source_file.sub(/^#{Regexp.escape(ENV['MM_ROOT'] + '/')}/, '')
 
         data = @resource.data

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

@@ -13,8 +13,7 @@ module Middleman
       end
 
       def render
-        content = ''
-        @children.keys.sort do |a,b|
+        sorted_children_keys = @children.keys.sort do |a, b|
           a_subtree = @children[a]
           b_subtree = @children[b]
           if a_subtree.is_a? SitemapResource
@@ -32,7 +31,9 @@ module Middleman
           else
             a.downcase <=> b.downcase
           end
-        end.each do |path_part|
+        end
+
+        sorted_children_keys.reduce('') do |content, path_part|
           subtree = @children[path_part]
           content << "<details class='#{subtree.css_classes.join(' ')}'>"
           content << '<summary>'
@@ -41,7 +42,6 @@ module Middleman
           content << subtree.render
           content << '</details>'
         end
-        content
       end
 
       def css_classes

data/lib/middleman-core/preview_server.rb

@@ -2,20 +2,20 @@ require 'webrick'
 require 'middleman-core/meta_pages'
 require 'middleman-core/logger'
 
+# rubocop:disable GlobalVars
 module Middleman
   module PreviewServer
-
     DEFAULT_PORT = 4567
 
     class << self
       attr_reader :app, :host, :port
-      delegate :logger, :to => :app
+      delegate :logger, to: :app
 
       # Start an instance of Middleman::Application
       # @return [void]
       def start(opts={})
         @options = opts
-        @host = @options[:host] || Socket.ip_address_list.find(&:ipv4_private?).ip_address
+        @host = @options[:host] || '0.0.0.0'
         @port = @options[:port] || DEFAULT_PORT
 
         mount_instance(new_app)
@@ -70,7 +70,7 @@ module Middleman
 
         begin
           app = new_app
-        rescue Exception => e
+        rescue => e
           logger.error "Error reloading Middleman: #{e}\n#{e.backtrace.join("\n")}"
           logger.info '== The Middleman is still running the application from before the error'
           return
@@ -89,7 +89,8 @@ module Middleman
         @webrick.shutdown
       end
 
-    private
+      private
+
       def new_app
         opts = @options.dup
         server = ::Middleman::Application.server
@@ -120,7 +121,7 @@ module Middleman
         if first_run
           # Watcher Library
           require 'listen'
-          @listener = Listen.to(Dir.pwd, :relative_paths => true, :force_polling => @options[:force_polling])
+          @listener = Listen.to(Dir.pwd, relative_paths: true, force_polling: @options[:force_polling])
           @listener.latency(@options[:latency])
         end
 
@@ -166,10 +167,10 @@ module Middleman
       # @return [void]
       def setup_webrick(is_logging)
         http_opts = {
-          :BindAddress        => host,
-          :Port               => port,
-          :AccessLog          => [],
-          :DoNotReverseLookup => true
+          BindAddress: host,
+          Port: port,
+          AccessLog: [],
+          DoNotReverseLookup: true
         }
 
         if is_logging
@@ -181,7 +182,7 @@ module Middleman
         begin
           ::WEBrick::HTTPServer.new(http_opts)
         rescue Errno::EADDRINUSE
-          logger.error "== Port #{port} is unavailable. Either close the instance of Middleman already running on #{port} or start this Middleman on a new port with: --port=#{port.to_i+1}"
+          logger.error "== Port #{port} is unavailable. Either close the instance of Middleman already running on #{port} or start this Middleman on a new port with: --port=#{port.to_i + 1}"
           exit(1)
         end
       end

data/lib/middleman-core/profiling.rb

@@ -1,7 +1,7 @@
 module Middleman
   module Profiling
-
     # The profiler instance. There can only be one!
+    # rubocop:disable TrivialAccessors
     def self.profiler=(prof)
       @profiler = prof
     end
@@ -24,18 +24,16 @@ module Middleman
       def start
       end
 
-      def report(report_name)
+      def report(_)
       end
     end
 
     # A profiler that uses ruby-prof
     class RubyProfProfiler
       def initialize
-        begin
-          require 'ruby-prof'
-        rescue LoadError
-          raise "To use the --profile option, you must add the 'ruby-prof' gem to your Gemfile"
-        end
+        require 'ruby-prof'
+      rescue LoadError
+        raise "To use the --profile option, you must add the 'ruby-prof' gem to your Gemfile"
       end
 
       def start
@@ -50,7 +48,7 @@ module Middleman
         outfile = (outfile + '.html') unless outfile.end_with? '.html'
         FileUtils.mkdir_p(File.dirname(outfile))
         File.open(outfile, 'w') do |f|
-          printer.print(f, :min_percent=> 1)
+          printer.print(f, min_percent: 1)
         end
       end
     end