cucumber-in-the-yard 1.7.7 → 1.7.8

data/History.txt

@@ -1,3 +1,12 @@
+=== 1.7.8 / 2011-01-06
+
+* 'All Features' lands you on the root features directory; 'Requirements'
+  is still accessible through the breadcrumbs.
+* Feature directory pages will display all the features in all subdirectories 
+* Better sorting for features, tags, and step transformers.
+
+- FIX Feature-Scenario links and Cursors
+
 === 1.7.7 / 2011-01-06
 
 * Feature Directories now support a README.md file that can be used to provide

data/README.md

@@ -36,7 +36,7 @@ The implemented example has been deployed at [http://recursivegames.com/cukes/](
 
 **8. [Undefined steps](http://recursivegames.com/cukes/requirements/step_transformers.html#undefined_steps) and even [Rubular](http://rubular.com/) links of your step definitions.**
 
-**9. Feature directories with a README.md will be parsed into the description** [example](http://recursivegames.com/cukes/requirements/example/child_feature.html)
+**9. Feature directories with a README.md will be parsed into the description** [example](http://recursivegames.com/cukes/requirements/features.html)
 
 Installation
 ------------

data/example/README.md

@@ -0,0 +1,8 @@
+This collection of features are really just to test some of the varied cases
+that CITY may come in contact with while parsing a series of features.  All
+of the features, tags, and directories displayed here are contained in this 
+directory and all subdirectories.
+
+* First, the features which are broken down alphabetically and displayed
+* Second, the tags, used by all the features and scenarios
+* Third, the subdirectories, contained in this directory and in the subdirectories.

data/example/child_feature/README.md

@@ -1,19 +1,21 @@
-Feature Directory README
-========================
-
-Synopsis
---------
-
-This collection of features are contained in this folder.  The description README
-allows a user to place a description for entire directory of the features and appears
-in the output to assist with understanding about the collection of features.
-
-Resources
----------
-
-Links to particular resources like the links to the stories, tasks, or other areas
-can also be represented.
-
-The implemented example has been deployed at [http://recursivegames.com/cukes/](http://recursivegames.com/cukes/).
-
-**1. An Item** [example](http://recursivegames.com/cukes/requirements/)
+Child Features
+==============
+
+Synopsis
+--------
+
+This collection of features are contained in this folder.  The description README
+allows a user to place a description for entire directory of the features and appears
+in the output to assist with understanding about the collection of features.
+
+Resources
+---------
+
+Links to particular resources like the links to the stories, tasks, or other areas
+can also be represented.
+
+The implemented example has been deployed at [http://recursivegames.com/cukes/](http://recursivegames.com/cukes/).
+
+**1. An Item** [example](http://recursivegames.com/cukes/requirements/)
+
+

data/example/scenario.feature

@@ -7,10 +7,10 @@ Feature: Displaying Scenarios
   Background:
     Given this background step
 
-  @first
+  @first @bvt
   Scenario: No Step Scenario
 
-  @second
+  @second @bvt
   Scenario: Scenario With Steps
     Given this first step
 	When this second step
@@ -41,7 +41,7 @@ Feature: Displaying Scenarios
     Oh what a bother!
     That this text has to take up two lines
       This line should be indented 2 spaces
-        This line should be idented 4 spaces      
+        This line should be indented 4 spaces      
     """
 
   # Comments before the scenario

data/lib/city.rb

@@ -4,7 +4,7 @@ require 'gherkin/formatter/tag_count_formatter'
 
 
 module CucumberInTheYARD
-  VERSION = '1.7.7' unless defined?(CucumberInTheYARD::VERSION)
+  VERSION = '1.7.8' unless defined?(CucumberInTheYARD::VERSION)
 end
 
 require File.dirname(__FILE__) + "/yard/code_objects/cucumber/base.rb"

data/lib/templates/default/feature/html/feature.erb

@@ -1,7 +1,7 @@
 <script type="text/javascript" charset="utf-8">
 $(function() {
   $(".developer").hide();
-  $(".scenario").css('cursor','pointer');
+  $(".scenario .title").css('cursor','pointer');
 });
 </script>
 

data/lib/templates/default/feature/html/scenario.erb

@@ -1,10 +1,12 @@
 <div class="scenario <%= @id %>">
   <a name="<%= @id %>" />
   <div class="title">
-    <a class="toggle"> - </a>
-    <span class="pre"><%= @scenario.keyword %>:</span>
-    <span class="name"><%= h @scenario.value %></span>
-    <a class="link" style="float:right; clear:right;" href="<% url_for(@scenario.feature,"scenario#{@id}") %>">link</a>
+    <div style="float: left;">
+      <a class="toggle"> - </a>
+      <span class="pre"><%= @scenario.keyword %>:</span>
+      <span class="name"><%= h @scenario.value %></span>
+    </div>
+    <a class="link" style="float:right; clear:right;" href="<%= url_for(@scenario.feature, @id) %>">link</a>
   </div>
 
   <% if @scenario.description.length > 0 %>

data/lib/templates/default/featuredirectory/html/alpha_table.erb

@@ -0,0 +1,26 @@
+<% if @elements && !@elements.empty? %>
+  <% i = (@elements.length % 2 == 0 ? 1 : 0) %>
+  <table style="margin-left: 10px; width: 100%;">
+    <tr>
+      <td valign='top' width="50%">
+        <% @elements.each do |letter, objects| %>
+          <% if (i += 1) > (@elements.length / 2 + 1) %>
+          </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.file %>)</small>
+                </li>
+              <% end %>
+            </ul>
+          </ul>
+        <% end %>
+      </td>
+    </tr>
+  </table>
+<% end %>

data/lib/templates/default/featuredirectory/html/directory.erb

@@ -1,81 +1,32 @@
 <% if @directory %>
-  <div class="requirements">
-    <div class="title">
-      <span class="pre">Directory:</span>
-      <span class="name"><%= h @directory.name.to_s.capitalize %></span>
-    </div>
-    <div class="meta">
-      <div class="file"><%= h(@directory.file) %></div>
-    </div>
-    <div class="summary">
-      <span class="name">Features:</span><span class="value"><%= features.size %></span>
-      <span class="name">Scenarios:</span><span class="value"><%= scenarios.size %></span>
-    </div>
-    <div class="tags"><span class="name">Tags:</span>
-      <%= tags.collect {|tag| linkify(tag,tag.value) }.join(",\n") %>
-    </div>
-  </div>
 
+<div class="requirements">
+  <div class="title">
+    <span class="pre">Directory:</span>
+    <span class="name"><%= h @directory.name.to_s.capitalize %></span>
+  </div>
+ 
   <div class="readme">
     <%= markdown @directory.description %>
   </div>
 
-  <div>
-    <% if @objects_by_letter && !@objects_by_letter.empty? %>
-      <div id="features">
-        <div class="title"><span class="name">Features</span></div>
-      </div>
-      <% i = 0 %>
-      <table>
-        <tr>
-          <td valign='top' width="33%">
-            <% @objects_by_letter.sort_by {|l,o| l.to_s }.each do |letter, objects| %>
-              <% if (i += 1) % 8 == 0 %>
-              </td><td valign='top' width="33%">
-                <% i = 0 %>
-              <% end %>
-              <ul id="alpha_<%= letter %>" class="alpha">
-                <li class="letter"><%= letter %></li>
-                <ul>
-                  <% objects.each do |obj| %>
-                    <li>
-                      <%= linkify obj, obj.value %>
-                      <% if !obj.namespace.root? %>
-                        <small>(<%= obj.namespace.file %>)</small>
-                      <% end %>
-                    </li>
-                  <% end %>
-                </ul>
-              </ul>
-            <% end %>
-          </td>
-        </tr>
-      </table>
-    <% end %>
+  <% if features && !features.empty? %>
+    <%= alpha_table(features) %>
   <% end %>
 
-  <% if @directories_by_letter && !@directories_by_letter.empty? %>
-    <div id="directory">
-      <div class="title"><span class="name">Subdirectories</span></div>
-    </div>
-    <% i = 0 %>
-    <table>
-      <tr>
-        <td valign='top' width="33%">
-          <% @directories_by_letter.each do |directory| %>
-            <% if (i += 1) % 8 == 0 %>
-            </td><td valign='top' width="33%">
-              <% i = 0 %>
-            <% end %>
-            <ul>
-              <%= linkify directory, directory.name %>
-            </ul>
-          <% end %>
-        </td>
-      </tr>
-    </table>
+  <div id="directory">
+    <div class="title"><span class="name">Tags</span></div>
+  </div>
+  <div class="tags">
+    <%= tags.collect {|tag| linkify(tag,tag.value) }.join(",\n") %>
+  </div>
 
+  <% if directories && !directories.empty? %>
+  <div id="directory">
+    <div class="title"><span class="name">Subdirectories</span></div>
+  </div>
+  <%= alpha_table(directories) %>
   <% end %>
-
 </div>
 
+<% end %>

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

@@ -8,37 +8,34 @@ def markdown(text)
   htmlify(text,:markdown) rescue h(text)
 end
 
-def directory
-  @objects_by_letter = all_types_by_letter(YARD::CodeObjects::Cucumber::Feature)
-  @directories_by_letter = @directory.children.find_all {|child| child.is_a?(YARD::CodeObjects::Cucumber::FeatureDirectory) }.sort_by {|dir| dir.name.to_s }
-  erb(:directory)
+def htmlify_with_newlines(text)
+  text.split("\n").collect {|c| h(c).gsub(/\s/,'&nbsp;') }.join("<br/>")
 end
 
-def all_types_by_letter(type)
-  hash = {}
-  objects = @directory.children.find_all {|child| child.is_a?(type) }
-  objects = run_verifier(objects)
-  objects.each {|o| (hash[o.value.to_s[0,1].upcase] ||= []) << o }
-  hash.values.each {|v| v.sort! {|a,b| b.value.to_s <=> a.value.to_s } }
-  hash
+def directories
+  @directories ||= @directory.subdirectories
 end
 
 def features
-  @directory.children.find_all{|child| child.is_a?(YARD::CodeObjects::Cucumber::Feature)}
+  @features ||= @directory.features + directories.collect {|d| d.features }.flatten
 end
 
 def scenarios
-  features.collect {|feature| feature.scenarios }.flatten
-end
-
-def steps
-  scenarios.collect {|scenario| scenario.steps }.flatten
+  @scenarios ||= features.collect {|feature| feature.scenarios }.flatten
 end
 
 def tags
-  (features.collect{|feature| feature.tags } + scenarios.collect {|scenario| scenario.tags }).flatten.uniq
+  @tags ||= (features.collect{|feature| feature.tags } + scenarios.collect {|scenario| scenario.tags }).flatten.uniq.sort_by {|l,o| l.value.to_s }
 end
 
-def htmlify_with_newlines(text)
-  text.split("\n").collect {|c| h(c).gsub(/\s/,'&nbsp;') }.join("<br/>")
-end
+def alpha_table(objects)
+  @elements = Hash.new
+
+  objects = run_verifier(objects)
+  objects.each {|o| (@elements[o.value.to_s[0,1].upcase] ||= []) << o }
+  @elements.values.each {|v| v.sort! {|a,b| b.value.to_s <=> a.value.to_s } }
+  @elements = @elements.sort_by {|l,o| l.to_s }
+
+  @elements.each {|letter,objects| objects.sort! {|a,b| b.value.to_s <=> a.value.to_s }}
+  erb(:alpha_table)
+end

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

@@ -17,7 +17,7 @@ def all_tags_by_letter
 end
 
 def tags
-  @tags ||= Registry.all(:tag)
+  @tags ||= Registry.all(:tag).sort_by {|l,o| l.value.to_s }
 end
 
 def features

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

@@ -7,6 +7,7 @@
 .control { float: right; font-size: 13px; color: #05A; vertical-align: bottom;  font-family: monospace;	font-size: 14px; cursor: pointer; }
 
 .title { margin: 20px 20px 10px 20px; padding-left: 0px; border-bottom: 1px solid #E3E3E3; }
+.scenario .title { height: 20px; }
 .noborder { border: none; }
 #header * .title { padding: 10px; margin: 0px; border: none; }
 
@@ -20,7 +21,9 @@
 
 .suggestion { color: #ff686e; }
 
-.readme { margin: 0px 10px 0px 30px; padding: 0px; }
+.readme { margin: 0px 20px 0px 30px; padding: 0px; }
+.readme h1:first-child { border-top: none; }
+
 
 .feature .description, .requirements .summary {
     margin: 10px 20px 0px 30px;
@@ -63,7 +66,7 @@
 .scenario .title .pre {	color: #00AAD2; }
 .background .title .pre { color: #346F97; }
 
-.requirements .tags { margin-left: 50px; margin-right: 30px; }
+.requirements .tags, .requirements .steptransformers { margin-left: 50px; margin-right: 30px; }
 .scenario .tags { float: right; margin-right: 20px; margin-top: 5px; }
 
 
@@ -153,9 +156,11 @@ div.undefined { padding: 6px; }
 /* Step Transformer Page */
 .transformer { margin-top: 20px; }
 .transformer * .docstring { margin-left: 20px; margin-top: 10px; padding: 5px 5px 5px 10px; }
-.transformer .steps, .method_details_list, .steps, .method_details_list { margin: 10px 20px 0px 30px; }
+.transformer .steps, .method_details_list, .steps, .method_details_list, .showSteps { margin: 10px 20px 0px 30px; }
 .transformer .steps .step { padding: 6px; font-size: 14px; }
 
+.showSteps { font-size: 0.9em; }
+.showSteps a:link, .showSteps a:visited { text-decoration: none; color: #666; }
 
 /* Tag Search Page */
 #tags * li { padding: 5px; padding-left: 12px; margin: 0 0 0 10px; font-size: 1.1em; list-style: none; }

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

@@ -1,6 +1,6 @@
 <% n = 1 %>
 <li class="r<%= n %>">
-  <%= linkify YARD::CodeObjects::Cucumber::CUCUMBER_NAMESPACE, "All Features" %>
+  <%= all_features_link %>
 </li>
 <% n = n == 2 ? 1 : 2 %>
 <% @items.each do |feature| %>

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

@@ -295,4 +295,20 @@ function generateCssSelectorFromTags(tagGroups) {
 
 
     return tagSelectors;
-}
+}
+
+
+function createStepDefinitionLinks() {
+    // $('.step_instances_list').
+    //         before("<span class='showSteps'>[<a href='#' class='toggleSteps'>View steps</a>]</span>");
+    $('.toggleSteps').toggle(function() {
+        $(this).parent().next().slideUp(100);
+        $(this).text("View " + $(this).attr('alt'));
+    },
+    function() {
+        $(this).parent().next().slideDown(100);
+        $(this).text("Hide " + $(this).attr('alt'));
+    });
+}
+
+$(createStepDefinitionLinks);

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

@@ -59,4 +59,14 @@ def serialize_feature_directories(namespaces)
     end
     serialize_feature_directories(namespace.children.find_all {|child| child.is_a?(YARD::CodeObjects::Cucumber::FeatureDirectory)})
   end
+end
+
+def all_features_link
+  root_feature_directories = YARD::CodeObjects::Cucumber::CUCUMBER_NAMESPACE.children.find_all {|child| child.is_a?(YARD::CodeObjects::Cucumber::FeatureDirectory)}
+
+  if root_feature_directories.length > 1
+    linkify YARD::CodeObjects::Cucumber::CUCUMBER_NAMESPACE, "All Features"
+  else
+    linkify root_feature_directories.first, "All Features"
+  end
 end

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

@@ -0,0 +1,26 @@
+<% if @elements && !@elements.empty? %>
+  <% i = (@elements.length % 2 == 0 ? 1 : 0) %>
+  <table style="margin-left: 10px; width: 100%;">
+    <tr>
+      <td valign='top' width="50%">
+        <% @elements.each do |letter, objects| %>
+          <% if (i += 1) > (@elements.length / 2 + 1) %>
+          </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.file %>)</small>
+                </li>
+              <% end %>
+            </ul>
+          </ul>
+        <% end %>
+      </td>
+    </tr>
+  </table>
+<% end %>

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

@@ -0,0 +1,50 @@
+<% if @namespace %>
+  <div id="cukes_logo">&nbsp;</div>
+  <div id="cukes_links">
+    <a href="http://cukes.info/">Cucumber</a> |
+    <a href="http://github.com/aslakhellesoy/cucumber/wiki/Gherkin">Gherkin</a> |
+    <a href="http://yardoc.org/">YARD</a> |
+    <a href="http://github.com/burtlo/Cucumber-In-The-Yard">Cucumber-In-The-YARD</a>
+  </div>
+
+  <div class="requirements">
+
+    <% if features && !features.empty? %>
+      <%= alpha_table(features) %>
+    <% else %>
+      <!-- No Features Defined -->
+      <div class="none">No Features Defined</div>
+    <% end %>
+
+    <div id="directory" style="margin-left: 40px;">
+      <div class="title"><span class="name">Tags</span></div>
+    </div>
+    <div class="tags">
+      <%= tags.collect {|tag| linkify(tag,tag.value) }.join(",\n") %>
+    </div>
+
+    <% if feature_subdirectories && !feature_subdirectories.empty? %>
+      <div id="directory" style="margin-left: 40px;">
+        <div class="title"><span class="name">Subdirectories</span></div>
+      </div>
+      <%= alpha_table(feature_subdirectories) %>
+    <% else %>
+      <!-- No Feature Directories -->
+    <% end %>
+    
+    <div id="directory" style="margin-left: 40px;">
+      <div class="title"><span class="name">Step Definitions &amp; Transforms</span></div>
+    </div>
+    <div class="steptransformers">
+      <%= step_definitions.length %> 
+      <a href="<%= url_for step_transformers, "step_definitions" %>">Step Definitions</a>
+      <%= transformers.length %>
+      <a href="<%= url_for step_transformers, "step_transforms" %>">Transforms</a>
+      and <%= undefined_steps.length %>
+      <a href="<%= url_for step_transformers, "undefined_steps" %>">Undefined Steps</a>
+    </div>
+    
+  </div>
+<% end %>
+
+

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

@@ -1,57 +1,51 @@
 def init
   super
-  sections.push :namespace
+  sections.push :requirements
   @namespace = object
 
 end
 
-def namespace
-  erb(:namespace)
+def features
+  @features ||= Registry.all(:feature)
 end
 
-def all_features_by_letter
-  hash = {}
-  objects = features
-  objects = run_verifier(objects)
-  objects.each {|o| (hash[o.value.to_s[0,1].upcase] ||= []) << o }
-  hash.values.each {|v| v.sort! {|a,b| b.value.to_s <=> a.value.to_s } }
-  hash
+def tags
+  @tags ||= Registry.all(:tag).sort_by {|l,o| l.value.to_s }
 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.values.each {|v| v.sort! {|a,b| b.value.to_s <=> a.value.to_s } }
-  hash
+def feature_directories
+  @feature_directories ||= YARD::CodeObjects::Cucumber::CUCUMBER_NAMESPACE.children.find_all {|child| child.is_a?(YARD::CodeObjects::Cucumber::FeatureDirectory)}
 end
 
-def all_directories_by_letter
-  hash = {}
-  objects = feature_directories
-  objects = run_verifier(objects)
-  objects.each {|o| (hash[o.value.to_s[0,1].upcase] ||= []) << o }
-  hash.values.each {|v| v.sort! {|a,b| b.value.to_s <=> a.value.to_s } }
-  hash
+def feature_subdirectories
+  @feature_subdirectories ||= Registry.all(:featuredirectory) - feature_directories
 end
 
-def feature_directories
-  @feature_directories ||= Registry.all(:featuredirectory)
+def step_transformers
+  YARD::CodeObjects::Cucumber::CUCUMBER_STEPTRANSFORM_NAMESPACE
 end
 
-def features
-  @features ||= Registry.all(:feature)
+def step_definitions
+  @step_definitions ||= YARD::Registry.all(:stepdefinition)
 end
 
-def scenarios
-  @scenarios ||= Registry.all(:scenario).reject {|s| s.background? }
+def transformers
+  @transformers ||= YARD::Registry.all(:steptransform)
 end
 
-def steps
-  @steps ||= Registry.all(:step)
+def undefined_steps
+  @undefined_steps ||= Registry.all(:step).reject {|s| s.definition || s.scenario.outline? }
 end
 
-def tags
-  @tags ||= Registry.all(:tag).sort {|a,b| a.value.to_s <=> b.value.to_s }
+
+def alpha_table(objects)
+  @elements = Hash.new
+
+  objects = run_verifier(objects)
+  objects.each {|o| (@elements[o.value.to_s[0,1].upcase] ||= []) << o }
+  @elements.values.each {|v| v.sort! {|a,b| b.value.to_s <=> a.value.to_s } }
+  @elements = @elements.sort_by {|l,o| l.to_s }
+
+  @elements.each {|letter,objects| objects.sort! {|a,b| b.value.to_s <=> a.value.to_s }}
+  erb(:alpha_table)
 end

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

@@ -1,9 +1,12 @@
 <div class="title">
   <% if @item_type %>
-     <a class="control" href="#" id="<%= @item_type.gsub(/\s/,'') %>">[Collapse All]</a>
+     <a class="control" id="<%= @item_type.gsub(/\s/,'') %>">[Collapse All]</a>
      <div style="clear: right;"></div>
    <% end %>
  
+  <% if @item_anchor_name %>
+    <a name="<%= @item_anchor_name %>">
+  <% end %>
   <div class="name"><%= @item_title %></div>
 </div>
 

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

@@ -0,0 +1,10 @@
+<div class="requirements">
+  <div class="title">Step Definitions &amp; Transforms</div>
+
+  <div class="summary">
+    <div><%= step_definitions.length %><a href="#step_definitions">Step Definitions</a></div>
+    <div><%= step_transforms.length %><a href="#step_transforms">Step Transforms</a></div>
+    <div><%= undefined_steps.length %><a href="#undefined_steps">Undefined Steps</a></div>
+  </div>
+
+</div>

data/lib/templates/default/steptransformers/{setup.rb → html/setup.rb}

@@ -1,27 +1,48 @@
 def init
   super
-  sections.push :stepdefinitions, :steptransforms, :undefined_steps
+  sections.push :index, :stepdefinitions, :steptransforms, :undefinedsteps
+end
+
+def step_definitions
+  @step_definitions ||= begin
+    YARD::Registry.all(:stepdefinition).sort_by {|definition| definition.steps.length * -1 }
+  end
+end
+
+def step_transforms
+  @step_transforms ||= begin
+    YARD::Registry.all(:steptransform).sort_by {|definition| definition.steps.length * -1 }
+  end
+end
+
+def undefined_steps
+  @undefined_steps ||= begin
+    unique_steps(Registry.all(:step).reject {|s| s.definition || s.scenario.outline? }).sort_by{|steps| steps.last.length * -1 }
+  end
 end
 
 def stepdefinitions
-  @item_title = "Step Definitions"
+  @item_title = "Step Definitions"  
+  @item_anchor_name = "step_definitions"
   @item_type = "step definition"
-  @items = YARD::Registry.all(:stepdefinition)
+  @items = step_definitions
   erb(:header) + erb(:transformers)
 end
 
 def steptransforms
   @item_title = "Step Transforms"
+  @item_anchor_name = "step_transforms"
   @item_type = "step transform"
-  @items = YARD::Registry.all(:steptransform)
+  @items = step_transforms
   erb(:header) + erb(:transformers)
 end
 
-def undefined_steps
-  @item_title = "Undefined Steps"
+def undefinedsteps
+  @item_title = "Undefined Steps"  
+  @item_anchor_name = "undefined_steps"
   @item_type = nil
-  @undefined_steps ||= Registry.all(:step).reject {|s| s.definition || s.scenario.outline? }
-  erb(:header) + erb(:undefined_steps)
+  @items = undefined_steps
+  erb(:header) + erb(:undefinedsteps)
 end
 
 
@@ -31,6 +52,7 @@ def unique_steps(steps)
   uniq_steps
 end
 
+
 def link_constants(definition)
   value = definition.literal_value.dup
 

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

@@ -10,15 +10,17 @@
   </div>
 
   <div class="details">
+    
+    <div class="meta" style="clear: right;">
+      <div class="file"><%= h item.location %></div>
+    </div>
 
+    
     <!-- Comments -->
     <div>
       <%= T('docstring').run(options.dup.merge({:object => item})) %>
     </div>
-
-    <div class="meta" style="clear: right;">
-      <div class="file"><%= h item.location %></div>
-    </div>
+    
 
     <!-- Source Code -->
     <div class="method_details_list">
@@ -35,7 +37,11 @@
     </div>
 
     <!-- Matching Step Instances -->
-
+    <% if item.steps.length > 0 %>
+      <div class='showSteps'>
+        [<a href='#' class='toggleSteps' alt="<%= item.steps.length %> steps">Hide <%= item.steps.length %> steps</a>]
+      </div>
+    <% end %>
     <div class="steps">
       <% if item.steps && !item.steps.empty? %>
       <% unique_steps(item.steps).each_with_index do |uniq_step,step_index| %>
@@ -49,7 +55,7 @@
           </span>
         </div>
         <% uniq_step.last.each do |step| %>
-          <a class="definition" style="clear: right;" href="<%= url_for step.scenario.feature %>"><%= h step.location %></a>
+        <a class="definition" style="clear: right;" href="<%= url_for step.scenario.feature %>"><%= h step.location %></a>
         <% end %>
         <div style="clear: both;"></div>
       </div>
@@ -58,8 +64,9 @@
       <div class="undefined">No steps were found to match this <%= @item_type %>.</div>
       <% end%>
     </div>
+    
   </div>
-  
+
   <div style="margin: 30px 20px; border-top: 1px dotted #AAA;"></div>
 
 </div>

data/lib/templates/default/steptransformers/html/{undefined_steps.erb → undefinedsteps.erb}

@@ -1,7 +1,7 @@
 <div class="transformer">
   <div class="steps">
   <% if @undefined_steps && !@undefined_steps.empty? %>
-    <% unique_steps(@undefined_steps).each_with_index do |uniq_step,step_index| %>
+    <% @undefined_steps.each_with_index do |uniq_step,step_index| %>
     <div class="step <%= (step_index + 1) % 2 == 0 ? 'even' : 'odd' %>">
       <div>
         <span class="predicate"><%= uniq_step.last.first.keyword %></span>

data/lib/templates/default/tag/html/alpha_table.erb

@@ -0,0 +1,26 @@
+<% if @elements && !@elements.empty? %>
+  <% i = (@elements.length % 2 == 0 ? 1 : 0) %>
+  <table style="margin-left: 10px; width: 100%;">
+    <tr>
+      <td valign='top' width="50%">
+        <% @elements.each do |letter, objects| %>
+          <% if (i += 1) > (@elements.length / 2 + 1) %>
+          </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.file %>)</small>
+                </li>
+              <% end %>
+            </ul>
+          </ul>
+        <% end %>
+      </td>
+    </tr>
+  </table>
+<% end %>

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

@@ -0,0 +1,27 @@
+def init
+  super
+  @tag = object
+
+  sections.push :tag
+end
+
+def features
+  @tag.features
+end
+
+def scenarios
+  @tag.scenarios
+end
+
+
+def alpha_table(objects)
+  @elements = Hash.new
+
+  objects = run_verifier(objects)
+  objects.each {|o| (@elements[o.value.to_s[0,1].upcase] ||= []) << o }
+  @elements.values.each {|v| v.sort! {|a,b| b.value.to_s <=> a.value.to_s } }
+  @elements = @elements.sort_by {|l,o| l.to_s }
+
+  @elements.each {|letter,objects| objects.sort! {|a,b| b.value.to_s <=> a.value.to_s }}
+  erb(:alpha_table)
+end

data/lib/templates/default/tag/html/tag.erb

@@ -1,19 +1,35 @@
 <div class="tag">
-	<div class="title">
-		<span class="pre">Tag:</span>
-		<span class="name"><%= @tag.value %></span>
-
-	</div>
-
-	<div class="meta">
-		<div class="file">Usage: 
-			<%= @tag.features.size > 0 ? "#{@tag.features.size} feature#{@tag.features.size > 1 ? 's' : ''} (with #{@tag.indirect_scenarios.size} scenario#{@tag.indirect_scenarios.size > 1 ? 's' : ''})" : "" %>
-			<%= " and " if @tag.features.size > 0 && @tag.scenarios.size > 0 %>
-			<%= @tag.scenarios.size > 0 ? "#{@tag.scenarios.size} scenario#{@tag.scenarios.size > 1 ? 's' : ''}" : "" %>
-		</div>		
-	</div>
-
-        <div style="margin-top: 20px;">&nbsp;</div>
-	<%= yieldall :object => @tag %>
+  <div class="title">
+    <span class="pre">Tag:</span>
+    <span class="name"><%= @tag.value %></span>
+
+  </div>
+
+  <div class="meta">
+    <div class="file">
+      <%= @tag.features.size > 0 ? "#{@tag.features.size} feature#{@tag.features.size > 1 ? 's' : ''} (with #{@tag.indirect_scenarios.size} scenario#{@tag.indirect_scenarios.size > 1 ? 's' : ''})" : "" %>
+      <%= " and " if @tag.features.size > 0 && @tag.scenarios.size > 0 %>
+      <%= @tag.scenarios.size > 0 ? "#{@tag.scenarios.size} scenario#{@tag.scenarios.size > 1 ? 's' : ''}" : "" %>
+    </div>		
+  </div>
+
+  <div style="margin-top: 20px;">&nbsp;</div>
+
+  <% if features && !features.empty? %>
+  <div id="features" style="margin-left: 40px;">
+    <div class="title"><span class="name">Features</span></div>
+  </div>
+  <%= alpha_table(features) %>
+
+  <% end %>
+
+  <% if scenarios && !scenarios.empty? %>
+  <div id="features" style="margin-left: 40px;">
+    <div class="title"><span class="name">Scenarios</span></div>
+  </div>
+  <%= alpha_table(scenarios) %>
+
+  <% end %>
+
 
 </div>

data/lib/yard/code_objects/cucumber/namespace_object.rb

@@ -24,6 +24,17 @@ module YARD::CodeObjects::Cucumber
     end
 
     def value ; name ; end
+    
+    def features
+      children.find_all {|d| d.is_a?(Feature) } 
+    end
+    
+    def subdirectories
+      subdirectories = children.find_all {|d| d.is_a?(FeatureDirectory) }
+      subdirectories + subdirectories.collect {|s| s.subdirectories }.flatten
+    end
+      
+    
   end
 
   CUCUMBER_NAMESPACE = Requirements.new(:root, "requirements")

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber-in-the-yard
 version: !ruby/object:Gem::Version 
-  hash: 5
   prerelease: false
   segments: 
   - 1
   - 7
-  - 7
-  version: 1.7.7
+  - 8
+  version: 1.7.8
 platform: ruby
 authors: 
 - Franklin Webber
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-06 00:00:00 -08:00
+date: 2011-01-30 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 2
         - 2
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 0
         - 7
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 0
         - 6
@@ -81,6 +77,7 @@ files:
 - README.md
 - Rakefile
 - city.gemspec
+- example/README.md
 - example/child_feature/README.md
 - example/child_feature/child.feature
 - example/child_feature/grandchild_feature/grandchild.feature
@@ -106,9 +103,10 @@ files:
 - lib/templates/default/feature/html/outline.erb
 - lib/templates/default/feature/html/pystring.erb
 - lib/templates/default/feature/html/scenario.erb
+- lib/templates/default/feature/html/setup.rb
 - lib/templates/default/feature/html/steps.erb
 - lib/templates/default/feature/html/table.erb
-- lib/templates/default/feature/setup.rb
+- lib/templates/default/featuredirectory/html/alpha_table.erb
 - lib/templates/default/featuredirectory/html/directory.erb
 - lib/templates/default/featuredirectory/html/setup.rb
 - lib/templates/default/featuretags/html/namespace.erb
@@ -124,16 +122,17 @@ files:
 - lib/templates/default/fulldoc/html/setup.rb
 - lib/templates/default/layout/html/headers.erb
 - lib/templates/default/layout/html/search.erb
-- lib/templates/default/requirements/html/namespace.erb
+- lib/templates/default/requirements/html/alpha_table.erb
+- lib/templates/default/requirements/html/requirements.erb
 - lib/templates/default/requirements/html/setup.rb
 - lib/templates/default/steptransformers/html/header.erb
+- lib/templates/default/steptransformers/html/index.erb
+- lib/templates/default/steptransformers/html/setup.rb
 - lib/templates/default/steptransformers/html/transformers.erb
-- lib/templates/default/steptransformers/html/undefined_steps.erb
-- lib/templates/default/steptransformers/setup.rb
-- lib/templates/default/tag/html/feature.erb
-- lib/templates/default/tag/html/scenario.erb
+- lib/templates/default/steptransformers/html/undefinedsteps.erb
+- lib/templates/default/tag/html/alpha_table.erb
+- lib/templates/default/tag/html/setup.rb
 - lib/templates/default/tag/html/tag.erb
-- lib/templates/default/tag/setup.rb
 - lib/yard/code_objects/cucumber/base.rb
 - lib/yard/code_objects/cucumber/feature.rb
 - lib/yard/code_objects/cucumber/namespace_object.rb
@@ -161,20 +160,9 @@ has_rdoc: true
 homepage: http://github.com/burtlo/Cucumber-In-The-Yard
 licenses: []
 
-post_install_message: |+
-  
-  (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)
-  
-    Thank you for installing Cucumber-In-The-YARD 1.7.7 / 2011-01-06.
-    
-    Changes:
-      
-    * Feature Directories now support a README.md file that can be used to provide
-      information (with markdown support) about the directory of features.
-    
-  
-  (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)
-  
+post_install_message: "\n\
+  (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)\n\n  Thank you for installing Cucumber-In-The-YARD 1.7.8 / 2011-01-06.\n  \n  Changes:\n    \n  * 'All Features' lands you on the root features directory; 'Requirements'\n    is still accessible through the breadcrumbs.\n  * Feature directory pages will display all the features in all subdirectories \n  * Better sorting for features, tags, and step transformers.\n  \n  - FIX Feature-Scenario links and Cursors\n  \n\n\
+  (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)\n\n"
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -184,7 +172,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -193,7 +180,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"

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

@@ -1,90 +0,0 @@
-<% if @namespace %>
-  <div id="cukes_logo">&nbsp;</div>
-  <div id="cukes_links">
-    <a href="http://cukes.info/">Cucumber</a> |
-    <a href="http://github.com/aslakhellesoy/cucumber/wiki/Gherkin">Gherkin</a> |
-    <a href="http://yardoc.org/">YARD</a> |
-    <a href="http://github.com/burtlo/Cucumber-In-The-Yard">Cucumber-In-The-YARD</a>
-  </div>
-
-  <div class="requirements">
-
-    <div class="summary">
-      <span class="name">Features:</span><span class="value"><%= features.size %></span>
-      <span class="name">Scenarios:</span><span class="value"><%= scenarios.size %></span>
-      <span class="name">Steps:</span><span class="value"><%= steps.size %></span>
-      <span class="name">Tags:</span><span class="value"><%= tags.size %></span>
-    </div>
-    <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>
-      </div>
-      <% i = 0 %>
-      <table style="margin-left: 10px;">
-        <tr>
-          <td valign='top' width="50%">
-            <% all_features_by_letter.sort_by {|l,o| l.to_s }.each do |letter, objects| %>
-              <% if (i += 1) % 13 == 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 class="feature <%= obj.tags.map{|t| t.value }.join(" ") %>">
-                      <%= linkify obj, obj.value %>
-                      <small>(<%= obj.file %>)</small>
-                    </li>
-                  <% end %>
-                </ul>
-              </ul>
-            <% end %>
-          </td>
-        </tr>
-      </table>
-    <% 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>
-      </div>
-      <% i = 0 %>
-      <table style="margin-left: 10px;">
-        <tr>
-          <td valign='top' width="50%">
-            <% all_directories_by_letter.sort_by {|l,o| l.to_s }.each do |letter, objects| %>
-              <% if (i += 1) % 13 == 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.file %>)</small>
-                    </li>
-                  <% end %>
-                </ul>
-              </ul>
-            <% end %>
-          </td>
-        </tr>
-      </table>
-    <% else %>
-      <!-- No Feature Directories -->
-    <% end %>
-
-  </div>
-<% end %>
-
-

data/lib/templates/default/tag/html/feature.erb

@@ -1,29 +0,0 @@
-<div id="features">
-  <div class="title"><span class="name">Features</span></div>
-</div>
-<% i = 0 %>
-<table>
-  <tr>
-    <td valign='top' width="33%">
-      <% all_features_by_letter.sort_by {|l,o| l.to_s }.each do |letter, objects| %>
-        <% if (i += 1) % 8 == 0 %>
-        </td><td valign='top' width="33%">
-          <% i = 0 %>
-        <% end %>
-        <ul id="alpha_<%= letter %>" class="alpha">
-          <li class="letter"><%= letter %></li>
-          <ul>
-            <% objects.each do |obj| %>
-              <li>
-                <%= linkify obj, obj.value %>
-                <% if !obj.namespace.root? %>
-                  <small>(<%= obj.namespace.file %>)</small>
-                <% end %>
-              </li>
-            <% end %>
-          </ul>
-        </ul>
-      <% end %>
-    </td>
-  </tr>
-</table>

data/lib/templates/default/tag/html/scenario.erb

@@ -1,33 +0,0 @@
-<div id="features">
-  <div class="title"><span class="name">Scenarios</span></div>
-</div>
-<% i = 0 %>
-<table>
-  <tr>
-    <td valign='top' width="33%">
-      <% all_scenarios_by_letter.sort_by {|l,o| l.to_s }.each do |letter, objects| %>
-        <% if (i += 1) % 8 == 0 %>
-        </td><td valign='top' width="33%">
-          <% i = 0 %>
-        <% end %>
-        <ul id="alpha_<%= letter %>" class="alpha">
-          <li class="letter"><%= letter %></li>
-          <ul>
-            <% objects.each do |obj| %>
-              <li>
-                <span class='object_link'>
-               		<a href="<%= url_for(obj.feature,"scenario#{obj.feature.scenarios.index(obj) }") %>">
-               		  <%= h obj.value %>
-               		</a>
-               	</span>
-                <% if !obj.namespace.root? %>
-                  <small>(<%= obj.namespace.file %>)</small>
-                <% end %>
-              </li>
-            <% end %>
-          </ul>
-        </ul>
-      <% end %>
-    </td>
-  </tr>
-</table>

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

@@ -1,20 +0,0 @@
-def init
-  super
-  @tag = object
-
-  sections.push :tag
-  sections.push :feature unless @tag.features.empty?
-  sections.push :scenario unless @tag.scenarios.empty?
-end
-
-def all_features_by_letter
-  hash = {}
-  @tag.features.each {|o| (hash[o.value.to_s[0,1].upcase] ||= []) << o }
-  hash
-end
-
-def all_scenarios_by_letter
-  hash = {}
-  @tag.scenarios.each {|o| (hash[o.value.to_s[0,1].upcase] ||= []) << o }
-  hash
-end