cucumber-in-the-yard 1.6.3 → 1.6.4

data/History.txt

@@ -1,6 +1,10 @@
-=== 1.6.3 / 2010-11-08
+=== 1.6.4 / 2010-11-16
 
-* FIX Step Definitions and Step Transforms incorrectly cached the YARD Constants
+* `yard server` can now serve up requirements with YARD 0.6.2
+* 'All Tags' page now has a cucumber tag AND filtering tool (beta)
+* Step Defs and Transforms will show comments
+
+* FIX removed warnings by no longer requiring YARD
 
 === 1.6.2 / 2010-11-07
 

data/Rakefile

@@ -6,4 +6,8 @@ task :gendoc do
   `rm -rf doc`
   `rm -rf .yardoc`
   `yardoc -e lib/city.rb -p lib/templates 'example/**/*.*' --debug`
-end
+end
+
+task :server do
+  `yard server -e lib/city.rb --debug`
+end

data/city.gemspec

@@ -1,3 +1,4 @@
+require 'YARD'
 require File.dirname(__FILE__) + "/lib/city"
 
 module CucumberInTheYARD
@@ -56,7 +57,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'gherkin', '>= 2.2.9'
   s.add_dependency 'cucumber', '>= 0.7.5'
-  s.add_dependency 'yard', '>= 0.6.1'
+  s.add_dependency 'yard', '>= 0.6.2'
   
   s.rubygems_version   = "1.3.7"
   s.files            = `git ls-files`.split("\n")

data/example/step_definitions/first.step.rb

@@ -6,10 +6,16 @@ Transform /^background$/ do |background|
   "background"
 end
 
+#
+# This step transform converts "scenario" to "scenario"
+# 
 Transform /^scenario$/ do |scenario|
   "scenario"
 end
 
+#
+# This step definition is all about steps
+# 
 Given /^this (scenario|background|#{ORDER}) step$/ do |step|
   pending "step #{order}"
 end

data/lib/city.rb

@@ -3,10 +3,8 @@ require 'cucumber/parser/gherkin_builder'
 require 'gherkin/parser/parser'
 require 'gherkin/formatter/tag_count_formatter'
 
-require 'yard'
-
 module CucumberInTheYARD
-  VERSION = '1.6.3' unless defined?(CucumberInTheYARD::VERSION)
+  VERSION = '1.6.4' unless defined?(CucumberInTheYARD::VERSION)
 end
 
 
@@ -35,5 +33,19 @@ require File.dirname(__FILE__) + "/yard/handlers/step_transform_handler.rb"
 
 require File.dirname(__FILE__) + "/yard/parser/source_parser.rb"
 require File.dirname(__FILE__) + "/yard/templates/helpers/base_helper.rb"
+
+require File.dirname(__FILE__) + "/yard/server/commands/list_command.rb"
+require File.dirname(__FILE__) + "/yard/server/router.rb"
+
 require File.dirname(__FILE__) + "/yard/rake/city_task.rb"
 
+
+#
+# For `yard server` utilize the templates and the static files at these locations
+# before using the defaults 
+#
+YARD::Templates::Engine.register_template_path File.dirname(__FILE__) + '/templates'
+YARD::Templates::Engine.register_template_path File.dirname(__FILE__) + '/docserver'
+
+YARD::Server.register_static_path File.dirname(__FILE__) + "/templates/default/fulldoc/html"
+YARD::Server.register_static_path File.dirname(__FILE__) + "/docserver/default/fulldoc/html"

data/lib/docserver/default/fulldoc/html/js/cucumber.js

@@ -0,0 +1,85 @@
+function cucumberSearchFrameLinks() {
+	$('#features_list_link').click(function() {
+		toggleSearchFrame(this, '/' + library + '/features');
+	});
+	$('#tags_list_link').click(function() {
+		toggleSearchFrame(this, '/' + library + '/tags');
+	});
+}
+
+$(cucumberSearchFrameLinks);
+
+
+
+function toggleScenarioExample(id,example) {
+
+	var element = $("#" + id + "Example" + example + "Steps")[0];
+
+	$('#' + id + ' tr').each(function(index) {
+		this.style.backgroundColor = (index % 2 == 0 ? '#FFFFFF' : '#F0F6F9' );
+	});
+
+	if (element.style.display != 'none') {
+		element = $("#" + id + "Steps")[0];
+	} else {
+		$('#' + id + ' .outline * tr')[example].style.backgroundColor = '#FFCC80';
+	}
+
+	$('#' + id + ' .steps').each(function(index) {
+		this.style.display = 'none';
+	});
+
+	element.style.display = 'block';
+
+}
+
+function determine_tags_used_in_formula(tag_string)  {
+	//$("#tag_debug")[0].innerHTML = "";
+	
+	tag_string = tag_string.replace(/^(\s+)|(\s+)$/,'').replace(/\s{2,}/,' ');
+
+	var tags = tag_string.match(/@\w+/g);
+
+	var return_tags = [];
+
+	if (tags != null) {
+		tags.forEach(function(tag, index, array) {
+			//$("#tag_debug")[0].innerHTML += tag + " ";
+			if (tag_list.indexOf(tag) != -1) { return_tags.push(tag); }
+		});
+	}
+
+	return return_tags;
+}
+
+
+function display_example_command_line(tags) {
+	$("#command_example")[0].innerHTML = "cucumber ";
+
+	if (tags.length > 0)  {
+		$("#command_example")[0].innerHTML += "--tags " + tags.join(" --tags ");
+	}
+}
+
+function display_qualifying_features_and_scenarios(tags) {
+	//$("#tag_debug")[0].innerHTML = "";
+
+	if (tags.length > 0) {
+		
+		$(".feature,.scenario").each(function(feature){
+			this.style.display = "none";
+		});
+
+		$(".feature.\\" + tags.join(".\\") + ",.scenario.\\" + tags.join(".\\")).each(function(feature) {
+			//$("#tag_debug")[0].innerHTML += feature + " " + this;
+			this.style.display = "block";
+		});
+
+		
+	}  else {
+		$(".feature,.scenario").each(function(feature){
+			this.style.display = "block";
+		});
+	}
+
+}

data/lib/docserver/default/layout/html/headers.erb

@@ -0,0 +1,13 @@
+<meta name="Content-Type" content="text/html; charset=UTF-8" />
+<title><%= @page_title %></title>
+<link rel="stylesheet" href="/css/style.css" type="text/css" media="screen" charset="utf-8" />
+<link rel="stylesheet" href="/css/custom.css" type="text/css" media="screen" charset="utf-8" />
+<link rel="stylesheet" href="/css/common.css" type="text/css" media="screen" charset="utf-8" />
+<script type="text/javascript" charset="utf-8" src="/js/jquery.js"></script>
+<script type="text/javascript" charset="utf-8" src="/js/autocomplete.js"></script>
+<script type="text/javascript" charset="utf-8" src="/js/app.js"></script>
+<script type="text/javascript" charset="utf-8" src="/js/live.js"></script>
+<script type="text/javascript" charset="utf-8" src="/js/cucumber.js"></script>
+<script type="text/javascript" charset="utf-8">
+  library = '<%= base_path(router.list_prefix) %>';
+</script>

data/lib/docserver/doc_server/full_list/html/full_list.erb

@@ -0,0 +1,37 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+  <head>
+    <meta name="Content-Type" content="text/html; charset=<%= charset %>" />
+    <link rel="stylesheet" href="/css/full_list.css" type="text/css" media="screen" charset="utf-8" />
+    <link rel="stylesheet" href="/css/common.css" type="text/css" media="screen" charset="utf-8" />
+    <script type="text/javascript" charset="utf-8" src="/js/jquery.js"></script>
+    <script type="text/javascript" charset="utf-8" src="/js/full_list.js"></script>
+    <base id="base_target" target="_parent" />
+  </head>
+  <body>
+    <script type="text/javascript" charset="utf-8">
+      if (window.top.frames.main) {
+        document.getElementById('base_target').target = 'main';
+        document.body.className = 'frames';
+      }
+    </script>
+    <div id="content">
+      <h1 id="full_list_header"><%= @list_title %></h1>
+      <div id="nav">
+        <a target="_self" href="/<%= base_path(router.list_prefix) %>/features">Features</a> | 
+        <a target="_self" href="/<%= base_path(router.list_prefix) %>/tags">Tags</a> | 
+        <a target="_self" href="/<%= base_path(router.list_prefix) %>/class">Classes</a> | 
+        <a target="_self" href="/<%= base_path(router.list_prefix) %>/methods">Methods</a> |
+        <a target="_self" href="/<%= base_path(router.list_prefix) %>/files">Files</a>
+      </div>
+      <div id="search">Search: <input type="text" /></div>
+
+
+      <ul id="full_list" class="<%= @list_class || @list_type %>">
+        <%= erb "full_list_#{@list_type}" %>
+      </ul>
+    </div>
+  </body>
+</html>
+

data/lib/docserver/doc_server/full_list/html/setup.rb

@@ -0,0 +1,14 @@
+include T('default/fulldoc/html')
+
+def init
+  # This is the css class type; here we just default to class
+  @list_class = "class"
+  case @list_type.to_sym
+  when :features; @list_title = "Features"
+  when :tags; @list_title = "Tags"
+  when :class; @list_title = "Class List"
+  when :methods; @list_title = "Method List"
+  when :files; @list_title = "File List"
+  end
+  sections :full_list
+end

data/lib/templates/default/featuretags/html/namespace.erb

@@ -1,37 +1,58 @@
 <% if @namespace %>
-  <div class="requirements">
+  <div id="tags" class="requirements">
+    <script type="text/javascript" charset="utf-8">
+      var tag_list = [ <%= tags.collect{|t| "'#{t.value}'" }.join(',') %> ];
+
+      $(function() {
+        $("#tag_search").keyup(function(event) {
+          var tags = determine_tags_used_in_formula($("#tag_search")[0].value);
+          display_example_command_line(tags);
+          display_qualifying_features_and_scenarios(tags);
+        });
+      });
+    </script>
+
     <div class="title">
-      <span class="name">Tags</span>
+      <span class="name">Requirements Tags</span>
+    </div>
+
+    <div class="tags"><span class="name">Tags:</span>
+      <%= tags.collect {|tag| linkify(tag,tag.value) }.join(",\n") %>
+    </div>
+
+    <div>
+      <input id="tag_search" type="text" />
     </div>
 
-    <% i = 0 %>
-    <table style="margin-left: 10px;">
-      <tr>
-        <td valign='top' width="50%">
-          <% all_tags_by_letter.sort_by {|l,o| l.to_s }.each do |letter, objects| %>
-            <% if (i += 1) % 8 == 0 %>
-            </td><td valign='top' width="50%">
-              <% i = 0 %>
-            <% end %>
-            <ul id="alpha_<%= letter %>" class="alpha">
-              <li class="letter"><%= letter %></li>
-              <ul>
-                <% objects.each do |obj| %>
-                  <li>
-                    <%= linkify obj, obj.value %>
-                    <small>
-                      ( <%= obj.features.size > 0 ? "#{obj.features.size} feature#{obj.features.size > 1 ? 's' : ''}" : "" %>
-			<%= " and " if obj.features.size > 0 && obj.scenarios.size > 0 %>
-			<%= obj.scenarios.size > 0 ? "#{obj.scenarios.size} scenario#{obj.scenarios.size > 1 ? 's' : ''}" : "" %> )
-                    </small>
-                  </li>
-                <% end %>
-              </ul>
-            </ul>
-          <% end %>
-        </td>
-      </tr>
-    </table>
+    <div id="command_example">cucumber</div>
+
+    <div id="features">
+      <div class="title">
+        <span class="name">Features</span>
+      </div>
+      <% n = 1 %>
+      <% features.each do |feature| %>
+        <li class="feature r<%= n %> <%= feature.tags.collect{|t| t.value }.join(" ") %>">
+          <%= linkify feature, feature.value %>
+          <small>(<%= h(feature.location) %>)</small>
+        </li>
+        <% n = n == 2 ? 1 : 2 %>
+        <% end %>
+    </div>
+
+    <div id="scenarios">
+      <div class="title">
+        <span class="name">Scenarios</span>
+      </div>
+      <% n = 1 %>
+      <% scenarios.each_with_index do |scenario,index| %>
+        <li class="scenario r<%= n %> <%= scenario.tags.collect{|t| t.value }.join(" ") %>">
+          <%= linkify scenario.feature,  scenario.value %>
+          <small>(<%= h(scenario.feature.location) %>)</small>
+        </li>
+      <% n = n == 2 ? 1 : 2 %>
+      <% end %>
+    </div>
 
   </div>
 <% end %>

data/lib/templates/default/featuretags/html/setup.rb

@@ -17,5 +17,13 @@ def all_tags_by_letter
 end
 
 def tags
-  Registry.all(:tag)
+  @tags ||= Registry.all(:tag)
+end
+
+def features
+  @features ||= Registry.all(:feature).sort {|x,y| x.value <=> y.value }
+end
+
+def scenarios
+  @scenarios ||= Registry.all(:scenario).reject {|s| s.outline? || s.background? }.sort {|x,y| x.value <=> y.value }
 end

data/lib/templates/default/fulldoc/html/css/common.css

@@ -25,11 +25,13 @@
 .odd { background-color: #F0F6F9; }
 .even { background-color: #FFFFFF; }
 
-#background, #features { margin-top: 10px; margin-left: 20px; }
+#background, #features, #scenarios { margin-top: 10px; margin-left: 20px; }
 
 #directory { margin-top: 20px; margin-left: 20px; }
 
 .scenario { margin-top: 40px; margin-left: 20px; }
+.requirements * .scenario { margin-top: 0px; margin-left: 0px; }
+
 .scenario .title, #background .title {
     font-size: 16px;
     padding-left: 0px;
@@ -37,10 +39,8 @@
     border-bottom: 1px solid #E3E3E3;
 }
 
-#directory .title, #features .title { padding-left: 0px; margin-left: 10px; border-bottom: 1px solid #E3E3E3; }
-#directory .title .name, #features .title .name { font-weight: normal; }
-
-
+#directory .title, #features .title, #scenarios .title { padding-left: 0px; margin-left: 10px; border-bottom: 1px solid #E3E3E3; }
+#directory .title .name, #features .title .name, #scenarios .title .name { font-weight: normal; }
 
 #background .title .pre { color: #346F97; }
 .requirements .tags { margin-left: 50px; margin-right: 30px; }
@@ -117,13 +117,13 @@
 
 
 /* Overrides for scenarios in the tag view */
-
 .tag .feature { margin-left: 20px; }
 .tag .scenario { margin-top: 0px;  margin-left: 20px; padding-left: 30px;	}
 .tag .scenario .title { border-bottom: none; }
 .tag .scenario .meta { margin-top: 0px; }
 /* Overrides for scenarios in the tag view */
 
+.stepdef * .docstring { margin-left: 20px; margin-top: 10px; padding: 5px 5px 5px 10px; }
 
 .stepdef .title {
     font-size: 14px;
@@ -137,6 +137,18 @@
 .stepdef .steps .step {
     padding: 4px;
 }
+#tags * li { padding: 5px; padding-left: 12px; margin: 0 0 0 10px; font-size: 1.1em; list-style: none; }
+
+.tag_search { margin-left: 40px; }
+#tag_search {  margin-left: 40px; width: 500px; height: 20px; }
+#command_example { 
+    margin: 10px 0px 0px 40px;
+    padding: 20px;
+    background-color: #F8F8FF;
+    color: #444444;
+    border: 1px solid #DEDEDE;
+}
+
 
 #cukes_links { margin: 10px auto 10px auto; 
                border-bottom: 1px solid #E3E3E3;
@@ -155,15 +167,15 @@
     margin: 0px auto 10px auto;
     width: 15px;
     height: 15px;
-	background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAIAAAC0tAIdAAAACXBIWXMAAA86AAAPOgGXOdvCAAABVklEQVQoFS2RO1IEMQxEJY+zzSDZlCNwAQIOxJm4DReAnICIIuFTW7U7lsxreTUzHltqtVqyPzw/HQ+3Oaebpc16EospszJ+OfP7/NePh5vHu/sRMfHw2RwxLjHOcQnlJHg42L9+vncIImOPQTbQOXPPHBmRE3o5RQMZwexmvig5pxFTMkqoLllaSZa/5ewgAoA4QEgrgXqXc9ELvbs1iItVNMCh4RgW1GzWoAaHEXV3lJjzwFeiqXD1OAjXUrjmzMw70MbrqFI5WBaTUKUbnDcW4TUTpIugcmBjg5wliRblb0gSoMO1ApxKkWrzXadmtrl6K98UN/takaLJMEGmFMtHmtMRHXCma8kXWd0cN5L7HHtdPIIJ1fAlFevcDcrFJ2JmPFYdVimTJOnQFZq45S9Xeb1tbettU6+a9WqnemLeX6ffl483BcjFdN01eyFFVHK0/FxO/9H/ezlUKYH7AAAAAElFTkSuQmCC) no-repeat center;
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAIAAAC0tAIdAAAACXBIWXMAAA86AAAPOgGXOdvCAAABVklEQVQoFS2RO1IEMQxEJY+zzSDZlCNwAQIOxJm4DReAnICIIuFTW7U7lsxreTUzHltqtVqyPzw/HQ+3Oaebpc16EospszJ+OfP7/NePh5vHu/sRMfHw2RwxLjHOcQnlJHg42L9+vncIImOPQTbQOXPPHBmRE3o5RQMZwexmvig5pxFTMkqoLllaSZa/5ewgAoA4QEgrgXqXc9ELvbs1iItVNMCh4RgW1GzWoAaHEXV3lJjzwFeiqXD1OAjXUrjmzMw70MbrqFI5WBaTUKUbnDcW4TUTpIugcmBjg5wliRblb0gSoMO1ApxKkWrzXadmtrl6K98UN/takaLJMEGmFMtHmtMRHXCma8kXWd0cN5L7HHtdPIIJ1fAlFevcDcrFJ2JmPFYdVimTJOnQFZq45S9Xeb1tbettU6+a9WqnemLeX6ffl483BcjFdN01eyFFVHK0/FxO/9H/ezlUKYH7AAAAAElFTkSuQmCC) no-repeat center;
 
 }
 
 .invalid {
-	margin: 0px auto 10px auto;
+    margin: 0px auto 10px auto;
     width: 15px;
     height: 15px;
-	background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAIAAAC0tAIdAAAACXBIWXMAAA86AAAPOgGXOdvCAAABWUlEQVQoFS2SvVEEMQyFJdkspFcCVAAVUREZXVAHHRAwZOQwQ3YM67X4nnwe3+3afn+S18/P9366s5yZ042R6c3c3bRKDw+WwZxf791Pt/3hMcev5QBpFtauPLoBYrYr6zcem/Xr8frUbc4c59zPPoekQeSesTm47IaD74kfTjnDbNqxC5pTzrJfQcCFBQClIh7bIdDc9S+6E8WIQXTl9somfA1S4iJVbUnJmyOhJT+51AMRkXVArMtBdUNLGcpmaReDdSIGHw4m2iyNIiMslTWqBvMuZSVZB4QhMRRp6IUjzYuPctvq3TpWumq2sIfNw/KQ3DwomfIv6aVBT+ZQMFKxhB8uLfhlzkO3Sstlwh1ja3+oEKVuqipGHhMztEGvvlZEQHwyMKPD1NDtrrpBR3jbalv90hWzo05FBr1vlKGXtvGF9fz5HG8vFRpK1a5yV0/KVuZSzO+Pf3G6tVs/+L00AAAAAElFTkSuQmCC) no-repeat center;
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAIAAAC0tAIdAAAACXBIWXMAAA86AAAPOgGXOdvCAAABWUlEQVQoFS2SvVEEMQyFJdkspFcCVAAVUREZXVAHHRAwZOQwQ3YM67X4nnwe3+3afn+S18/P9366s5yZ042R6c3c3bRKDw+WwZxf791Pt/3hMcev5QBpFtauPLoBYrYr6zcem/Xr8frUbc4c59zPPoekQeSesTm47IaD74kfTjnDbNqxC5pTzrJfQcCFBQClIh7bIdDc9S+6E8WIQXTl9somfA1S4iJVbUnJmyOhJT+51AMRkXVArMtBdUNLGcpmaReDdSIGHw4m2iyNIiMslTWqBvMuZSVZB4QhMRRp6IUjzYuPctvq3TpWumq2sIfNw/KQ3DwomfIv6aVBT+ZQMFKxhB8uLfhlzkO3Sstlwh1ja3+oEKVuqipGHhMztEGvvlZEQHwyMKPD1NDtrrpBR3jbalv90hWzo05FBr1vlKGXtvGF9fz5HG8vFRpK1a5yV0/KVuZSzO+Pf3G6tVs/+L00AAAAAElFTkSuQmCC) no-repeat center;
 }
 
 .conflicted {}

data/lib/templates/default/fulldoc/html/full_list_features.erb

@@ -1,20 +1,23 @@
-<li>
+<% n = 1 %>
+<li class="r<%= n %>">
   <%= linkify YARD::CodeObjects::Cucumber::CUCUMBER_NAMESPACE, "All Features" %>
 </li>
+<% n = n == 2 ? 1 : 2 %>
 <% @items.each do |feature| %>
-<li>
+<li class="r<%= n %>">
 	<%= "<a class='toggle'></a>" unless feature.scenarios.empty? %>
 	<%= linkify feature, feature.value %>
 	<small><%= feature.location %></small>
 </li>
-
+<% n = n == 2 ? 1 : 2 %>
 <% if feature.scenarios %>
 <ul>
 	<% feature.scenarios.each do |scenario| %>
-	<li>
+	<li class="r<%= n %>">
 		<%= linkify feature, scenario.value %>
 		<small><%= scenario.location %></small>
 	</li>
+        <% n = n == 2 ? 1 : 2 %>
 	<% end %>
 </ul>
 <% end %>

data/lib/templates/default/fulldoc/html/js/cucumber.js

@@ -1,14 +1,16 @@
 function cucumberSearchFrameLinks() {
-    $('#feature_list_link').click(function() {
+    $('#features_list_link').click(function() {
         toggleSearchFrame(this, relpath + 'feature_list.html');
     });
-    $('#tagusage_list_link').click(function() {
+    $('#tags_list_link').click(function() {
         toggleSearchFrame(this, relpath + 'tag_list.html');
     });
 }
 
 $(cucumberSearchFrameLinks);
 
+
+
 function toggleScenarioExample(id,example) {
 
     var element = $("#" + id + "Example" + example + "Steps")[0];
@@ -30,3 +32,55 @@ function toggleScenarioExample(id,example) {
     element.style.display = 'block';
 
 }
+
+function determine_tags_used_in_formula(tag_string)  {
+    //$("#tag_debug")[0].innerHTML = "";
+	
+    tag_string = tag_string.replace(/^(\s+)|(\s+)$/,'').replace(/\s{2,}/,' ');
+
+    var tags = tag_string.match(/@\w+/g);
+
+    var return_tags = [];
+
+    if (tags != null) {
+        tags.forEach(function(tag, index, array) {
+            //$("#tag_debug")[0].innerHTML += tag + " ";
+            if (tag_list.indexOf(tag) != -1) {
+                return_tags.push(tag);
+            }
+        });
+    }
+
+    return return_tags;
+}
+
+
+function display_example_command_line(tags) {
+    $("#command_example")[0].innerHTML = "cucumber ";
+
+    if (tags.length > 0)  {
+        $("#command_example")[0].innerHTML += "--tags " + tags.join(" --tags ");
+    }
+}
+
+function display_qualifying_features_and_scenarios(tags) {
+    //$("#tag_debug")[0].innerHTML = "";
+
+    if (tags.length > 0) {
+		
+        $(".feature,.scenario").each(function(feature){
+            this.style.display = "none";
+        });
+
+        $(".feature.\\" + tags.join(".\\") + ",.scenario.\\" + tags.join(".\\")).each(function(feature) {
+            //$("#tag_debug")[0].innerHTML += feature + " " + this;
+            this.style.display = "block";
+        });
+		
+    } else {
+        $(".feature,.scenario").each(function(feature){
+            this.style.display = "block";
+        });
+    }
+
+}

data/lib/templates/default/layout/html/search.erb

@@ -1,6 +1,6 @@
 <div id="search">
-  <a id="feature_list_link" href="#">Features</a>
-  <a id="tagusage_list_link" href="#">Tags</a>
+  <a id="features_list_link" href="#">Features</a>
+  <a id="tags_list_link" href="#">Tags</a>
   <a id="class_list_link" href="#">Class List</a>
   <a id="method_list_link" href="#">Method List</a>
   <a id ="file_list_link" href="#">File List</a>

data/lib/templates/default/requirements/html/namespace.erb

@@ -18,7 +18,7 @@
     <div class="tags"><span class="name">Tags:</span>
       <%= tags.collect {|tag| linkify(tag,tag.value) }.join(",\n") %>
     </div>
-
+   
     <% if features && !features.empty? %>
       <div id="features" style="margin-left: 40px;">
         <div class="title"><span class="name">Features</span></div>
@@ -36,7 +36,7 @@
                 <li class="letter"><%= letter %></li>
                 <ul>
                   <% objects.each do |obj| %>
-                    <li>
+                    <li class="feature <%= obj.tags.map{|t| t.value }.join(" ") %>">
                       <%= linkify obj, obj.value %>
                       <small>(<%= obj.file %>)</small>
                     </li>
@@ -50,7 +50,8 @@
     <% else %>
       <!-- No Features Defined -->
     <% end %>
-
+    
+    
     <% if feature_directories && !feature_directories.empty? %>
       <div id="directory" style="margin-left: 40px;">
         <div class="title"><span class="name">Subdirectories</span></div>

data/lib/templates/default/requirements/html/setup.rb

@@ -17,6 +17,14 @@ def all_features_by_letter
   hash
 end
 
+def all_scenarios_by_letter
+  hash = {}
+  objects = scenarios
+  objects = run_verifier(objects)
+  objects.each {|o| (hash[o.value.to_s[0,1].upcase] ||= []) << o }
+  hash
+end
+
 def all_directories_by_letter
   hash = {}
   objects = feature_directories
@@ -34,7 +42,7 @@ def features
 end
 
 def scenarios
-  @scenarios ||= Registry.all(:scenario)
+  @scenarios ||= Registry.all(:scenario).reject {|s| s.background? }
 end
 
 def steps

data/lib/templates/default/steptransformers/html/header.erb

@@ -0,0 +1,7 @@
+<div style="margin: 10px;">&nbsp;</div>
+
+<div class="title">
+	<div class="name"><%= @item_title %></div>
+</div>
+
+<div style="margin: 10px;">&nbsp;</div>

data/lib/templates/default/steptransformers/html/transformers.erb

@@ -1,12 +1,3 @@
-
-<div style="margin: 10px;">&nbsp;</div>
-
-<div class="title">
-	<div class="name"><%= @item_title %></div>
-</div>
-
-<div style="margin: 10px;">&nbsp;</div>
-
 <% @items.each do |item| %>
 
 <div class="stepdef">
@@ -16,7 +7,9 @@
 		<span class="name"><%= item.value %></span>
 		<div style="float: right;"><%= h( item.location ) %></div>
 	</div>
-
+  <div>
+    <%= T('docstring').run(options.dup.merge({:object => item})) %>
+  </div>
 	<div class="method_details_list">
 		<table class="source_code">
 			<tr>

data/lib/templates/default/steptransformers/html/undefined_steps.erb

@@ -1,12 +1,3 @@
-
-<div style="margin: 10px;">&nbsp;</div>
-
-<div id="undefined_steps" class="title">
-  <div class="name">Undefined Steps</div>
-</div>
-
-<div style="margin: 10px;">&nbsp;</div>
-
 <div class="stepdef">
   <div class="steps">
   <% if @undefined_steps && !@undefined_steps.empty? %>

data/lib/templates/default/steptransformers/setup.rb

@@ -8,19 +8,21 @@ def stepdefinitions
   @item_title = "Step Definitions"
   @item_type = "step definition"
   @items = YARD::Registry.all(:stepdefinition)
-  erb(:transformers)
+  erb(:header) + erb(:transformers)
 end
 
 def steptransforms
   @item_title = "Step Transforms"
   @item_type = "step transform"
   @items = YARD::Registry.all(:steptransform)
-  erb(:transformers)
+  erb(:header) + erb(:transformers)
 end
 
 def undefined_steps
+  @item_title = "Undefined Steps"
+  @item_type = "undefined steps"
   @undefined_steps ||= Registry.all(:step).reject {|s| s.definition || s.scenario.outline? }
-  erb(:undefined_steps)
+  erb(:header) + erb(:undefined_steps)
 end
 
 

data/lib/yard/server/commands/list_command.rb

@@ -0,0 +1,25 @@
+module YARD
+  module Server
+    module Commands
+      
+      class ListFeaturesCommand < ListCommand
+        def type; :features end
+        
+        def items
+          Registry.load_all
+          run_verifier(Registry.all(:feature))
+        end
+      end
+      
+      class ListTagsCommand < ListCommand
+        def type; :tags end
+        
+        def items
+          Registry.load_all
+          run_verifier(Registry.all(:tag).sort_by {|t| t.value.to_s })
+        end
+      end
+      
+    end
+  end
+end

data/lib/yard/server/router.rb

@@ -0,0 +1,31 @@
+module YARD
+  module Server
+
+    #
+    # The YARD::Server::Router needs the following modification,
+    # otherwise it perfectly suited for the requirements documents
+    #
+    Router.class_eval do
+
+      alias_method :core_route_list, :route_list
+
+      #
+      # Provide the full list of features and tags
+      #
+      def route_list(library, paths)
+          
+        if paths && !paths.empty? && paths.first =~ /^(?:features|tags)$/
+          case paths.shift
+          when "features"; cmd = Commands::ListFeaturesCommand
+          when "tags"; cmd = Commands::ListTagsCommand
+          end
+          cmd.new(final_options(library, paths)).call(request)
+        else
+          core_route_list(library,paths)
+        end
+        
+      end
+
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber-in-the-yard
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 1
   - 6
-  - 3
-  version: 1.6.3
+  - 4
+  version: 1.6.4
 platform: ruby
 authors: 
 - Franklin Webber
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-08 00:00:00 -08:00
+date: 2010-11-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,12 +58,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
         - 0
         - 6
-        - 1
-        version: 0.6.1
+        - 2
+        version: 0.6.2
   type: :runtime
   version_requirements: *id003
 description: " \n    Cucumber-In-The-Yard is a YARD extension that processes Cucumber Features, Scenarios, Steps,\n    Step Definitions, Transforms, and Tags and provides a documentation interface that allows you\n    easily view and investigate the test suite.  This tools hopes to bridge the gap of being able\n    to provide your feature descriptions to your Product Owners and Stakeholders.  "
@@ -94,6 +94,10 @@ files:
 - example/transform.feature
 - lib/city.rb
 - lib/cucumber/city_builder.rb
+- lib/docserver/default/fulldoc/html/js/cucumber.js
+- lib/docserver/default/layout/html/headers.erb
+- lib/docserver/doc_server/full_list/html/full_list.erb
+- lib/docserver/doc_server/full_list/html/setup.rb
 - lib/templates/default/feature/html/background.erb
 - lib/templates/default/feature/html/feature.erb
 - lib/templates/default/feature/html/no_steps_defined.erb
@@ -122,6 +126,7 @@ files:
 - lib/templates/default/requirements/html/setup.rb
 - lib/templates/default/scenario/html/scenario.erb
 - lib/templates/default/scenario/setup.rb
+- lib/templates/default/steptransformers/html/header.erb
 - lib/templates/default/steptransformers/html/steptransformers.erb
 - lib/templates/default/steptransformers/html/transformers.erb
 - lib/templates/default/steptransformers/html/undefined_steps.erb
@@ -148,6 +153,8 @@ files:
 - lib/yard/parser/cucumber/feature.rb
 - lib/yard/parser/source_parser.rb
 - lib/yard/rake/city_task.rb
+- lib/yard/server/commands/list_command.rb
+- lib/yard/server/router.rb
 - lib/yard/templates/helpers/base_helper.rb
 has_rdoc: true
 homepage: http://github.com/burtlo/Cucumber-In-The-Yard
@@ -157,11 +164,15 @@ post_install_message: |+
   
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)
   
-    Thank you for installing Cucumber-In-The-YARD 1.6.3 / 2010-11-08.
+    Thank you for installing Cucumber-In-The-YARD 1.6.4 / 2010-11-16.
     
     Changes:
       
-    * FIX Step Definitions and Step Transforms incorrectly cached the YARD Constants
+    * `yard server` can now serve up requirements with YARD 0.6.2
+    * 'All Tags' page now has a cucumber tag AND filtering tool (beta)
+    * Step Defs and Transforms will show comments
+    
+    * FIX removed warnings by no longer requiring YARD
     
   
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)