Merge pull request #4933 from pathawks/liquid

Merge pull request 4933

.rubocop.yml

@@ -17,8 +17,6 @@ AllCops:
   - lib/jekyll/drops/site_drop.rb
   - lib/jekyll/filters.rb
   - lib/jekyll/frontmatter_defaults.rb
-  - lib/jekyll/liquid_renderer/table.rb
-  - lib/jekyll/liquid_renderer.rb
   - lib/jekyll/reader.rb
   - lib/jekyll/readers/layout_reader.rb
   - lib/jekyll/readers/page_reader.rb

lib/jekyll/liquid_renderer.rb

@@ -1,5 +1,5 @@
-require 'jekyll/liquid_renderer/file'
+require "jekyll/liquid_renderer/file"
-require 'jekyll/liquid_renderer/table'
+require "jekyll/liquid_renderer/table"
 
 module Jekyll
   class LiquidRenderer
@@ -13,7 +13,10 @@ module Jekyll
     end
 
     def file(filename)
-      filename = @site.in_source_dir(filename).sub(/\A#{Regexp.escape(@site.source)}\//, '')
+      filename = @site.in_source_dir(filename).sub(
+        %r!\A#{Regexp.escape(@site.source)}/!,
+        ""
+      )
 
       LiquidRenderer::File.new(self, filename).tap do
         @stats[filename] ||= {}

lib/jekyll/liquid_renderer/table.rb

@@ -31,8 +31,8 @@ module Jekyll
       str = ""
 
       row_data.each_index do |cell_index|
-        str << '-' * widths[cell_index]
+        str << "-" * widths[cell_index]
-        str << '-+-' unless cell_index == row_data.length-1
+        str << "-+-" unless cell_index == row_data.length-1
       end
 
       str << "\n"
@@ -40,16 +40,16 @@ module Jekyll
     end
 
     def generate_row(row_data, widths)
-      str = ''
+      str = ""
 
       row_data.each_with_index do |cell_data, cell_index|
-        if cell_index == 0
+        str << if cell_index == 0
-          str << cell_data.ljust(widths[cell_index], ' ')
+                 cell_data.ljust(widths[cell_index], " ")
-        else
+               else
-          str << cell_data.rjust(widths[cell_index], ' ')
+                 cell_data.rjust(widths[cell_index], " ")
-        end
+               end
 
-        str << ' | ' unless cell_index == row_data.length-1
+        str << " | " unless cell_index == row_data.length-1
       end
 
       str << "\n"
@@ -79,7 +79,7 @@ module Jekyll
         row << filename
         row << file_stats[:count].to_s
         row << format_bytes(file_stats[:bytes])
-        row << "%.3f" % file_stats[:time]
+        row << format("%.3f", file_stats[:time])
         table << row
       end
 
@@ -88,7 +88,7 @@ module Jekyll
 
     def format_bytes(bytes)
       bytes /= 1024.0
-      "%.2fK" % bytes
+      format("%.2fK", bytes)
     end
   end
 end