coverband 6.0.3.rc.2 → 6.0.3.rc.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ed82514a858dae89f9a09ec1e1cfb089a9356a1445c4ce930121bb9d8661fc1
-  data.tar.gz: 3d51eab417e906fbda76b6b94b7f23e000c0f971b7de2a96c9e3adb6fa26616d
+  metadata.gz: cf0b6bab823d8155a5e15d361c3acbbef271f84e79947b9818a650e640a61fc7
+  data.tar.gz: 25cd0843b3c1e852794bcc008be165bfcbf7e476f373ab681cbff7861f050904
 SHA512:
-  metadata.gz: 1a63814d8eb4133fa82990fc7207ee9dce27b9f3b9f09658f34d1904706ec29d2110d15b11461ebbd4c2f5e5b0b7b1e0d8c6575f8daa7d4a06d2b460f2a0aa44
-  data.tar.gz: 5fcb0ba39f83744b54d97a68318db91686ea5beb2e15a773802a46446afa9ba5b1f892c22add88c11d26ba33f617ad3a276f95cddad37997e8ea0930970b880f
+  metadata.gz: d2ae2023667369ac1e7be83ec41898c6e77662545f6226c02417ef9a43e75a4e2950ad0d775e18c96d800270d81da104162d4414b13768ac98c14bcff431acd1
+  data.tar.gz: 64ddff4e59042a6ee22cd4839e6e7ac57dff4cf289b02a8f6801c144aafea7edd417ed918c38309b61173176cb177ce548dbf6302963d4b53464d8901cb05d30

data/coverband.gemspec

@@ -34,12 +34,13 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "capybara"
   spec.add_development_dependency "m"
   spec.add_development_dependency "memory_profiler"
-  # breaking change in minitest and mocha
+  # breaking change in minitest and mocha...
+  # note: we are also adding 'spy' as mocha doesn't want us to spy on redis calls...
+  # ^^^ probably need a large test cleanup refactor
   spec.add_development_dependency "minitest", "= 5.18.1"
   spec.add_development_dependency "minitest-fork_executor"
   spec.add_development_dependency "minitest-stub-const"
   spec.add_development_dependency "mocha", "~> 1.7.0"
-  # spec.add_development_dependency "spy"
   spec.add_development_dependency "rack"
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "rake"

data/lib/coverband/adapters/hash_redis_store.rb

@@ -51,16 +51,6 @@ module Coverband
           end
         end
 
-        protected
-
-        def split_coverage(types, coverage_cache, options = {})
-          if types.is_a?(Array)
-            coverage_for_types(types, options)
-          else
-            super
-          end
-        end
-
         private
 
         # sleep in between to avoid holding other redis commands..
@@ -99,7 +89,7 @@ module Coverband
       # used to store data to redis. It is changed only when breaking changes to our
       # redis format are required.
       ###
-      REDIS_STORAGE_FORMAT_VERSION = "coverband_hash_3_3"
+      REDIS_STORAGE_FORMAT_VERSION = "coverband_hash_4_0"
 
       JSON_PAYLOAD_EXPIRATION = 5 * 60
 
@@ -117,7 +107,7 @@ module Coverband
         @relative_file_converter = opts[:relative_file_converter] || Utils::RelativeFileConverter
 
         @get_coverage_cache = if opts[:get_coverage_cache]
-          key_prefix = [REDIS_STORAGE_FORMAT_VERSION, @redis_namespace, "v2"].compact.join(".")
+          key_prefix = [REDIS_STORAGE_FORMAT_VERSION, @redis_namespace].compact.join(".")
           GetCoverageRedisCacheStore.new(redis, key_prefix)
         else
           GetCoverageNullCacheStore
@@ -182,18 +172,21 @@ module Coverband
         @redis.sadd(files_key, keys) if keys.any?
       end
 
-      # TODO: refactor this and the method below and consider removing all the cached results stuff
+      # NOTE: This method should be used for full coverage or filename coverage look ups
+      # When paging code should use coverage_for_types and pull eager and runtime together as matched pairs
       def coverage(local_type = nil, opts = {})
         page_size = opts[:page_size] || 250
         cached_results = @get_coverage_cache.fetch(local_type || type) do |sleep_time|
           files_set = if opts[:page]
-            files_set(local_type).each_slice(page_size).to_a[opts[:page] - 1] || {}
+            raise "call coverage_for_types with paging"
           elsif opts[:filename]
-            files_set(local_type).select { |filepath| filepath == opts[:filename] } || {}
+            type_key_prefix = key_prefix(local_type)
+            # NOTE: a better way to extract filename from key would be better
+            files_set(local_type).select { |cache_key| cache_key.sub(type_key_prefix, "").match(short_name(opts[:filename])) } || {}
           else
             files_set(local_type)
           end
-          # use batches with a sleep in between to avoid overloading redis
+          # below uses batches with a sleep in between to avoid overloading redis
           files_set.each_slice(page_size).flat_map do |key_batch|
             sleep sleep_time
             @redis.pipelined do |pipeline|
@@ -209,20 +202,25 @@ module Coverband
         end
       end
 
-      # NOTE: when using paging we need to ensure we have the same set of files per page in runtime and eager
+      def split_coverage(types, coverage_cache, options = {})
+        if types.is_a?(Array) && !options[:filename] && options[:page]
+          data = coverage_for_types(types, options)
+          coverage_cache[Coverband::RUNTIME_TYPE] = data[Coverband::RUNTIME_TYPE]
+          coverage_cache[Coverband::EAGER_TYPE] = data[Coverband::EAGER_TYPE]
+          data
+        else
+          super
+        end
+      end
+
       def coverage_for_types(types, opts = {})
         page_size = opts[:page_size] || 250
 
         local_type = Coverband::RUNTIME_TYPE
         hash_data = {}
 
-        runtime_file_set = if opts[:page]
-          files_set(local_type).each_slice(page_size).to_a[opts[:page] - 1] || {}
-        elsif opts[:filename]
-          files_set(local_type).select { |filepath| filepath == opts[:filename] } || {}
-        else
-          files_set(local_type)
-        end
+        runtime_file_set = files_set(local_type).each_slice(page_size).to_a[opts[:page] - 1] || []
+
         hash_data[Coverband::RUNTIME_TYPE] = runtime_file_set.each_slice(page_size).flat_map do |key_batch|
           @redis.pipelined do |pipeline|
             key_batch.each do |key|
@@ -231,8 +229,14 @@ module Coverband
           end
         end
 
+        eager_key_pre = key_prefix(Coverband::EAGER_TYPE)
+        runtime_key_pre = key_prefix(Coverband::RUNTIME_TYPE)
         matched_file_set = files_set(Coverband::EAGER_TYPE)
-          .select { |filepath| runtime_file_set.include?(filepath) } || {}
+          .select { |eager_key, val|
+            runtime_file_set.any? { |runtime_key|
+              (eager_key.sub(eager_key_pre, "") == runtime_key.sub(runtime_key_pre, ""))
+            }
+          } || []
         hash_data[Coverband::EAGER_TYPE] = matched_file_set.each_slice(page_size).flat_map do |key_batch|
           @redis.pipelined do |pipeline|
             key_batch.each do |key|
@@ -240,9 +244,20 @@ module Coverband
             end
           end
         end
+        hash_data[Coverband::RUNTIME_TYPE] = hash_data[Coverband::RUNTIME_TYPE].each_with_object({}) do |data_from_redis, hash|
+          add_coverage_for_file(data_from_redis, hash)
+        end
+        hash_data[Coverband::EAGER_TYPE] = hash_data[Coverband::EAGER_TYPE].each_with_object({}) do |data_from_redis, hash|
+          add_coverage_for_file(data_from_redis, hash)
+        end
         hash_data
       end
 
+      def short_name(filename)
+        filename.sub(/^#{Coverband.configuration.root}/, ".")
+          .gsub(%r{^\.\/}, "")
+      end
+
       def file_count(local_type = nil)
         files_set(local_type).count { |filename| !Coverband.configuration.ignore.any? { |i| filename.match(i) } }
       end

data/lib/coverband/configuration.rb

@@ -17,7 +17,7 @@ module Coverband
       :s3_secret_access_key, :password, :api_key, :service_url, :coverband_timeout, :service_dev_mode,
       :service_test_mode, :process_type, :track_views, :redis_url,
       :background_reporting_sleep_seconds, :reporting_wiggle,
-      :send_deferred_eager_loading_data
+      :send_deferred_eager_loading_data, :paged_reporting
 
     attr_reader :track_gems, :ignore, :use_oneshot_lines_coverage
 
@@ -293,6 +293,10 @@ module Coverband
       @send_deferred_eager_loading_data
     end
 
+    def paged_reporting
+      !!@paged_reporting
+    end
+
     def service_disabled_dev_test_env?
       return false unless service?
 

data/lib/coverband/reporters/json_report.rb

@@ -5,13 +5,14 @@
 module Coverband
   module Reporters
     class JSONReport < Base
-      attr_accessor :filtered_report_files, :options, :page, :as_report, :store, :filename
+      attr_accessor :filtered_report_files, :options, :page, :as_report, :store, :filename, :base_path
 
       def initialize(store, options = {})
         self.options = options
         self.page = options.fetch(:page) { nil }
         self.filename = options.fetch(:filename) { nil }
         self.as_report = options.fetch(:as_report) { false }
+        self.base_path = options.fetch(:base_path) { "./" }
         self.store = store
 
         coverband_reports = Coverband::Reporters::Base.report(store, options)
@@ -29,6 +30,18 @@ module Coverband
 
       private
 
+      def coverage_css_class(covered_percent)
+        if covered_percent.nil?
+          ""
+        elsif covered_percent > 90
+          "green"
+        elsif covered_percent > 80
+          "yellow"
+        else
+          "red"
+        end
+      end
+
       def report_as_json
         result = Coverband::Utils::Results.new(filtered_report_files)
         source_files = result.source_files
@@ -41,10 +54,16 @@ module Coverband
         if as_report
           row_data = []
           data[:files].each_pair do |key, data|
+            source_class = data[:never_loaded] ? "strong red" : "strong"
+            data_loader_url = "#{base_path}load_file_details?filename=#{data[:filename]}"
+            link = "<a href=\"##{data[:hash]}\" class=\"src_link #{source_class} cboxElement\" title=\"#{key}\" data-loader-url=\"#{data_loader_url}\" onclick=\"src_link_click(this)\">#{key}</a>"
+            # Hack to ensure the sorting works on percentage columns, the span is hidden but colors the cell and the text is used for sorting
+            covered_percent = "#{data[:covered_percent]} <span class=\"#{coverage_css_class(data[:covered_percent])}\">&nbsp;</span>"
+            runtime_percentage = "#{data[:runtime_percentage]}<span class=\"#{coverage_css_class(data[:runtime_percentage])}\">&nbsp;</span>"
             row_data << [
-              key,
-              data[:covered_percent].to_s,
-              data[:runtime_percentage].to_s,
+              link,
+              covered_percent,
+              runtime_percentage,
               data[:lines_of_code].to_s,
               (data[:lines_covered] + data[:lines_missed]).to_s,
               data[:lines_covered].to_s,
@@ -79,6 +98,8 @@ module Coverband
         source_files.each_with_object({}) do |source_file, hash|
           runtime_coverage = result.file_with_type(source_file, Coverband::RUNTIME_TYPE)&.covered_lines_count || 0
           hash[source_file.short_name] = {
+            filename: source_file.filename,
+            hash: Digest::SHA1.hexdigest(source_file.filename),
             never_loaded: source_file.never_loaded,
             runtime_percentage: result.runtime_relevant_coverage(source_file),
             lines_of_code: source_file.lines.count,

data/lib/coverband/reporters/web.rb

@@ -112,11 +112,16 @@ module Coverband
       def index
         notice = "<strong>Notice:</strong> #{Rack::Utils.escape_html(request.params["notice"])}<br/>"
         notice = request.params["notice"] ? notice : ""
-        Coverband::Reporters::HTMLReport.new(Coverband.configuration.store,
+        page = (request.params["page"] || 1).to_i
+        options = {
           static: false,
           base_path: base_path,
           notice: notice,
-          open_report: false).report
+          open_report: false
+        }
+        options[:page] = page if Coverband.configuration.paged_reporting
+        Coverband::Reporters::HTMLReport.new(Coverband.configuration.store,
+          options).report
       end
 
       def json
@@ -125,7 +130,8 @@ module Coverband
 
       def report_json
         report_options = {
-          as_report: true
+          as_report: true,
+          base_path: base_path
         }
         report_options[:page] = (request.params["page"] || 1).to_i if request.params["page"]
         Coverband::Reporters::JSONReport.new(
@@ -141,10 +147,12 @@ module Coverband
       def display_abstract_tracker(tracker)
         notice = "<strong>Notice:</strong> #{Rack::Utils.escape_html(request.params["notice"])}<br/>"
         notice = request.params["notice"] ? notice : ""
-        Coverband::Utils::HTMLFormatter.new(nil,
+        options = {
           tracker: tracker,
           notice: notice,
-          base_path: base_path).format_abstract_tracker!
+          base_path: base_path
+        }
+        Coverband::Utils::HTMLFormatter.new(nil, options).format_abstract_tracker!
       end
 
       def view_tracker_data

data/lib/coverband/utils/html_formatter.rb

@@ -117,13 +117,6 @@ module Coverband
         puts "Encoding error file:#{source_file.filename} Coverband/ERB error #{e.message}."
       end
 
-      # Returns the html to ajax load a given source_file
-      def formatted_source_file_loader(result, source_file)
-        template("source_file_loader").result(binding)
-      rescue Encoding::CompatibilityError => e
-        puts "Encoding error file:#{source_file.filename} Coverband/ERB error #{e.message}."
-      end
-
       # Returns a table containing the given source files
       def formatted_file_list(title, result, source_files, options = {})
         title_id = title.gsub(/^[^a-zA-Z]+/, "").gsub(/[^a-zA-Z0-9\-\_]/, "")
@@ -175,7 +168,8 @@ module Coverband
       end
 
       def link_to_source_file(source_file)
-        %(<a href="##{id source_file}" class="src_link" title="#{shortened_filename source_file}">#{shortened_filename source_file}</a>)
+        data_loader_url = "#{base_path}load_file_details?filename=#{source_file.filename}"
+        %(<a href="##{id source_file}" class="src_link" title="#{shortened_filename source_file}" data-loader-url="#{data_loader_url}" onclick="src_link_click(this)">#{shortened_filename source_file}</a>)
       end
     end
   end

data/lib/coverband/utils/results.rb

@@ -44,6 +44,8 @@ module Coverband
         eager_file = get_eager_file(source_file)
         runtime_file = get_runtime_file(source_file)
 
+        return 0 unless runtime_file
+
         return runtime_file.covered_lines_count unless eager_file
 
         eager_file.relevant_lines - eager_file.covered_lines_count

data/lib/coverband/version.rb

@@ -5,5 +5,5 @@
 # use format "4.2.1.rc.1" ~> 4.2.1.rc to prerelease versions like v4.2.1.rc.2 and v4.2.1.rc.3
 ###
 module Coverband
-  VERSION = "6.0.3.rc.2"
+  VERSION = "6.0.3.rc.4"
 end

data/lib/coverband.rb

@@ -91,8 +91,8 @@ module Coverband
     coverage_instance.eager_loading!
   end
 
-  def self.eager_loading_coverage(&block)
-    coverage_instance.eager_loading(&block)
+  def self.eager_loading_coverage(...)
+    coverage_instance.eager_loading(...)
   end
 
   def self.runtime_coverage!
@@ -130,7 +130,6 @@ module Coverband
       ###
       def initialize
         require "coverband/reporters/web"
-        require "coverband/reporters/web_pager"
         require "coverband/utils/html_formatter"
         require "coverband/utils/result"
         require "coverband/utils/file_list"
@@ -148,19 +147,4 @@ module Coverband
       end
     end
   end
-
-  module Reporters
-    class WebPager < Web
-      def initialize
-        require "coverband/reporters/web"
-        require "coverband/reporters/web_pager"
-        super
-      end
-
-      def self.call(env)
-        @app ||= new
-        @app.call(env)
-      end
-    end
-  end
 end

data/public/application.css

@@ -687,9 +687,17 @@ a.src_link {
   background: url("./magnify.png") no-repeat left 50%;
   padding-left: 18px; }
 
+a.src_link.strong {
+  font-weight: bold;
+}
+
 .red a.src_link {
     color: #990000;
-   }
+}
+
+a.src_link.red {
+  color: #990000;
+}
 
 tr, td {
   margin: 0;
@@ -817,6 +825,21 @@ td {
 .red {
   color: #990000; }
 
+span.red {
+    color: #990000; }
+
+td:has(> span.red) { 
+  color: #990000;
+}
+
+td:has(> span.yellow) { 
+  color: #ddaa00;
+}
+
+td:has(> span.green) { 
+  color: #009900;
+}
+
 .yellow {
   color: #ddaa00; }
 

data/public/application.js

@@ -16,7 +16,7 @@ $(document).ready(function() {
   });
 
   // Configuration for fancy sortable tables for source file groups
-  $(".file_list").dataTable({
+  var tableOptions = {
     aaSorting: [[1, "asc"]],
     bPaginate: false,
     bJQueryUI: true,
@@ -30,19 +30,25 @@ $(document).ready(function() {
       null,
       null,
       null
-    ]
-  });
+    ],
+  }
 
-  // TODO: add support for searching...
-  // hmm should I just use manual paging? or load more...
+  $(".file_list").dataTable(tableOptions);
+
+  // TODO: add support for searching on server side
   // best docs on our version of datatables 1.7 https://datatables.net/beta/1.7/examples/server_side/server_side.html
-  // TODO: fix bug where we hardcoded /coverage we need to pull it from the path it is mounted on
   if ($(".file_list.unsorted").length == 1) {
+    $(".dataTables_empty").html("loading...");
     var current_rows = 0;
     var total_rows = 0;
     var page = 1;
+    
+    // load and render page content before we start the loop
+    // perhaps move this into a datatable ready event
+    setTimeout(() => {
+      get_page(page);
+    }, 1250);
 
-    // write a function to get a page of data and add it to the table
     function get_page(page) {
       $.ajax({
         url: `${$(".file_list").data("coverageurl")}/report_json?page=${page}`,
@@ -54,79 +60,51 @@ $(document).ready(function() {
           // so we don't get back 250 per page... to ensure we we need to account for filtered out and empty files
           // this 250 at the moment is synced to the 250 in the hash redis store
           current_rows += 250; //data["aaData"].length;
-          console.log(current_rows);
-          console.log(total_rows);
           $(".file_list.unsorted").dataTable().fnAddData(data["aaData"]);
           page += 1;
+          // allow rendering to complete before we click the anchor
+          setTimeout(() => {
+            if (window.auto_click_anchor && $(window.auto_click_anchor).length > 0) {
+              $(window.auto_click_anchor).click();
+            }
+          }, 50);
           // the page less than 100 is to stop infinite loop in case of folks never clearing out old coverage reports
           if (page < 100 && current_rows < total_rows) {
-            get_page(page);
+            setTimeout(() => {
+              get_page(page);
+            }, 200);
           }
         }
       });
     }
-    get_page(page);
   }
 
+  src_link_click = (trigger_element) => {
+      var loader_url = $(trigger_element).attr("data-loader-url");
+      auto_click_anchor = null;
+      $(trigger_element).colorbox(jQuery.extend(colorbox_options, { href: loader_url}));
+    };
 
-  // Syntax highlight all files up front - deactivated
-  // $('.source_table pre code').each(function(i, e) {hljs.highlightBlock(e, '  ')});
-
-  // Syntax highlight source files on first toggle of the file view popup
-  $("a.src_link").click(function() {
-    // Get the source file element that corresponds to the clicked element
-    var source_table = $($(this).attr("href"));
-    var loader_url = $(source_table).attr("data-loader-url");
-
-    $(source_table).load(loader_url);
-
-    // If not highlighted yet, do it!
-    if (!source_table.hasClass("highlighted")) {
-      source_table.find("pre code").each(function(i, e) {
-        hljs.highlightBlock(e, "  ");
-      });
-      source_table.addClass("highlighted");
-    }
-  });
-
-  var prev_anchor;
-  var curr_anchor;
-
-  // Set-up of popup for source file views
-  $("a.src_link").colorbox({
+  var colorbox_options = {
     transition: "none",
-    inline: true,
     opacity: 1,
     width: "95%",
     height: "95%",
     onLoad: function() {
-      prev_anchor = curr_anchor ? curr_anchor : jQuery.url.attr("anchor");
-      curr_anchor = this.href.split("#")[1];
-      window.location.hash = curr_anchor;
+      // If not highlighted yet, do it!
+      var source_table = $(".shared_source_table");
+      if (!source_table.hasClass("highlighted")) {
+        source_table.find("pre code").each(function(i, e) {
+          hljs.highlightBlock(e, "  ");
+        });
+        source_table.addClass("highlighted");
+      }
+      window.location.hash = this.href.split("#")[1];
     },
     onCleanup: function() {
-      if (prev_anchor && prev_anchor != curr_anchor) {
-        $('a[href="#' + prev_anchor + '"]').click();
-        curr_anchor = prev_anchor;
-      } else {
-        $(".group_tabs a:first").click();
-        prev_anchor = curr_anchor;
-        curr_anchor = $(".group_tabs a:first").attr("href");
-      }
-      window.location.hash = curr_anchor;
+      window.location.hash = $(".group_tabs a:first").attr("href");
     }
-  });
-
-  window.onpopstate = function(event) {
-    if (location.hash.substring(0, 2) == "#_") {
-      $.colorbox.close();
-      curr_anchor = jQuery.url.attr("anchor");
-    } else {
-      if ($("#colorbox").is(":hidden")) {
-        $('a.src_link[href="' + location.hash + '"]').colorbox({ open: true });
-      }
-    }
-  };
+  }
 
   // Hide src files and file list container after load
   $(".source_files").hide();
@@ -145,15 +123,20 @@ $(document).ready(function() {
       .find(".covered_percent")
       .first()
       .html();
+    if (covered_percent) {
+      covered_percent = "(" + covered_percent + ")";
+    } else {
+      covered_percent = "";
+    }
 
     $(".group_tabs").append(
       '<li><a href="#' +
         container_id +
         '">' +
         group_name +
-        " (" +
+        " " +
         covered_percent +
-        ")</a></li>"
+        "</a></li>"
     );
   });
 
@@ -185,15 +168,26 @@ $(document).ready(function() {
         .addClass("active");
     }
     $(".file_list_container").hide();
-    $(".file_list_container" + $(this).attr("href")).show();
-    window.location.href =
-      window.location.href.split("#")[0] +
-      $(this)
-        .attr("href")
-        .replace("#", "#_");
-
+    $(".file_list_container" + $(this).attr("href")).show(function() {
+      // If we have an anchor to click, click it
+      // allow rendering to complete before we click the anchor
+      setTimeout(() => {
+        if (window.auto_click_anchor && $(window.auto_click_anchor).length > 0) {
+          $(window.auto_click_anchor).click();
+        }
+      }, 30);
+    });
+    // Below the #_ is a hack to show we have processed the hash change
+    if (!window.auto_click_anchor) {
+      window.location.href =
+        window.location.href.split("#")[0] +
+        $(this)
+          .attr("href")
+          .replace("#", "#_");
+    }
+  
     // Force favicon reload - otherwise the location change containing anchor would drop the favicon...
-    // Works only on firefox, but still... - Anyone know a better solution to force favicon on local file?
+    // Works only on firefox, but still... - Anyone know a better solution to force favicon on local relative file path?
     $('link[rel="shortcut icon"]').remove();
     $("head").append(
       '<link rel="shortcut icon" type="image/png" href="' +
@@ -203,17 +197,21 @@ $(document).ready(function() {
     return false;
   });
 
+  // The below function handles turning initial anchors in links to navigate to correct tab
   if (jQuery.url.attr("anchor")) {
     var anchor = jQuery.url.attr("anchor");
-    // source file hash
     if (anchor.length == 40) {
-      $("a.src_link[href=#" + anchor + "]").click();
+      // handles deep links to source files
+      window.auto_click_anchor = "a.src_link[href=#" + anchor + "]";
+      $(".group_tabs a:first").click();
     } else {
+      // handles a # anchor that needs to be processed into a #_ completed action
       if ($(".group_tabs a." + anchor.replace("_", "")).length > 0) {
         $(".group_tabs a." + anchor.replace("_", "")).click();
       }
     }
   } else {
+    // No anchor, so click the first navigation tab
     $(".group_tabs a:first").click();
   }
 

data/test/coverband/reporters/json_test.rb

@@ -38,7 +38,7 @@ class ReportJSONTest < Minitest::Test
     json = Coverband::Reporters::JSONReport.new(@store).report
     parsed = JSON.parse(json)
 
-    expected_keys = ["never_loaded", "runtime_percentage", "lines_of_code", "lines_covered", "lines_runtime", "lines_missed", "covered_percent", "covered_strength"]
+    expected_keys = ["filename", "hash", "never_loaded", "runtime_percentage", "lines_of_code", "lines_covered", "lines_runtime", "lines_missed", "covered_percent", "covered_strength"]
 
     assert_equal parsed["files"].length, 2
     parsed["files"].keys.each do |file|

data/test/coverband/utils/results_test.rb

@@ -7,12 +7,14 @@ describe "results" do
     let(:source_file) { Coverband::Utils::SourceFile.new(source_fixture("app/models/user.rb"), run_lines) }
     let(:eager_lines) { [nil, 1, 1, 0, nil, nil, 1, 0, nil, nil] }
     let(:run_lines) { [nil, nil, nil, 1, nil, nil, nil, nil, nil, nil] }
+    let(:missing_run_coverage_file) { false }
     let(:original_result) do
       orig = {
         Coverband::MERGED_TYPE => {source_fixture("app/models/user.rb") => eager_lines}
       }
       orig[Coverband::EAGER_TYPE] = {source_fixture("app/models/user.rb") => eager_lines} if eager_lines
       orig[Coverband::RUNTIME_TYPE] = {source_fixture("app/models/user.rb") => run_lines} if run_lines
+      orig[Coverband::RUNTIME_TYPE] = {"random.rb" => [nil, 1, nil]} if missing_run_coverage_file
       orig
     end
     subject { Coverband::Utils::Results.new(original_result) }
@@ -27,15 +29,28 @@ describe "results" do
       end
     end
 
-    describe "runtime relevant lines when no runtime coverage exists" do
+    describe "runtime relevant lines when no runtime coverage file matches" do
       let(:run_lines) { nil }
 
+      it "has correct runtime relevant coverage" do
+        assert_equal 0, subject.runtime_relevant_coverage(source_file)
+      end
+
       it "has correct runtime relevant lines" do
+        assert_equal 0, subject.runtime_relavent_lines(source_file)
+      end
+    end
+
+    describe "runtime relevant lines when no runtime coverage exists" do
+      let(:run_lines) { nil }
+      let(:missing_run_coverage_file) { true }
+
+      it "has correct runtime relevant coverage" do
         assert_equal 0.0, subject.runtime_relevant_coverage(source_file)
       end
 
       it "has correct runtime relevant lines" do
-        assert_equal 2, subject.runtime_relavent_lines(source_file)
+        assert_equal 0, subject.runtime_relavent_lines(source_file)
       end
     end
 

data/views/layout.erb

@@ -26,9 +26,13 @@
       </div>
 
       <div class="source_files">
-        <% result.source_files.each do |source_file| %>
-          <%= formatted_source_file_loader(result, source_file) %>
-        <% end %>
+        <div class="shared_source_table">
+          <div class='loader'>
+            loading source data...
+            <br/>
+            <img src="<%= assets_path('loading.gif') %>" alt="loading"/>
+          </div>
+        </div>
       </div>
     </div>
   </body>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coverband
 version: !ruby/object:Gem::Version
-  version: 6.0.3.rc.2
+  version: 6.0.3.rc.4
 platform: ruby
 authors:
 - Dan Mayer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-05 00:00:00.000000000 Z
+date: 2024-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -307,7 +307,6 @@ files:
 - lib/coverband/reporters/html_report.rb
 - lib/coverband/reporters/json_report.rb
 - lib/coverband/reporters/web.rb
-- lib/coverband/reporters/web_pager.rb
 - lib/coverband/utils/absolute_file_converter.rb
 - lib/coverband/utils/configuration_template.rb
 - lib/coverband/utils/dead_methods.rb
@@ -490,7 +489,6 @@ files:
 - views/nav.erb
 - views/settings.erb
 - views/source_file.erb
-- views/source_file_loader.erb
 homepage: https://github.com/danmayer/coverband
 licenses:
 - MIT

data/lib/coverband/reporters/web_pager.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require "base64"
-require "coverband"
-
-begin
-  require "rack"
-rescue LoadError
-  puts "error loading Coverband web reporter as Rack is not available"
-end
-
-module Coverband
-  module Reporters
-    class WebPager < Web
-      def index
-        notice = "<strong>Notice:</strong> #{Rack::Utils.escape_html(request.params["notice"])}<br/>"
-        notice = request.params["notice"] ? notice : ""
-        # TODO: remove the call to the store render empty table
-        Coverband::Reporters::HTMLReport.new(Coverband.configuration.store,
-          page: (request.params["page"] || 1).to_i,
-          static: false,
-          base_path: base_path,
-          notice: notice,
-          open_report: false).report
-      end
-    end
-  end
-end

data/views/source_file_loader.erb

@@ -1,7 +0,0 @@
-<div class="source_table" id="<%= id source_file %>" data-loader-url="<%= base_path %>load_file_details?filename=<%= source_file.filename %>">
-  <div class='loader'>
-    loading source data...
-    <br/>
-    <img src="<%= assets_path('loading.gif') %>" alt="loading"/>
-  </div>
-</div>