simplecov-html 0.5.0 → 0.5.3

data/assets/app.js

@@ -59,7 +59,7 @@ $(document).ready(function() {
   // Make sure tabs don't get ugly focus borders when active
   $('.group_tabs a').live('focus', function() { $(this).blur(); });
   
-  var favicon_path = $('link[rel="shortcut icon"]').attr('href')
+  var favicon_path = $('link[rel="shortcut icon"]').attr('href');
   $('.group_tabs a').live('click', function(){
     if (!$(this).parent().hasClass('active')) {
       $('.group_tabs a').parent().removeClass('active');
@@ -69,7 +69,7 @@ $(document).ready(function() {
       window.location.href = window.location.href.split('#')[0] + $(this).attr('href').replace('#', '#_');
       
       // Force favicon reload - otherwise the location change containing anchor would drop the favicon...
-      // Works only on firefox, but still... - Anyone know a better solution to force favicon?
+      // Works only on firefox, but still... - Anyone know a better solution to force favicon on local file?
       $('link[rel="shortcut icon"]').remove();
       $('head').append('<link rel="shortcut icon" type="image/png" href="'+ favicon_path +'" />');
     };

data/assets/stylesheet.css

@@ -344,382 +344,29 @@ td.strong {
 .yellow {
   color: #da0;
 }
-.source_table .hit {
+.source_table .covered {
   border-color: #090;
 }
-.source_table .miss {
+.source_table .missed {
   border-color: #900;
 }
 .source_table .never {
   border-color: black;
 }
-
-/* -----------------------------------------------------------------------
-
-
- Blueprint CSS Framework 0.9
- http://blueprintcss.org
-
-   * Copyright (c) 2007-Present. See LICENSE for more info.
-   * See README for instructions on how to use Blueprint.
-   * For credits and origins, see AUTHORS.
-   * This is a compressed file. See the sources in the 'src' directory.
-
------------------------------------------------------------------------ */
-
-/* reset.css */
-html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section {margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;}
-article, aside, dialog, figure, footer, header, hgroup, nav, section {display:block;}
-body {line-height:1.5;}
-table {border-collapse:separate;border-spacing:0;}
-caption, th, td {text-align:left;font-weight:normal;}
-table, td, th {vertical-align:middle;}
-blockquote:before, blockquote:after, q:before, q:after {content:"";}
-blockquote, q {quotes:"" "";}
-a img {border:none;}
-
-/* typography.css */
-html {font-size:100.01%;}
-body {font-size:82%;color:#222;background:#fff;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;}
-h1, h2, h3, h4, h5, h6 {font-weight:normal;color:#111;}
-h1 {font-size:3em;line-height:1;margin-bottom:0.5em;}
-h2 {font-size:2em;margin-bottom:0.75em;}
-h3 {font-size:1.5em;line-height:1;margin-bottom:1em;}
-h4 {font-size:1.2em;line-height:1.25;margin-bottom:1.25em;}
-h5 {font-size:1em;font-weight:bold;margin-bottom:1.5em;}
-h6 {font-size:1em;font-weight:bold;}
-h1 img, h2 img, h3 img, h4 img, h5 img, h6 img {margin:0;}
-p {margin:0 0 1.5em;}
-p img.left {float:left;margin:1.5em 1.5em 1.5em 0;padding:0;}
-p img.right {float:right;margin:1.5em 0 1.5em 1.5em;}
-a:focus, a:hover {color:#000;}
-a {color:#009;text-decoration:underline;}
-blockquote {margin:1.5em;color:#666;font-style:italic;}
-strong {font-weight:bold;}
-em, dfn {font-style:italic;}
-dfn {font-weight:bold;}
-sup, sub {line-height:0;}
-abbr, acronym {border-bottom:1px dotted #666;}
-address {margin:0 0 1.5em;font-style:italic;}
-del {color:#666;}
-pre {margin:1.5em 0;white-space:pre;}
-pre, code, tt {font:1em 'andale mono', 'lucida console', monospace;line-height:1.5;}
-li ul, li ol {margin:0;}
-ul, ol {margin:0 1.5em 1.5em 0;padding-left:3.333em;}
-ul {list-style-type:disc;}
-ol {list-style-type:decimal;}
-dl {margin:0 0 1.5em 0;}
-dl dt {font-weight:bold;}
-dd {margin-left:1.5em;}
-table {margin-bottom:1.4em;width:100%;}
-th {font-weight:bold;}
-thead th {background:#c3d9ff;}
-th, td, caption {padding:4px 10px 4px 5px;}
-tr.even td {background:#efefef;}
-tfoot {font-style:italic;}
-caption {background:#eee;}
-.small {font-size:.8em;margin-bottom:1.875em;line-height:1.875em;}
-.large {font-size:1.2em;line-height:2.5em;margin-bottom:1.25em;}
-.hide {display:none;}
-.quiet {color:#666;}
-.loud {color:#000;}
-.highlight {background:#ff0;}
-.added {background:#060;color:#fff;}
-.removed {background:#900;color:#fff;}
-.first {margin-left:0;padding-left:0;}
-.last {margin-right:0;padding-right:0;}
-.top {margin-top:0;padding-top:0;}
-.bottom {margin-bottom:0;padding-bottom:0;}
-
-/* forms.css */
-label {font-weight:bold;}
-fieldset {padding:1.4em;margin:0 0 1.5em 0;border:1px solid #ccc;}
-legend {font-weight:bold;font-size:1.2em;}
-input[type=text], input[type=password], input.text, input.title, textarea, select {background-color:#fff;border:1px solid #bbb;}
-input[type=text]:focus, input[type=password]:focus, input.text:focus, input.title:focus, textarea:focus, select:focus {border-color:#666;}
-input[type=text], input[type=password], input.text, input.title, textarea, select {margin:0.5em 0;}
-input.text, input.title {width:300px;padding:5px;}
-input.title {font-size:1.5em;}
-textarea {width:390px;height:250px;padding:5px;}
-input[type=checkbox], input[type=radio], input.checkbox, input.radio {position:relative;top:.25em;}
-form.inline {line-height:3;}
-form.inline p {margin-bottom:0;}
-.error, .notice, .success {padding:.8em;margin-bottom:1em;border:2px solid #ddd;}
-.error {background:#FBE3E4;color:#8a1f11;border-color:#FBC2C4;}
-.notice {background:#FFF6BF;color:#514721;border-color:#FFD324;}
-.success {background:#E6EFC2;color:#264409;border-color:#C6D880;}
-.error a {color:#8a1f11;}
-.notice a {color:#514721;}
-.success a {color:#264409;}
-.box {padding:1.5em;margin-bottom:1.5em;background:#E5ECF9;}
-hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:.1em;margin:0 0 1.45em;border:none;}
-hr.space {background:#fff;color:#fff;visibility:hidden;}
-.clearfix:after, .container:after {content:"\0020";display:block;height:0;clear:both;visibility:hidden;overflow:hidden;}
-.clearfix, .container {display:block;}
-.clear {clear:both;}
-
-#loading {
-  position: fixed;
-  left: 40%;
-  top: 50%;
+.source_table .skipped {
+  border-color: #fc0;
 }
 
-a {
-  color: #333;
-  text-decoration: none;
-}
-
-a:hover {
-  color: #000;
-  text-decoration: underline;
-}
-
-body {
-  font-family: "Lucida Grande", Helvetica, "Helvetica Neue", Arial, sans-serif;
-  padding: 12px;
-  background-color: #333;
-}
-
-h1, h2, h3, h4 {
-  color: #1C2324;
-  margin: 0;
-  padding: 0;
-  margin-bottom: 12px;
-}
-
-table {
-  width: 100%;
-}
-
-#content {
-  clear: left;
-  background-color: white;
-  border: 2px solid #ddd;
-  border-top: 8px solid #ddd;
-  padding: 18px;
-  -webkit-border-bottom-left-radius: 5px;
-  -webkit-border-bottom-right-radius: 5px;
-  -webkit-border-top-right-radius: 5px;
-  -moz-border-radius-bottomleft: 5px;
-  -moz-border-radius-bottomright: 5px;
-  -moz-border-radius-topright: 5px;
-  border-bottom-left-radius: 5px;
-  border-bottom-right-radius: 5px;
-  border-top-right-radius: 5px;
-}
-
-.dataTables_filter, .dataTables_info {
-  padding: 2px 6px;
-}
-
-abbr.timeago {
-  text-decoration: none;
-  border: none;
-  font-weight: bold;
-}
-
-.timestamp {
-  float: right;
-  color: #ddd;
-}
-
-.group_tabs {
-  list-style: none;
-  float: left;
-  margin: 0;
-  padding: 0;
-}
-.group_tabs li {
-  display: inline;
-  float: left;
-}
-
-.group_tabs li a {
-  font-family: Helvetica, Arial, sans-serif;
-  display: block;
-  float: left;
-  text-decoration: none;
-  padding: 4px 8px;
-  background-color: #aaa;
-  background: -webkit-gradient(linear, 0 0, 0 bottom, from(#DDD), to(#aaa));
-  background: -moz-linear-gradient(#DDD, #aaa);
-  background: linear-gradient(#DDD, #aaa);
-  text-shadow: #e5e5e5 1px 1px 0px;
-  border-bottom: none;
-  color: #333;
-  font-weight: bold;
-  margin-right: 8px;
-  border-top: 1px solid #efefef;
-  -webkit-border-top-left-radius: 2px;
-  -webkit-border-top-right-radius: 2px;
-  -moz-border-radius-topleft: 2px;
-  -moz-border-radius-topright: 2px;
-  border-top-left-radius: 2px;
-  border-top-right-radius: 2px;
-}
-
-.group_tabs li a:hover {
-  background-color: #ccc;
-  background: -webkit-gradient(linear, 0 0, 0 bottom, from(#eee), to(#aaa));
-  background: -moz-linear-gradient(#eee, #aaa);
-  background: linear-gradient(#eee, #aaa);
-}
-
-.group_tabs li a:active {
-  padding-top: 5px;
-  padding-bottom: 3px;
-}
-
-.group_tabs li.active a {
-  color: black;
-  text-shadow: #fff 1px 1px 0px;
-  background-color: #ddd;
-  background: -webkit-gradient(linear, 0 0, 0 bottom, from(#fff), to(#ddd));
-  background: -moz-linear-gradient(#fff, #ddd);
-  background: linear-gradient(#fff, #ddd);
-}
-
-.file_list {
-  margin-bottom: 18px;
-}
-
-a.src_link {
-  background: url('./magnify.png') no-repeat left 50%;
-  padding-left: 18px;
-}
-
-tr, td {
-  margin: 0;
-  padding: 0;
-}
-
-th {
-  white-space: nowrap;
-}
-
-th.ui-state-default {
-  cursor: pointer;
-}
-
-th span.ui-icon {
-  float: left;
-}
-
-td {
-  padding: 4px 8px;
-}
-
-td.strong {
-  font-weight: bold;
-}
-
-.source_table h3, .source_table h4 {
-  padding: 0;
-  margin: 0;
-  margin-bottom: 4px;
-}
-
-.source_table .header {
-  padding: 10px;
-}
-
-.source_table pre {
-  margin: 0;
-  padding: 0;
-  white-space: normal;
-}
-
-.source_table pre, .source_table code {
-  color: #000;
-  font-family: "Monaco", "Inconsolata", "Consolas", monospace;
-}
-
-.source_table pre {
-  background-color: #333;
-}
-
-.source_table pre ol {
-  margin: 0px; 
-  padding: 0px;
-  margin-left: 45px;
-  font-size: 12px;
-  color: white;
-}
-
-.source_table pre li {
-  margin: 0px;
-  padding: 2px 6px;
-  border-left: 5px solid white;
-}
-
-.source_table pre li code {
-  white-space: pre;
-  white-space: pre-wrap;
-}
-
-.source_table pre .hits {
-  float: right;
-  margin-left: 10px;
-  padding: 2px 4px;
-  
-  background-color: #444;
-  background: -webkit-gradient(linear, 0 0, 0 bottom, from(#222), to(#666));
-  background: -moz-linear-gradient(#222, #666);
-  background: linear-gradient(#222, #666);
-  
-  color: white;
-  font-family: Helvetica, "Helvetica Neue", Arial, sans-serif;
-  font-size: 10px;
-  font-weight: bold;
-  text-align: center;
-  border-radius: 6px;
-}
-
-#footer {
-  color: #ddd;
-  font-size: 12px;
-  font-weight: bold;
-  margin-top: 12px;
-  text-align: right;
-}
-#footer a {
-  color: #eee;
-  text-decoration: underline;
-}
-#footer a:hover {
-  color: #fff;
-  text-decoration: none;
-}
-
-.green {
-  color: #090;
-}
-.red {
-  color: #900;
-}
-.yellow {
-  color: #da0;
-}
-.source_table .hit {
-  border-color: #090;
-}
-.source_table .miss {
-  border-color: #900;
-}
-.source_table .never {
-  border-color: black;
-}
-
-.source_table .hit:nth-child(odd) {
+.source_table .covered:nth-child(odd) {
   background-color: #CDF2CD;
 }
-.source_table .hit:nth-child(even) {
+.source_table .covered:nth-child(even) {
   background-color: #DBF2DB;
 }
-.source_table .miss:nth-child(odd) {
+.source_table .missed:nth-child(odd) {
   background-color: #F7C0C0;
 }
-.source_table .miss:nth-child(even) {
+.source_table .missed:nth-child(even) {
   background-color: #F7CFCF;
 }
 .source_table .never:nth-child(odd) {
@@ -727,4 +374,10 @@ td.strong {
 }
 .source_table .never:nth-child(even) {
   background-color: #f4f4f4;
+}
+.source_table .skipped:nth-child(odd) {
+  background-color: #FBF0C0;
+}
+.source_table .skipped:nth-child(even) {
+  background-color: #FBFfCf;
 }

data/lib/simplecov-html.rb

@@ -5,7 +5,7 @@ require 'digest/sha1'
 require 'time'
 
 # Ensure we are using a compatible version of SimpleCov
-if Gem::Version.new(SimpleCov::VERSION) < Gem::Version.new("0.5")
+if Gem::Version.new(SimpleCov::VERSION) < Gem::Version.new("0.5.3")
   raise RuntimeError, "The version of SimpleCov you are using is too old. Please update with 'gem install simplecov'"
 end
 

data/lib/simplecov-html/version.rb

@@ -1,7 +1,7 @@
 module SimpleCov
   module Formatter
     class HTMLFormatter
-      VERSION = "0.5.0"
+      VERSION = "0.5.3"
     end
   end
 end

data/views/layout.erb

@@ -14,7 +14,7 @@
     <link href='<%= assets_path('highlight.css') %>' media='screen, projection, print' rel='stylesheet' type='text/css'>
     <link href='<%= assets_path('fancybox/jquery.fancybox-1.3.1.css') %>' media='screen, projection, print' rel='stylesheet' type='text/css'>
     <link href='<%= assets_path('smoothness/jquery-ui-1.8.4.custom.css') %>' media='screen, projection, print' rel='stylesheet' type='text/css'>    
-    <link rel="shortcut icon" type="image/png" href="<%= assets_path('favicon.png') %>" />
+    <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>
   

data/views/source_file.erb

@@ -12,9 +12,9 @@
   <pre>
     <ol>
       <% source_file.lines.each_with_index do |line| %>
-        <% classname = line.coverage ? (line.coverage > 0 ? 'hit' : 'miss') : 'never' %>
-        <li class="<%= classname %>" data-hits="<%= line.coverage ? line.coverage : '' %>" data-linenumber="<%= line.number %>">
+        <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>
       <% end %>

metadata

@@ -1,39 +1,35 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: simplecov-html
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.5.3
   prerelease: 
-  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - Christoph Olszowka
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-09 00:00:00 +02:00
+date: 2011-09-13 00:00:00.000000000 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70216563315440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id001
+  version_requirements: *70216563315440
 description: Default HTML formatter for SimpleCov code coverage tool for ruby 1.9+
-email: 
+email:
 - christoph at olszowka de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
 - Gemfile
@@ -63,7 +59,9 @@ files:
 - assets/fancybox/fancybox.png
 - assets/fancybox/jquery.fancybox-1.3.1.css
 - assets/fancybox/jquery.fancybox-1.3.1.pack.js
-- assets/favicon.png
+- assets/favicon_green.png
+- assets/favicon_red.png
+- assets/favicon_yellow.png
 - assets/highlight.css
 - assets/highlight.pack.js
 - assets/jquery-1.6.2.min.js
@@ -98,37 +96,28 @@ files:
 has_rdoc: true
 homepage: https://github.com/colszowka/simplecov-html
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 2641290894485359765
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 2641290894485359765
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: simplecov-html
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Default HTML formatter for SimpleCov code coverage tool for ruby 1.9+
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_simple_cov-html.rb