cucumber-in-the-yard 1.2 → 1.3

data/History.txt

@@ -1,3 +1,15 @@
+=== 1.3 / 2010-10-13
+
+* (7rans requested) Step definitions to show their source code; required a better source definition to be stored during creation of the CodeObject
+* Fixes to the Feature template which had some unclosed table header elements
+* Scenario Outline helper methods added to Scenarios
+* Scenario Outlines, Tables, and Multiline Strings had other minor CSS changes
+* Step tables and Scenario Example tables are no longer locked to 150px; instead that is the minimum width
+* Tables and Multiline Strings (PyStrings) are no longer displayed in the steps frame which was causing ugliness with the striping of the rows
+* (lsegal strongly recommended) Removed the pervasive use of filename in the CodeObjects
+* Cleaned up the fulldoc setup to remove the redundancy
+* Updated all the templates to support the lack of filename
+
 === 1.2 / 2010-10-10
 
 * FIX: Empty Step Definitions caused failure during serialization

data/Manifest

@@ -1,13 +1,15 @@
 History.txt
+Manifest
 README.md
 Rakefile
+example/empty.feature
 example/example.feature
 example/example.step.rb
 example/example.third.feature
 example/second_example.feature
 lib/city.rb
 lib/cucumber/city_builder.rb
-lib/yard/code_objects/cucumber_location_helper.rb
+lib/yard/code_objects/base.rb
 lib/yard/code_objects/feature.rb
 lib/yard/code_objects/scenario.rb
 lib/yard/code_objects/step.rb
@@ -16,8 +18,8 @@ lib/yard/extensions.rb
 lib/yard/handlers/base.rb
 lib/yard/handlers/feature_handler.rb
 lib/yard/parser/feature.rb
-lib/yard/rb_extensions.rb
 lib/yard/rake/city_task.rb
+lib/yard/rb_extensions.rb
 lib/yard/templates/default/feature/html/feature.erb
 lib/yard/templates/default/feature/setup.rb
 lib/yard/templates/default/fulldoc/html/css/common.css
@@ -48,4 +50,3 @@ spec/city/yard_namespace_object_spec.rb
 spec/city/yard_parser_cucumber_spec.rb
 spec/city/yard_rb_extensions_spec.rb
 spec/spec_helper.rb
-Manifest

data/Rakefile

@@ -7,7 +7,7 @@ task :gendoc do
   `yardoc -e lib/city.rb -p lib/yard/templates 'example/**/*.rb' 'example/**/*.feature' --debug`
 end
 
-Echoe.new('cucumber-in-the-yard', '1.2') do |g|
+Echoe.new('cucumber-in-the-yard', '1.3') do |g|
   g.author = "Frank;lin Webber"
   g.email = "franklin.webber@gmail.com"
   g.url = "http://github.com/burtlo/Cucumber-In-The-Yard"

data/cucumber-in-the-yard.gemspec

@@ -2,19 +2,19 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cucumber-in-the-yard}
-  s.version = "1.2"
+  s.version = "1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Frank;lin Webber"]
-  s.date = %q{2010-10-10}
+  s.date = %q{2010-10-13}
   s.description = %q{ 
     Cucumber-In-The-Yard is a YARD extension that processes Cucumber Features, Scenarios, Steps,
     Step Definitions, Transforms, and Tags and provides a documentation interface that allows you
     easily view and investigate the test suite.  This tools hopes to bridge the gap of being able
     to provide your feature descriptions to your Product Owners and Stakeholders.  }
   s.email = %q{franklin.webber@gmail.com}
-  s.extra_rdoc_files = ["README.md", "lib/city.rb", "lib/cucumber/city_builder.rb", "lib/yard/code_objects/cucumber_location_helper.rb", "lib/yard/code_objects/feature.rb", "lib/yard/code_objects/scenario.rb", "lib/yard/code_objects/step.rb", "lib/yard/code_objects/tags.rb", "lib/yard/extensions.rb", "lib/yard/handlers/base.rb", "lib/yard/handlers/feature_handler.rb", "lib/yard/parser/feature.rb", "lib/yard/rb_extensions.rb", "lib/yard/rake/city_task.rb", "lib/yard/templates/default/feature/html/feature.erb", "lib/yard/templates/default/feature/setup.rb", "lib/yard/templates/default/fulldoc/html/css/common.css", "lib/yard/templates/default/fulldoc/html/full_list.erb", "lib/yard/templates/default/fulldoc/html/full_list_features.erb", "lib/yard/templates/default/fulldoc/html/full_list_scenarios.erb", "lib/yard/templates/default/fulldoc/html/full_list_stepdefinitions.erb", "lib/yard/templates/default/fulldoc/html/full_list_steps.erb", "lib/yard/templates/default/fulldoc/html/full_list_tagusages.erb", "lib/yard/templates/default/fulldoc/html/index.erb", "lib/yard/templates/default/fulldoc/html/js/cucumber.js", "lib/yard/templates/default/fulldoc/html/setup.rb", "lib/yard/templates/default/layout/html/headers.erb", "lib/yard/templates/default/layout/html/search.erb", "lib/yard/templates/default/module/html/step_transforms.erb", "lib/yard/templates/default/module/setup.rb", "lib/yard/templates/default/scenario/html/scenario.erb", "lib/yard/templates/default/scenario/setup.rb", "lib/yard/templates/default/steptransformers/html/stepdefinition.erb", "lib/yard/templates/default/steptransformers/setup.rb", "lib/yard/templates/default/tagusage/html/tagusage.erb", "lib/yard/templates/default/tagusage/setup.rb"]
-  s.files = ["History.txt", "README.md", "Rakefile", "example/example.feature", "example/example.step.rb", "example/example.third.feature", "example/second_example.feature", "lib/city.rb", "lib/cucumber/city_builder.rb", "lib/yard/code_objects/cucumber_location_helper.rb", "lib/yard/code_objects/feature.rb", "lib/yard/code_objects/scenario.rb", "lib/yard/code_objects/step.rb", "lib/yard/code_objects/tags.rb", "lib/yard/extensions.rb", "lib/yard/handlers/base.rb", "lib/yard/handlers/feature_handler.rb", "lib/yard/parser/feature.rb", "lib/yard/rb_extensions.rb", "lib/yard/rake/city_task.rb", "lib/yard/templates/default/feature/html/feature.erb", "lib/yard/templates/default/feature/setup.rb", "lib/yard/templates/default/fulldoc/html/css/common.css", "lib/yard/templates/default/fulldoc/html/full_list.erb", "lib/yard/templates/default/fulldoc/html/full_list_features.erb", "lib/yard/templates/default/fulldoc/html/full_list_scenarios.erb", "lib/yard/templates/default/fulldoc/html/full_list_stepdefinitions.erb", "lib/yard/templates/default/fulldoc/html/full_list_steps.erb", "lib/yard/templates/default/fulldoc/html/full_list_tagusages.erb", "lib/yard/templates/default/fulldoc/html/index.erb", "lib/yard/templates/default/fulldoc/html/js/cucumber.js", "lib/yard/templates/default/fulldoc/html/setup.rb", "lib/yard/templates/default/layout/html/headers.erb", "lib/yard/templates/default/layout/html/search.erb", "lib/yard/templates/default/module/html/step_transforms.erb", "lib/yard/templates/default/module/setup.rb", "lib/yard/templates/default/scenario/html/scenario.erb", "lib/yard/templates/default/scenario/setup.rb", "lib/yard/templates/default/steptransformers/html/stepdefinition.erb", "lib/yard/templates/default/steptransformers/setup.rb", "lib/yard/templates/default/tagusage/html/tagusage.erb", "lib/yard/templates/default/tagusage/setup.rb", "spec/city/feature_parser_spec_examples.rb", "spec/city/gherkin_loader_spec.rb", "spec/city/test.feature", "spec/city/yard_handlers_cucumber_spec.rb", "spec/city/yard_namespace_object_spec.rb", "spec/city/yard_parser_cucumber_spec.rb", "spec/city/yard_rb_extensions_spec.rb", "spec/spec_helper.rb", "Manifest", "cucumber-in-the-yard.gemspec"]
+  s.extra_rdoc_files = ["README.md", "lib/city.rb", "lib/cucumber/city_builder.rb", "lib/yard/code_objects/base.rb", "lib/yard/code_objects/feature.rb", "lib/yard/code_objects/scenario.rb", "lib/yard/code_objects/step.rb", "lib/yard/code_objects/tags.rb", "lib/yard/extensions.rb", "lib/yard/handlers/base.rb", "lib/yard/handlers/feature_handler.rb", "lib/yard/parser/feature.rb", "lib/yard/rake/city_task.rb", "lib/yard/rb_extensions.rb", "lib/yard/templates/default/feature/html/feature.erb", "lib/yard/templates/default/feature/setup.rb", "lib/yard/templates/default/fulldoc/html/css/common.css", "lib/yard/templates/default/fulldoc/html/full_list.erb", "lib/yard/templates/default/fulldoc/html/full_list_features.erb", "lib/yard/templates/default/fulldoc/html/full_list_scenarios.erb", "lib/yard/templates/default/fulldoc/html/full_list_stepdefinitions.erb", "lib/yard/templates/default/fulldoc/html/full_list_steps.erb", "lib/yard/templates/default/fulldoc/html/full_list_tagusages.erb", "lib/yard/templates/default/fulldoc/html/index.erb", "lib/yard/templates/default/fulldoc/html/js/cucumber.js", "lib/yard/templates/default/fulldoc/html/setup.rb", "lib/yard/templates/default/layout/html/headers.erb", "lib/yard/templates/default/layout/html/search.erb", "lib/yard/templates/default/module/html/step_transforms.erb", "lib/yard/templates/default/module/setup.rb", "lib/yard/templates/default/scenario/html/scenario.erb", "lib/yard/templates/default/scenario/setup.rb", "lib/yard/templates/default/steptransformers/html/stepdefinition.erb", "lib/yard/templates/default/steptransformers/setup.rb", "lib/yard/templates/default/tagusage/html/tagusage.erb", "lib/yard/templates/default/tagusage/setup.rb"]
+  s.files = ["History.txt", "Manifest", "README.md", "Rakefile", "example/empty.feature", "example/example.feature", "example/example.step.rb", "example/example.third.feature", "example/second_example.feature", "lib/city.rb", "lib/cucumber/city_builder.rb", "lib/yard/code_objects/base.rb", "lib/yard/code_objects/feature.rb", "lib/yard/code_objects/scenario.rb", "lib/yard/code_objects/step.rb", "lib/yard/code_objects/tags.rb", "lib/yard/extensions.rb", "lib/yard/handlers/base.rb", "lib/yard/handlers/feature_handler.rb", "lib/yard/parser/feature.rb", "lib/yard/rake/city_task.rb", "lib/yard/rb_extensions.rb", "lib/yard/templates/default/feature/html/feature.erb", "lib/yard/templates/default/feature/setup.rb", "lib/yard/templates/default/fulldoc/html/css/common.css", "lib/yard/templates/default/fulldoc/html/full_list.erb", "lib/yard/templates/default/fulldoc/html/full_list_features.erb", "lib/yard/templates/default/fulldoc/html/full_list_scenarios.erb", "lib/yard/templates/default/fulldoc/html/full_list_stepdefinitions.erb", "lib/yard/templates/default/fulldoc/html/full_list_steps.erb", "lib/yard/templates/default/fulldoc/html/full_list_tagusages.erb", "lib/yard/templates/default/fulldoc/html/index.erb", "lib/yard/templates/default/fulldoc/html/js/cucumber.js", "lib/yard/templates/default/fulldoc/html/setup.rb", "lib/yard/templates/default/layout/html/headers.erb", "lib/yard/templates/default/layout/html/search.erb", "lib/yard/templates/default/module/html/step_transforms.erb", "lib/yard/templates/default/module/setup.rb", "lib/yard/templates/default/scenario/html/scenario.erb", "lib/yard/templates/default/scenario/setup.rb", "lib/yard/templates/default/steptransformers/html/stepdefinition.erb", "lib/yard/templates/default/steptransformers/setup.rb", "lib/yard/templates/default/tagusage/html/tagusage.erb", "lib/yard/templates/default/tagusage/setup.rb", "spec/city/feature_parser_spec_examples.rb", "spec/city/gherkin_loader_spec.rb", "spec/city/test.feature", "spec/city/yard_handlers_cucumber_spec.rb", "spec/city/yard_namespace_object_spec.rb", "spec/city/yard_parser_cucumber_spec.rb", "spec/city/yard_rb_extensions_spec.rb", "spec/spec_helper.rb", "cucumber-in-the-yard.gemspec"]
   s.homepage = %q{http://github.com/burtlo/Cucumber-In-The-Yard}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cucumber-in-the-yard", "--main", "README.md"]
   s.require_paths = ["lib"]

data/example/empty.feature

@@ -0,0 +1,2 @@
+# This is a feature that has not been written
+# However, I don't want parser to fail when reaching this file

data/example/example.step.rb

@@ -20,7 +20,7 @@ When /^a customer logs in as username '([^']+)' with password '([^']+)'$/ do |us
   pending "Customer logs in with #{username} and #{password}"
 end
 
-Then /^I expect them to have logged in successfully $/ do 
+Then /^I expect them to have logged in successfully$/ do 
   pending "Validation that the customer has logged in successfully"  
 end
 
@@ -36,6 +36,10 @@ And /^this third defined step definition$/ do
   pending
 end
 
+And /^the customer has the following details:$/ do |table|
+  pending "Table of data #{table.hashes}"
+end
+
 And /^edits their the biography to state:$/ do |bio|
   pending "text_field not present for bio #{bio} for this release"
 end

data/example/example.third.feature

@@ -4,6 +4,9 @@ Feature: Customer Account
 
   Background:
     Given this third defined step definition
+	And the customer has the following details:
+      | Name  | Email       | Age |
+      | Roger | r@email.com | 22  |
 
   @bvt
   Scenario: Customer is able to change their password

data/example/second_example.feature

@@ -17,7 +17,10 @@ Feature: Customer Logout Feature
     Given that a customer is a valid customer
     And the customer has the following details:
       | Name  | Email       | Age |
-      | Frank | f@email.com | 22  | 
+      | Roger | r@email.com | 22  |
+	And the customer has the following details:
+      | Name  | Email       | Age |
+      | Roger | r@email.com | 22  |
     When a customer logs in as username 'frank' with password 'default'
 	And visits the customer update page
 	Then I expect the customer is able able to post to their profile

data/lib/city.rb

@@ -7,7 +7,7 @@ require File.dirname(__FILE__) + "/cucumber/city_builder.rb"
 
 require 'yard'
 
-require File.dirname(__FILE__) + "/yard/code_objects/cucumber_location_helper.rb"
+require File.dirname(__FILE__) + "/yard/code_objects/base.rb"
 require File.dirname(__FILE__) + "/yard/code_objects/feature.rb"
 require File.dirname(__FILE__) + "/yard/code_objects/scenario.rb"
 require File.dirname(__FILE__) + "/yard/code_objects/step.rb"

data/lib/cucumber/city_builder.rb

@@ -14,7 +14,7 @@ module Cucumber
 
       def feature(feature)
         #log.debug  "FEATURE: #{feature.name} #{feature.line} #{feature.keyword} #{feature.description}"
-        @feature = YARD::CodeObjects::Cucumber::Feature.new(:root,@file.gsub('.','_')) do |f|
+        @feature = YARD::CodeObjects::Cucumber::Feature.new(:root,@file.gsub(/\/|\./,'_')) do |f|
           f.comments = feature.comments.map{|comment| comment.value}.join("\n")
           f.description = feature.description
           f.add_file(@file,feature.line)

data/lib/yard/code_objects/base.rb

@@ -0,0 +1,38 @@
+
+module YARD::CodeObjects::Cucumber
+
+  module LocationHelper
+
+    def line_number
+      files.first.last
+    end
+
+    def file
+      files.first.first if files && !files.empty?
+    end
+
+    def location
+      "#{file}:#{line_number}"
+    end
+
+  end
+
+  class Base < YARD::CodeObjects::Base
+    include LocationHelper
+    
+    # def sep ; '/' ; end
+    
+    # def path
+    #       if parent && !parent.root?
+    #         [ "Cucumber$", name.to_s ].join(sep)
+    #       else
+    #         name.to_s
+    #       end
+    #     end
+
+  end
+
+  
+  
+end
+

data/lib/yard/code_objects/feature.rb

@@ -2,9 +2,8 @@
 
 module YARD::CodeObjects::Cucumber
 
-  class Feature < YARD::CodeObjects::Base
-    include CucumberLocationHelper
-
+  class Feature < Base
+    
     attr_accessor :background, :comments, :description, :keyword, :scenarios, :tags, :value
 
     def initialize(namespace,name)
@@ -14,11 +13,6 @@ module YARD::CodeObjects::Cucumber
       @tags = []
     end
 
-    #TODO: this is likely a bad hack because I couldn't understand path
-    def filename
-      "#{self.name.to_s.gsub(/\//,'_')}.html"
-    end
-
   end
 
 end

data/lib/yard/code_objects/scenario.rb

@@ -2,9 +2,8 @@
 
 module YARD::CodeObjects::Cucumber
 
-  class Scenario < YARD::CodeObjects::Base
-    include CucumberLocationHelper
-
+  class Scenario < Base
+    
     attr_accessor :value, :description, :steps, :tags, :feature, :examples
     
     def initialize(namespace,name)
@@ -14,12 +13,27 @@ module YARD::CodeObjects::Cucumber
       @tags = []
       @examples = []
     end
-
-    #TODO: this is likely a bad hack because I couldn't understand path
-    def filename
-      "#{self.name.to_s.gsub(/\//,'_')}.html"
+    
+    def background?
+      @keyword == "Background"
     end
-
+    
+    def outline?
+      @examples && !examples.empty?
+    end
+    
+    def example_keyword
+      @examples.first.first.to_s.strip
+    end
+    
+    def example_headers
+      @examples.first.find {|example| example.is_a?(Array) }.first
+    end
+    
+    def example_data
+      @examples.first.find {|example| example.is_a?(Array) }[1..-1]
+    end
+    
   end
 
 end

data/lib/yard/code_objects/step.rb

@@ -2,9 +2,8 @@
 
 module YARD::CodeObjects::Cucumber
 
-  class Step < YARD::CodeObjects::Base
-    include CucumberLocationHelper
-
+  class Step < Base
+    
     attr_accessor :definition, :keyword, :scenario, :table, :text, :value
     
     def initialize(namespace,name)

data/lib/yard/code_objects/tags.rb

@@ -2,27 +2,19 @@
 
 module YARD::CodeObjects::Cucumber
 
-  class Tag < YARD::CodeObjects::Base
-    include CucumberLocationHelper
+  class Tag < Base
 
     attr_accessor :value, :feature, :scenario
-
-    def filename
-      "#{self.name.to_s.gsub(/\//,'_')}.html"
-    end
-
+    
   end
 
   
-  class TagUsage < YARD::CodeObjects::Base
+  class TagUsage < Base
 
     attr_reader :value
 
     attr_accessor :tags
 
-    def filename
-      "#{self.name}.html"
-    end
 
     def push(tag)
       @tags = [] unless @tags

data/lib/yard/handlers/feature_handler.rb

@@ -11,7 +11,7 @@ module YARD
           if statement
             # For the background and the scenario, find the steps that have definitions
             process_scenario(statement.background) if statement.background
-          
+            
             statement.scenarios.each do |scenario|
               process_scenario(scenario)
             end
@@ -24,6 +24,7 @@ module YARD
         
         
         def process_scenario(scenario)
+
           scenario.steps.each do |step|
             owner.step_definitions.each do |stepdef|
               

data/lib/yard/rb_extensions.rb

@@ -6,6 +6,7 @@ module YARD::CodeObjects
   # StepDefinitions, as implemented in a ruby file
   #
   class StepDefinitionObject < Base
+    include Cucumber::LocationHelper
     
     attr_reader :keyword, :value, :compare_value, :source 
     attr_accessor :constants, :steps
@@ -54,9 +55,6 @@ module YARD::CodeObjects
     
     alias_method :<< , :push
     
-    def filename
-      "#{name}.html"
-    end
     
   end
   
@@ -65,6 +63,8 @@ module YARD::CodeObjects
   # Transforms
   #
   class StepTransformObject < Base
+    include Cucumber::LocationHelper
+    
     attr_reader :value
 
     def value=(value)
@@ -90,7 +90,11 @@ class StepDefinitionHandler < YARD::Handlers::Ruby::Legacy::Base
     step_definition = statement.tokens.to_s[MATCH,3]
     @@unique_name = @@unique_name + 1
 
-    stepdef_instance = StepDefinitionObject.new(namespace, "StepDefinition_#{@@unique_name}") {|o| o.source = statement.block.to_s ; o.value = step_definition ; o.keyword = keyword}
+    stepdef_instance = StepDefinitionObject.new(namespace, "StepDefinition_#{@@unique_name}") do |o| 
+      o.source = "#{keyword} #{step_definition} do #{statement.block.to_s =~ /^\s*\|.+/ ? '' : "\n  "}#{statement.block.to_s}\nend"
+      o.value = step_definition
+      o.keyword = keyword
+    end
 
     begin
       # Look for all constants within the step definitions

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

@@ -64,180 +64,182 @@
 				<span class="defined">
 					<a href="steptransformers.html#<%= step.definition.name %>"><%= h(step.value) %></a>
 					<div class="details" style="display: none;">
-						(<%= h("#{step.definition.files.first.first}:#{step.definition.files.first.last}") %>)
+						(<%= h( step.definition.location ) %>)
 					</div>
 				</span>
 				<% else %>
 				<span class="undefined"><%= h(step.value) %></span>
 				<% end %>
 
-				<% if step.has_text? %>
-				<div class="text">
-					<%= h(step.text) %>
-				</div>
-				<% 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) %></td>
-									<% end %>
-								</tr>
-							</thead>
-
-							<% step.table[1..-1].each do |row| %>
-							<tr>
-								<% row.each_with_index do |column,column_index| %>
-								<td class="<%= (column_index + 1) % 2 == 0 ? 'even' : 'odd' %>"><%= h(column.strip) %></td>
-								<% end %>
-							</tr>
+			<% 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 %>
-						</table>
-					</div>
+						</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 %>
-
-				</div>
-
-				<% end %>
-				<% else %>
-				<span>No Steps Defined</span>
-				<% 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>
-		<% end %> 
 
-		<% if @feature.scenarios %>
-		<% @feature.scenarios.each_with_index do |scenario,scenario_index| %>
+	</div>
+	<% end %> 
 
-		<script type="text/javascript" charset="utf-8">
-		$(function() {
-			$('#scenario<%=scenario_index%> .toggle').click(function() {
-				$("#scenario<%=scenario_index%>Steps").toggle('blind');
+	<% if @feature.scenarios %>
+	<% @feature.scenarios.each_with_index do |scenario,scenario_index| %>
+
+	<script type="text/javascript" charset="utf-8">
+	$(function() {
+		$('#scenario<%=scenario_index%> .toggle').click(function() {
+			$("#scenario<%=scenario_index%>Steps").toggle('blind');
 
-				var stateIndicator = $('#scenario<%=scenario_index%> a.toggle')[0]
+			var stateIndicator = $('#scenario<%=scenario_index%> a.toggle')[0]
 
-				stateIndicator.innerHTML = (stateIndicator.innerHTML === '+' ? '-' : '+'); 
-				return false;
-			});
+			stateIndicator.innerHTML = (stateIndicator.innerHTML === '+' ? '-' : '+'); 
+			return false;
 		});
-		</script>
+	});
+	</script>
 
-		<div <%= "id='scenario#{scenario_index}'" %>  class="scenario">
-			<div class="title">
-				<a class="toggle">-</a>
-				<span class="pre">Scenario<%= !scenario.examples.empty? ? " Outline" : "" %>:</span>
-				<span class="name"><%= h(scenario.value) %></span>
-			</div>
-			<div class="meta">
-				<div class="file">Line: <%= scenario.files.first.last %></div>
-				<% unless scenario.tags.empty? %>
-				<div class="tags">
-					<% scenario.tags.each do |tag| %>
-					<a href="tag_<%= tag.value %>.html"><%= tag.value %></a>
-					<% end %>
-				</div>
-				<% end%>
-			</div>
-			<% unless scenario.description.empty? %>
-			<div class="description">
-				<%= h(scenario.description) %>
+	<div <%= "id='scenario#{scenario_index}'" %>  class="scenario">
+		<div class="title">
+			<a class="toggle">-</a>
+			<span class="pre">Scenario<%= !scenario.examples.empty? ? " Outline" : "" %>:</span>
+			<span class="name"><%= h(scenario.value) %></span>
+		</div>
+		<div class="meta">
+			<div class="file">Line: <%= scenario.files.first.last %></div>
+			<% unless scenario.tags.empty? %>
+			<div class="tags">
+				<% scenario.tags.each do |tag| %>
+				<a href="tag_<%= tag.value %>.html"><%= tag.value %></a>
+				<% end %>
 			</div>
-			<% end %>
+			<% end%>
+		</div>
+		<% unless scenario.description.empty? %>
+		<div class="description">
+			<%= h(scenario.description) %>
+		</div>
+		<% end %>
 
-			<div <%= "id='scenario#{scenario_index}Steps'" %> class="steps">
-				<% if scenario.steps %>
-				<% scenario.steps.each_with_index do |step,index| %>
-				<div <%= "id='scenario#{scenario_index}Step#{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">
-					$('<%= "#scenario#{scenario_index}Step#{index}" %>').hover(
-						function () { $('<%= "#scenario#{scenario_index}Step#{index} div.details" %>').toggle('slide'); },
-						function () { $('<%= "#scenario#{scenario_index}Step#{index} div.details" %>').toggle('slide'); }
-					);
-
-					$('<%= "#scenario#{scenario_index}Step#{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.files.first.first}:#{step.definition.files.first.last}") %>)
-						</div>
-					</span>
-					<% else %>
-					<span class="undefined"><%= h(step.value) %></span>
-					<% end %>
-					
-					<% if step.has_text? %>
-					<div class="text">
-						<%= h(step.text) %>
+		<div <%= "id='scenario#{scenario_index}Steps'" %> class="steps">
+			<% if scenario.steps %>
+			<% scenario.steps.each_with_index do |step,index| %>
+			<div <%= "id='scenario#{scenario_index}Step#{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">
+				$('<%= "#scenario#{scenario_index}Step#{index}" %>').hover(
+					function () { $('<%= "#scenario#{scenario_index}Step#{index} div.details" %>').toggle('slide'); },
+					function () { $('<%= "#scenario#{scenario_index}Step#{index} div.details" %>').toggle('slide'); }
+				);
+
+				$('<%= "#scenario#{scenario_index}Step#{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.files.first.first}:#{step.definition.files.first.last}") %>)
 					</div>
-					<% end %>
+				</span>
+				<% else %>
+				<span class="undefined"><%= h(step.value) %></span>
+				<% end %>
 
-					<% 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) %></td>
-										<% end %>
-									</tr>
-								</thead>
-
-								<% step.table[1..-1].each do |row| %>
-								<tr>
-									<% row.each_with_index do |column,column_index| %>
-									<td class="<%= (column_index + 1) % 2 == 0 ? 'even' : 'odd' %>"><%= h(column.strip) %></td>
-									<% end %>
-								</tr>
-								<% end %>
-							</table>
-						</div>
+			</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 %>
+			
 
 
-					</div>
+			<% end %>
+			<% else %>
+			<span>No Steps Defined</span>
+			<% end %>
+		</div>
 
-					<% end %>
-					<% else %>
-					<span>No Steps Defined</span>
-					<% end %>
-				</div>
-
-				<% if scenario.examples && !scenario.examples.empty? %>
-				<div class="outline">
-					<table>
-						<thead>
-							<tr>
-								<th class="odd" colspan="10"><%= h(scenario.examples.first.first.to_s.strip) %></td>
-							</tr>
-						</thead>
-						<% scenario.examples.first.find {|example| example.is_a?(Array) }.each_with_index do |row,row_index| %>
-					    	<tr>
-								<% row.each do |column| %>
-									<td class="<%= (row_index + 1) % 2 == 0 ? 'even' : 'odd' %>"><%= h(column.to_s.strip) %></td>
-								<% end %>
-							</tr>
+		<% if scenario.outline? %>
+		<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>
 						<% end %>
-						</table>
-					</div>
-
+					</tr>
+				</thead>
+				<% scenario.example_data.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.to_s.strip) %></td>
 					<% end %>
-
-				</div>
-				<% end %>
+				</tr>
 				<% end %>
+			</table>
+		</div>
+		<% end %>
 
-			</div>
+	</div>
+	<% end %>
+	<% end %>
+
+</div>
 

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

@@ -90,7 +90,7 @@
 
 .scenario .step, #background .step {
 	margin-top: 4px;
-        padding: 4px;
+	padding: 4px;
 	font-size: 14px;
 	font-weight: bold;
 }
@@ -135,8 +135,9 @@
 
 .text {
 	padding: 20px;
-	background-color: #F5F5F5;
-	color: #343332;
+	background-color: #F8F8FF;
+	color: #444444;
+	border: 1px solid #DEDEDE;
 }
 
 
@@ -144,6 +145,12 @@
 	margin-top: 20px;
 	margin-left: 40px;
 }
+.outline .keyword {
+	padding: 4px;
+	font-weight: bold;
+	font-size: 16px;
+}
+
 .multiline table tr, .outline table tr {
 	padding: 4px;
 }
@@ -153,8 +160,8 @@
 	background-color: #A8C0A8;
 }
 .multiline table tr td, .outline table tr td {
-	width: 150px;
-	padding: 4px;
+	min-width: 100px;
+	padding: 4px 10px 4px 10px;
 }
 
 
@@ -174,7 +181,7 @@
 	border-bottom: 1px solid #E3E3E3;
 }
 
-.stepdef .steps {
+.stepdef .steps, .stepdef .source {
 	margin: 10px 0px 0px 30px;
 }
 .stepdef .steps .step {

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

@@ -1,8 +1,8 @@
 <% n = 1 %>
-<% @features.each do |feature| %>
+<% @items.each do |feature| %>
   <li class="r<%= n %>">
 	<span class='object_link'>
-		<a href="<%= feature.filename %>"><%= h(feature.value) %></a>
+		<a href="<%= "#{feature.name}.html" %>"><%= h(feature.value) %></a>
 	</span>
 	<span class="">(<%= h(feature.file) %>)<span>
   </li>

data/lib/yard/templates/default/fulldoc/html/full_list_scenarios.erb

@@ -1,8 +1,8 @@
 <% n = 1 %>
-<% @scenarios.each do |scenario| %>
+<% @items.each do |scenario| %>
   <li class="r<%= n %>">
 	<span class='object_link'>
-		<a href="<%= scenario.feature.filename %>"><%= h(scenario.value) %></a>
+		<a href="<%= "#{scenario.feature.name}.html" %>"><%= h(scenario.value) %></a>
 	</span>
 	<span class="">(<%= h(scenario.location) %>)<span>
   </li>

data/lib/yard/templates/default/fulldoc/html/full_list_stepdefinitions.erb

@@ -1,11 +1,11 @@
 <% n = 1 %>
-<% @step_definitions.each do |stepdef| %>
+<% @items.each do |stepdef| %>
   <li class="r<%= n %>">
 	<span class='object_link'>
 		<span class="pre"><%= stepdef.keyword %></span>
 		<a href="steptransformers.html#<%= stepdef.name %>"><span class="name"><%= h(stepdef.value) %></span></a>&nbsp;&nbsp;
 	</span>
-	<span class="">(<%= h("#{stepdef.files.first.first}:#{stepdef.files.first.last}") %>)<span>
+	<span class="">(<%= h(stepdef.location) %>)<span>
   </li>
   <% n = n == 2 ? 1 : 2 %>
 <% end %>

data/lib/yard/templates/default/fulldoc/html/full_list_steps.erb

@@ -1,13 +1,13 @@
 <% n = 1 %>
-<% @steps.each do |step| %>
+<% @items.each do |step| %>
   <li class="r<%= n %>">
 	<span class='object_link'>
-		<a href="<%= step.scenario.feature.filename %>">
+		<a href="<%= "#{step.scenario.feature.name}.html" %>">
 			<span class="pre"><%= step.keyword %></span>
 			<span class="name"><%= h(step.value) %></span>
 		</a>
 	</span>
-	<span class="">(<%= h(step.files.first.first) %>)<span>
+	<span class="">(<%= h(step.file) %>)<span>
   </li>
   <% n = n == 2 ? 1 : 2 %>
 <% end %>

data/lib/yard/templates/default/fulldoc/html/full_list_tagusages.erb

@@ -1,8 +1,8 @@
 <% n = 1 %>
-<% @tagusage.each do |usage| %>
+<% @items.each do |usage| %>
   <li class="r<%= n %>">
 	<span class='object_link'>
-		<a href="<%= usage.filename %>"><%= h(usage.value) %></a>
+		<a href="<%= "#{usage.name}.html" %>"><%= h(usage.value) %></a>
 	</span>
 	<small><%= usage.total_scenario_count %></small>
   </li>

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

@@ -5,61 +5,43 @@ def init
   asset("js/cucumber.js",file("js/cucumber.js",true))
 
   @features = Registry.all(:feature)
-  
-  if @features
-
-    @scenarios = []
-    @tags = []
 
-    @features.each do |feature|
-      serialize_object(feature)
-
-      feature.tags.each { |tag| @tags << tag }
-
-      feature.scenarios.each do |scenario|
-        @scenarios << scenario
-        scenario.tags.each { |tag| @tags << tag }
-      end
-    end
+  if @features
+    @features.each {|feature| serialize(feature) } 
+    generate_full_list(@features)
+  end
 
-    @tags = find_unique_tags(@tags)
-    @tags.each { |tag,tag_objects| serialize_object(tag_objects) }
+  
+  @tags = find_unique_tags(@tags)
+  
+  if @tags
+    @tags.each { |tag,tag_objects| serialize_tags(tag_objects) }
+    
     @tagusage = @tags.values.sort {|x,y| y.total_scenario_count <=> x.total_scenario_count }
+    generate_full_list(@tagusage,"Tag Usage") if @tagusage
+  end
 
-    create_full_list(@tagusage,"Tag Usage") if @tagusage
-    create_full_list(@features) if @features
-    create_full_list(@scenarios) if @scenarios
+  @scenarios = Registry.all(:scenario).find_all {|scenario| !scenario.background? }
+  generate_full_list(@scenarios) if @scenarios
 
-    @steps = Registry.all(:step)
-    create_full_list(@steps) if @steps
-
-  end
+  @steps = Registry.all(:step)
+  generate_full_list(@steps) if @steps
 
   @step_definitions = Registry.all(:stepdefinition)
-  
+
   if @step_definitions
-    create_full_list(@step_definitions,"Step Definition") 
+    generate_full_list(@step_definitions,"Step Definition") 
     @step_transformers = YARD::CodeObjects::StepTransformersObject.new(:root,"steptransformers")
     @step_definitions.each {|stepdef| @step_transformers << stepdef }
-    serialize_object(@step_transformers)
+    serialize(@step_transformers)
   end
 
-  
-end
 
-def asset(path, content)
-  options[:serializer].serialize(path, content) if options[:serializer]
 end
 
-def serialize_object(object)
-  options[:object] = object
-   Templates::Engine.with_serializer(object.filename, options[:serializer]) do
-      T('layout').run(options)
-   end
-end
-
-def create_full_list(objects,friendly_name=nil)
+def generate_full_list(objects,friendly_name=nil)
   if !objects.empty?
+    @items = objects
     @list_type = "#{objects.first.type.to_s}s"
     @list_title = "#{friendly_name || objects.first.type.to_s.capitalize} List"
     asset("#{objects.first.type}_list.html",erb(:full_list))
@@ -68,12 +50,21 @@ def create_full_list(objects,friendly_name=nil)
   end
 end
 
+def serialize_tags(tags)
+  options[:object] = tags
+  Templates::Engine.with_serializer("#{tags.name}.html", options[:serializer]) do
+    T('layout').run(options)
+  end
+end
+
 def find_unique_tags(tags)
 
   tags_hash = {}
 
-  tags.each do |tag|
-    tags_hash[tag.value] = YARD::CodeObjects::Cucumber::TagUsage.new(:root,"tag_#{tag.value}"){|t| t.value = tag.value } unless tags_hash[tag.value]
+  Registry.all(:tag).each do |tag|
+    unless tags_hash[tag.value]
+      tags_hash[tag.value] = YARD::CodeObjects::Cucumber::TagUsage.new(:root,"tag_#{tag.value}") {|t| t.value = tag.value } 
+    end
     tags_hash[tag.value.to_s] << tag
   end
 

data/lib/yard/templates/default/steptransformers/html/stepdefinition.erb

@@ -12,7 +12,7 @@
 	<div class="title">
 		<span class="pre"><%= stepdef.keyword %></span>
 		<span class="name"><%= stepdef.value %></span>
-		<div style="float: right;"><%= h( "#{stepdef.files.first.first}:#{stepdef.files.first.last}" ) %></div>
+		<div style="float: right;"><%= h( stepdef.location ) %></div>
 	</div>
 
 
@@ -21,17 +21,28 @@
 		<% stepdef.steps.each_with_index do |step,step_index| %>	
 		<div class="step <%= (step_index + 1) % 2 == 0 ? 'even' : 'odd' %>">
 			<%= h("#{step.keyword} #{step.value}") %>
-			<div class="details"><a href="<%= step.scenario.feature.filename %>"><%= h(step.location) %></a></div>
+			<div class="details"><a href="<%= "#{step.scenario.feature.name}.html" %>"><%= h(step.location) %></a></div>
 		</div>
 		<% end %>
 		<% else %>
 		<span class="undefined">No steps were found to match this step definition.</span>
 		<% end%>
 	</div>
-
-
+	
 	<div class="source">
-		<!-- <%= h(stepdef.source) %> -->
+		<span class="showSource">
+		[ <a href="#" class="toggleSource">View source</a> ]	
+		</span>
+		<table class="source_code">
+			<tr>
+				<td>
+					<pre class="lines"><%= "" %><%= h format_lines(stepdef) %></pre>
+				</td>
+				<td>
+					<pre class="code"><%= "" %><%= html_syntax_highlight stepdef.source %></pre>
+				</td>
+			</tr>
+		</table>
 	</div>
 </div>
 

data/lib/yard/templates/default/tagusage/html/tagusage.erb

@@ -21,7 +21,7 @@
 		<div class="title">
 			<span class="pre">Feature:</span>
 			<span class="name">
-				<a href="<%= tag.scenario.feature.filename %>"><%= tag.scenario.feature.value %></a>
+				<a href="<%= "#{tag.scenario.feature.name}.html" %>"><%= tag.scenario.feature.value %></a>
 			</span>
 		</div>
 		<div class="description"><%= tag.scenario.feature.description %></div>
@@ -31,7 +31,7 @@
 		<div class="title">
 			<span class="pre">Scenario:</span>
 			<span class="name">
-				<a href="<%= tag.scenario.feature.filename %>"><%= tag.scenario.value %></a>
+				<a href="<%= "#{tag.scenario.feature.name}.html" %>"><%= tag.scenario.value %></a>
 			</span>
 		</div>
 		<div class="description"><%= tag.scenario.description %></div>
@@ -41,7 +41,7 @@
 		<div class="title">
 			<span class="pre">Feature:</span>
 			<span class="name">
-				<a href="<%= tag.feature.filename %>"><%= tag.feature.value %></a>
+				<a href="<%= "#{tag.feature.name}.html" %>"><%= tag.feature.value %></a>
 			</span>
 		</div>
 		<div class="description"><%= tag.feature.description %></div>
@@ -52,7 +52,7 @@
 		<div class="title">
 			<span class="pre">Scenario:</span>
 			<span class="name">
-				<a href="<%= scenario.feature.filename %>"><%= scenario.value %></a>
+				<a href="<%= "#{scenario.feature.name}.html" %>"><%= scenario.value %></a>
 			</span>
 		</div>
 		<div class="description"><%= scenario.description %></div>

data/lib/yard/templates/default/tagusage/setup.rb

@@ -1,5 +1,5 @@
 def init
   super
   sections.push :tagusage
-  @tags = object  
+  @tags = object
 end

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
-  version: "1.2"
+  - 3
+  version: "1.3"
 platform: ruby
 authors: 
 - Frank;lin Webber
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-10 00:00:00 -07:00
+date: 2010-10-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,7 +54,7 @@ extra_rdoc_files:
 - README.md
 - lib/city.rb
 - lib/cucumber/city_builder.rb
-- lib/yard/code_objects/cucumber_location_helper.rb
+- lib/yard/code_objects/base.rb
 - lib/yard/code_objects/feature.rb
 - lib/yard/code_objects/scenario.rb
 - lib/yard/code_objects/step.rb
@@ -63,8 +63,8 @@ extra_rdoc_files:
 - lib/yard/handlers/base.rb
 - lib/yard/handlers/feature_handler.rb
 - lib/yard/parser/feature.rb
-- lib/yard/rb_extensions.rb
 - lib/yard/rake/city_task.rb
+- lib/yard/rb_extensions.rb
 - lib/yard/templates/default/feature/html/feature.erb
 - lib/yard/templates/default/feature/setup.rb
 - lib/yard/templates/default/fulldoc/html/css/common.css
@@ -89,15 +89,17 @@ extra_rdoc_files:
 - lib/yard/templates/default/tagusage/setup.rb
 files: 
 - History.txt
+- Manifest
 - README.md
 - Rakefile
+- example/empty.feature
 - example/example.feature
 - example/example.step.rb
 - example/example.third.feature
 - example/second_example.feature
 - lib/city.rb
 - lib/cucumber/city_builder.rb
-- lib/yard/code_objects/cucumber_location_helper.rb
+- lib/yard/code_objects/base.rb
 - lib/yard/code_objects/feature.rb
 - lib/yard/code_objects/scenario.rb
 - lib/yard/code_objects/step.rb
@@ -106,8 +108,8 @@ files:
 - lib/yard/handlers/base.rb
 - lib/yard/handlers/feature_handler.rb
 - lib/yard/parser/feature.rb
-- lib/yard/rb_extensions.rb
 - lib/yard/rake/city_task.rb
+- lib/yard/rb_extensions.rb
 - lib/yard/templates/default/feature/html/feature.erb
 - lib/yard/templates/default/feature/setup.rb
 - lib/yard/templates/default/fulldoc/html/css/common.css
@@ -138,7 +140,6 @@ files:
 - spec/city/yard_parser_cucumber_spec.rb
 - spec/city/yard_rb_extensions_spec.rb
 - spec/spec_helper.rb
-- Manifest
 - cucumber-in-the-yard.gemspec
 has_rdoc: true
 homepage: http://github.com/burtlo/Cucumber-In-The-Yard

data/lib/yard/code_objects/cucumber_location_helper.rb

@@ -1,15 +0,0 @@
-module CucumberLocationHelper
-
-  def line_number
-    files.first.last
-  end
-
-  def file
-    files.first.first
-  end
-
-  def location
-    "#{files.first.first}:#{files.first.last}"
-  end
-
-end