rubocoping2

middleman-cli/lib/middleman-cli/build.rb

@@ -170,11 +170,11 @@ module Middleman::Cli
         path.to_s !~ /\/\./ || path.to_s =~ /\.(htaccess|htpasswd)/
       end
 
-      if RUBY_PLATFORM =~ /darwin/
+      return unless RUBY_PLATFORM =~ /darwin/
+
       # handle UTF-8-MAC filename on MacOS
       @to_clean = @to_clean.map { |path| path.to_s.encode('UTF-8', 'UTF-8-MAC') }
     end
-    end
 
     # Actually build the app
     # @return [void]
@@ -222,7 +222,8 @@ module Middleman::Cli
 
       output_path = render_to_file(resource)
 
-      if should_clean? && output_path.exist?
+      return unless should_clean? && output_path.exist?
+
       if RUBY_PLATFORM =~ /darwin/
         # handle UTF-8-MAC filename on MacOS
 
@@ -231,7 +232,6 @@ module Middleman::Cli
         @to_clean.delete(output_path.realpath)
       end
     end
-    end
 
     # Render a resource to a file.
     #
@@ -281,9 +281,7 @@ module Middleman::Cli
     end
 
     def binary_encode(string)
-      if string.respond_to?(:force_encoding)
+      string.force_encoding('ascii-8bit') if string.respond_to?(:force_encoding)
-        string.force_encoding('ascii-8bit')
-      end
       string
     end
   end

middleman-core/lib/middleman-core/core_extensions/i18n.rb

@@ -92,11 +92,11 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
   private
 
   def on_file_changed(file)
-    if @locales_regex =~ file
+    return unless @locales_regex =~ file
-      @langs = nil # Clear langs cache
+
+    @_langs = nil # Clear langs cache
     ::I18n.reload!
   end
-  end
 
   def convert_glob_to_regex(glob)
     # File.fnmatch doesn't support brackets: {rb,yml,yaml}
@@ -109,10 +109,9 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
     ::I18n.reload!
 
     ::I18n.default_locale = @mount_at_root
+
     # Reset fallbacks to fall back to our new default
-    if ::I18n.respond_to? :fallbacks
+    ::I18n.fallbacks = ::I18n::Locale::Fallbacks.new if ::I18n.respond_to?(:fallbacks)
-      ::I18n.fallbacks = ::I18n::Locale::Fallbacks.new
-    end
   end
 
   def known_languages

middleman-core/lib/middleman-core/extension.rb

@@ -269,12 +269,12 @@ module Middleman
 
     def bind_before_configuration
       ext = self
-      if ext.respond_to?(:before_configuration)
+      return unless ext.respond_to?(:before_configuration)
+
       @klass.before_configuration do
         ext.before_configuration
       end
     end
-    end
 
     def bind_after_configuration
       ext = self
@@ -289,7 +289,8 @@ module Middleman
 
     def bind_before_build
       ext = self
-      if ext.respond_to?(:before_build)
+      return unless ext.respond_to?(:before_build)
+
       @klass.before_build do |builder|
         if ext.method(:before_build).arity == 1
           ext.before_build(builder)
@@ -298,11 +299,11 @@ module Middleman
         end
       end
     end
-    end
 
     def bind_after_build
       ext = self
-      if ext.respond_to?(:after_build)
+      return unless ext.respond_to?(:after_build)
+
       @klass.after_build do |builder|
         if ext.method(:after_build).arity == 1
           ext.after_build(builder)
@@ -312,5 +313,4 @@ module Middleman
       end
     end
   end
-  end
 end

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

@@ -59,12 +59,12 @@ class Middleman::Extensions::Gzip < ::Middleman::Extension
     num_paths.times do
       output_filename, old_size, new_size = out_queue.pop
 
-      if output_filename
+      next unless output_filename
+
       total_savings += (old_size - new_size)
       size_change_word = (old_size - new_size) > 0 ? 'smaller' : 'larger'
       builder.say_status :gzip, "#{output_filename} (#{NumberHelpers.new.number_to_human_size((old_size - new_size).abs)} #{size_change_word})"
     end
-    end
 
     builder.say_status :gzip, "Total gzip savings: #{NumberHelpers.new.number_to_human_size(total_savings)}", :blue
     I18n.locale = old_locale

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

@@ -22,7 +22,7 @@ module Middleman
         logger.info "== Inspect your site configuration at #{uri + '__middleman'}"
 
         @initialized ||= false
-        unless @initialized
+        return if @initialized
         @initialized = true
 
         register_signal_handlers
@@ -34,17 +34,16 @@ module Middleman
         loop do
           @webrick.start
 
-            # @mm_shutdown is set by the signal handler
+          # $mm_shutdown is set by the signal handler
-            if @mm_shutdown
+          if $mm_shutdown
             shutdown
             exit
-            elsif @mm_reload
+          elsif $mm_reload
-              @mm_reload = false
+            $mm_reload = false
             reload
           end
         end
       end
-      end
 
       # Detach the current Middleman::Application instance
       # @return [void]
@@ -106,9 +105,7 @@ module Middleman
             opts[:instrumenting] || false
           )
 
-          if opts[:environment]
+          config[:environment] = opts[:environment].to_sym if opts[:environment]
-            config[:environment] = opts[:environment].to_sym
-          end
         end
       end
 
@@ -152,15 +149,15 @@ module Middleman
       # @return [void]
       def register_signal_handlers
         %w(INT HUP TERM QUIT).each do |sig|
-          if Signal.list[sig]
+          next unless Signal.list[sig]
+
           Signal.trap(sig) do
             # Do as little work as possible in the signal context
-              @mm_shutdown = true
+            $mm_shutdown = true
             @webrick.stop
           end
         end
       end
-      end
 
       # Initialize webrick
       # @return [void]
@@ -240,9 +237,7 @@ module Middleman
 
     class FilteredWebrickLog < ::WEBrick::Log
       def log(level, data)
-        unless data =~ %r{Could not determine content-length of response body.}
+        super(level, data) unless data =~ %r{Could not determine content-length of response body.}
-          super(level, data)
-        end
       end
     end
   end

middleman-core/lib/middleman-core/renderers/redcarpet.rb

@@ -20,8 +20,8 @@ module Middleman
         # Pick a renderer
         renderer = MiddlemanRedcarpetHTML
 
-        # Support SmartyPants
         if options.delete(:smartypants)
+          # Support SmartyPants
           renderer = Class.new(renderer) do
             include ::Redcarpet::Render::SmartyPants
           end
@@ -30,9 +30,8 @@ module Middleman
         # Renderer Options
         possible_render_opts = [:filter_html, :no_images, :no_links, :no_styles, :safe_links_only, :with_toc_data, :hard_wrap, :xhtml, :prettify, :link_attributes]
 
-        render_options = possible_render_opts.reduce({}) do |sum, opt|
+        render_options = possible_render_opts.each_with_object({}) do |opt, sum|
           sum[opt] = options.delete(opt) if options.key?(opt)
-          sum
         end
 
         renderer.new(render_options)
@@ -71,7 +70,7 @@ module Middleman
         else
           link_string = link.dup
           link_string << %Q("#{title}") if title && title.length > 0 && title != alt_text
-          %Q{![#{alt_text}](#{link_string})}
+          "![#{alt_text}](#{link_string})"
         end
       end
 
@@ -84,7 +83,7 @@ module Middleman
         else
           link_string = link.dup
           link_string << %Q("#{title}") if title && title.length > 0 && title != alt_text
-          %Q{[#{content}](#{link_string})}
+          "[#{content}](#{link_string})"
         end
       end
     end

middleman-core/lib/middleman-core/sitemap/extensions/on_disk.rb

@@ -59,25 +59,22 @@ module Middleman
           # whether or not it belongs in the sitemap (like a partial)
           @sitemap.rebuild_resource_list!(:touched_file)
 
-          unless waiting_for_ready || @app.build?
           # Force sitemap rebuild so the next request is ready to go.
           # Skip this during build because the builder will control sitemap refresh.
-            @sitemap.ensure_resource_list_updated!
+          @sitemap.ensure_resource_list_updated! unless waiting_for_ready || @app.build?
-          end
         end
 
         # Remove a file from the store
         # @param [String] file
         # @return [void]
         def remove_file(file)
-          if @file_paths_on_disk.delete?(file)
+          return unless @file_paths_on_disk.delete?(file)
+
           @sitemap.rebuild_resource_list!(:removed_file)
-            unless waiting_for_ready || @app.build?
+
           # Force sitemap rebuild so the next request is ready to go.
           # Skip this during build because the builder will control sitemap refresh.
-              @sitemap.ensure_resource_list_updated!
+          @sitemap.ensure_resource_list_updated! unless waiting_for_ready || @app.build?
-            end
-          end
         end
 
         # Update the main sitemap resource list

middleman-core/lib/middleman-core/sitemap/extensions/traversal.rb

@@ -75,6 +75,7 @@ module Middleman
           if !path.end_with?("/#{@app.config[:index_file]}") && destination_path.end_with?("/#{@app.config[:index_file]}")
             return true
           end
+
           full_path = File.join(@app.source_dir, eponymous_directory_path)
           File.exist?(full_path) && File.directory?(full_path)
         end