coverband 5.2.6.rc.1 → 5.2.6.rc.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc0d04670278db743e5beef3f1494cf3534f162c5e6e285100ac42ad6f04f24b
-  data.tar.gz: 6e091007de4ac8fa1f99dff488756e09a748ce6648b186b95d59b9f3b771548b
+  metadata.gz: '039bd98899c0794752cb3244029b3bce0d9d6ebda8ddf449423e94e44741acb5'
+  data.tar.gz: 5b19acc65170a2f2c6d66a750a7e958759e90caca808943426481828c26dedfa
 SHA512:
-  metadata.gz: 2a1292ce42a916fdcc5bfc47cf800ee6ff68511c98a81a6321c65d602e6843bc3112c8c6347b7706595c4926c7ecad37678ca536e301a1af4b1234f2df6bb352
-  data.tar.gz: e02d38262d17772614ef420c33bf5307d6616338b593e07b787e87fccf62b8ba56082a926a1b3bd3af5d2370e87c7c7fa9932bc624d3b840b7affd9d4df60ba7
+  metadata.gz: 51e2ef52b7bd14f677845d6d565872ab9a607990ff28e89ba020f5fe8f8a65d728400f241ea2d70647580f2387e2115f9d033e450704d821d9a1664be5457f76
+  data.tar.gz: 62dc029eb498529c31e81a297db3afb5a1d95a716d0802ed0b99128b8405f937b6d90c61eb3d0dc49df4f2faf9b9c2545ae5f54dbda9db2d04e3b6465001a75d

data/.github/workflows/diagram.yml

@@ -13,4 +13,5 @@ jobs:
       - name: Update diagram
         uses: githubocto/repo-visualizer@main
         with:
-          excluded_paths: "ignore,.github"
+          excluded_paths: "ignore,.github"
+          branch: diagram

data/.github/workflows/main.yml

@@ -21,11 +21,11 @@ jobs:
         # removing jruby again to flaky
         # ruby: [2.3, 2.4, 2.5, 2.6, 2.7, "3.0", "3.1", jruby]
         # need to add support for multiple gemfiles
-        ruby: ["2.7", "3.0", "3.1"]
+        ruby: ["2.7", "3.0", "3.1", "3.2"]
         redis-version: [4, 5, 6]
     runs-on: ${{ matrix.os }}-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: supercharge/redis-github-action@1.2.0
       - uses: ruby/setup-ruby@v1
         with:

data/README.md

@@ -207,9 +207,9 @@ config.ignore +=  ['config/application.rb',
                    'config/boot.rb',
                    'config/puma.rb',
                    'config/schedule.rb',
-                   'bin/*',
-                   'config/environments/*',
-                   'lib/tasks/*']
+                   'bin/.*',
+                   'config/environments/.*',
+                   'lib/tasks/.*']
 ```
 
 **Ignoring Custom Gem Locations:** Note, if you have your gems in a custom location under your app folder you likely want to add them to `config.ignore`. For example, if you have your gems not in a default ignored location of `app/vendor` but have them in `app/gems` you would need to add `gems/*` to your ignore list.
@@ -437,7 +437,7 @@ What is the coverage data in Redis?
 
 A diagram of the code.
 
-![Visualization of this repo](./diagram.svg)
+![Visualization of this repo](https://raw.githubusercontent.com/danmayer/coverband/diagram/diagram.svg)
 
 ## Logo
 

data/changes.md

@@ -1,6 +1,10 @@
 ### Coverband 5.2.6
 
+__NOTE: the current RCs include below, but this might turn into coverband 6.0__
+
 - add support for translation keys
+- refactor non Coverage.so based trackers
+- adds CSP report support (thanks @jwg2s)
 
 ### Coverband 5.2.5
 

data/lib/coverband/at_exit.rb

@@ -22,7 +22,8 @@ module Coverband
             Coverband.report_coverage
             # to ensure we track mailer views we now need to report views tracking
             # at exit as well for rake tasks and background tasks that can trigger email
-            Coverband.configuration.view_tracker&.report_views_tracked
+            Coverband.configuration.view_tracker&.save_report
+            Coverband.configuration.translations_tracker&.save_report
           end
         end
       end

data/lib/coverband/collectors/abstract_tracker.rb

@@ -0,0 +1,164 @@
+# frozen_string_literal: true
+
+require "set"
+require "singleton"
+
+module Coverband
+  module Collectors
+    ###
+    # This abstract class makes it easy to track any used/unused with timestamp set of usage
+    ###
+    class AbstractTracker
+      REPORT_ROUTE = "/"
+      TITLE = "abstract"
+
+      attr_accessor :target
+      attr_reader :logger, :store, :ignore_patterns
+
+      def initialize(options = {})
+        raise NotImplementedError, "#{self.class.name} requires a newer version of Rails" unless self.class.supported_version?
+        raise "Coverband: #{self.class.name} initialized before configuration!" if !Coverband.configured? && ENV["COVERBAND_TEST"] == "test"
+
+        @ignore_patterns = Coverband.configuration.ignore
+        @store = options.fetch(:store) { Coverband.configuration.store }
+        @logger = options.fetch(:logger) { Coverband.configuration.logger }
+        @target = options.fetch(:target) do
+          concrete_target
+        end
+
+        @one_time_timestamp = false
+
+        @logged_keys = Set.new
+        @keys_to_record = Set.new
+      end
+
+      def logged_keys
+        @logged_keys.to_a
+      end
+
+      def keys_to_record
+        @keys_to_record.to_a
+      end
+
+      ###
+      # This method is called on every translation usage
+      ###
+      def track_key(key)
+        if key
+          if newly_seen_key?(key)
+            @logged_keys << key
+            @keys_to_record << key if track_key?(key)
+          end
+        end
+      end
+
+      def used_keys
+        redis_store.hgetall(tracker_key)
+      end
+
+      def all_keys
+        target.uniq
+      end
+
+      def unused_keys(used_keys = nil)
+        recently_used_keys = (used_keys || self.used_keys).keys
+        all_keys.reject { |k| recently_used_keys.include?(k.to_s) }
+      end
+
+      def as_json
+        used_keys = self.used_keys
+        {
+          unused_keys: unused_keys(used_keys),
+          used_keys: used_keys
+        }.to_json
+      end
+
+      def tracking_since
+        if (tracking_time = redis_store.get(tracker_time_key))
+          Time.at(tracking_time.to_i).iso8601
+        else
+          "N/A"
+        end
+      end
+
+      def reset_recordings
+        redis_store.del(tracker_key)
+        redis_store.del(tracker_time_key)
+      end
+
+      def clear_key!(key)
+        return unless key
+        puts "#{tracker_key} key #{key}"
+        redis_store.hdel(tracker_key, key)
+        @logged_keys.delete(key)
+      end
+
+      def save_report
+        redis_store.set(tracker_time_key, Time.now.to_i) unless @one_time_timestamp || tracker_time_key_exists?
+        @one_time_timestamp = true
+        reported_time = Time.now.to_i
+        @keys_to_record.to_a.each do |key|
+          redis_store.hset(tracker_key, key.to_s, reported_time)
+        end
+        @keys_to_record.clear
+      rescue => e
+        # we don't want to raise errors if Coverband can't reach redis.
+        # This is a nice to have not a bring the system down
+        logger&.error "Coverband: #{self.class.name} failed to store, error #{e.class.name} info #{e.message}"
+      end
+
+      # This is the basic rails version supported, if there is something more unique over ride in subclass
+      def self.supported_version?
+        defined?(Rails) && defined?(Rails::VERSION) && Rails::VERSION::STRING.split(".").first.to_i >= 5
+      end
+
+      def route
+        self.class::REPORT_ROUTE
+      end
+
+      def title
+        self.class::TITLE
+      end
+
+      protected
+
+      def newly_seen_key?(key)
+        !@logged_keys.include?(key)
+      end
+
+      def track_key?(key, options = {})
+        @ignore_patterns.none? { |pattern| key.to_s.include?(pattern) }
+      end
+
+      private
+
+      def concrete_target
+        raise "subclass must implement"
+      end
+
+      def redis_store
+        store.raw_store
+      end
+
+      def tracker_time_key_exists?
+        if defined?(redis_store.exists?)
+          redis_store.exists?(tracker_time_key)
+        else
+          redis_store.exists(tracker_time_key)
+        end
+      end
+
+      def tracker_key
+        "#{class_key}_tracker"
+      end
+
+      def tracker_time_key
+        "#{class_key}_tracker_time"
+      end
+
+      def class_key
+        @class_key ||= self.class.name.split("::").last
+      end
+    end
+  end
+end

data/lib/coverband/collectors/route_tracker.rb

@@ -8,51 +8,23 @@ module Coverband
     ###
     # This class tracks route usage via ActiveSupport::Notifications
     ###
-    class RouteTracker
-      attr_accessor :target
-      attr_reader :logger, :store, :ignore_patterns
+    class RouteTracker < AbstractTracker
+      REPORT_ROUTE = "routes_tracker"
+      TITLE = "Routes"
 
       def initialize(options = {})
-        raise NotImplementedError, "Route Tracker requires Rails 4 or greater" unless self.class.supported_version?
-        raise "Coverband: route tracker initialized before configuration!" if !Coverband.configured? && ENV["COVERBAND_TEST"] == "test"
-
-        @ignore_patterns = Coverband.configuration.ignore
-        @store = options.fetch(:store) { Coverband.configuration.store }
-        @logger = options.fetch(:logger) { Coverband.configuration.logger }
-        @target = options.fetch(:target) do
-          if defined?(Rails.application)
-            Rails.application.routes.routes.map do |route|
-              {
-                controller: route.defaults[:controller],
-                action: route.defaults[:action],
-                url_path: route.path.spec.to_s.gsub("(.:format)", ""),
-                verb: route.verb
-              }
-            end
-          else
-            []
-          end
+        if Rails&.respond_to?(:version) && Gem::Version.new(Rails.version) >= Gem::Version.new("6.0.0") && Gem::Version.new(Rails.version) < Gem::Version.new("7.1.0")
+          require_relative "../utils/rails6_ext"
         end
 
-        @one_time_timestamp = false
-
-        @logged_routes = Set.new
-        @routes_to_record = Set.new
-      end
-
-      def logged_routes
-        @logged_routes.to_a
-      end
-
-      def routes_to_record
-        @routes_to_record.to_a
+        super
       end
 
       ###
       # This method is called on every routing call, so we try to reduce method calls
       # and ensure high performance
       ###
-      def track_routes(_name, _start, _finish, _id, payload)
+      def track_key(payload)
         route = if payload[:request]
           {
             controller: nil,
@@ -69,104 +41,53 @@ module Coverband
           }
         end
         if route
-          if newly_seen_route?(route)
-            @logged_routes << route
-            @routes_to_record << route if track_route?(route)
+          if newly_seen_key?(route)
+            @logged_keys << route
+            @keys_to_record << route if track_key?(route)
           end
         end
       end
 
-      def used_routes
-        redis_store.hgetall(tracker_key)
-      end
-
-      def all_routes
-        target.uniq
+      def self.supported_version?
+        defined?(Rails) && defined?(Rails::VERSION) && Rails::VERSION::STRING.split(".").first.to_i >= 6
       end
 
-      def unused_routes(used_routes = nil)
-        recently_used_routes = (used_routes || self.used_routes).keys
+      def unused_keys(used_keys = nil)
+        recently_used_routes = (used_keys || self.used_keys).keys
         # NOTE: we match with or without path to handle paths with named params like `/user/:user_id` to used routes filling with all the variable named paths
-        all_routes.reject { |r| recently_used_routes.include?(r.to_s) || recently_used_routes.include?(r.merge(url_path: nil).to_s) }
-      end
-
-      def as_json
-        used_routes = self.used_routes
-        {
-          unused_routes: unused_routes(used_routes),
-          used_routes: used_routes
-        }.to_json
+        all_keys.reject { |r| recently_used_routes.include?(r.to_s) || recently_used_routes.include?(r.merge(url_path: nil).to_s) }
       end
 
-      def tracking_since
-        if (tracking_time = redis_store.get(tracker_time_key))
-          Time.at(tracking_time.to_i).iso8601
-        else
-          "N/A"
+      def railtie!
+        ActiveSupport::Notifications.subscribe("start_processing.action_controller") do |name, start, finish, id, payload|
+          Coverband.configuration.route_tracker.track_key(payload)
         end
-      end
-
-      def reset_recordings
-        redis_store.del(tracker_key)
-        redis_store.del(tracker_time_key)
-      end
-
-      def clear_route!(route)
-        return unless route
 
-        redis_store.hdel(tracker_key, route)
-        @logged_routes.delete(route)
-      end
-
-      def report_routes_tracked
-        redis_store.set(tracker_time_key, Time.now.to_i) unless @one_time_timestamp || tracker_time_key_exists?
-        @one_time_timestamp = true
-        reported_time = Time.now.to_i
-        @routes_to_record.to_a.each do |route|
-          redis_store.hset(tracker_key, route.to_s, reported_time)
+        # NOTE: This event was instrumented in Aug 10th 2022, but didn't make the 7.0.4 release and should be in the next release
+        # https://github.com/rails/rails/pull/43755
+        # Automatic tracking of redirects isn't avaible before Rails 7.1.0 (currently tested against the 7.1.0.alpha)
+        # We could consider back porting or patching a solution that works on previous Rails versions
+        ActiveSupport::Notifications.subscribe("redirect.action_dispatch") do |name, start, finish, id, payload|
+          Coverband.configuration.route_tracker.track_key(payload)
         end
-        @routes_to_record.clear
-      rescue => e
-        # we don't want to raise errors if Coverband can't reach redis.
-        # This is a nice to have not a bring the system down
-        logger&.error "Coverband: route_tracker failed to store, error #{e.class.name} info #{e.message}"
-      end
-
-      def self.supported_version?
-        defined?(Rails) && defined?(Rails::VERSION) && Rails::VERSION::STRING.split(".").first.to_i >= 4
-      end
-
-      protected
-
-      def newly_seen_route?(route)
-        !@logged_routes.include?(route)
-      end
-
-      def track_route?(route, options = {})
-        @ignore_patterns.none? { |pattern| route.to_s.include?(pattern) }
       end
 
       private
 
-      def redis_store
-        store.raw_store
-      end
-
-      def tracker_time_key_exists?
-        if defined?(redis_store.exists?)
-          redis_store.exists?(tracker_time_key)
+      def concrete_target
+        if defined?(Rails.application)
+          Rails.application.routes.routes.map do |route|
+            {
+              controller: route.defaults[:controller],
+              action: route.defaults[:action],
+              url_path: route.path.spec.to_s.gsub("(.:format)", ""),
+              verb: route.verb
+            }
+          end
         else
-          redis_store.exists(tracker_time_key)
+          []
         end
       end
-
-      def tracker_key
-        "route_tracker_2"
-      end
-
-      def tracker_time_key
-        "route_tracker_time"
-      end
     end
   end
 end

data/lib/coverband/collectors/translation_tracker.rb

@@ -20,129 +20,30 @@ module Coverband
     ###
     # This class tracks translation usage via I18n::Backend
     ###
-    class TranslationTracker
-      attr_accessor :target
-      attr_reader :logger, :store, :ignore_patterns
+    class TranslationTracker < AbstractTracker
+      REPORT_ROUTE = "translations_tracker"
+      TITLE = "Translations"
 
-      def initialize(options = {})
-        raise NotImplementedError, "#{self.class.name} requires Rails 4 or greater" unless self.class.supported_version?
-        raise "Coverband: #{self.class.name} initialized before configuration!" if !Coverband.configured? && ENV["COVERBAND_TEST"] == "test"
-
-        @ignore_patterns = Coverband.configuration.ignore
-        @store = options.fetch(:store) { Coverband.configuration.store }
-        @logger = options.fetch(:logger) { Coverband.configuration.logger }
-        @target = options.fetch(:target) do
-          if defined?(Rails.application)
-            # I18n.eager_load!
-            # I18n.backend.send(:translations)
-            app_translation_keys = []
-            app_translation_files = ::I18n.load_path.select { |f| f.match(/config\/locales/) }
-            app_translation_files.each do |file|
-              app_translation_keys += flatten_hash(YAML.load_file(file)).keys
-            end
-            app_translation_keys.uniq
-          else
-            []
-          end
-        end
-
-        @one_time_timestamp = false
-
-        @logged_keys = Set.new
-        @keys_to_record = Set.new
+      def railtie!
+        # plugin to i18n
+        ::I18n::Backend::Simple.send :include, ::Coverband::Collectors::I18n::KeyRegistry
       end
 
-      def logged_keys
-        @logged_keys.to_a
-      end
-
-      def keys_to_record
-        @keys_to_record.to_a
-      end
+      private
 
-      ###
-      # This method is called on every translation usage
-      ###
-      def track_key(key)
-        if key
-          if newly_seen_key?(key)
-            @logged_keys << key
-            @keys_to_record << key if track_key?(key)
+      def concrete_target
+        if defined?(Rails.application)
+          app_translation_keys = []
+          app_translation_files = ::I18n.load_path.select { |f| f.match(/config\/locales/) }
+          app_translation_files.each do |file|
+            app_translation_keys += flatten_hash(YAML.load_file(file)).keys
           end
-        end
-      end
-
-      def used_keys
-        redis_store.hgetall(tracker_key)
-      end
-
-      def all_keys
-        target.uniq
-      end
-
-      def unused_keys(used_keys = nil)
-        recently_used_keys = (used_keys || self.used_keys).keys
-        all_keys.reject { |k| recently_used_keys.include?(k.to_s) }
-      end
-
-      def as_json
-        used_keys = self.used_keys
-        {
-          unused_keys: unused_keys(used_keys),
-          used_keys: used_keys
-        }.to_json
-      end
-
-      def tracking_since
-        if (tracking_time = redis_store.get(tracker_time_key))
-          Time.at(tracking_time.to_i).iso8601
+          app_translation_keys.uniq
         else
-          "N/A"
+          []
         end
       end
 
-      def reset_recordings
-        redis_store.del(tracker_key)
-        redis_store.del(tracker_time_key)
-      end
-
-      def clear_key!(key)
-        return unless key
-
-        redis_store.hdel(tracker_key, key)
-        @logged_keys.delete(key)
-      end
-
-      def save_report
-        redis_store.set(tracker_time_key, Time.now.to_i) unless @one_time_timestamp || tracker_time_key_exists?
-        @one_time_timestamp = true
-        reported_time = Time.now.to_i
-        @keys_to_record.to_a.each do |key|
-          redis_store.hset(tracker_key, key.to_s, reported_time)
-        end
-        @keys_to_record.clear
-      rescue => e
-        # we don't want to raise errors if Coverband can't reach redis.
-        # This is a nice to have not a bring the system down
-        logger&.error "Coverband: #{self.class.name} failed to store, error #{e.class.name} info #{e.message}"
-      end
-
-      def self.supported_version?
-        defined?(Rails) && defined?(Rails::VERSION) && Rails::VERSION::STRING.split(".").first.to_i >= 4
-      end
-
-      protected
-
-      def newly_seen_key?(key)
-        !@logged_keys.include?(key)
-      end
-
-      def track_key?(key, options = {})
-        @ignore_patterns.none? { |pattern| key.to_s.include?(pattern) }
-      end
-
-      private
-
       def flatten_hash(hash)
         hash.each_with_object({}) do |(k, v), h|
           if v.is_a? Hash
@@ -154,30 +55,6 @@ module Coverband
           end
         end
       end
-
-      def redis_store
-        store.raw_store
-      end
-
-      def tracker_time_key_exists?
-        if defined?(redis_store.exists?)
-          redis_store.exists?(tracker_time_key)
-        else
-          redis_store.exists(tracker_time_key)
-        end
-      end
-
-      def tracker_key
-        "#{class_key}_tracker"
-      end
-
-      def tracker_time_key
-        "#{class_key}_tracker_time"
-      end
-
-      def class_key
-        @class_key ||= self.class.name.split("::").last
-      end
     end
   end
 end