coverband 5.2.6.rc.1 → 5.2.6.rc.2

data/test/coverband/collectors/route_tracker_test.rb

@@ -23,7 +23,7 @@ class RouterTrackerTest < Minitest::Test
     assert_equal nil, tracker.target.first
     assert !tracker.store.nil?
     assert_equal [], tracker.target
-    assert_equal [], tracker.logged_routes
+    assert_equal [], tracker.logged_keys
   end
 
   test "track redirect routes" do
@@ -35,9 +35,9 @@ class RouterTrackerTest < Minitest::Test
     payload = {
       request: Payload.new("path", "GET")
     }
-    tracker.track_routes("name", "start", "finish", "id", payload)
-    tracker.report_routes_tracked
-    assert_equal [route_hash], tracker.logged_routes
+    tracker.track_key(payload)
+    tracker.save_report
+    assert_equal [route_hash], tracker.logged_keys
   end
 
   test "track controller routes" do
@@ -52,9 +52,9 @@ class RouterTrackerTest < Minitest::Test
       path: "path",
       method: "GET"
     }
-    tracker.track_routes("name", "start", "finish", "id", payload)
-    tracker.report_routes_tracked
-    assert_equal [route_hash], tracker.logged_routes
+    tracker.track_key(payload)
+    tracker.save_report
+    assert_equal [route_hash], tracker.logged_keys
   end
 
   test "report used routes" do
@@ -68,9 +68,9 @@ class RouterTrackerTest < Minitest::Test
       path: "path",
       method: "GET"
     }
-    tracker.track_routes("name", "start", "finish", "id", payload)
-    tracker.report_routes_tracked
-    assert_equal [route_hash.to_s], tracker.used_routes.keys
+    tracker.track_key(payload)
+    tracker.save_report
+    assert_equal [route_hash.to_s], tracker.used_keys.keys
   end
 
   test "report unused routes" do
@@ -97,9 +97,9 @@ class RouterTrackerTest < Minitest::Test
       path: "path",
       method: "GET"
     }
-    tracker.track_routes("name", "start", "finish", "id", payload)
-    tracker.report_routes_tracked
-    assert_equal [app_routes.first], tracker.unused_routes
+    tracker.track_key(payload)
+    tracker.save_report
+    assert_equal [app_routes.first], tracker.unused_keys
   end
 
   test "report unused routes pulls out parameterized routes" do
@@ -120,9 +120,9 @@ class RouterTrackerTest < Minitest::Test
       path: "some/controller/123",
       method: "GET"
     }
-    tracker.track_routes("name", "start", "finish", "id", payload)
-    tracker.report_routes_tracked
-    assert_equal [], tracker.unused_routes
+    tracker.track_key(payload)
+    tracker.save_report
+    assert_equal [], tracker.unused_keys
   end
 
   test "reset store" do
@@ -135,9 +135,9 @@ class RouterTrackerTest < Minitest::Test
       method: "GET"
     }
     store.raw_store.expects(:del).with(tracker_key)
-    store.raw_store.expects(:del).with("route_tracker_time")
+    store.raw_store.expects(:del).with("RouteTracker_tracker_time")
     tracker = Coverband::Collectors::RouteTracker.new(store: store, roots: "dir")
-    tracker.track_routes("name", "start", "finish", "id", payload)
+    tracker.track_key(payload)
     tracker.reset_recordings
   end
 
@@ -152,10 +152,10 @@ class RouterTrackerTest < Minitest::Test
       path: "path",
       method: "GET"
     }
-    tracker.track_routes("name", "start", "finish", "id", payload)
-    tracker.report_routes_tracked
-    assert_equal [route_hash.to_s], tracker.used_routes.keys
-    tracker.clear_route!(route_hash.to_s)
+    tracker.track_key(payload)
+    tracker.save_report
+    assert_equal [route_hash.to_s], tracker.used_keys.keys
+    tracker.clear_key!(route_hash.to_s)
     assert_equal [], tracker.store.raw_store.hgetall(tracker_key).keys
   end
 

data/test/coverband/collectors/view_tracker_test.rb

@@ -4,7 +4,7 @@ require File.expand_path("../../test_helper", File.dirname(__FILE__))
 
 class ViewTrackerTest < Minitest::Test
   def tracker_key
-    "render_tracker_2"
+    "ViewTracker_tracker"
   end
 
   def setup
@@ -18,7 +18,7 @@ class ViewTrackerTest < Minitest::Test
     assert_equal "dir", tracker.roots.first
     assert !tracker.store.nil?
     assert_equal [], tracker.target
-    assert_equal [], tracker.logged_views
+    assert_equal [], tracker.logged_keys
   end
 
   test "track partials" do
@@ -27,9 +27,9 @@ class ViewTrackerTest < Minitest::Test
     file_path = "#{File.expand_path(Coverband.configuration.root)}/file"
     store.raw_store.expects(:hset).with(tracker_key, file_path, anything)
     tracker = Coverband::Collectors::ViewTracker.new(store: store, roots: "dir")
-    tracker.track_views("name", "start", "finish", "id", identifier: file_path)
-    tracker.report_views_tracked
-    assert_equal [file_path], tracker.logged_views
+    tracker.track_key(identifier: file_path)
+    tracker.save_report
+    assert_equal [file_path], tracker.logged_keys
   end
 
   test "track partials that include the word vendor in the path" do
@@ -37,9 +37,9 @@ class ViewTrackerTest < Minitest::Test
     store = fake_store
     file_path = "#{File.expand_path(Coverband.configuration.root)}/vendor_relations/file"
     tracker = Coverband::Collectors::ViewTracker.new(store: store, roots: "dir")
-    tracker.track_views("name", "start", "finish", "id", identifier: file_path)
-    tracker.report_views_tracked
-    assert_equal [file_path], tracker.used_views.keys
+    tracker.track_key(identifier: file_path)
+    tracker.save_report
+    assert_equal [file_path], tracker.used_keys.keys
   end
 
   test "track partials that include the word _mailer in the path" do
@@ -47,9 +47,9 @@ class ViewTrackerTest < Minitest::Test
     store = fake_store
     file_path = "#{File.expand_path(Coverband.configuration.root)}/_mailer/file"
     tracker = Coverband::Collectors::ViewTracker.new(store: store, roots: "dir")
-    tracker.track_views("name", "start", "finish", "id", identifier: file_path)
-    tracker.report_views_tracked
-    assert_equal [file_path], tracker.used_views.keys
+    tracker.track_key(identifier: file_path)
+    tracker.save_report
+    assert_equal [file_path], tracker.used_keys.keys
   end
 
   test "ignore partials that include the folder vendor in the path" do
@@ -57,9 +57,9 @@ class ViewTrackerTest < Minitest::Test
     store = fake_store
     file_path = "#{File.expand_path(Coverband.configuration.root)}/vendor/file"
     tracker = Coverband::Collectors::ViewTracker.new(store: store, roots: "dir")
-    tracker.track_views("name", "start", "finish", "id", identifier: file_path)
-    tracker.report_views_tracked
-    assert_equal({}, tracker.used_views)
+    tracker.track_key(identifier: file_path)
+    tracker.save_report
+    assert_equal({}, tracker.used_keys)
   end
 
   test "track layouts" do
@@ -68,9 +68,9 @@ class ViewTrackerTest < Minitest::Test
     file_path = "#{File.expand_path(Coverband.configuration.root)}/layout"
     store.raw_store.expects(:hset).with(tracker_key, file_path, anything)
     tracker = Coverband::Collectors::ViewTracker.new(store: store, roots: "dir")
-    tracker.track_views("name", "start", "finish", "id", layout: file_path)
-    tracker.report_views_tracked
-    assert_equal [file_path], tracker.logged_views
+    tracker.track_key(layout: file_path)
+    tracker.save_report
+    assert_equal [file_path], tracker.logged_keys
   end
 
   test "report used partials" do
@@ -78,9 +78,9 @@ class ViewTrackerTest < Minitest::Test
     store = fake_store
     file_path = "#{File.expand_path(Coverband.configuration.root)}/file"
     tracker = Coverband::Collectors::ViewTracker.new(store: store, roots: "dir")
-    tracker.track_views("name", "start", "finish", "id", identifier: file_path)
-    tracker.report_views_tracked
-    assert_equal [file_path], tracker.used_views.keys
+    tracker.track_key(identifier: file_path)
+    tracker.save_report
+    assert_equal [file_path], tracker.used_keys.keys
   end
 
   test "report unused partials" do
@@ -89,30 +89,30 @@ class ViewTrackerTest < Minitest::Test
     file_path = "#{File.expand_path(Coverband.configuration.root)}/file"
     target = [file_path, "not_used"]
     tracker = Coverband::Collectors::ViewTracker.new(store: store, roots: "dir", target: target)
-    tracker.track_views("name", "start", "finish", "id", identifier: file_path)
-    tracker.report_views_tracked
-    assert_equal ["not_used"], tracker.unused_views
+    tracker.track_key(identifier: file_path)
+    tracker.save_report
+    assert_equal ["not_used"], tracker.unused_keys
   end
 
   test "reset store" do
     Coverband::Collectors::ViewTracker.expects(:supported_version?).returns(true)
     store = fake_store
     store.raw_store.expects(:del).with(tracker_key)
-    store.raw_store.expects(:del).with("render_tracker_time")
+    store.raw_store.expects(:del).with("ViewTracker_tracker_time")
     tracker = Coverband::Collectors::ViewTracker.new(store: store, roots: "dir")
-    tracker.track_views("name", "start", "finish", "id", identifier: "file")
+    tracker.track_key(identifier: "file")
     tracker.reset_recordings
   end
 
-  test "clear_file" do
+  test "clear_key" do
     Coverband::Collectors::ViewTracker.expects(:supported_version?).returns(true)
     store = fake_store
     file_path = "#{File.expand_path(Coverband.configuration.root)}/file"
     store.raw_store.expects(:hdel).with(tracker_key, file_path)
     tracker = Coverband::Collectors::ViewTracker.new(store: store, roots: "dir")
-    tracker.track_views("name", "start", "finish", "id", identifier: file_path)
-    tracker.clear_file!("file")
-    assert_equal [], tracker.logged_views
+    tracker.track_key(identifier: file_path)
+    tracker.clear_key!("file")
+    assert_equal [], tracker.logged_keys
   end
 
   protected

data/test/forked/rails_full_stack_views_test.rb

@@ -22,35 +22,35 @@ class RailsFullStackTest < Minitest::Test
     visit "/dummy_view/show"
     assert_content("I am no dummy view tracker text")
     Coverband.report_coverage
-    Coverband.configuration.view_tracker&.report_views_tracked
-    Coverband.configuration.route_tracker&.report_routes_tracked
-    visit "/coverage/view_tracker"
+    Coverband.configuration.view_tracker&.save_report
+    Coverband.configuration.route_tracker&.save_report
+    visit "/coverage/views_tracker"
     assert_content("Used Views: (1)")
     assert_content("Unused Views: (2)")
-    assert_selector("li.used-views", text: "dummy_view/show.html.erb")
-    assert_selector("li.unused-views", text: "dummy_view/show_haml.html.haml")
-    assert_selector("li.unused-views", text: "dummy_view/show_slim.html.slim")
+    assert_selector("li.used-keys", text: "dummy_view/show.html.erb")
+    assert_selector("li.unused-keys", text: "dummy_view/show_haml.html.haml")
+    assert_selector("li.unused-keys", text: "dummy_view/show_slim.html.slim")
 
-    visit "/coverage/route_tracker"
+    visit "/coverage/routes_tracker"
     assert_content("Used Routes: (1)")
     assert_content("Unused Routes: (5)")
 
     visit "/dummy_view/show_haml"
     assert_content("I am haml text")
     Coverband.report_coverage
-    Coverband.configuration.view_tracker&.report_views_tracked
-    visit "/coverage/view_tracker"
+    Coverband.configuration.view_tracker&.save_report
+    visit "/coverage/views_tracker"
     assert_content("Used Views: (2)")
     assert_content("Unused Views: (1)")
-    assert_selector("li.used-views", text: "dummy_view/show_haml.html.haml")
+    assert_selector("li.used-keys", text: "dummy_view/show_haml.html.haml")
 
     visit "/dummy_view/show_slim"
     assert_content("I am slim text")
     Coverband.report_coverage
-    Coverband.configuration.view_tracker&.report_views_tracked
-    visit "/coverage/view_tracker"
+    Coverband.configuration.view_tracker&.save_report
+    visit "/coverage/views_tracker"
     assert_content("Used Views: (3)")
     assert_content("Unused Views: (0)")
-    assert_selector("li.used-views", text: "dummy_view/show_slim.html.slim")
+    assert_selector("li.used-keys", text: "dummy_view/show_slim.html.slim")
   end
 end

data/test/forked/rails_route_tracker_stack_test.rb

@@ -17,7 +17,7 @@ class RailsRoutesWithoutConfigStackTest < Minitest::Test
     output = `sleep 7 && curl http://localhost:9999/dummy_view/show`
     assert output.match(/rendered view/)
     assert output.match(/I am no dummy view tracker text/)
-    output = `sleep 2 && curl http://localhost:9999/coverage/route_tracker`
+    output = `sleep 2 && curl http://localhost:9999/coverage/routes_tracker`
     assert output.match(/Used Routes: \(1\)/)
     assert output.match(/dummy_view\/show/)
     assert output.match(/GET/)

data/test/forked/rails_view_tracker_stack_test.rb

@@ -17,7 +17,7 @@ class RailsWithoutConfigStackTest < Minitest::Test
     output = `sleep 7 && curl http://localhost:9999/dummy_view/show`
     assert output.match(/rendered view/)
     assert output.match(/I am no dummy view tracker text/)
-    output = `sleep 2 && curl http://localhost:9999/coverage/view_tracker`
+    output = `sleep 2 && curl http://localhost:9999/coverage/views_tracker`
     assert output.match(/Used Views: \(1\)/)
     assert output.match(/dummy_view\/show/)
   end

data/views/{translations_tracker.erb → abstract_tracker.erb}

@@ -11,31 +11,30 @@
 
   <body>
     <div id="wrapper" style="">
-      <%= display_nav(active_link: 'translations_tracker') %>
+      <%= display_nav(active_link: tracker.route) %>
       <div id="content">
-        <% tracker = Coverband::Collectors::TranslationTracker.new(store: Coverband.configuration.store) %>
         <h4>
           <% if Coverband.configuration.web_enable_clear %>
-            <%= button("#{base_path}clear_translation_tracking", 'reset translation tracker', delete: true) %>
+            <%= button("#{base_path}clear_#{tracker.route}", "reset #{tracker.title} tracker", delete: true) %>
           <% end %>
         </h4>
-        <h2>Unused Translations: (<%= tracker.unused_keys.length %>)</h2>
-        <p>These Translations have not been rendered since recording started at <%= tracker.tracking_since %></p>
+        <h2>Unused <%= tracker.title %>: (<%= tracker.unused_keys.length %>)</h2>
+        <p>These <%= tracker.title %> have not been rendered since recording started at <%= tracker.tracking_since %></p>
         <ul>
         <% tracker.unused_keys.each do |key| %>
           <li class="unused-keys"><%= key %></li>
         <% end %>
         </ul>
 
-        <h2>Used Translations: (<%= tracker.used_keys.length %>)</h2>
-        <p>These Translations have been rendered at least once</p>
+        <h2>Used <%= tracker.title %>: (<%= tracker.used_keys.length %>)</h2>
+        <p>These <%= tracker.title %> have been rendered at least once</p>
         <ul>
         <% tracker.used_keys.each_pair do |key, time_at| %>
           <li class="used-keys">
             <%= key %>
             <span class="last_seen_at">last activity recorded <%= Time.at(time_at.to_i)%></span>
             <% if Coverband.configuration.web_enable_clear %>
-              <%= button("#{base_path}clear_translations_tracking_key?key=#{key}", 'reset tracked key', delete: true) %>
+              <%= button("#{base_path}clear_#{tracker.route}_key?key=#{key}", 'reset tracked key', delete: true) %>
             <% end %>
           </li>
         <% end %>

data/views/nav.erb

@@ -29,13 +29,13 @@
     <li><a href='<%= base_path %>'>Coverage</a></li>
   <% end %>
   <% if Coverband.configuration.track_views %>
-    <li class='<%= nav_options[:active_link] == 'view_tracker' ? 'active' : '' %>'>
-      <a href='<%= base_path %>view_tracker'>Views Tracker</a>
+    <li class='<%= nav_options[:active_link] == 'views_tracker' ? 'active' : '' %>'>
+      <a href='<%= base_path %>views_tracker'>Views Tracker</a>
     </li>
   <% end %>
   <% if Coverband.configuration.track_routes %>
-    <li class='<%= nav_options[:active_link] == 'route_tracker' ? 'active' : '' %>'>
-      <a href='<%= base_path %>route_tracker'>Route Tracker</a>
+    <li class='<%= nav_options[:active_link] == 'routes_tracker' ? 'active' : '' %>'>
+      <a href='<%= base_path %>routes_tracker'>Route Tracker</a>
     </li>
   <% end %>
     <% if Coverband.configuration.track_translations %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coverband
 version: !ruby/object:Gem::Version
-  version: 5.2.6.rc.1
+  version: 5.2.6.rc.2
 platform: ruby
 authors:
 - Dan Mayer
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-28 00:00:00.000000000 Z
+date: 2023-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -299,6 +299,7 @@ files:
 - lib/coverband/adapters/stdout_store.rb
 - lib/coverband/adapters/web_service_store.rb
 - lib/coverband/at_exit.rb
+- lib/coverband/collectors/abstract_tracker.rb
 - lib/coverband/collectors/coverage.rb
 - lib/coverband/collectors/delta.rb
 - lib/coverband/collectors/route_tracker.rb
@@ -488,16 +489,14 @@ files:
 - test/rails_test_helper.rb
 - test/test_helper.rb
 - test/unique_files.rb
+- views/abstract_tracker.erb
 - views/data.erb
 - views/file_list.erb
 - views/layout.erb
 - views/nav.erb
-- views/route_tracker.erb
 - views/settings.erb
 - views/source_file.erb
 - views/source_file_loader.erb
-- views/translations_tracker.erb
-- views/view_tracker.erb
 homepage: https://github.com/danmayer/coverband
 licenses:
 - MIT

data/views/route_tracker.erb

@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<html xmlns='http://www.w3.org/1999/xhtml'>
-  <head>
-    <title>Coverband Info: <%= Coverband::VERSION %></title>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        <script src='<%= assets_path('dependencies.js') %>' type='text/javascript'></script>
-    <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="icon" type="image/png" href="<%= assets_path('favicon.png') %>" />
-  </head>
-
-  <body>
-    <div id="wrapper" style="">
-      <%= display_nav(active_link: 'route_tracker') %>
-      <div id="content">
-        <% tracker = Coverband::Collectors::RouteTracker.new(store: Coverband.configuration.store) %>
-        <h4>
-          <% if Coverband.configuration.web_enable_clear %>
-            <%= button("#{base_path}clear_route_tracking", 'reset route tracker', delete: true) %>
-          <% end %>
-        </h4>
-        <h2>Unused Routes: (<%= tracker.unused_routes.length %>)</h2>
-        <p>These routes have not been rendered since recording started at <%= tracker.tracking_since %></p>
-        <ul>
-        <% tracker.unused_routes.each do |route| %>
-          <li class="unused-routes"><%= route %></li>
-        <% end %>
-        </ul>
-
-        <h2>Used Routes: (<%= tracker.used_routes.length %>)</h2>
-        <p>These routes have been rendered at least once</p>
-        <ul>
-        <% tracker.used_routes.each_pair do |route, time_at| %>
-          <li class="used-routes">
-            <%= route %>
-            <span class="last_seen_at">last activity recorded <%= Time.at(time_at.to_i)%></span>
-            <% if Coverband.configuration.web_enable_clear %>
-              <%= button("#{base_path}clear_route_tracking_route?route=#{route}", 'reset tracked route', delete: true) %>
-            <% end %>
-          </li>
-        <% end %>
-        </ul>
-      </div>
-      <div id="footer">
-        Generated by <a href="http://github.com/danmayer/coverband">Coverband</a> v<%= Coverband::VERSION %>
-      </div>
-    </div>
-  </body>
-</html>

data/views/view_tracker.erb

@@ -1,52 +0,0 @@
-<!DOCTYPE html>
-<html xmlns='http://www.w3.org/1999/xhtml'>
-  <head>
-    <title>Coverband Info: <%= Coverband::VERSION %></title>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        <script src='<%= assets_path('dependencies.js') %>' type='text/javascript'></script>
-    <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="icon" type="image/png" href="<%= assets_path('favicon.png') %>" />
-  </head>
-
-  <body>
-    <div id="wrapper" style="">
-      <%= display_nav(active_link: 'view_tracker') %>
-      <div id="content">
-        <% tracker = Coverband::Collectors::ViewTracker.new(store: Coverband.configuration.store) %>
-        <h4>
-          <% if Coverband.configuration.web_enable_clear %>
-            <%= button("#{base_path}clear_view_tracking", 'reset view tracker', delete: true) %>
-          <% end %>
-          <% if Coverband.configuration.web_debug %>
-            <a href='<%= "#{base_path}view_tracker_data" %>'>view tracker data</a>
-          <% end %>
-        </h4>
-        <h2>Unused Views: (<%= tracker.unused_views.length %>)</h2>
-        <p>These views have not been rendered since recording started at <%= tracker.tracking_since %></p>
-        <ul>
-        <% tracker.unused_views.each do |view_file| %>
-          <li class="unused-views"><%= view_file %></li>
-        <% end %>
-        </ul>
-
-        <h2>Used Views: (<%= tracker.used_views.length %>)</h2>
-        <p>These views have been rendered at least once</p>
-        <ul>
-        <% tracker.used_views.each_pair do |view_file, time_at| %>
-          <li class="used-views">
-            <%= view_file %>
-            <span class="last_seen_at">last activity recorded <%= Time.at(time_at.to_i)%></span>
-            <% if Coverband.configuration.web_enable_clear %>
-              <%= button("#{base_path}clear_view_tracking_file?filename=#{view_file}", 'reset tracked file', delete: true) %>
-            <% end %>
-          </li>
-        <% end %>
-        </ul>
-      </div>
-      <div id="footer">
-        Generated by <a href="http://github.com/danmayer/coverband">Coverband</a> v<%= Coverband::VERSION %>
-      </div>
-    </div>
-  </body>
-</html>