tarantula 0.1.4 → 0.1.5

data/README.rdoc

@@ -33,10 +33,10 @@ Tarantula into your Rails app.
     cd vendor/gems
     gem unpack relevance-tarantula
 
-You can then add the following line into your Rakefile, substituting the proper version of
-relevance-tarantula in the path.
+You can then add the following line into your Rakefile, which will allow your application to discover 
+Tarantula's rake tasks.
 
-    load File.join(RAILS_ROOT, "vendor/gems/relevance-tarantula-0.0.8.1/tasks/tarantula_tasks.rake")
+  load File.join(RAILS_ROOT, Dir["vendor/gems/relevance-tarantula-*/tasks/*.rake"])
 
 === Crawling Your App
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 4
+:patch: 5
 :major: 0
 :minor: 1

data/examples/relevance/tarantula/html_report_helper_example.rb

@@ -12,10 +12,10 @@ end
 
 describe 'Relevance::Tarantula::HtmlReportHelper#wrap_in_line_number_table' do
   include HtmlReportHelperSpec
-  it "can wrap text in a line number table" do
-    html = @reporter.wrap_in_line_number_table("Line 1\nLine 2")
+  it "can wrap text in a table row used for displaying lines and line numbers" do
+    html = @reporter.wrap_in_line_number_table_row("Line 1\nLine 2")
     html.should == <<-END.strip
-<table class=\"grid tablesorter\"><thead><tr><th class=\"line-number\"><span>Line #</span></th><th align=\"center\"><span>Line</span></th></tr></thead><tr><td class=\"line-number\">1</td><td>Line 1</td></tr><tr><td class=\"line-number\">2</td><td>Line 2</td></tr></table>
+<tr><td class=\"numbers\"><span class=\"line number\">1</span><span class=\"line number\">2</span></td><td class=\"lines\"><span class=\"line\">Line 1</span><span class=\"line\">Line 2</span></td></tr>
 END
   end  
 end

data/examples/relevance/tarantula/html_reporter_example.rb

@@ -12,7 +12,7 @@ describe "Relevance::Tarantula::HtmlReporter file output" do
         :success => true, 
         :method => "get", 
         :url => "/widgets/#{index}", 
-        :response => stub(:code => 200, :body => "<h1>header</h1>\n<p>text</p>"), 
+        :response => stub(:code => "200", :body => "<h1>header</h1>\n<p>text</p>"), 
         :referrer => "/random/#{rand(100)}", 
         :test_name => @test_name,
         :log => <<-END,
@@ -30,7 +30,7 @@ blah blah blah
         :success => false, 
         :method => "get", 
         :url => "/widgets/#{index}", 
-        :response => stub(:code => 500, :body => "<h1>header</h1>\n<p>text</p>"), 
+        :response => stub(:code => "500", :body => "<h1>header</h1>\n<p>text</p>"), 
         :referrer => "/random/#{rand(100)}", 
         :test_name => @test_name,
         :log => <<-END,
@@ -66,7 +66,7 @@ blah blah blah
     reporter.finish_report(@test_name)
     links = Hpricot(File.read(@index)).search('.left a')
     links.each do |link|
-      link['href'].should.match(/#{@test_name}\/\d+\.html/)
+      link['href'].should match(/#{@test_name}\/\d+\.html/)
     end
   end
 

data/laf/javascripts/tarantula.js

@@ -5,6 +5,6 @@ $(document).ready(function() {
 		cssDesc: 'sort desc',       // class name for descending sorting action to header
 		headerClass: 'header'		// class name for headers (th's)
 	});
-    $('#tabs-container > ul').tabs();
+  $('#tabs-container > ul').tabs();
 });
 

data/laf/stylesheets/tarantula.css

@@ -1,3 +1,4 @@
+/* RESET */
 html, body, div, span, applet, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
 a, abbr, acronym, address, big, cite, code,
@@ -7,85 +8,232 @@ b, u, i, center,
 dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td {
-    margin: 0;
-    padding: 0;
-    border: 0;
-    outline: 0;
-    font-size: 100%;
-    vertical-align: baseline;
-    background: transparent;
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	font-size: 100%;
+	vertical-align: baseline;
+	background: transparent;
+}
+body {
+	line-height: 1;
+}
+ol, ul {
+	list-style: none;
+}
+blockquote, q {
+	quotes: none;
+}
+
+/* remember to define focus styles! */
+:focus {
+	outline: 0;
+}
+
+/* remember to highlight inserts somehow! */
+ins {
+	text-decoration: none;
+}
+del {
+	text-decoration: line-through;
+}
+
+/* tables still need 'cellspacing="0"' in the markup */
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
 }
 
 body {
-    background-color: #eee;
-    font-family: "Lucida Grande", veranda, arial, helvetica, sans-serif;
+  line-height: 1em;
+  font-family: Tahoma, Arial, Helvetica, sans-serif;
+  color: #050505;
 }
 
+/* header */
 #header {
-    background-color: #003366;
-    font-size: 22px;
-    height: 70px;
+  background: #37302e url(../images/header_bg.jpg) no-repeat top left;
+  height: 70px; 
+  border-bottom: 2px solid #d0d0d0; 
 }
 
-.header_text {
-    color: #ffcc00;
-    padding-top: 10px;
-    padding-left: 15px;
+#header h1 {
+  width:206px;
+  height:56px;
+  text-indent: -9999em;
+  background: transparent url(../images/logo.png) no-repeat top center;
+  position: absolute;
+  top: 7px;
+  left: 42px;
 }
 
-#tabs-container {
-    padding-top: 7px;
-    padding-left: 15px;
+#header h2 {
+  width:196px;
+  height:34px;
+  text-indent: -9999em;
+  background: transparent url(../images/tagline.png) no-repeat top center;
+  position: absolute;
+  top: 15px;
+  left: 257px;
 }
 
-#results-container {
-    float: left;
-    width: 625px;
-    margin-left: 20px;
-    margin-top: 10px;
-    background-color: #fff;    
+#header p {
+  display: block;
+  position: absolute;
+  right: 42px;
+  width: 315px;
+  padding: 8px;
+  color: #fff;
+  font-size: 13px;
+  line-height: 15px;
 }
 
-#sidebar {
-    float: right;	
-    width: 300px;
-    margin-right: 20px;
-    margin-top: 10px;
-    font-size: 12px;
-    padding: 20px;
-    background-color: #fff;
+#header a:link, #header a:visited, #header a  {
+  color: #70b1ca;
 }
 
-.clearer {
-    clear: both;
+#header a:hover {
+  text-decoration: none;
 }
 
-.grid {
-    width: 100%;
-    font-size: 12px;
+#header hr {
+  display: none;
 }
 
-table caption {
-    font-size: 16px;
+.left { text-align: left !important; }
+.right { text-align: right !important; }
+.center { text-align: center !important; }
+
+/* page */
+
+#page {
+  padding: 55px 10px 0 10px;
+  width: 1000px;
+  margin: auto;
+  position: relative;
 }
 
-.even {
-    background-color: #eee;
+div#page ul.tabs {
+ 
+  clear: both;  
 }
 
-.odd {
+div#page ul.tabs li{
+  display: block;
+  float: left;
+}
 
+div#page ul.tabs li a {
+  display: block;
+  float: left;
+  clear: right;  
+  margin-right: 5px;
 }
 
-table th.line-number, table td.line-number {
+div#page ul.tabs li a.active, .ui-tabs-selected a {
+  background: transparent url(../images/button_active.png) no-repeat top left !important;   
+  color: #050505 !important;
+}
+
+div#page ul.tabs li a {
+  background: transparent url(../images/button_inactive.png) no-repeat top left;
+  height: 38px;
+  width: 110px;
+  color: #fff;
+  padding: 8px 0 0 12px;
+  font-size: 14px;
+  line-height: 18px;
+  text-decoration: none;
+}
+
+div#page ul.tabs li a:hover {
+  background: transparent url(../images/button_hover.png) no-repeat top left;  
+  color: #613005;
+}
+
+div#page ul.tabs {
+  position: absolute;
+  top: 7px;
+  left: 7px;
+}
+
+.list {
+  width: 100%;
+}
+
+.list th {
+  cursor:pointer;
+}
+
+.list th, .list th a, .list tfoot td {
+  background: #b9b9a9;
+  color: #463c38;
+  text-decoration: none;
+ 
+}
+
+.sort {
+  font-size: 75%; 
+  filter:alpha(opacity=50);
+	-moz-opacity:0.5;
+	-khtml-opacity: 0.5;
+	opacity: 0.5;
+}
+
+.list th, .list th a:hover span {
+  filter:alpha(opacity=100);
+	-moz-opacity:1;
+	-khtml-opacity: 1;
+	opacity: 1;  
+}
+
+.list td, .list th {
   text-align: center;
-  width: 30px;
+  padding: 4px;
+  font-size: 14px;
+}         
+
+.list .sort.asc .sort:after {
+  content: "\25BC";
+}           
+
+.list .sort.desc .sort:after {
+  content: "\25B2";
+}
+
+
+div#page tbody a {
+ color: #6699cc; 
+}
+
+div#page tbody a:hover {
+  text-decoration: none;
+}
+
+div#page table caption  {
+  text-align: left;
+  padding: 7px;
+  background: #d0d0c4;
+  border-bottom: 2px solid #aba7a1;
+  -moz-border-radius-topleft: 2px;
+  -moz-border-radius-topright: 2px;
+}
+
+.list tbody td {
+  background: #f2f2eb;
 }
 
-#details {
-    margin-left: 10px;
-    margin-top: 5px;
-    font-size: 12px;
+.list tfoot td {
+   line-height: 18px;
+}
+
+.list .method {
+  width: 6em;
+}         
+
+tr.even td {
+  background: #e9e9e2 !important;
 }
 
 /* Response Codes */
@@ -127,49 +275,71 @@ span.r5 {
 	border: 1px solid #dc0000;
 }
 
-/* Fixes */
-
-/* Safari Bold Fix */			
-/*\*/
-html*table th {
-	font-weight: normal;				
-}/**/
-
-/*\*/			
-html*#header ul.navigation {
-	top: 30px;
-}	/**/
+/* Detail */
+#report h3 {
+  background: #D0D0C4; font-weight: normal;
+  border-bottom: 2px solid #ABA7A1;
+  -moz-border-radius-topleft: 2px; -moz-border-radius-topright: 2px;
+  -webkit-border-top-left-radius: 2px; -webkit-border-top-right-radius: 2px;
+}
 
-#results table.grid {
-    background-color: #003366;
+#report h3,
+#report p { 
+  width: 50%;
+  padding:6px 8px;
+  margin: 1px 0;
 }
 
+#report a {
+  color: #70B1CA
+}
 
-#results table th, #results table td {
-	font-family: Arial, Helvetica, sans-serif;				  
-	color: #fff;			
-	background-color: #003366;
-}	
+#report a:hover {
+  text-decoration: none;
+}
 
-#results table.grid {
-	border-collapse: separate;				
-	margin-bottom: 1em;
-	width: 100%;
+#report p b {
+  color: #050505;
+  font-weight: normal;
 }
 
-#results table.grid tfoot tr td {
-	padding: 4px;
-	font-weight: 900;
+#report p {
+  color: #463C38;
+  background: #f2f2eb;
+  line-height: 22px;
 }
-			
-#results table.grid tbody a {					
-	color: #003366;
+
+#report p span {
+  display: inline-block;
+  display: -moz-inline-block;
+  margin: 0;
+  padding: 2px 6px;
+  line-height: 16px;
 }
 
-#results table.grid tbody td {
-	padding: 2px 4px;
-	background-color: #f6ffcd;
-	color: #000;
+#report h3 em {
+  display: block;
+  font-family: Consolas, Lucida Console, Monaco, monospace;
+  font-size: 75%;
+  font-style: normal;
+  font-weight: normal;
+  color: #463C38;
+  line-height: 22px;
 }
 
+/* Output */
+.output {margin: 10px 0; width: 100%; font-size: 82.5%;}
+.output th { background: #b9b9a9; text-align: left; padding-left: 2.25em; font-weight: normal; line-height: 18px; color: #463C38; border-bottom: 1px solid #fff; 
+  -moz-border-radius-topleft: 2px; -moz-border-radius-topright: 2px;
+  -webkit-border-top-left-radius: 2px; -webkit-border-top-right-radius: 2px; 
+}
+.output td { background: #f2f2eb; padding: 1px; line-height: 18px; }
+.output { font-family: Consolas, Lucida Console, Monaco, monospace; }
+.output .numbers { width: 3em; text-align: right; border-right: 1px solid #fff;}
+.output .lines { width: auto; text-align: left;}
+.output .line { display: block; text-align: left; padding: 1px 4px;}
+.output .line.number { text-align: right;  color: #585850; }         
 
+/* Tabs */    
+.ui-tabs-panel {display: block;}
+.ui-tabs-panel.ui-tabs-hide {display: none !important;}

data/lib/relevance/tarantula/detail.html.erb

@@ -1,91 +1,82 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
-<html>
-  <head>
-    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
-    <title>Tarantula report detail <%= short_description %></title>
-
-    <script type="text/javascript" src="../javascripts/jquery-1.2.3.js"></script>
-    <script type="text/javascript" src="../javascripts/jquery.tablesorter.js"></script>
-    <script type="text/javascript" src="../javascripts/jquery-ui-tabs.js"></script>
-    <script type="text/javascript" src="../javascripts/tarantula.js"></script>
-    <script type="text/javascript" src="../javascripts/niftycube-details.js"></script>
-    <link type="text/css" media="screen" rel="stylesheet" href="../stylesheets/tarantula.css"/>
-    <link type="text/css" media="screen" rel="stylesheet" href="../stylesheets/ui.tabs.css"/>
-
-    <script type="text/javascript">
-      window.onload=function() {
-        Nifty("div#sidebar", "big");
-        Nifty("div#results-container", "big");
-      }
-    </script>
-
-    <!--[if lte IE 7]>
-	<link rel="stylesheet" href="jqeury.tabs-ie.css" type="text/css" media="projection, screen" />
-    <![endif]-->
-  </head>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+  <link rel="stylesheet" href="../stylesheets/tarantula.css" type="text/css" media="screen" title="no title" charset="utf-8" />
+	<title>Detail</title>
+</head>
+<body>
+  <div id="container">
+    <div id="header">
+      <h1>Tarantula by Relevance</h1>
+      <h2>Eight legs, two fangs ... and an attitude</h2>
+      <p>Tarantula is an open source tool for testing Rails web 
+      applications. Tarantula is developed by <a href="http://thinkrelevance.com">Relevance, Inc.</a>
+      and lives at <a href="http://github.com/relevance/tarantula">http://github.com/relevance/tarantula</a>.</p>
+      <hr/>
+    </div>
+    <div id="page">
+      <ul class="tabs">
+        <li><a href="../index.html">&laquo; Back</a></li>
+        <!-- TODO dynamically hide/show body/log sections based on selected "tab" - dynamically assign the "active" class to the selected tab -->
+        <li><a href="#fragment-1" class="active">Body</a></li>
+        <li><a href="#fragment-2" class="active">Log</a></li>
+      </ul>
 
-  <body>
+      <div id="report">
+        <h3>Detail of <%= short_description %> <em>Generated on <%= Time.now %></em></h3>
+        <p><b>Resource</b> <a href="<%= full_url %>"><%= full_url %></a></p>
+        <p><b>Response</b> <span class="r<%= code.first %>"><%= code %></span></p>
+        <p><b>Referrer</b> <%= referrer || "" %></p>
 
-    <div id="container">
-      
-      <div id="header">
-        <div class="header_text">Tarantula : Eight Legs, Two Fangs, and an Attitude</div>
-	<div id="tabs-container">
-          <ul>
-            <li><a href="#fragment-1"><span>Data</span></a></li>
-            <li><a href="#fragment-2"><span>Body</span></a></li>
-            <li><a href="#fragment-3"><span>Log</span></a></li>
-	  </ul>
-	</div>
-      </div>
+        <table class="output">
+        <tbody>
+          <tr>                
+            <th colspan="2">#&nbsp;&nbsp;Data</th>           
+          </tr>
+          <% if data %>
+            <%= wrap_in_line_number_table_row(data) %>
+          <% else %>
+            <tr>
+              <td colspan="2">No Data</td>
+            </tr>
+          <% end %>
+          </tbody>
+        </table>                            
 
-      <div id="results-container">
-        <div id="details">
-          <p>Tarantula report detail <strong><%= short_description %></strong></p>
-          <p>Generated on <%= Time.now %> (<a href="../index.html">Back</a>)</p>
-          <p>Visit <a href="<%= full_url %>"><%= full_url %></a></p>
-          <p>Response: <%= code %></p>
-          <p>Referrer: <%= referrer || "" %></p>
-        </div>
+        <table class="output" id="fragment-1">
+          <tbody>
+          <tr>
+            <th colspan="2">#&nbsp;&nbsp;Body</th>           
+          </tr>
+          <% if body %>
+            <%= wrap_in_line_number_table_row(body) %>
+          <% else %>
+            <tr>
+              <td colspan="2">No Body</td>
+            </tr>
+          <% end %>
+          </tbody>
+        </table>                             
 
-	<div id="results">
-	  <div id="fragment-1">
-            <% if data %>
-              <%= wrap_in_line_number_table(data) %>
-            <% else %>
-              <p>No Data</p>
-            <% end %>
-          </div>
-          <div id="fragment-2">
-            <% if body %>
-              <%= wrap_in_line_number_table(body) %>
-            <% else %>
-              <p>No Body</p>
-              <% end %>
-          </div>
-          <div id="fragment-3">
+        <table class="output" id="fragment-2">
+          <tbody>
+            <tr>
+              <th colspan="2">#&nbsp;&nbsp;Log</th>           
+            </tr>
             <% if log %>
-              <%= wrap_in_line_number_table(log) {|line| wrap_stack_trace_line(line)} %>
+              <%= wrap_in_line_number_table_row(log) {|line| wrap_stack_trace_line(line)} %>
             <% else %>
-              <p>No Log</p>
+              <tr>
+                <td colspan="2">No Log</td>
+              </tr>
             <% end %>
-          </div>
-	</div>
+          </tbody>
+        </table>                            
       </div>
-
-      <div id="sidebar">
-	Tarantula is an open-source tool for testing Rails web applications. Tarantula is developed by 
-	<a href="http://thinkrelevance.com">Relevance, Inc.</a> 
-	and lives at <a href="http://github.com/relevance/tarantula">http://github.com/relevance/tarantula</a>.
-      </div>
-
-      <div class="clearer"></div>
-
     </div>
-  </body>
-
-</html>
-
-
+  </div>
+</body>
+</html>