coverband 6.0.2 → 6.0.3.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e834afa9139c4fc6b0e17a151476a7e9769f082ff435d93a58f3d1a8c44ff1a
-  data.tar.gz: 935efdfe633f5ccafc3d43d4d5237558b8032545526f0a7320b11ba64a04c7c1
+  metadata.gz: f25f2799e62201b31472588ed6ee3d00697b6ab8eba5beb04c3a76cb7e52d962
+  data.tar.gz: 599a0d1a4ef26b9b353d4ae341db2287f15b5119b9d9d3ed3d2b0e796c6e1fae
 SHA512:
-  metadata.gz: de37c02bb694b58b25dad7b31f8fd9bbe09f0c963d779f5094e1db8db6e971b4df4501722657e00a7772a3e0a1622d9538e75b8e4625996ce4e60e3faadf27a3
-  data.tar.gz: 8ce7d73882bbc4e501dedde77f58358165e16143e59794d779e7568ec2b15bbbe0dc5f286f995808283c1c8616b7b03704137ec22a28392cff0df95c0fc97d35
+  metadata.gz: b58f4486c028a9ed4f2e3444ed164a43b620b4cc213f91e9b7aef93c2ef1c394840aade62466b216f29ade57851314989e0ed3f3bca2a7f692deddd106efe7a3
+  data.tar.gz: 6569ffaeb15feb24b4eb40d5e0403bcf4fcc6fc381a7fd30e64a9e6a7fee06498e05ffe2832c7a99545c51a8b25a12cf6264daf672ef82485ccf10e03a3895a3

data/.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/main.yml

@@ -20,13 +20,12 @@ jobs:
         # truffleruby-head,
         # removing jruby again to flaky
         gemfile: [ Gemfile.rails6.0, Gemfile.rails6.1, Gemfile.rails7.0, Gemfile.rails7.1 ]
-        # 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", "3.2"]
+        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3"]
         redis-version: [4, 5, 6, 7]
     runs-on: ${{ matrix.os }}-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: supercharge/redis-github-action@1.2.0
         with:
           redis-version: ${{ matrix.redis-version }}

data/.standard.yml

@@ -1,4 +1,4 @@
-ruby_version: 2.3
+ruby_version: 2.7
 fix: false # default: false
 parallel: true # default: false
 format: progress # default: Standard::Formatter

data/Gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in coverband.gemspec
 gemspec
-gem "rails", "~>6"
+gem "rails", "~>7"
 gem "haml"
 gem "slim"
 gem "webrick"

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2010-2018 Dan Mayer
+Copyright (c) 2010 Dan Mayer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -79,7 +79,7 @@ run ActionController::Dispatcher.new
 
 ![image](https://raw.github.com/danmayer/coverband/master/docs/coverband_web_ui.png)
 
-> The web index is available on the [Coverband Demo site](https://coverband-demo.herokuapp.com/coverage?#_Coverage).
+> You can check it out locally by running the [Coverband Demo App](https://github.com/danmayer/coverband_rails_example).
 
 - View overall coverage information
 
@@ -438,6 +438,7 @@ If you submit a change please make sure the tests and benchmarks are passing.
 - **Coverband, [Elastic APM](https://github.com/elastic/apm-agent-ruby) and resque**
   - In an environment that uses the Elastic APM ruby agent, resque jobs will fail with `Transactions may not be nested. Already inside #<ElasticAPM::Transaction>` if the `elastic-apm` gem is loaded _before_ the `coverband` gem
   - Put `coverage` ahead of `elastic-apm` in your Gemfile
+- **Bootsnap**, The methods used by [bootsnap do not support having coverage enabled](https://github.com/Shopify/bootsnap/blob/main/lib/bootsnap/compile_cache/iseq.rb#L87), so you can either have Coverband or bootsnap, but not both.  
 
 ### Debugging Redis Store
 
@@ -462,4 +463,4 @@ The Coverband logo was created by [Dave Woodall](http://davewoodall.com). Thanks
 # License
 
 This is a MIT License project...
-See the file license.txt for copying permission.
+See the file [LICENSE](LICENSE) for copying permission.

data/Rakefile

@@ -8,7 +8,7 @@ RuboCop::RakeTask.new
 
 task default: %i[test]
 
-task 'test:all': %i[rubocop test forked_tests benchmarks:memory benchmarks]
+task "test:all": %i[rubocop test forked_tests benchmarks:memory benchmarks]
 
 task :test
 require "rake/testtask"

data/changes.md

@@ -135,7 +135,7 @@ __NOTE: the current RCs include below, but this might turn into coverband 6.0__
 - added support to download coverage and view data in JSON format
 - documentation about working with environment variables
 - add cache wiggle to avoid Redis CPU spikes (cache stampede on Redis server)
-- make the nocov consistant on the data download and html view
+- make the nocov consistent on the data download and html view
 - small performance improvements
 
 ### Coverband 4.2.3

data/coverband.gemspec

@@ -18,10 +18,9 @@ Gem::Specification.new do |spec|
 
   spec.files = `git ls-files`.split("\n").reject { |f| f.start_with?("docs") }
   spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = %w[lib]
 
-  spec.required_ruby_version = ">= 2.3"
+  spec.required_ruby_version = ">= 2.7"
 
   spec.metadata = {
     "homepage_uri" => "https://github.com/danmayer/coverband",
@@ -40,11 +39,12 @@ Gem::Specification.new do |spec|
   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"
   spec.add_development_dependency "resque"
-  spec.add_development_dependency "standard", "= 0.2.5"
+  spec.add_development_dependency "standard", "~> 1.34.0"
   spec.add_development_dependency "standardrb"
 
   spec.add_development_dependency "coveralls"

data/lib/coverband/adapters/base.rb

@@ -35,7 +35,7 @@ module Coverband
         raise ABSTRACT_KEY
       end
 
-      def coverage(_local_type = nil)
+      def coverage(_local_type = nil, opts = {})
         raise ABSTRACT_KEY
       end
 
@@ -51,9 +51,9 @@ module Coverband
         raise "abstract"
       end
 
-      def get_coverage_report
+      def get_coverage_report(options = {})
         coverage_cache = {}
-        data = Coverband.configuration.store.split_coverage(Coverband::TYPES, coverage_cache)
+        data = Coverband.configuration.store.split_coverage(Coverband::TYPES, coverage_cache, options)
         data.merge(Coverband::MERGED_TYPE => Coverband.configuration.store.merged_coverage(Coverband::TYPES, coverage_cache))
       end
 
@@ -67,12 +67,12 @@ module Coverband
 
       protected
 
-      def split_coverage(types, coverage_cache)
+      def split_coverage(types, coverage_cache, options = {})
         types.reduce({}) do |data, type|
           if type == Coverband::RUNTIME_TYPE && Coverband.configuration.simulate_oneshot_lines_coverage
             data.update(type => coverage_cache[type] ||= simulated_runtime_coverage)
           else
-            data.update(type => coverage_cache[type] ||= coverage(type))
+            data.update(type => coverage_cache[type] ||= coverage(type, options))
           end
         end
       end
@@ -100,7 +100,7 @@ module Coverband
       def expand_report(report)
         expanded = {}
         report_time = Time.now.to_i
-        updated_time = type == Coverband::EAGER_TYPE ? nil : report_time
+        updated_time = (type == Coverband::EAGER_TYPE) ? nil : report_time
         report.each_pair do |key, line_data|
           extended_data = {
             FIRST_UPDATED_KEY => report_time,
@@ -115,7 +115,7 @@ module Coverband
 
       def merge_reports(new_report, old_report, options = {})
         # transparently update from RUNTIME_TYPE = nil to RUNTIME_TYPE = :runtime
-        # transparent update for format coveband_3_2
+        # transparent update for format coverband_3_2
         old_report = coverage(nil, override_type: nil) if old_report.nil? && type == Coverband::RUNTIME_TYPE
         new_report = expand_report(new_report) unless options[:skip_expansion]
         keys = (new_report.keys + old_report.keys).uniq
@@ -145,11 +145,11 @@ module Coverband
       # TODO: This should only be 2 cases get our dup / not dups aligned
       def array_add(latest, original)
         if Coverband.configuration.use_oneshot_lines_coverage
-          latest.map!.with_index { |v, i| (v + original[i] >= 1 ? 1 : 0) if v && original[i] }
+          latest.map!.with_index { |v, i| ((v + original[i] >= 1) ? 1 : 0) if v && original[i] }
         elsif Coverband.configuration.simulate_oneshot_lines_coverage
-          latest.map.with_index { |v, i| (v + original[i] >= 1 ? 1 : 0) if v && original[i] }
+          latest.map.with_index { |v, i| ((v + original[i] >= 1) ? 1 : 0) if v && original[i] }
         else
-          latest.map.with_index { |v, i| v && original[i] ? v + original[i] : nil }
+          latest.map.with_index { |v, i| (v && original[i]) ? v + original[i] : nil }
         end
       end
     end

data/lib/coverband/adapters/file_store.rb

@@ -52,7 +52,7 @@ module Coverband
         raise NotImplementedError, "FileStore doesn't support migrations"
       end
 
-      def coverage(_local_type = nil)
+      def coverage(_local_type = nil, opts = {})
         if merge_mode
           data = {}
           Dir[path.sub(/\.\d+/, ".*")].each do |path|

data/lib/coverband/adapters/hash_redis_store.rb

@@ -34,12 +34,10 @@ module Coverband
           else
             if lock!(local_type)
               Thread.new do
-                begin
-                  result = yield(deferred_time)
-                  set(local_type, JSON.generate(result))
-                ensure
-                  unlock!(local_type)
-                end
+                result = yield(deferred_time)
+                set(local_type, JSON.generate(result))
+              ensure
+                unlock!(local_type)
               end
             end
             JSON.parse(cached_result)
@@ -53,12 +51,22 @@ 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..
         # with a small random offset so runtime and eager types can be processed "at the same time"
         def deferred_time
-          rand(3.0..4.0)
+          rand(2.0..3.0)
         end
 
         def del(local_type)
@@ -109,7 +117,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].compact.join(".")
+          key_prefix = [REDIS_STORAGE_FORMAT_VERSION, @redis_namespace, "v2"].compact.join(".")
           GetCoverageRedisCacheStore.new(redis, key_prefix)
         else
           GetCoverageNullCacheStore
@@ -130,6 +138,7 @@ module Coverband
           file_keys = files_set
           @redis.del(*file_keys) if file_keys.any?
           @redis.del(files_key)
+          @redis.del(files_key(type))
           @get_coverage_cache.clear!(type)
         end
         self.type = old_type
@@ -147,7 +156,7 @@ module Coverband
 
       def save_report(report)
         report_time = Time.now.to_i
-        updated_time = type == Coverband::EAGER_TYPE ? nil : report_time
+        updated_time = (type == Coverband::EAGER_TYPE) ? nil : report_time
         keys = []
         report.each_slice(@save_report_batch_size) do |slice|
           files_data = slice.map { |(file, data)|
@@ -173,12 +182,19 @@ module Coverband
         @redis.sadd(files_key, keys) if keys.any?
       end
 
-      def coverage(local_type = nil)
+      # TODO: refactor this and the method below and consider removing all the cached results stuff
+      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 = files_set(local_type)
-
+          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] } || {}
+          else
+            files_set(local_type)
+          end
           # use batches with a sleep in between to avoid overloading redis
-          files_set.each_slice(250).flat_map do |key_batch|
+          files_set.each_slice(page_size).flat_map do |key_batch|
             sleep sleep_time
             @redis.pipelined do |pipeline|
               key_batch.each do |key|
@@ -193,6 +209,44 @@ 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 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
+        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|
+              pipeline.hgetall(key)
+            end
+          end
+        end
+
+        matched_file_set = files_set(Coverband::EAGER_TYPE)
+          .select { |filepath| runtime_file_set.include?(filepath) } || {}
+        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|
+              pipeline.hgetall(key)
+            end
+          end
+        end
+        hash_data
+      end
+
+      def file_count(local_type = nil)
+        files_set(local_type).count { |filename| !Coverband.configuration.ignore.any? { |i| filename.match(i) } }
+      end
+
       def raw_store
         @redis
       end
@@ -215,7 +269,7 @@ module Coverband
 
         data = coverage_data_from_redis(data_from_redis)
         hash[file] = data_from_redis.select { |meta_data_key, _value| META_DATA_KEYS.include?(meta_data_key) }.merge!("data" => data)
-        hash[file][LAST_UPDATED_KEY] = hash[file][LAST_UPDATED_KEY].nil? || hash[file][LAST_UPDATED_KEY] == "" ? nil : hash[file][LAST_UPDATED_KEY].to_i
+        hash[file][LAST_UPDATED_KEY] = (hash[file][LAST_UPDATED_KEY].nil? || hash[file][LAST_UPDATED_KEY] == "") ? nil : hash[file][LAST_UPDATED_KEY].to_i
         hash[file].merge!(LAST_UPDATED_KEY => hash[file][LAST_UPDATED_KEY], FIRST_UPDATED_KEY => hash[file][FIRST_UPDATED_KEY].to_i)
       end
 
@@ -223,7 +277,7 @@ module Coverband
         max = data_from_redis[FILE_LENGTH_KEY].to_i - 1
         Array.new(max + 1) do |index|
           line_coverage = data_from_redis[index.to_s]
-          line_coverage.nil? ? nil : line_coverage.to_i
+          line_coverage&.to_i
         end
       end
 

data/lib/coverband/adapters/null_store.rb

@@ -26,7 +26,7 @@ module Coverband
         raise NotImplementedError, "NullStore doesn't support migrations"
       end
 
-      def coverage(_local_type = nil)
+      def coverage(_local_type = nil, opts = {})
         {}
       end
 

data/lib/coverband/adapters/stdout_store.rb

@@ -25,7 +25,7 @@ module Coverband
         raise NotImplementedError, "StdoutStore doesn't support migrations"
       end
 
-      def coverage(_local_type = nil)
+      def coverage(_local_type = nil, opts = {})
         {}
       end
 

data/lib/coverband/adapters/web_service_store.rb

@@ -42,7 +42,7 @@ module Coverband
 
       ###
       # Fetch coverband coverage via the API
-      # This would allow one to expore from the service and move back to the open source
+      # This would allow one to explore from the service and move back to the open source
       # without having to reset coverage
       ###
       def coverage(local_type = nil, opts = {})
@@ -98,12 +98,10 @@ module Coverband
       def retry_failed_reports
         retries = []
         @failed_coverage_reports.any? do
-          begin
-            report_body = @failed_coverage_reports.pop
-            send_report_body(report_body)
-          rescue
-            retries << report_body
-          end
+          report_body = @failed_coverage_reports.pop
+          send_report_body(report_body)
+        rescue
+          retries << report_body
         end
         retries.each do |report_body|
           add_retry_message(report_body)

data/lib/coverband/collectors/route_tracker.rb

@@ -65,7 +65,7 @@ module Coverband
 
         # 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)
+        # Automatic tracking of redirects isn't available 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)

data/lib/coverband/collectors/translation_tracker.rb

@@ -36,7 +36,7 @@ module Coverband
           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
+            app_translation_keys += flatten_hash(YAML.load_file(file, aliases: true)).keys
           end
           app_translation_keys.uniq
         else
@@ -48,7 +48,7 @@ module Coverband
         hash.each_with_object({}) do |(k, v), h|
           if v.is_a? Hash
             flatten_hash(v).map do |h_k, h_v|
-              h["#{k}.#{h_k}".to_sym] = h_v
+              h[:"#{k}.#{h_k}"] = h_v
             end
           else
             h[k] = v

data/lib/coverband/collectors/view_tracker.rb

@@ -81,7 +81,7 @@ module Coverband
       end
 
       def unused_keys(used_views = nil)
-        recently_used_views = (used_keys || used_keys).keys
+        recently_used_views = used_keys.keys
         unused_views = all_keys - recently_used_views
         # since layouts don't include format we count them used if they match with ANY formats
         unused_views.reject { |view| view.match(/\/layouts\//) && recently_used_views.any? { |used_view| view.include?(used_view) } }

data/lib/coverband/configuration.rb

@@ -93,7 +93,7 @@ module Coverband
       @coverband_timeout = nil
       @service_dev_mode = nil
       @service_test_mode = nil
-      @proces_type = nil
+      @process_type = nil
 
       @redis_url = nil
       @redis_namespace = nil
@@ -154,7 +154,7 @@ module Coverband
     def background_reporting_sleep_seconds
       @background_reporting_sleep_seconds ||= if service?
         # default to 10m for service
-        Coverband.configuration.coverband_env == "production" ? 600 : 60
+        (Coverband.configuration.coverband_env == "production") ? 600 : 60
       elsif store.is_a?(Coverband::Adapters::HashRedisStore)
         # Default to 5 minutes if using the hash redis store
         300
@@ -180,7 +180,7 @@ module Coverband
     def store=(store)
       raise "Pass in an instance of Coverband::Adapters" unless store.is_a?(Coverband::Adapters::Base)
       raise "invalid configuration: only coverband service expects an API Key" if api_key && store.class.to_s != "Coverband::Adapters::WebServiceStore"
-      raise "invalid configuration: coverband service shouldn't have redis url set" if ENV["COVERBAND_REDIS_URL"] && store.class.to_s == "Coverband::Adapters::WebServiceStore"
+      raise "invalid configuration: coverband service shouldn't have redis url set" if ENV["COVERBAND_REDIS_URL"] && store.instance_of?(::Coverband::Adapters::WebServiceStore)
 
       @store = store
     end
@@ -262,11 +262,11 @@ module Coverband
     end
 
     def coverband_env
-      ENV["RACK_ENV"] || ENV["RAILS_ENV"] || (defined?(Rails) && Rails.respond_to?(:env) ? Rails.env : "unknown")
+      ENV["RACK_ENV"] || ENV["RAILS_ENV"] || ((defined?(Rails) && Rails.respond_to?(:env)) ? Rails.env : "unknown")
     end
 
     def coverband_timeout
-      @coverband_timeout ||= coverband_env == "development" ? 5 : 2
+      @coverband_timeout ||= (coverband_env == "development") ? 5 : 2
     end
 
     def service_dev_mode

data/lib/coverband/integrations/rack_server_check.rb

@@ -20,10 +20,8 @@ module Coverband
 
     def rails_server?
       @stack.any? do |location|
-        (
-          location.path.include?("rails/commands/commands_tasks.rb") && location.label == "server" ||
+        location.path.include?("rails/commands/commands_tasks.rb") && location.label == "server" ||
           location.path.include?("rails/commands/server/server_command.rb") && location.label == "perform"
-        )
       end
     end
   end

data/lib/coverband/reporters/base.rb

@@ -4,15 +4,15 @@ module Coverband
   module Reporters
     ###
     # This is the base clase for report generation
-    # it helps with filtering, normalization, etc for final reprort generation
+    # it helps with filtering, normalization, etc for final report generation
     ###
     class Base
       class << self
         DATA_KEY = "data"
 
-        def report(store, _options = {})
+        def report(store, options = {})
           all_roots = Coverband.configuration.all_root_paths
-          scov_style_report = get_current_scov_data_imp(store, all_roots)
+          get_current_scov_data_imp(store, all_roots, options)
 
           # These are extremelhy verbose but useful during coverband development, not generally for users
           # Only available by uncommenting this mode is never released
@@ -20,7 +20,6 @@ module Coverband
           #   # msg = "report:\n #{scov_style_report.inspect}"
           #   # Coverband.configuration.logger.debug msg
           # end
-          scov_style_report
         end
 
         ###
@@ -71,7 +70,7 @@ module Coverband
         # > [nil,0,0,1,0,1]
         def merge_arrays(first, second)
           merged = []
-          longest = first.length > second.length ? first : second
+          longest = (first.length > second.length) ? first : second
 
           longest.each_with_index do |_line, index|
             merged[index] = if first[index] || second[index]
@@ -86,12 +85,13 @@ module Coverband
         # why do we need to merge covered files data?
         # basically because paths on machines or deployed hosts could be different, so
         # two different keys could point to the same filename or `line_key`
+        # this happens when deployment has a dynmaic path or the path change during deployment (hot code reload)
         # TODO: think we are filtering based on ignore while sending to the store
         # and as we also pull it out here
         ###
-        def get_current_scov_data_imp(store, roots)
+        def get_current_scov_data_imp(store, roots, options = {})
           scov_style_report = {}
-          store.get_coverage_report.each_pair do |name, data|
+          store.get_coverage_report(options).each_pair do |name, data|
             data.each_pair do |key, line_data|
               next if Coverband.configuration.ignore.any? { |i| key.match(i) }
               next unless line_data

data/lib/coverband/reporters/html_report.rb

@@ -4,17 +4,23 @@ module Coverband
   module Reporters
     class HTMLReport < Base
       attr_accessor :filtered_report_files, :open_report, :notice,
-        :base_path, :filename
+        :base_path, :filename, :page
 
       def initialize(store, options = {})
-        coverband_reports = Coverband::Reporters::Base.report(store, options)
+        self.page = options.fetch(:page) { nil }
         self.open_report = options.fetch(:open_report) { true }
         # TODO: refactor notice out to top level of web only
         self.notice = options.fetch(:notice) { nil }
         self.base_path = options.fetch(:base_path) { "./" }
         self.filename = options.fetch(:filename) { nil }
 
-        self.filtered_report_files = self.class.fix_reports(coverband_reports)
+        coverband_reports = Coverband::Reporters::Base.report(store, options)
+        # NOTE: at the moment the optimization around paging and filenames only works for hash redis store
+        self.filtered_report_files = if (page || filename) && store.is_a?(Coverband::Adapters::HashRedisStore)
+          coverband_reports
+        else
+          self.class.fix_reports(coverband_reports)
+        end
       end
 
       def file_details
@@ -36,12 +42,14 @@ module Coverband
       def report_dynamic_html
         Coverband::Utils::HTMLFormatter.new(filtered_report_files,
           base_path: base_path,
-          notice: notice).format_dynamic_html!
+          notice: notice,
+          page: page).format_dynamic_html!
       end
 
       def report_dynamic_data
         Coverband::Utils::HTMLFormatter.new(filtered_report_files,
           base_path: base_path,
+          page: page,
           notice: notice).format_dynamic_data!
       end
     end