spoom 1.1.11 → 1.1.13

data/lib/spoom/coverage/d3/circle_map.rb

@@ -7,50 +7,52 @@ module Spoom
   module Coverage
     module D3
       class CircleMap < Base
-        extend T::Sig
+        class << self
+          extend T::Sig
 
-        sig { returns(String) }
-        def self.header_style
-          <<~CSS
-            .node {
-              cursor: pointer;
-            }
+          sig { returns(String) }
+          def header_style
+            <<~CSS
+              .node {
+                cursor: pointer;
+              }
 
-            .node:hover {
-              stroke: #333;
-              stroke-width: 1px;
-            }
+              .node:hover {
+                stroke: #333;
+                stroke-width: 1px;
+              }
 
-            .label.dir {
-              fill: #333;
-            }
+              .label.dir {
+                fill: #333;
+              }
 
-            .label.file {
-              font: 12px Arial, sans-serif;
-            }
+              .label.file {
+                font: 12px Arial, sans-serif;
+              }
 
-            .node.root, .node.file {
-              pointer-events: none;
-            }
-          CSS
-        end
+              .node.root, .node.file {
+                pointer-events: none;
+              }
+            CSS
+          end
 
-        sig { returns(String) }
-        def self.header_script
-          <<~JS
-            function treeHeight(root, height = 0) {
-              height += 1;
-              if (root.children && root.children.length > 0)
-                return Math.max(...root.children.map(child => treeHeight(child, height)));
-              else
-                return height;
-            }
+          sig { returns(String) }
+          def header_script
+            <<~JS
+              function treeHeight(root, height = 0) {
+                height += 1;
+                if (root.children && root.children.length > 0)
+                  return Math.max(...root.children.map(child => treeHeight(child, height)));
+                else
+                  return height;
+              }
 
-            function tooltipMap(d) {
-              moveTooltip(d)
-                .html("<b>" + d.data.name + "</b>")
-            }
-          JS
+              function tooltipMap(d) {
+                moveTooltip(d)
+                  .html("<b>" + d.data.name + "</b>")
+              }
+            JS
+          end
         end
 
         sig { override.returns(String) }
@@ -159,6 +161,7 @@ module Spoom
             if node.children.empty?
               return { name: node.name, strictness: tree_node_strictness(node) }
             end
+
             {
               name: node.name,
               children: node.children.values.map { |n| tree_node_to_json(n) },

data/lib/spoom/coverage/d3/pie.rb

@@ -18,34 +18,38 @@ module Spoom
           @title = title
         end
 
-        sig { returns(String) }
-        def self.header_style
-          <<~CSS
-            .pie .title {
-              font: 18px Arial, sans-serif;
-              font-weight: bold;
-              fill: #212529;
-              text-anchor: middle;
-              pointer-events: none;
-            }
+        class << self
+          extend T::Sig
 
-            .pie .arc {
-              stroke: #fff;
-              stroke-width: 2px;
-            }
-          CSS
-        end
+          sig { returns(String) }
+          def header_style
+            <<~CSS
+              .pie .title {
+                font: 18px Arial, sans-serif;
+                font-weight: bold;
+                fill: #212529;
+                text-anchor: middle;
+                pointer-events: none;
+              }
 
-        sig { returns(String) }
-        def self.header_script
-          <<~JS
-            function tooltipPie(d, title, kind, sum) {
-              moveTooltip(d)
-                .html("<b>" + title + "</b><br><br>"
-                  + "<b>" + d.data.value + "</b> " + kind + "<br>"
-                  + "<b>" + toPercent(d.data.value, sum) + "</b>%")
-            }
-          JS
+              .pie .arc {
+                stroke: #fff;
+                stroke-width: 2px;
+              }
+            CSS
+          end
+
+          sig { returns(String) }
+          def header_script
+            <<~JS
+              function tooltipPie(d, title, kind, sum) {
+                moveTooltip(d)
+                  .html("<b>" + title + "</b><br><br>"
+                    + "<b>" + d.data.value + "</b> " + kind + "<br>"
+                    + "<b>" + toPercent(d.data.value, sum) + "</b>%")
+              }
+            JS
+          end
         end
 
         sig { override.returns(String) }
@@ -121,14 +125,14 @@ module Spoom
 
           sig { params(id: String, title: String, snapshot: Snapshot).void }
           def initialize(id, title, snapshot)
-            super(id, title, snapshot.sigils.select { |_k, v| v })
+            super(id, title, snapshot.sigils_excluding_rbis.select { |_k, v| v })
           end
 
           sig { override.returns(String) }
           def tooltip
             <<~JS
               function tooltip_#{id}(d) {
-                tooltipPie(d, "typed: " + d.data.key, "files", sum_#{id});
+                tooltipPie(d, "typed: " + d.data.key, "files excluding RBIs", sum_#{id});
               }
             JS
           end
@@ -157,14 +161,21 @@ module Spoom
 
           sig { params(id: String, title: String, snapshot: Snapshot).void }
           def initialize(id, title, snapshot)
-            super(id, title, { true: snapshot.methods_with_sig, false: snapshot.methods_without_sig })
+            super(
+              id,
+              title,
+              { true: snapshot.methods_with_sig_excluding_rbis, false: snapshot.methods_without_sig_excluding_rbis }
+            )
           end
 
           sig { override.returns(String) }
           def tooltip
             <<~JS
               function tooltip_#{id}(d) {
-                tooltipPie(d, (d.data.key == "true" ? " with" : " without") + " a signature", "methods", sum_#{id})
+                tooltipPie(
+                  d,
+                  (d.data.key == "true" ? " with" : " without") + " a signature", "methods excluding RBIs", sum_#{id}
+                )
               }
             JS
           end

data/lib/spoom/coverage/d3/timeline.rb

@@ -18,79 +18,83 @@ module Spoom
           @keys = keys
         end
 
-        sig { returns(String) }
-        def self.header_style
-          <<~CSS
-            .domain {
-              stroke: transparent;
-            }
+        class << self
+          extend T::Sig
 
-            .grid line {
-              stroke: #ccc;
-            }
+          sig { returns(String) }
+          def header_style
+            <<~CSS
+              .domain {
+                stroke: transparent;
+              }
 
-            .axis text {
-              font: 12px Arial, sans-serif;
-              fill: #333;
-              text-anchor: right;
-              pointer-events: none;
-            }
+              .grid line {
+                stroke: #ccc;
+              }
 
-            .area {
-              fill-opacity: 0.5;
-            }
+              .axis text {
+                font: 12px Arial, sans-serif;
+                fill: #333;
+                text-anchor: right;
+                pointer-events: none;
+              }
 
-            .line {
-              stroke-width: 2;
-              fill: transparent;
-            }
+              .area {
+                fill-opacity: 0.5;
+              }
 
-            .dot {
-              r: 2;
-              fill: #888;
-            }
+              .line {
+                stroke-width: 2;
+                fill: transparent;
+              }
 
-            .inverted .grid line {
-              stroke: #777;
-            }
+              .dot {
+                r: 2;
+                fill: #888;
+              }
 
-            .inverted .area {
-              fill-opacity: 0.9;
-            }
+              .inverted .grid line {
+                stroke: #777;
+              }
 
-            .inverted .axis text {
-              fill: #fff;
-            }
+              .inverted .area {
+                fill-opacity: 0.9;
+              }
 
-            .inverted .axis line {
-              stroke: #fff;
-            }
+              .inverted .axis text {
+                fill: #fff;
+              }
 
-            .inverted .dot {
-              fill: #fff;
-            }
-          CSS
-        end
+              .inverted .axis line {
+                stroke: #fff;
+              }
 
-        sig { returns(String) }
-        def self.header_script
-          <<~JS
-            var parseVersion = function(version) {
-              if (!version) {
-                return null;
+              .inverted .dot {
+                fill: #fff;
               }
-              return parseFloat(version.replaceAll("0.", ""));
-            }
+            CSS
+          end
 
-            function tooltipTimeline(d, kind) {
-              moveTooltip(d)
-                .html("commit <b>" + d.data.commit + "</b><br>"
-                  + d3.timeFormat("%y/%m/%d")(parseDate(d.data.timestamp)) + "<br><br>"
-                  + "<b>typed: " + d.key + "</b><br><br>"
-                  + "<b>" + (d.data.values[d.key] ? d.data.values[d.key] : 0) + "</b> " + kind +"<br>"
-                  + "<b>" + toPercent(d.data.values[d.key] ? d.data.values[d.key] : 0, d.data.total) + "%")
-            }
-          JS
+          sig { returns(String) }
+          def header_script
+            <<~JS
+              var parseVersion = function(version) {
+                if (!version) {
+                  return null;
+                }
+                return parseFloat(version.replaceAll("0.", ""));
+              }
+
+              function tooltipTimeline(d, kind) {
+                moveTooltip(d)
+                  .html("commit <b>" + d.data.commit + "</b><br>"
+                    + d3.timeFormat("%y/%m/%d")(parseDate(d.data.timestamp)) + "<br><br>"
+                    + "<b>typed: " + d.key + "</b><br><br>"
+                    + "<b>" + (d.data.values[d.key] ? d.data.values[d.key] : 0) + "</b> " + kind +"<br>"
+                    + "<b>" + toPercent(d.data.values[d.key] ? d.data.values[d.key] : 0, d.data.total) + "%")
+              }
+            JS
+          end
         end
 
         sig { override.returns(String) }
@@ -264,13 +268,13 @@ module Spoom
                               d3.min(data_#{id}, (d) => parseVersion(d.runtime))]) - 0.01",
                 max: "d3.max([d3.max(data_#{id}, (d) => parseVersion(d.static)),
                               d3.max(data_#{id}, (d) => parseVersion(d.runtime))]) + 0.01",
-                ticks: 'ticks(8)'
+                ticks: "ticks(8)",
               )}
-              #{line(y: 'parseVersion(d.runtime)', color: '#e83e8c', curve: 'curveStepAfter')}
-              #{line(y: 'parseVersion(d.static)', color: '#007bff', curve: 'curveStepAfter')}
-              #{points(y: 'parseVersion(d.static)')}
+              #{line(y: "parseVersion(d.runtime)", color: "#e83e8c", curve: "curveStepAfter")}
+              #{line(y: "parseVersion(d.static)", color: "#007bff", curve: "curveStepAfter")}
+              #{points(y: "parseVersion(d.static)")}
               #{x_ticks}
-              #{y_ticks(ticks: 'ticks(4)', format: "'v0.' + d.toFixed(2)", padding: 50)}
+              #{y_ticks(ticks: "ticks(4)", format: "'v0.' + d.toFixed(2)", padding: 50)}
             JS
           end
         end
@@ -308,15 +312,15 @@ module Spoom
             <<~JS
               #{x_scale}
               #{y_scale(
-                min: '0',
+                min: "0",
                 max: "d3.max(data_#{id}, (d) => d.runtime)",
-                ticks: 'ticks(10)'
+                ticks: "ticks(10)",
               )}
-              #{area(y: 'd.runtime')}
-              #{line(y: 'd.runtime')}
-              #{points(y: 'd.runtime')}
+              #{area(y: "d.runtime")}
+              #{line(y: "d.runtime")}
+              #{points(y: "d.runtime")}
               #{x_ticks}
-              #{y_ticks(ticks: 'ticks(5)', format: 'd.toFixed(2) + "s"', padding: 40)}
+              #{y_ticks(ticks: "ticks(5)", format: 'd.toFixed(2) + "s"', padding: 40)}
                 .call(g => g.selectAll(".tick:first-of-type text").remove())
             JS
           end
@@ -373,15 +377,15 @@ module Spoom
           def plot
             <<~JS
               #{x_scale}
-              #{y_scale(min: '0', max: '100', ticks: 'tickValues([0, 25, 50, 75, 100])')}
-              #{line(y: 'd.data.timestamp')}
+              #{y_scale(min: "0", max: "100", ticks: "tickValues([0, 25, 50, 75, 100])")}
+              #{line(y: "d.data.timestamp")}
               #{x_ticks}
-              #{y_ticks(ticks: 'tickValues([25, 50, 75])', format: "d + '%'", padding: 30)}
+              #{y_ticks(ticks: "tickValues([25, 50, 75])", format: "d + '%'", padding: 30)}
             JS
           end
 
           sig { override.params(y: String, color: String, curve: String).returns(String) }
-          def line(y:, color: 'strictnessColor(d.key)', curve: 'curveCatmullRom.alpha(1)')
+          def line(y:, color: "strictnessColor(d.key)", curve: "curveCatmullRom.alpha(1)")
             <<~JS
               var area_#{id} = d3.area()
                 .x((d) => xScale_#{id}(parseDate(#{y})))
@@ -424,8 +428,8 @@ module Spoom
               {
                 timestamp: snapshot.commit_timestamp,
                 commit: snapshot.commit_sha,
-                total: snapshot.files,
-                values: snapshot.sigils,
+                total: snapshot.files - snapshot.rbi_files,
+                values: snapshot.sigils_excluding_rbis,
               }
             end
             super(id, data, keys)
@@ -435,7 +439,7 @@ module Spoom
           def tooltip
             <<~JS
               function tooltip_#{id}(d) {
-                tooltipTimeline(d, "files");
+                tooltipTimeline(d, "files excluding RBIs");
               }
             JS
           end
@@ -446,7 +450,7 @@ module Spoom
 
           sig { params(id: String, snapshots: T::Array[Snapshot]).void }
           def initialize(id, snapshots)
-            keys = ['false', 'true']
+            keys = ["false", "true"]
             data = snapshots.map do |snapshot|
               {
                 timestamp: snapshot.commit_timestamp,
@@ -473,13 +477,16 @@ module Spoom
 
           sig { params(id: String, snapshots: T::Array[Snapshot]).void }
           def initialize(id, snapshots)
-            keys = ['false', 'true']
+            keys = ["false", "true"]
             data = snapshots.map do |snapshot|
               {
                 timestamp: snapshot.commit_timestamp,
                 commit: snapshot.commit_sha,
-                total: snapshot.methods_with_sig + snapshot.methods_without_sig,
-                values: { true: snapshot.methods_with_sig, false: snapshot.methods_without_sig },
+                total: snapshot.methods_with_sig_excluding_rbis + snapshot.methods_without_sig_excluding_rbis,
+                values: {
+                  true: snapshot.methods_with_sig_excluding_rbis,
+                  false: snapshot.methods_without_sig_excluding_rbis,
+                },
               }
             end
             super(id, data, keys)
@@ -489,7 +496,7 @@ module Spoom
           def tooltip
             <<~JS
               function tooltip_#{id}(d) {
-                tooltipTimeline(d, "methods");
+                tooltipTimeline(d, "methods excluding RBIs");
               }
             JS
           end
@@ -500,7 +507,7 @@ module Spoom
 
           sig { params(id: String, snapshots: T::Array[Snapshot]).void }
           def initialize(id, snapshots)
-            keys = ['rbis', 'files']
+            keys = ["rbis", "files"]
             data = snapshots.map do |snapshot|
               {
                 timestamp: snapshot.commit_timestamp,
@@ -567,7 +574,7 @@ module Spoom
           end
 
           sig { override.params(y: String, color: String, curve: String).returns(String) }
-          def line(y:, color: 'strictnessColor(d.key)', curve: 'curveCatmullRom.alpha(1)')
+          def line(y:, color: "strictnessColor(d.key)", curve: "curveCatmullRom.alpha(1)")
             <<~JS
               var area_#{id} = d3.area()
                 .x((d) => xScale_#{id}(parseDate(#{y})))
@@ -610,10 +617,10 @@ module Spoom
           def plot
             <<~JS
               #{x_scale}
-              #{y_scale(min: '0', max: "d3.max(data_#{id}, (d) => d.total + 10)", ticks: 'tickValues([0, 25, 50, 75, 100])')}
-              #{line(y: 'd.data.timestamp', color: "d.key == 'rbis' ? '#8673ff' : '#007bff'")}
+              #{y_scale(min: "0", max: "d3.max(data_#{id}, (d) => d.total + 10)", ticks: "tickValues([0, 25, 50, 75, 100])")}
+              #{line(y: "d.data.timestamp", color: "d.key == 'rbis' ? '#8673ff' : '#007bff'")}
               #{x_ticks}
-              #{y_ticks(ticks: 'tickValues([25, 50, 75])', format: 'd', padding: 20)}
+              #{y_ticks(ticks: "tickValues([25, 50, 75])", format: "d", padding: 20)}
             JS
           end
         end

data/lib/spoom/coverage/d3.rb

@@ -8,94 +8,96 @@ require_relative "d3/timeline"
 module Spoom
   module Coverage
     module D3
-      extend T::Sig
-
       COLOR_IGNORE = "#999"
       COLOR_FALSE = "#db4437"
       COLOR_TRUE = "#0f9d58"
       COLOR_STRICT = "#0a7340"
       COLOR_STRONG = "#064828"
 
-      sig { returns(String) }
-      def self.header_style
-        <<~CSS
-          svg {
-            width: 100%;
-            height: 100%;
-          }
+      class << self
+        extend T::Sig
 
-          .tooltip {
-            font: 12px Arial, sans-serif;
-            color: #fff;
-            text-align: center;
-            background: rgba(0, 0, 0, 0.6);
-            padding: 5px;
-            border: 0px;
-            border-radius: 4px;
-            position: absolute;
-            top: 0;
-            left: 0;
-            opacity: 0;
-          }
+        sig { returns(String) }
+        def header_style
+          <<~CSS
+            svg {
+              width: 100%;
+              height: 100%;
+            }
 
-          .label {
-            font: 14px Arial, sans-serif;
-            font-weight: bold;
-            fill: #fff;
-            text-anchor: middle;
-            pointer-events: none;
-          }
+            .tooltip {
+              font: 12px Arial, sans-serif;
+              color: #fff;
+              text-align: center;
+              background: rgba(0, 0, 0, 0.6);
+              padding: 5px;
+              border: 0px;
+              border-radius: 4px;
+              position: absolute;
+              top: 0;
+              left: 0;
+              opacity: 0;
+            }
 
-          .label .small {
-            font-size: 10px;
-          }
+            .label {
+              font: 14px Arial, sans-serif;
+              font-weight: bold;
+              fill: #fff;
+              text-anchor: middle;
+              pointer-events: none;
+            }
 
-          #{Pie.header_style}
-          #{CircleMap.header_style}
-          #{Timeline.header_style}
-        CSS
-      end
+            .label .small {
+              font-size: 10px;
+            }
+
+            #{Pie.header_style}
+            #{CircleMap.header_style}
+            #{Timeline.header_style}
+          CSS
+        end
 
-      sig { params(palette: ColorPalette).returns(String) }
-      def self.header_script(palette)
-        <<~JS
-          var parseDate = d3.timeParse("%s");
+        sig { params(palette: ColorPalette).returns(String) }
+        def header_script(palette)
+          <<~JS
+            var parseDate = d3.timeParse("%s");
 
-          function strictnessColor(strictness) {
-            switch(strictness) {
-              case "ignore":
-                return "#{palette.ignore}";
-              case "false":
-                return "#{palette.false}";
-              case "true":
-                return "#{palette.true}";
-              case "strict":
-                return "#{palette.strict}";
-              case "strong":
-                return "#{palette.strong}";
+            function strictnessColor(strictness) {
+              switch(strictness) {
+                case "ignore":
+                  return "#{palette.ignore}";
+                case "false":
+                  return "#{palette.false}";
+                case "true":
+                  return "#{palette.true}";
+                case "strict":
+                  return "#{palette.strict}";
+                case "strong":
+                  return "#{palette.strong}";
+              }
+              return "#{palette.false}";
             }
-            return "#{palette.false}";
-          }
 
-          function toPercent(value, sum) {
-            return value ? Math.round(value * 100 / sum) : 0;
-          }
+            function toPercent(value, sum) {
+              return value ? Math.round(value * 100 / sum) : 0;
+            }
 
-          var tooltip = d3.select("body")
-            .append("div")
+            var tooltip = d3.select("body")
               .append("div")
-                .attr("class", "tooltip");
+                .append("div")
+                  .attr("class", "tooltip");
 
-          function moveTooltip(d) {
-            return tooltip
-              .style("left", (d3.event.pageX + 20) + "px")
-              .style("top", (d3.event.pageY) + "px")
-          }
+            function moveTooltip(d) {
+              return tooltip
+                .style("left", (d3.event.pageX + 20) + "px")
+                .style("top", (d3.event.pageY) + "px")
+            }
 
-          #{Pie.header_script}
-          #{CircleMap.header_script}
-          #{Timeline.header_script}
-        JS
+            #{Pie.header_script}
+            #{CircleMap.header_script}
+            #{Timeline.header_script}
+          JS
+        end
       end
 
       class ColorPalette < T::Struct