Use CoverageStatistics directly in HTML coverage_summary

The HTML formatter's `build_stats` reimplemented CoverageStatistics
with different key names (`:pct` vs `percent`). Replace it by having
`coverage_summary` take a source_file and read from
`source_file.coverage_statistics`, and update `enabled_type_summary`
to call CoverageStatistics methods directly.

Source file ERB template simplifies from hand-building a
per-criterion counts hash to a single argument pass-through.

Author: sferik

lib/simplecov/formatter/html_formatter/coverage_helpers.rb

@@ -47,21 +47,17 @@ def coverage_type_summary(type, label, summary, enabled:, **opts)
           enabled_type_summary(type, label, summary.fetch(type.to_sym), opts)
         end
 
-        def coverage_summary(stats, show_method_toggle: false)
+        def coverage_summary(source_file, show_method_toggle: false)
+          stats = source_file.coverage_statistics
           _summary = {
-            line: build_stats(stats.fetch(:covered_lines), stats.fetch(:total_lines)),
-            branch: build_stats(stats.fetch(:covered_branches, 0), stats.fetch(:total_branches, 0)),
-            method: build_stats(stats.fetch(:covered_methods, 0), stats.fetch(:total_methods, 0)),
+            line: stats[:line],
+            branch: stats[:branch],
+            method: stats[:method],
             show_method_toggle: show_method_toggle
           }
           template("coverage_summary").result(binding)
         end
 
-        def build_stats(covered, total)
-          pct = total.positive? ? (covered * 100.0 / total) : 100.0
-          {covered: covered, total: total, missed: total - covered, pct: pct}
-        end
-
       private
 
         def totals_cell_attrs(type, css)
@@ -104,12 +100,12 @@ def append_method_attrs(pairs, source_file)
         end
 
         def enabled_type_summary(type, label, stats, opts)
-          css = coverage_css_class(stats.fetch(:pct))
-          missed = stats.fetch(:missed)
+          css = coverage_css_class(stats.percent)
+          missed = stats.missed
           parts = [
             %(<div class="t-#{type}-summary">\n    #{label}: ),
-            %(<span class="#{css}"><b>#{Kernel.format('%.2f', stats.fetch(:pct).floor(2))}%</b></span>),
-            %(<span class="coverage-cell__fraction"> #{stats.fetch(:covered)}/#{stats.fetch(:total)} #{opts.fetch(:suffix, 'covered')}</span>)
+            %(<span class="#{css}"><b>#{Kernel.format('%.2f', stats.percent.floor(2))}%</b></span>),
+            %(<span class="coverage-cell__fraction"> #{stats.covered}/#{stats.total} #{opts.fetch(:suffix, 'covered')}</span>)
           ]
           parts << missed_summary_html(missed, opts.fetch(:missed_class, "red"), opts.fetch(:toggle, false)) if missed.positive?
           parts << "\n  </div>"

lib/simplecov/formatter/html_formatter/views/source_file.erb

@@ -1,11 +1,7 @@
 <div class="source_table" id="<%= id source_file %>">
   <div class="header">
     <h2><%= shortened_filename source_file %></h2>
-    <%= coverage_summary({
-      covered_lines: source_file.covered_lines.count, total_lines: source_file.covered_lines.count + source_file.missed_lines.count,
-      covered_branches: branch_coverage? ? source_file.covered_branches.count : 0, total_branches: branch_coverage? ? source_file.total_branches.count : 0,
-      covered_methods: method_coverage? ? source_file.covered_methods.count : 0, total_methods: method_coverage? ? source_file.methods.count : 0
-    }, show_method_toggle: method_coverage? && source_file.missed_methods.any?) %>
+    <%= coverage_summary(source_file, show_method_toggle: method_coverage? && source_file.missed_methods.any?) %>
 <%- if method_coverage? && source_file.missed_methods.any? -%>
     <div class="t-missed-method-list" style="display: none">
       <ul>