coverband 6.0.3.rc.1 → 6.0.3.rc.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f25f2799e62201b31472588ed6ee3d00697b6ab8eba5beb04c3a76cb7e52d962
-  data.tar.gz: 599a0d1a4ef26b9b353d4ae341db2287f15b5119b9d9d3ed3d2b0e796c6e1fae
+  metadata.gz: 7076b5973080adc6d9fc4ddeadf8baa92d19e04f0d8f2e1ef961ac3075737448
+  data.tar.gz: aca8e906625af383fbae32139836e8c93113d89e9b17ca323708aed3b5b46ee7
 SHA512:
-  metadata.gz: b58f4486c028a9ed4f2e3444ed164a43b620b4cc213f91e9b7aef93c2ef1c394840aade62466b216f29ade57851314989e0ed3f3bca2a7f692deddd106efe7a3
-  data.tar.gz: 6569ffaeb15feb24b4eb40d5e0403bcf4fcc6fc381a7fd30e64a9e6a7fee06498e05ffe2832c7a99545c51a8b25a12cf6264daf672ef82485ccf10e03a3895a3
+  metadata.gz: 302bf319119b5c1c3911da3591db34170717a53b9d9af32aee1f04b87171115daa6f97502c1e2d2d06180c7ba9c24ca675e5b09c6f19473bffb98838c5765f6f
+  data.tar.gz: 0a65eb875a43605f1ef355b6bc268728763e8c6a64e1a5566388fbbd685714e8db6ef48e38849a4d1de5b5b34e984782512b9ffe9a37446b3549f82fa586701a

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..
@@ -189,7 +179,8 @@ module Coverband
           files_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] } || {}
+            # TODO: this probably needs to be an exact match of the parsed cache key section
+            files_set(local_type).select{ |cache_key| cache_key.match(short_name(opts[:filename])) } || {}
           else
             files_set(local_type)
           end
@@ -209,7 +200,17 @@ module Coverband
         end
       end
 
+      # TODO: fix this before shipping main line release
+      # def split_coverage(types, coverage_cache, options = {})
+      #   if types.is_a?(Array)
+      #     coverage_for_types(types, options)
+      #   else
+      #     super
+      #   end
+      # end
+
       # NOTE: when using paging we need to ensure we have the same set of files per page in runtime and eager
+      # TODO: This merge of eager and runtime isn't working fix later...
       def coverage_for_types(types, opts = {})
         page_size = opts[:page_size] || 250
 
@@ -219,10 +220,13 @@ module Coverband
         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] } || {}
+          # TODO: this probably needs to be an exact match of the parsed cache key section
+          # match is a hack that will only kind of work
+          files_set(local_type).select{ |cache_key| cache_key.match(short_name(opts[:filename])) } || {}
         else
           files_set(local_type)
         end
+        
         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 +235,12 @@ module Coverband
           end
         end
 
+        # TODO: debug the set isn't just paths it has other key details including coverage type so below probalby fails
+        # match is a hack that will work a sometimes... fix this but it will prove out if this solves the perf issue
         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.match(/\.\.(.*).rb/) && eager_key.match(/\.\.(.*).rb/)[0]==runtime_key.match(/\.\.(.*).rb/)[0]) }
+          } || {}
         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 +248,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/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)
@@ -41,8 +42,14 @@ 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]}"
+            # class=\"src_link cboxElement\
+            link = "<a href=\"##{data[:hash]}\" class=\"cboxElement\" title=\"#{key}\" data-loader-url=\"#{data_loader_url}\" onclick=\"src_link_click(this)\">#{key}</a>"
+            # Started GET "/config/coverage/load_file_details?filename=/home/danmayer/projects/coverband_rails_example/app/jobs/application_job.rb" for ::1 at 2024-03-05 16:02:33 -0700
+            # class="<%= coverage_css_class(source_file.covered_percent) %> strong"
             row_data << [
-              key,
+              link,
               data[:covered_percent].to_s,
               data[:runtime_percentage].to_s,
               data[:lines_of_code].to_s,
@@ -79,6 +86,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

@@ -125,7 +125,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(

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.1"
+  VERSION = "6.0.3.rc.3"
 end

data/public/application.js

@@ -35,6 +35,8 @@ $(document).ready(function() {
 
   // TODO: add support for searching...
   // hmm should I just use manual paging? or load more...
+  // 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) {
     var current_rows = 0;
     var total_rows = 0;
@@ -43,11 +45,10 @@ $(document).ready(function() {
     // write a function to get a page of data and add it to the table
     function get_page(page) {
       $.ajax({
-        url: `/coverage/report_json?page=${page}`,
+        url: `${$(".file_list").data("coverageurl")}/report_json?page=${page}`,
         type: 'GET',
         dataType: 'json',
         success: function(data) {
-          console.log(data);
           total_rows = data["iTotalRecords"];
           // NOTE: we request 250 at a time, but we seem to have some files that we have as a list but 0 coverage,
           // so we don't get back 250 per page... to ensure we we need to account for filtered out and empty files
@@ -70,35 +71,36 @@ $(document).ready(function() {
 
   // Syntax highlight all files up front - deactivated
   // $('.source_table pre code').each(function(i, e) {hljs.highlightBlock(e, '  ')});
+  src_link_click = (trigger_element) => {
+      // Get the source file element that corresponds to the clicked element
+      var source_table = $(".shared_source_table");
+      var loader_url = $(trigger_element).attr("data-loader-url");
+      $(trigger_element).colorbox(jQuery.extend(colorbox_options, { href: 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");
+      }
+    };
+  window.src_link_click = src_link_click;
 
   // 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");
-    }
-  });
+  $("a.src_link").click(src_link_click(this));
 
   var prev_anchor;
   var curr_anchor;
-
-  // Set-up of popup for source file views
-  $("a.src_link").colorbox({
+  var colorbox_options = {
+    open: true,
     transition: "none",
-    inline: true,
+    // inline: true,
     opacity: 1,
     width: "95%",
     height: "95%",
     onLoad: function() {
+      // TODO: move source highlighting here
       prev_anchor = curr_anchor ? curr_anchor : jQuery.url.attr("anchor");
       curr_anchor = this.href.split("#")[1];
       window.location.hash = curr_anchor;
@@ -114,7 +116,16 @@ $(document).ready(function() {
       }
       window.location.hash = curr_anchor;
     }
-  });
+  }
+
+  src_link_colorbox = (trigger_element) => {
+    $(trigger_element).colorbox(colorbox_options);
+  };
+  window.src_link_colorbox = src_link_colorbox;
+
+  // Set-up of popup for source file views
+  // TODO: drop the static source view even for not paged coverband, then delete all this
+  $("a.src_link").colorbox(colorbox_options);
 
   window.onpopstate = function(event) {
     if (location.hash.substring(0, 2) == "#_") {
@@ -122,7 +133,9 @@ $(document).ready(function() {
       curr_anchor = jQuery.url.attr("anchor");
     } else {
       if ($("#colorbox").is(":hidden")) {
-        $('a.src_link[href="' + location.hash + '"]').colorbox({ open: true });
+        console.log("pop");
+        // $('a.src_link[href="' + location.hash + '"]').colorbox({ open: true });
+        $('.shared_source_table').colorbox({ open: true });
       }
     }
   };
@@ -206,7 +219,8 @@ $(document).ready(function() {
     var anchor = jQuery.url.attr("anchor");
     // source file hash
     if (anchor.length == 40) {
-      $("a.src_link[href=#" + anchor + "]").click();
+      console.log("I need to fix deep links to source, the click call wont work anymore");
+      // $("a.src_link[href=#" + anchor + "]").click();
     } else {
       if ($(".group_tabs a." + anchor.replace("_", "")).length > 0) {
         $(".group_tabs a." + anchor.replace("_", "")).click();

data/views/file_list.erb

@@ -22,7 +22,7 @@
       <span class="red"><b><%= source_files.missed_lines %></b> lines missed </span>
     <% end %>
   </div>
-  <table class="file_list <%= page ? "unsorted" : "sorted" %>">
+  <table class="file_list <%= page ? "unsorted" : "sorted" %>" data-coverageurl="<%= base_path %>">
     <thead>
       <tr>
         <th title="The source file name">File</th>

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.1
+  version: 6.0.3.rc.3
 platform: ruby
 authors:
 - Dan Mayer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-28 00:00:00.000000000 Z
+date: 2024-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips