simplecov-html 0.10.2 → 0.12.3

data/simplecov-html.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.push File.expand_path("../lib", __FILE__)
 require "simplecov-html/version"
 
@@ -7,13 +9,12 @@ Gem::Specification.new do |gem|
   gem.platform    = Gem::Platform::RUBY
   gem.authors     = ["Christoph Olszowka"]
   gem.email       = ["christoph at olszowka de"]
-  gem.homepage    = "https://github.com/colszowka/simplecov-html"
-  gem.description = %(Default HTML formatter for SimpleCov code coverage tool for ruby 1.9+)
+  gem.homepage    = "https://github.com/simplecov-ruby/simplecov-html"
+  gem.description = %(Default HTML formatter for SimpleCov code coverage tool for ruby 2.4+)
   gem.summary     = gem.description
   gem.license     = "MIT"
 
-  gem.required_ruby_version = ">= 1.8.7"
-  gem.add_development_dependency "bundler", "~> 1.9"
+  gem.required_ruby_version = ">= 2.4"
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/test/helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/setup"
 require "simplecov"
 require "simplecov-html"

data/test/test_simple_cov-html.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require "helper"
 
-class TestSimpleCovHtml < MiniTest::Unit::TestCase
+class TestSimpleCovHtml < Minitest::Test
   def test_defined
     assert defined?(SimpleCov::Formatter::HTMLFormatter)
     assert defined?(SimpleCov::Formatter::HTMLFormatter::VERSION)

data/views/covered_percent.erb

@@ -0,0 +1,3 @@
+<span class="<%= coverage_css_class(percent) %>">
+  <%= percent.round(2) %>%
+</span>

data/views/file_list.erb

@@ -1,45 +1,78 @@
 <div class="file_list_container" id="<%= title_id %>">
   <h2>
     <span class="group_name"><%= title %></span>
-    (<span class="covered_percent"><span class="<%= coverage_css_class(source_files.covered_percent) %>"><%= source_files.covered_percent.round(2) %>%</span></span>
+    (<span class="covered_percent">
+      <%= covered_percent(source_files.covered_percent) %>
+     </span>
      covered at
      <span class="covered_strength">
        <span class="<%= strength_css_class(source_files.covered_strength) %>">
          <%= source_files.covered_strength.round(2) %>
        </span>
-    </span> hits/line)
+    </span> hits/line
+    )
   </h2>
+
   <a name="<%= title_id %>"></a>
+
   <div>
     <b><%= source_files.length %></b> files in total.
-    <b><%= source_files.lines_of_code %></b> relevant lines. 
+  </div>
+
+  <div class="t-line-summary">
+    <b><%= source_files.lines_of_code %></b> relevant lines,
     <span class="green"><b><%= source_files.covered_lines %></b> lines covered</span> and
-    <span class="red"><b><%= source_files.missed_lines %></b> lines missed </span>
+    <span class="red"><b><%= source_files.missed_lines %></b> lines missed. </span>
+    (<%= covered_percent(source_files.covered_percent) %>)
+  </div>
+
+  <% if branchable_result? %>
+    <div class="t-branch-summary">
+      <span><b><%= source_files.total_branches %></b> total branches, </span>
+      <span class="green"><b><%= source_files.covered_branches %></b> branches covered</span> and
+      <span class="red"><b><%= source_files.missed_branches %></b> branches missed.</span>
+      (<%= covered_percent(source_files.branch_covered_percent) %>)
+    </div>
+  <% end %>
+
+  <div class="file_list--responsive">
+    <table class="file_list">
+      <thead>
+        <tr>
+          <th>File</th>
+          <th class="cell--number">% covered</th>
+          <th class="cell--number">Lines</th>
+          <th class="cell--number">Relevant Lines</th>
+          <th class="cell--number">Lines covered</th>
+          <th class="cell--number">Lines missed</th>
+          <th class="cell--number">Avg. Hits / Line</th>
+          <% if branchable_result? %>
+            <th class="cell--number">Branch Coverage</th>
+            <th class="cell--number">Branches</th>
+            <th class="cell--number">Covered branches</th>
+            <th class="cell--number">Missed branches </th>
+          <% end %>
+        </tr>
+      </thead>
+      <tbody>
+        <% source_files.each do |source_file| %>
+          <tr class="t-file">
+            <td class="strong t-file__name"><%= link_to_source_file(source_file) %></td>
+            <td class="<%= coverage_css_class(source_file.covered_percent) %> strong cell--number t-file__coverage"><%= sprintf("%.2f", source_file.covered_percent.round(2)) %> %</td>
+            <td class="cell--number"><%= source_file.lines.count %></td>
+            <td class="cell--number"><%= source_file.covered_lines.count + source_file.missed_lines.count %></td>
+            <td class="cell--number"><%= source_file.covered_lines.count %></td>
+            <td class="cell--number"><%= source_file.missed_lines.count %></td>
+            <td class="cell--number"><%= sprintf("%.2f", source_file.covered_strength.round(2)) %></td>
+            <% if branchable_result? %>
+              <td class="<%= coverage_css_class(source_file.branches_coverage_percent) %> strong cell--number t-file__branch-coverage"><%= sprintf("%.2f", source_file.branches_coverage_percent.round(2)) %> %</td>
+              <td class="cell--number"><%= source_file.total_branches.count %></td>
+              <td class="cell--number"><%= source_file.covered_branches.count %></td>
+              <td class="cell--number"><%= source_file.missed_branches.count %></td>
+            <% end %>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
   </div>
-  <table class="file_list">
-    <thead>
-      <tr>
-        <th>File</th>
-        <th>% covered</th>
-        <th>Lines</th>
-        <th>Relevant Lines</th>
-        <th>Lines covered</th>
-        <th>Lines missed</th>
-        <th>Avg. Hits / Line</th>
-      </tr>
-    </thead>
-    <tbody>
-      <% source_files.each do |source_file| %>
-      <tr>
-        <td class="strong"><%= link_to_source_file(source_file) %></td>
-        <td class="<%= coverage_css_class(source_file.covered_percent) %> strong"><%= source_file.covered_percent.round(2).to_s %> %</td>
-        <td><%= source_file.lines.count %></td>
-        <td><%= source_file.covered_lines.count + source_file.missed_lines.count %></td>
-        <td><%= source_file.covered_lines.count %></td>
-        <td><%= source_file.missed_lines.count %></td>
-        <td><%= source_file.covered_strength %></td>
-      </tr>
-      <% end %>
-    </tbody>
-  </table>
 </div>

data/views/layout.erb

@@ -3,17 +3,17 @@
   <head>
     <title>Code coverage for <%= SimpleCov.project_name %></title>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <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'>
+    <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="shortcut icon" type="image/png" href="<%= assets_path("favicon_#{coverage_css_class(result.source_files.covered_percent)}.png") %>" />
     <link rel="icon" type="image/png" href="<%= assets_path('favicon.png') %>" />
   </head>
-  
-  <body>
+
+  <body<%= ' data-branch-coverage=true' if branchable_result? %>>
     <div id="loading">
       <img src="<%= assets_path('loading.gif') %>" alt="loading"/>
     </div>
-    <div id="wrapper" style="display:none;">
+    <div id="wrapper" class="hide">
       <div class="timestamp">Generated <%= timeago(Time.now) %></div>
       <ul class="group_tabs"></ul>
 
@@ -24,13 +24,13 @@
           <%= formatted_file_list(name, files) %>
         <% end %>
       </div>
-    
+
       <div id="footer">
-        Generated by <a href="http://github.com/colszowka/simplecov">simplecov</a> v<%= SimpleCov::VERSION %> 
+        Generated by <a href="https://github.com/simplecov-ruby/simplecov">simplecov</a> v<%= SimpleCov::VERSION %>
         and simplecov-html v<%= SimpleCov::Formatter::HTMLFormatter::VERSION %><br/>
         using <%= result.command_name %>
       </div>
-    
+
       <div class="source_files">
       <% result.source_files.each do |source_file| %>
         <%= formatted_source_file(source_file) %>

data/views/source_file.erb

@@ -1,22 +1,53 @@
 <div class="source_table" id="<%= id source_file %>">
   <div class="header">
     <h3><%= shortened_filename source_file %></h3>
-    <h4><span class="<%= coverage_css_class(source_file.covered_percent) %>"><%= source_file.covered_percent.round(2).to_s %> %</span> covered</h4>
-    <div>
-      <b><%= source_file.lines_of_code %></b> relevant lines. 
+    <h4>
+      <%= covered_percent(source_file.covered_percent) %>
+      lines covered
+    </h4>
+
+    <% if branchable_result? %>
+      <h4>
+        <%= covered_percent(source_file.branches_coverage_percent) %>
+        branches covered
+      </h4>
+    <% end %>
+
+    <div class="t-line-summary">
+      <b><%= source_file.lines_of_code %></b> relevant lines.
       <span class="green"><b><%= source_file.covered_lines.count %></b> lines covered</span> and
       <span class="red"><b><%= source_file.missed_lines.count %></b> lines missed.</span>
     </div>
+
+    <% if branchable_result? %>
+      <div class="t-branch-summary">
+          <span><b><%= source_file.total_branches.count %></b> total branches, </span>
+          <span class="green"><b><%= source_file.covered_branches.count %></b> branches covered</span> and
+          <span class="red"><b><%= source_file.missed_branches.count %></b> branches missed.</span>
+      </div>
+    <% end %>
+
   </div>
-  
+
   <pre>
     <ol>
       <% source_file.lines.each do |line| %>
-        <li class="<%= line.status %>" data-hits="<%= line.coverage ? line.coverage : '' %>" data-linenumber="<%= line.number %>">
-          <% if line.covered? %><span class="hits"><%= line.coverage %></span><% end %>
-          <% if line.skipped? %><span class="hits">skipped</span><% end %>
-          <code class="ruby"><%= CGI.escapeHTML(line.src.chomp) %></code>
-        </li>
+        <div>
+          <li class="<%= line_status?(source_file, line) %>" data-hits="<%= line.coverage ? line.coverage : '' %>" data-linenumber="<%= line.number %>">
+            <% if line.covered? %><span class="hits"><%= line.coverage %></span><% end %>
+            <% if line.skipped? %><span class="hits">skipped</span><% end %>
+
+            <% if branchable_result? %>
+              <% source_file.branches_for_line(line.number).each do |branch_type, hit_count| %>
+                <span class="hits" title="<%= branch_type%> branch hit <%= hit_count %> times">
+                  <%= branch_type %>: <%= hit_count %>
+                </span>
+              <% end %>
+            <% end %>
+
+            <code class="ruby"><%= CGI.escapeHTML(line.src.chomp) %></code>
+          </li>
+        </div>
       <% end %>
     </ol>
   </pre>

metadata

@@ -1,30 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: simplecov-html
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.12.3
 platform: ruby
 authors:
 - Christoph Olszowka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-description: Default HTML formatter for SimpleCov code coverage tool for ruby 1.9+
+date: 2020-09-23 00:00:00.000000000 Z
+dependencies: []
+description: Default HTML formatter for SimpleCov code coverage tool for ruby 2.4+
 email:
 - christoph at olszowka de
 executables: []
@@ -34,28 +20,35 @@ files:
 - ".document"
 - ".gitignore"
 - ".rubocop.yml"
+- ".tool-versions"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.md
 - Rakefile
 - assets/javascripts/application.js
-- assets/javascripts/libraries/jquery-1.6.2.min.js
+- assets/javascripts/libraries/jquery-3.4.1.js
 - assets/javascripts/plugins/highlight.pack.js
 - assets/javascripts/plugins/jquery.colorbox.js
-- assets/javascripts/plugins/jquery.dataTables.min.js
+- assets/javascripts/plugins/jquery.dataTables.js
 - assets/javascripts/plugins/jquery.timeago.js
-- assets/javascripts/plugins/jquery.url.js
 - assets/stylesheets/application.css
+- assets/stylesheets/plugins/datatables.css
 - assets/stylesheets/plugins/highlight.css
 - assets/stylesheets/plugins/jquery-ui-1.8.4.custom.css
 - assets/stylesheets/plugins/jquery.colorbox.css
 - assets/stylesheets/reset.css
-- assets/stylesheets/screen.css.sass
+- assets/stylesheets/screen.css
 - lib/simplecov-html.rb
 - lib/simplecov-html/version.rb
+- public/DataTables-1.10.20/images/sort_asc.png
+- public/DataTables-1.10.20/images/sort_asc_disabled.png
+- public/DataTables-1.10.20/images/sort_both.png
+- public/DataTables-1.10.20/images/sort_desc.png
+- public/DataTables-1.10.20/images/sort_desc_disabled.png
 - public/application.css
 - public/application.js
 - public/colorbox/border.png
@@ -65,28 +58,29 @@ files:
 - public/favicon_green.png
 - public/favicon_red.png
 - public/favicon_yellow.png
+- public/images/ui-bg_flat_0_aaaaaa_40x100.png
+- public/images/ui-bg_flat_75_ffffff_40x100.png
+- public/images/ui-bg_glass_55_fbf9ee_1x400.png
+- public/images/ui-bg_glass_65_ffffff_1x400.png
+- public/images/ui-bg_glass_75_dadada_1x400.png
+- public/images/ui-bg_glass_75_e6e6e6_1x400.png
+- public/images/ui-bg_glass_95_fef1ec_1x400.png
+- public/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+- public/images/ui-icons_222222_256x240.png
+- public/images/ui-icons_2e83ff_256x240.png
+- public/images/ui-icons_454545_256x240.png
+- public/images/ui-icons_888888_256x240.png
+- public/images/ui-icons_cd0a0a_256x240.png
 - public/loading.gif
 - public/magnify.png
-- public/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
-- public/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
-- public/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
-- public/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
-- public/smoothness/images/ui-bg_glass_75_dadada_1x400.png
-- public/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
-- public/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
-- public/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-- public/smoothness/images/ui-icons_222222_256x240.png
-- public/smoothness/images/ui-icons_2e83ff_256x240.png
-- public/smoothness/images/ui-icons_454545_256x240.png
-- public/smoothness/images/ui-icons_888888_256x240.png
-- public/smoothness/images/ui-icons_cd0a0a_256x240.png
 - simplecov-html.gemspec
 - test/helper.rb
 - test/test_simple_cov-html.rb
+- views/covered_percent.erb
 - views/file_list.erb
 - views/layout.erb
 - views/source_file.erb
-homepage: https://github.com/colszowka/simplecov-html
+homepage: https://github.com/simplecov-ruby/simplecov-html
 licenses:
 - MIT
 metadata: {}
@@ -98,16 +92,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: Default HTML formatter for SimpleCov code coverage tool for ruby 1.9+
+summary: Default HTML formatter for SimpleCov code coverage tool for ruby 2.4+
 test_files: []