cucumber-in-the-yard 1.7.0 → 1.7.1

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.7.1 / 2010-11-28
+
+* Feature file with layout enhancements
+* Scenarios are now linked/linkable
+* FIX Scenario Outline error on CentOS, Ruby 1.8.7
+* FIX Requiring Cucumber before Gherkin so that correct gherkin is loaded
+
 === 1.7.0 / 2010-11-18
 
 * Dynamic Tag Union / Intersection

data/example/child_feature/scenario.feature

@@ -39,9 +39,11 @@ Feature: Scenario
       Oh what a bother!
     """
 
+  # Comments before the scenario
   @seventh @comments
-  Scenario: Scenario with comments and 
-    with multiple lines for the name
+  Scenario: Scenario with comments and a description
+    There once was a need for information to be displayed alongside all the
+    entities that I hoped to test
     # First Comment
     Given this first step
     # Second Comment

data/lib/city.rb

@@ -1,13 +1,11 @@
-require 'gherkin/rubify'
 require 'cucumber/parser/gherkin_builder'
 require 'gherkin/parser/parser'
 require 'gherkin/formatter/tag_count_formatter'
 
 module CucumberInTheYARD
-  VERSION = '1.7.0' unless defined?(CucumberInTheYARD::VERSION)
+  VERSION = '1.7.1' unless defined?(CucumberInTheYARD::VERSION)
 end
 
-
 require File.dirname(__FILE__) + "/yard/code_objects/cucumber/base.rb"
 require File.dirname(__FILE__) + "/yard/code_objects/cucumber/namespace_object.rb"
 require File.dirname(__FILE__) + "/yard/code_objects/cucumber/feature.rb"

data/lib/cucumber/city_builder.rb

@@ -34,7 +34,8 @@ module Cucumber
       end
 
       def feature(feature)
-        #log.debug  "FEATURE: #{feature.name} #{feature.line} #{feature.keyword} #{feature.description}"
+        #log.debug "FEATURE"
+        
         @feature = YARD::CodeObjects::Cucumber::Feature.new(@namespace,File.basename(@file.gsub('.feature','').gsub('.','_'))) do |f|
           f.comments = feature.comments.map{|comment| comment.value}.join("\n")
           f.description = feature.description
@@ -48,7 +49,8 @@ module Cucumber
       end
 
       def background(background)
-        #log.debug "BACKGROUND #{background.keyword} #{background.name} #{background.line} #{background.description}"
+        #log.debug "BACKGROUND"
+        
         @background = YARD::CodeObjects::Cucumber::Scenario.new(@feature,"background") do |b|
           b.comments = background.comments.map{|comment| comment.value}.join("\n")
           b.description = background.description
@@ -64,6 +66,7 @@ module Cucumber
 
       def scenario(statement)
         #log.debug "SCENARIO"
+
         scenario = YARD::CodeObjects::Cucumber::Scenario.new(@feature,"scenario_#{@feature.scenarios.length + 1}") do |s|
           s.comments = statement.comments.map{|comment| comment.value}.join("\n")
           s.description = statement.description
@@ -81,7 +84,7 @@ module Cucumber
 
       def scenario_outline(statement)
         #log.debug "SCENARIO OUTLINE"
-
+        
         outline = YARD::CodeObjects::Cucumber::ScenarioOutline.new(@feature,"scenario_#{@feature.scenarios.length + 1}") do |s|
           s.comments = statement.comments.map{|comment| comment.value}.join("\n")
           s.description = statement.description
@@ -116,8 +119,6 @@ module Cucumber
             s.add_file(@file,@step_container.line_number)
             s.keyword = @step_container.keyword
             s.value = "#{@step_container.value} (#{@step_container.scenarios.length + 1})"
-
-            #TODO: Should scenario instances have their own tag instances?
           end
 
           @step_container.steps.each do |step|
@@ -151,13 +152,16 @@ module Cucumber
       end
 
       def step(step)
-        #log.debug "STEP #{step.multiline_arg}"
+        #log.debug "STEP"
+
         @table_owner = YARD::CodeObjects::Cucumber::Step.new(@step_container,"#{step.line}") do |s|
           s.keyword = step.keyword
           s.value = step.name
           s.add_file(@file,step.line)
         end
 
+        @table_owner.comments = step.comments.map{|comment| comment.value}.join("\n")
+
         multiline_arg = rubify(step.multiline_arg)
         
         case(multiline_arg)

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

@@ -1,22 +1,32 @@
+<script type="text/javascript" charset="utf-8">
+  $(function() {
+    $(".developer").hide();
+  });
+</script>
+
 <div class="feature">
-	<div class="title">
-		<span class="pre"><%= @feature.keyword %>:</span>
-		<span class="name"><%= @feature.value %></span>
-	</div>
+  <div class="title">
+    <span class="pre"><%= @feature.keyword %>:</span>
+    <span class="name"><%= @feature.value %></span>
 
-	<div class="meta">
-		<div class="file"><%= h(@feature.file) %></div>
-		<div class="tags">
-			<% @feature.tags.each do |tag| %>
-			<a href="<%= url_for tag %>"><%= tag.value %></a>
-			<% end %>
-		</div>		
-	</div>
+    <div id="view">[More Detail]</div>
+    <div id="expand">[Collapse All]</div>
+</div>
 
-	<div class="description">
-		<%= @feature.description %>
-	</div>
+<div class="meta">
+  <div class="file developer"><%= h(@feature.file) %></div>
+  <div style="clear: right;"></div>
+  <div class="tags developer">
+    <% @feature.tags.each do |tag| %>
+      <a href="<%= url_for tag %>"><%= tag.value %></a>
+    <% end %>
+  </div>
+</div>
+
+<div class="description">
+  <%= @feature.description %>
+</div>
 
-	<%= yieldall %>
+<%= yieldall %>
 </div>
 

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

@@ -1 +1 @@
-<span class="none">No Steps Defined</span>
+<div class="none">No Steps Defined</div>

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

@@ -1,56 +1,25 @@
 <% @scenario.scenarios.each_with_index do |scenario,example_index| %>
-<div id="<%= "#{@id}Example#{example_index + 1}Steps" %>" style="display: none;" class="steps">
-  <% scenario.steps.each_with_index do |step,index| %>
-  <% @step = step %>
-
-
-  <div <%= "id='#{@id}Example#{example_index + 1}Step#{index}'" %> class="step <%= (index + 1) % 2 == 0 ? 'even' : 'odd' %>">
-    <span class="predicate"><%= step.keyword %></span>
-
-    <% if step.definition %>
-    <span class="defined">
-      <%=  highlight_matches(step) %>
-      <div class="details">
-        <a href="<%= url_for step.definition %>"><div class="valid">&nbsp;</div></a>
-      </div>
-    </span>
-    <% else %>
-    <span class="undefined">
-      <%= h step.value %>
-      <div class="details">
-        <a href="<%= url_for YARD::CodeObjects::Cucumber::CUCUMBER_STEPTRANSFORM_NAMESPACE %>#undefined_steps">
-          <div class="invalid">&nbsp;</div>
-        </a>  
-      </div>
-    </span>
-    <% end %>
-
+  <div style="display: none;" class="steps <%= "example#{example_index + 1}" %>">
+    <% @scenario_outline = @scenario ; @scenario = scenario ; @steps = scenario.steps %>
+    <%= erb(:steps) %>
+    <% @scenario = @scenario_outline %>
   </div>
-
-  <%= erb(:table) if step.has_table? %>
-  <%= erb(:pystring) if step.has_text? %>
-
-
-  <% end %>
-</div>
 <% end %>
 
-
 <div class="outline">
   <div class="keyword"> <%= h @scenario.example_keyword %> </div>
   <table>
     <thead>
       <tr>
         <% @scenario.example_headers.each_with_index do |header,header_index| %>
-        <th><%= h(header) %></th>
+          <th><%= h(header) %></th>
         <% end %>
       </tr>
     </thead>
     <% @scenario.example_data.each_with_index do |row,row_index| %>
-    <tr class="<%= (row_index + 1) % 2 == 0 ? 'even' : 'odd' %>"
-      onclick="<%= "toggleScenarioExample('#{@id}',#{row_index + 1});" %>">
+    <tr class="<%= (row_index + 1) % 2 == 0 ? "even example#{row_index +1}" : "odd example#{row_index +1}" %>">
       <% row.each_with_index do |column,column_index| %>
-      <td><%= h(column.to_s.strip) %></td>
+        <td><%= h(column.to_s.strip) %></td>
       <% end %>
     </tr>
     <% end %>

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

@@ -1,41 +1,52 @@
-<script type="text/javascript" charset="utf-8">
-$(function() {
-	$('#<%= @id %> .toggle').click(function() {
-		$("#<%= @id %>Steps").toggle('blind');
-
-		var stateIndicator = $('#<%= @id %> a.toggle')[0]
-
-		stateIndicator.innerHTML = (stateIndicator.innerHTML === '+' ? '-' : '+'); 
-		return false;
-	});
-});
-</script>
-
-<div id="<%= @id %>" class="scenario">
-	<div class="title">
-		<a class="toggle">-</a>
-		<span class="pre"><%= @scenario.keyword %>:</span>
-		<span class="name"><%= h @scenario.value %></span>
-	</div>
-	<div class="meta">
-		<div class="file"><%= @scenario.location %></div>
-		<% unless @scenario.tags.empty? %>
-		<div class="tags">
-			<% @scenario.tags.each do |tag| %>
-			<a href="<%= url_for tag %>"><%= tag.value %></a>
-			<% end %>
-		</div>
-		<% end%>
-	</div>
-	<% unless @scenario.description.empty? %>
-	<div class="description">
-          <%= h @scenario.description %>
-	</div>
-	<% end %>
-
-        <div id="<%= @id %>Steps" class="steps">
-          <%= @scenario.steps.empty? ? erb(:no_steps_defined) : erb(:steps) %>
+<div class="scenario">
+  <a name="<%= @id %>" />
+  <div class="title">
+    <a class="toggle">&nbsp;-&nbsp;</a>
+    <span class="pre"><%= @scenario.keyword %>:</span>
+    <span class="name"><%= h @scenario.value %></span>
+  </div>
+
+  <% if @scenario.description.length > 0 %>
+  <div class="description">
+    <%= h @scenario.description %>
+  </div>
+  <% end %>
+
+  <% if @scenario.comments.length > 0 %>
+  <div class="comments developer">
+    <%= h @scenario.comments %>
+  </div>
+  <% end %>
+
+  <div class="details">
+    <div class="meta developer">
+      <div class="file"><%= @scenario.location %></div>
+      <% unless @scenario.tags.empty? %>
+        <div style="clear:right;"></div>
+        <div class="tags">
+          <% @scenario.tags.each do |tag| %>
+            <a href="<%= url_for tag %>"><%= tag.value %></a>
+          <% end %>
         </div>
+      <% end%>
+      <div style="clear: both;"></div>
+    </div>
+
+    <div class="steps">
+      <% if @scenario.steps.empty?  %>
+        <%= erb(:no_steps_defined) %>
+      <% else %>
+        <%= @steps = @scenario.steps ; erb(:steps) %>
+      <% end %>
+    </div>
+
+
+    <%= erb(:outline) if @scenario.outline? %>
+
+  </div>
   
-        <%= erb(:outline) if @scenario.outline? %>
+  <div class="attributes" style="display:none;">
+    <input type="hidden" name="collapsed" value="false">
+  </div>
+
 </div>

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

@@ -1,31 +1,33 @@
-<% @scenario.steps.each_with_index do |step,index| %>
+<% @steps.each_with_index do |step,index| %>
   <% @step = step %>
 
-
-  <div <%= "id='#{@id}Step#{index}'" %> class="step <%= (index + 1) % 2 == 0 ? 'even' : 'odd' %>">
+  <% if step.comments && step.comments.length > 0 %>
+  <div class="comments developer"><%= h step.comments %></div>
+  <% end %>
+  <div class="step <%= (index + 1) % 2 == 0 ? 'even' : 'odd' %>">
     <span class="predicate"><%= step.keyword %></span>
 
     <% if @scenario.outline? %>
-      <%= step.value %>
+      <%= h step.value %>
     <% else %>
 
-    <% if step.definition %>
-    <span class="defined">
-      <%=  highlight_matches(step) %>
-      <div class="details">
-        <a href="<%= url_for step.definition %>"><div class="valid">&nbsp;</div></a>
-      </div>
-    </span>
-    <% else %>
-    <span class="undefined">
-      <%= h step.value %>
-      <div class="details">
-        <a href="<%= url_for YARD::CodeObjects::Cucumber::CUCUMBER_STEPTRANSFORM_NAMESPACE %>#undefined_steps">
-          <div class="invalid">&nbsp;</div>
-        </a>  
-      </div>
-    </span>
-    <% end %>
+      <% if step.definition %>
+        <span class="defined">
+          <%=  highlight_matches(step) %>
+          <div class="definition developer">
+            <a href="<%= url_for step.definition %>"><div class="valid">&nbsp;</div></a>
+          </div>
+        </span>
+      <% else %>
+        <span class="undefined">
+          <%= h step.value %>
+          <div class="definition developer">
+            <a href="<%= url_for YARD::CodeObjects::Cucumber::CUCUMBER_STEPTRANSFORM_NAMESPACE %>#undefined_steps">
+              <div class="invalid">&nbsp;</div>
+            </a>
+          </div>
+        </span>
+      <% end %>
 
     <% end %>
   </div>
@@ -34,4 +36,4 @@
   <%= erb(:pystring) if step.has_text? %>
 
 
-  <% end %>
+<% end %>

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

@@ -4,7 +4,6 @@ def init
     
   sections.push :feature
   
-  sections.push :background if object.background
   sections.push :scenarios if object.scenarios
     
 end
@@ -18,6 +17,12 @@ end
 def scenarios
   scenarios = ""
   
+  if @feature.background
+    @scenario = @feature.background
+    @id = "background"
+    scenarios += erb(:scenario)
+  end
+  
   @feature.scenarios.each_with_index do |scenario,index|
     @scenario = scenario
     @id = "scenario#{index}"

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

@@ -77,7 +77,11 @@
       <% 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 %>
+            <span class='object_link'>
+           		<a href="<%= url_for(scenario.feature,"scenario#{scenario.feature.scenarios.index(scenario) }") %>">
+           		  <%= h scenario.value %>
+           		</a>
+           	</span>
           <% itags = scenario.tags.collect{|t| tagify(t) }.join(", ") %>
           <% if itags && itags != "" %>
             - <small><%= itags %></small>

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

@@ -25,7 +25,7 @@ def features
 end
 
 def scenarios
-  @scenarios ||= Registry.all(:scenario).reject {|s| s.outline? || s.background? }.sort {|x,y| x.value <=> y.value }
+  @scenarios ||= features.collect {|f| f.scenarios.reject {|s| s.background? } }.flatten.sort {|x,y| x.value <=> y.value }
 end
 
 def tagify(tag)

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

@@ -4,15 +4,19 @@
 .tags { font-family: monospace;	font-size: 14px; }
 .title { padding: 10px; font-size: 24px; }
 
+#view, #expand { float: right; font-size: 13px; color: gray; vertical-align: bottom; }
+
 .feature > .title, .tag > .title, .requirements > .title { margin: 20px 20px 10px 20px;	padding-left: 0px; border-bottom: 1px solid #E3E3E3; }
-.meta .file { float: right; margin-right: 20px; }
-.title .pre {	color: #696969; }
+.meta .file { float: right; margin-top: 5px; margin-right: 20px; }
+.title .pre { color: #696969; }
 .title .name { font-weight: bold; color: #3F3F3F; }
 
 .meta { margin-left: 30px; color: gray; }
 .scenario .meta .tags { margin-left: 0px; }
+.feature .meta .tags { float: right; margin-right: 20px; }
+
 
-.feature .description, .requirements .summary, .scenario .description, #background .description {
+.feature .description, .requirements .summary {
     margin: 10px 20px 0px 30px;
     padding: 10px 20px 20px 10px;
     color: #343332;
@@ -20,13 +24,15 @@
 }
 
 .summary .name, .tags .name { color: gray; }
-.summary .tags {}
 
 .odd { background-color: #F0F6F9; }
 .even { background-color: #FFFFFF; }
+.selected {	background-color: #FFCC80; }
+
 
 #background, #features, #scenarios { margin-top: 10px; margin-left: 20px; }
 
+
 #directory { margin-top: 20px; margin-left: 20px; }
 
 .scenario { margin-top: 40px; margin-left: 20px; }
@@ -44,6 +50,8 @@
 
 #background .title .pre { color: #346F97; }
 .requirements .tags { margin-left: 50px; margin-right: 30px; }
+.scenario .tags { float: right; margin-right: 20px; margin-top: 5px; }
+
 
 * ul.alpha { font-size: 1.1em; }
 * ul.alpha { padding-bottom: 10px; list-style: none; }
@@ -53,7 +61,7 @@
 
 
 .scenario .steps, #background .steps {
-    margin: 20px 20px 0px 30px;
+    margin: 0px 20px 0px 30px;
     font-size: 12px;
 }
 
@@ -67,18 +75,25 @@
 
 
 #background .title .name {}
-#background .description {}
 
 .scenario .title .name {}
-.scenario .description {  }
+
+#background .description, .scenario .description {
+    padding: 10px;
+    color: #444444;
+    margin-right: 20px;
+    margin-left: 20px;
+}
+
+.comments { margin-left: 25px; color: gray; padding: 5px; font-size: 13px; }
+.scenario .steps .comments { margin-left: 0px; }
 
 .scenario .title .pre {	color: #00AAD2; }
-.scenario .tags { margin-left: 30px; margin-top: 10px; }
 
 .step .predicate { color: #5D5C5B; }
 /*.step .undefined { border-bottom: 1px dashed #E99494; }*/
 .step .defined {}
-.step .details { float: right; color: #343332; }
+.step .definition { float: right; color: #343332; }
 .step .details .pre {}
 .step .details .name { font-family: monospace; color: black; }
 .step .defined .match { color: #346F97; }
@@ -101,6 +116,7 @@
     font-size: 16px;
 }
 
+
 .multiline table tr, .outline table tr {
     padding: 4px;
 }
@@ -168,7 +184,6 @@
 }
 
 .valid {
-    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;
@@ -176,7 +191,6 @@
 }
 
 .invalid {
-    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;

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

@@ -12,10 +12,14 @@
 <% n = n == 2 ? 1 : 2 %>
 <% if feature.scenarios %>
 <ul>
-	<% feature.scenarios.each do |scenario| %>
+	<% feature.scenarios.each_with_index do |scenario,index| %>
 	<li class="r<%= n %>">
-		<%= linkify feature, scenario.value %>
-		<small><%= scenario.location %></small>
+	  <span class='object_link'>
+   		<a href="<%= url_for(scenario.feature,"scenario#{index}") %>">
+   		  <%= h scenario.value %>
+   		</a>
+   	</span>
+   	<small><%= scenario.location %></small>
 	</li>
         <% n = n == 2 ? 1 : 2 %>
 	<% end %>

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

@@ -10,27 +10,105 @@ function cucumberSearchFrameLinks() {
 $(cucumberSearchFrameLinks);
 
 
+$(function() {
+
+	//
+    //  Feature Page - Scenarios 
+    //
+	$('.scenario div.title').click(function(eventObject) {
+        if (typeof eventObject.currentTarget !== "undefined")  {
+            toggleScenario( $($(eventObject.currentTarget).parent()) );
+        }
+    });
 
-function toggleScenarioExample(id,example) {
-
-    var element = $("#" + id + "Example" + example + "Steps")[0];
+	//
+	// Developer View
+    // Click + Developer View = toggle the expansion of all tags, location, and comments
+    //
+	$('#view').click(function(eventObject) {
+		
+		if (typeof eventObject.currentTarget !== "undefined")  {
+			var view = eventObject.currentTarget;
+			
+			if (view.innerHTML === '[More Detail]') {
+				$('.developer').show(500);
+				view.innerHTML = '[Less Detail]';
+			} else {
+				$('.developer').hide(500);
+				// Already hidden elements with .developer sub-elements were not getting message
+				$('.developer').each(function() { $(this).css('display','none'); });
+				view.innerHTML = '[More Detail]';
+			}
+		}
+    });
 
-    $('#' + id + ' tr').each(function(index) {
-        this.style.backgroundColor = (index % 2 == 0 ? '#FFFFFF' : '#F0F6F9' );
+	//
+	// Expand/Collapse All
+	// 
+    $('#expand').click(function(eventObject) {
+	    
+		if (typeof eventObject.currentTarget !== "undefined")  {
+            if (eventObject.currentTarget.innerHTML === '[Expand All]') {
+                eventObject.currentTarget.innerHTML = '[Collapse All]';
+                $('div.scenario > div.details:hidden').each(function() {
+					toggleScenario( $($(this).parent()) );
+                });
+            } else {
+                eventObject.currentTarget.innerHTML = '[Expand All]';
+                $('div.scenario > div.details:visible').each(function() {
+					toggleScenario( $($(this).parent()) );
+				});
+            }
+        }
     });
 
-    if (element.style.display != 'none') {
-        element = $("#" + id + "Steps")[0];
-    } else {
-        $('#' + id + ' .outline * tr')[example].style.backgroundColor = '#FFCC80';
-    }
+	// 
+	// Scenario Outlines - Toggle Examples
+	// 
+	$('.outline table tr').click(function(eventObject) {
+		
+		if (typeof eventObject.currentTarget !== "undefined")  {
+			var exampleRow = $(eventObject.currentTarget);
+			var exampleClass = eventObject.currentTarget.className.match(/example\d+/)[0];
+			var example = exampleRow.closest('div.details').find('.' + exampleClass);			
+			
+			var currentExample = null;
+			
+			$('.outline table tr').each(function() { $(this).removeClass('selected'); });
+			
+			if ( example[0].style.display == 'none' ) {
+				currentExample = example[0];
+				exampleRow.addClass('selected');
+			} else {
+				currentExample = exampleRow.closest('div.details').find('.steps')[0];
+			}
+
+			// hide everything 
+			exampleRow.closest('div.details').find('.steps').each(function() { $(this).hide(); });
+			
+			// show the selected
+			$(currentExample).show();
+		}
+	});
 
-    $('#' + id + ' .steps').each(function(index) {
-        this.style.display = 'none';
-    });
 
-    element.style.display = 'block';
+});
+ 
 
+function toggleScenario(scenario) {
+	
+	var state = scenario.find(".attributes input[name='collapsed']")[0];
+	
+	if (state.value === 'true') {
+		scenario.find("div.details").each(function() { $(this).show(500); });
+		state.value = "false";
+		scenario.find('a.toggle').each(function() { this.innerHTML = ' - '; });
+		
+	}  else {
+		scenario.find("div.details").each(function() { $(this).hide(500); });
+		state.value = "true";
+		scenario.find('a.toggle').each(function() { this.innerHTML = ' + '; });
+	}	
 }
 
 
@@ -54,7 +132,9 @@ function determineTagsUsedInFormula(tagString)  {
         tagGroup.forEach(function(tag, index, array) {
             //console.log("Tag Group: " + tag);
             var validTags = removeInvalidTags(tag)
-            if (validTags != "") { returnTags.push(validTags); }
+            if (validTags != "") {
+                returnTags.push(validTags);
+            }
         });
     }
 
@@ -84,27 +164,27 @@ function displayExampleCommandLine(tags) {
 
 function hideEmptySections() {
 	
-	["feature","scenario"].forEach(function(section,index,sections) {
+    ["feature","scenario"].forEach(function(section,index,sections) {
 	
-		if ( $("." + section + ":visible").length == 0 ) {
-			$("#" + section + "s")[0].style.display = "none";
-		} else {
-			$("#" + section + "s")[0].style.display = "block";
-		}
+        if ( $("." + section + ":visible").length == 0 ) {
+            $("#" + section + "s")[0].style.display = "none";
+        } else {
+            $("#" + section + "s")[0].style.display = "block";
+        }
 		
-	});
+    });
 }
 
 function fixSectionRowAlternations() {
 
-	["feature","scenario"].forEach(function(section,index,sections) {
+    ["feature","scenario"].forEach(function(section,index,sections) {
 	
-		$("." + section + ":visible")
-		$("." + section + ":visible").each(function(index) {
-			$(this).removeClass("r1 r2").addClass("r" + ((index % 2) + 1));
-		});
+        $("." + section + ":visible")
+        $("." + section + ":visible").each(function(index) {
+            $(this).removeClass("r1 r2").addClass("r" + ((index % 2) + 1));
+        });
 		
-	});
+    });
 }
 
 function displayQualifyingFeaturesAndScenarios(tags) {

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

@@ -33,7 +33,7 @@
 			<span class="defined">
 			<%= link_transformed_step(step) %>
 			</span>
-			<div class="details"><a href="<%= url_for step.scenario.feature %>"><%= h(step.location) %></a></div>
+			<div class="definition"><a href="<%= url_for step.scenario.feature %>"><%= h(step.location) %></a></div>
 		</div>
 		<% end %>
 		<% else %>

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

@@ -7,7 +7,7 @@
       <span class="undefined">
         <%= h step.value %>
       </span>
-      <div class="details">
+      <div class="definition">
         <a href="<%= url_for step.scenario.feature %>"><%= h(step.location) %></a>
       </div>
     </div>

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

@@ -15,7 +15,11 @@
           <ul>
             <% objects.each do |obj| %>
               <li>
-                <%= linkify obj.feature, obj.value %>
+                <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 %>

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

@@ -3,12 +3,12 @@
 module YARD::CodeObjects::Cucumber
 
   class Scenario < NamespaceObject
-    
+        
     attr_accessor :value, :comments, :keyword, :description, :steps, :tags, :feature
     
     def initialize(namespace,name)
       super(namespace,name.to_s.strip)
-      @commants = @description = @keyword = @value = @feature = nil
+      @comments = @description = @keyword = @value = @feature = nil
       @steps = []
       @tags = []
     end

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

@@ -4,7 +4,7 @@ module YARD::CodeObjects::Cucumber
 
   class ScenarioOutline < NamespaceObject
 
-    attr_accessor :value, :comments, :description, :steps, :tags, :feature
+    attr_accessor :value, :comments, :keyword, :description, :steps, :tags, :feature
     attr_accessor :scenarios, :examples
 
     def initialize(namespace,name)

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

@@ -4,11 +4,11 @@ module YARD::CodeObjects::Cucumber
 
   class Step < Base
     
-    attr_accessor :definition, :examples, :keyword, :scenario, :table, :text, :transforms, :value
+    attr_accessor :comments, :definition, :examples, :keyword, :scenario, :table, :text, :transforms, :value
     
     def initialize(namespace,name)
       super(namespace,name.to_s.strip)
-      @definition = @description = @keyword = @table = @text = @value = nil
+      @comments = @definition = @description = @keyword = @table = @text = @value = nil
       @examples = {}
       @transforms = []
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber-in-the-yard
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 1
   - 7
-  - 0
-  version: 1.7.0
+  - 1
+  version: 1.7.1
 platform: ruby
 authors: 
 - Franklin Webber
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-18 00:00:00 -08:00
+date: 2010-11-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,7 +98,6 @@ files:
 - 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
 - lib/templates/default/feature/html/outline.erb
@@ -164,11 +163,14 @@ post_install_message: |+
   
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)
   
-    Thank you for installing Cucumber-In-The-YARD 1.7.0 / 2010-11-18.
+    Thank you for installing Cucumber-In-The-YARD 1.7.1 / 2010-11-28.
     
     Changes:
       
-    * Dynamic Tag Union / Intersection
+    * Feature file with layout enhancements
+    * Scenarios are now linked/linkable
+    * FIX Scenario Outline error on CentOS, Ruby 1.8.7
+    * FIX Requiring Cucumber before Gherkin so that correct gherkin is loaded
     
   
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)

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

@@ -1,92 +0,0 @@
-
-<script type="text/javascript" charset="utf-8">
-$(function() {
-	$('#background .toggle').click(function() {
-		$("#backgroundSteps").toggle('blind');
-
-		var stateIndicator = $('#background a.toggle')[0]
-
-		stateIndicator.innerHTML = (stateIndicator.innerHTML === '+' ? '-' : '+'); 
-		return false;
-	});
-});
-</script>
-
-<div id="background">
-	<div class="title">
-		<a class="toggle">-</a>
-		<span class="pre">Background</span>
-	</div>
-	<% unless @feature.background.description.empty? %>
-	<div class="description">
-		<%= h(@feature.background.description) %>
-	</div>
-	<% end %>
-
-	<!-- Background and scenario should have the same display with some minor changes -->
-
-	<div id="backgroundSteps" class="steps">
-		<% if @feature.background.steps %>
-		<%  @feature.background.steps.each_with_index do |step,index| %>
-		<div <%= "id='backgroundStep#{index}'" %> class="step <%= (index + 1) % 2 == 0 ? 'even' : 'odd' %>">
-			<span class="predicate"><%= step.keyword %></span>
-
-			<% if step.definition %>
-			<script type="text/javascript" charset="utf-8">
-			$('<%= "#backgroundStep#{index}" %>').hover(
-				function () { $('<%= "#backgroundStep#{index} div.details" %>').toggle('slide'); },
-				function () { $('<%= "#backgroundStep#{index} div.details" %>').toggle('slide'); }
-			);
-
-			$('<%= "#backgroundStep#{index} div.details" %>').show();
-
-			</script>
-			<span class="defined">
-				<a href="steptransformers.html#<%= step.definition.name %>"><%= h(step.value) %></a>
-				<div class="details" style="display: none;">
-					(<%= h( step.definition.location ) %>)
-				</div>
-			</span>
-			<% else %>
-			<span class="undefined"><%= h(step.value) %></span>
-			<% end %>
-
-		</div>
-
-		<% if step.has_table? %>
-		<div class="multiline">
-			<table style="">
-
-				<thead>
-					<tr>
-						<% step.table.first.each_with_index do |column,column_index| %>
-						<th class="<%= (column_index + 1) % 2 == 0 ? 'even' : 'odd' %>"><%= h(column.strip) %></th>
-						<% end %>
-					</tr>
-				</thead>
-
-				<% step.table[1..-1].each_with_index do |row,row_index| %>
-				<tr class="<%= (row_index + 1) % 2 == 0 ? 'even' : 'odd' %>">
-					<% row.each_with_index do |column,column_index| %>
-					<td><%= h(column.strip) %></td>
-					<% end %>
-				</tr>
-				<% end %>
-			</table>
-		</div>
-		<% end %>
-		
-		<% if step.has_text? %>
-		<div class="text">
-			<%= h(step.text) %>
-		</div>
-		<% end %>
-
-
-		<% end %>
-		<% else %>
-		<span>No Steps Defined</span>
-		<% end %>
-	</div>
-
-</div>