Merge remote-tracking branch 'upstream/main' into add-method-coverage-support

Author: Yuri Smirnov

Gemfile.lock

@@ -23,7 +23,7 @@ GEM
     parallel (1.22.1)
     parser (3.1.1.0)
       ast (~> 2.4.1)
-    rack (2.2.3)
+    rack (2.2.6.4)
     rainbow (3.1.1)
     rake (13.0.1)
     regexp_parser (2.2.1)

assets/javascripts/application.js

@@ -56,13 +56,29 @@ $(document).ready(function () {
     }
   });
 
+  // Set-up of anchor of linenumber
+  $('.source_table li[data-linenumber]').click(function () {
+    $('#cboxLoadedContent').scrollTop(this.offsetTop);
+    var new_anchor = curr_anchor.replace(/-.*/, '') + '-L' + $(this).data('linenumber');
+    window.location.replace(window.location.href.replace(/#.*/, '#' + new_anchor));
+    curr_anchor = new_anchor;
+    return false;
+  });
+
   window.onpopstate = function (event) {
     if (window.location.hash.substring(0, 2) == "#_") {
       $.colorbox.close();
       curr_anchor = window.location.hash.substring(1);
     } else {
       if ($('#colorbox').is(':hidden')) {
-        $('a.src_link[href="' + window.location.hash + '"]').colorbox({ open: true });
+        var anchor = window.location.hash.substring(1);
+        var ary = anchor.split('-L');
+        var source_file_id = ary[0];
+        var linenumber = ary[1];
+        $('a.src_link[href="#' + source_file_id + '"]').colorbox({ open: true });
+        if (linenumber !== undefined) {
+          $('#cboxLoadedContent').scrollTop($('#cboxLoadedContent .source_table li[data-linenumber="' + linenumber + '"]')[0].offsetTop);
+        }
       }
     }
   };
@@ -106,8 +122,15 @@ $(document).ready(function () {
 
   if (window.location.hash) {
     var anchor = window.location.hash.substring(1);
-    if (anchor.length == 40) {
+    if (anchor.length === 40) {
       $('a.src_link[href="#' + anchor + '"]').click();
+    } else if (anchor.length > 40) {
+      var ary = anchor.split('-L');
+      var source_file_id = ary[0];
+      var linenumber = ary[1];
+      $('a.src_link[href="#' + source_file_id + '"]').colorbox({ open: true });
+      // Scroll to anchor of linenumber
+      $('#' + source_file_id + ' li[data-linenumber="' + linenumber + '"]').click();
     } else {
       $('.group_tabs a.' + anchor.replace('_', '')).click();
     }

assets/stylesheets/screen.css

@@ -196,6 +196,11 @@ td.strong {
   border-left: 5px solid white;
 }
 
+.source_table pre li:hover {
+  cursor: pointer;
+  text-decoration: underline black;
+}
+
 .source_table pre li code {
   white-space: pre;
   white-space: pre-wrap;

lib/simplecov-html.rb

@@ -5,6 +5,7 @@
 require "fileutils"
 require "digest/sha1"
 require "time"
+require "base64"
 
 # Ensure we are using a compatible version of SimpleCov
 major, minor, patch = SimpleCov::VERSION.scan(/\d+/).first(3).map(&:to_i)
@@ -19,11 +20,16 @@ class HTMLFormatter # rubocop:disable Metrics/ClassLength
       def initialize
         @branch_coverage = SimpleCov.branch_coverage?
         @method_coverage = SimpleCov.method_coverage?
+        @templates = {}
+        @inline_assets = !ENV["SIMPLECOV_INLINE_ASSETS"].nil?
+        @public_assets_dir = File.join(File.dirname(__FILE__), "../public/")
       end
 
       def format(result)
-        Dir[File.join(File.dirname(__FILE__), "../public/*")].each do |path|
-          FileUtils.cp_r(path, asset_output_path)
+        unless @inline_assets
+          Dir[File.join(@public_assets_dir, "*")].each do |path|
+            FileUtils.cp_r(path, asset_output_path)
+          end
         end
 
         File.open(File.join(output_path, "index.html"), "wb") do |file|
@@ -68,7 +74,7 @@ def line_status?(source_file, line)
 
       # Returns the an erb instance for the template of given name
       def template(name)
-        ERB.new(File.read(File.join(File.dirname(__FILE__), "../views/", "#{name}.erb")))
+        @templates[name] ||= ERB.new(File.read(File.join(File.dirname(__FILE__), "../views/", "#{name}.erb")))
       end
 
       def output_path
@@ -84,9 +90,26 @@ def asset_output_path
       end
 
       def assets_path(name)
+        return asset_inline(name) if @inline_assets
+
         File.join("./assets", SimpleCov::Formatter::HTMLFormatter::VERSION, name)
       end
 
+      def asset_inline(name)
+        path = File.join(@public_assets_dir, name)
+
+        # Only have a few content types, just hardcode them
+        content_type = {
+          ".js" => "text/javascript",
+          ".png" => "image/png",
+          ".gif" => "image/gif",
+          ".css" => "text/css",
+        }[File.extname(name)]
+
+        base64_content = Base64.strict_encode64 File.open(path).read
+        "data:#{content_type};base64,#{base64_content}"
+      end
+
       # Returns the html for the given source_file
       def formatted_source_file(source_file)
         template("source_file").result(binding)

public/application.css

@@ -5,8 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <script src='<%= assets_path('application.js') %>' type='text/javascript'></script>
     <link href='<%= assets_path('application.css') %>' media='screen, projection, print' rel='stylesheet' type='text/css' />
-    <link rel="shortcut icon" type="image/png" href="<%= assets_path("favicon_#{coverage_css_class(result.source_files.covered_percent)}.png") %>" />
-    <link rel="icon" type="image/png" href="<%= assets_path('favicon.png') %>" />
+    <link rel="icon" type="image/png" href="<%= assets_path("favicon_#{coverage_css_class(result.source_files.covered_percent)}.png") %>" />
   </head>
 
   <body<%= ' data-branch-coverage=true' if branch_coverage? %>>

public/application.js

@@ -61,8 +61,11 @@
       <% source_file.lines.each do |line| %>
         <div>
           <li class="<%= line_status?(source_file, line) %>" data-hits="<%= line.coverage ? line.coverage : '' %>" data-linenumber="<%= line.number %>">
-            <% if line.covered? %><span class="hits"><%= line.coverage %></span><% end %>
-            <% if line.skipped? %><span class="hits">skipped</span><% end %>
+            <% if line.covered? %>
+              <span class="hits"><%= line.coverage %></span>
+            <% elsif line.skipped? %>
+              <span class="hits">skipped</span>
+            <% end %>
 
             <% if branch_coverage? %>
               <% source_file.branches_for_line(line.number).each do |branch_type, hit_count| %>