cucumber-in-the-yard 1.5 → 1.5.1

data/History.txt

@@ -1,3 +1,13 @@
+=== 1.5.1 / 2010-10-26
+
+* Unified Feature/Scenario search field that resembles the Namespace-Class field
+* Tag search also displays immediate features/scenarios
+* Removed Scenario searching field
+* Added filename and line number to a number of locations
+* Minor Tag template enhancements
+* FIX - Scenario Outline Reference was being replaced with the first example
+* FIX - Scenario Outlines were not getting counted for tags
+
 === 1.5 / 2010-10-25
 
 * Steps that have found their step definitions will also attempt to find their

data/Manifest

@@ -1,63 +1,61 @@
-History.txt
-Manifest
-README.md
-Rakefile
-example/empty.feature
-example/example.feature
-example/example.third.feature
-example/second_example.feature
-example/step_definitions/example.step.rb
-example/step_definitions/support/env.rb
-example/step_definitions/support/env_support.rb
-example/step_definitions/support/support.rb
-lib/city.rb
-lib/cucumber/city_builder.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
-lib/templates/default/feature/html/pystring.erb
-lib/templates/default/feature/html/scenario.erb
-lib/templates/default/feature/html/steps.erb
-lib/templates/default/feature/html/table.erb
-lib/templates/default/feature/setup.rb
-lib/templates/default/fulldoc/html/css/common.css
-lib/templates/default/fulldoc/html/full_list.erb
-lib/templates/default/fulldoc/html/full_list_features.erb
-lib/templates/default/fulldoc/html/full_list_requirements.erb
-lib/templates/default/fulldoc/html/full_list_scenarios.erb
-lib/templates/default/fulldoc/html/full_list_stepdefinitions.erb
-lib/templates/default/fulldoc/html/full_list_steps.erb
-lib/templates/default/fulldoc/html/full_list_tags.erb
-lib/templates/default/fulldoc/html/index.erb
-lib/templates/default/fulldoc/html/js/cucumber.js
-lib/templates/default/fulldoc/html/setup.rb
-lib/templates/default/layout/html/headers.erb
-lib/templates/default/layout/html/search.erb
-lib/templates/default/scenario/html/scenario.erb
-lib/templates/default/scenario/setup.rb
-lib/templates/default/steptransformers/html/steptransformers.erb
-lib/templates/default/steptransformers/html/transformers.erb
-lib/templates/default/steptransformers/setup.rb
-lib/templates/default/tag/html/feature.erb
-lib/templates/default/tag/html/scenario.erb
-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
-lib/yard/code_objects/cucumber/scenario.rb
-lib/yard/code_objects/cucumber/scenario_outline.rb
-lib/yard/code_objects/cucumber/step.rb
-lib/yard/code_objects/cucumber/tag.rb
-lib/yard/code_objects/namespace_object.rb
-lib/yard/code_objects/step_definition.rb
-lib/yard/code_objects/step_transform.rb
-lib/yard/handlers/cucumber/base.rb
-lib/yard/handlers/cucumber/feature_handler.rb
-lib/yard/handlers/step_definition_handler.rb
-lib/yard/handlers/step_transform_handler.rb
-lib/yard/parser/cucumber/feature.rb
-lib/yard/parser/source_parser.rb
-lib/yard/rake/city_task.rb
-lib/yard/templates/helpers/base_helper.rb
+History.txt
+Manifest
+README.md
+Rakefile
+example/empty.feature
+example/example.feature
+example/example.third.feature
+example/second_example.feature
+example/step_definitions/example.step.rb
+example/step_definitions/support/env.rb
+example/step_definitions/support/env_support.rb
+example/step_definitions/support/support.rb
+lib/city.rb
+lib/cucumber/city_builder.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
+lib/templates/default/feature/html/pystring.erb
+lib/templates/default/feature/html/scenario.erb
+lib/templates/default/feature/html/steps.erb
+lib/templates/default/feature/html/table.erb
+lib/templates/default/feature/setup.rb
+lib/templates/default/fulldoc/html/css/common.css
+lib/templates/default/fulldoc/html/full_list.erb
+lib/templates/default/fulldoc/html/full_list_features.erb
+lib/templates/default/fulldoc/html/full_list_stepdefinitions.erb
+lib/templates/default/fulldoc/html/full_list_steps.erb
+lib/templates/default/fulldoc/html/full_list_tags.erb
+lib/templates/default/fulldoc/html/index.erb
+lib/templates/default/fulldoc/html/js/cucumber.js
+lib/templates/default/fulldoc/html/setup.rb
+lib/templates/default/layout/html/headers.erb
+lib/templates/default/layout/html/search.erb
+lib/templates/default/scenario/html/scenario.erb
+lib/templates/default/scenario/setup.rb
+lib/templates/default/steptransformers/html/steptransformers.erb
+lib/templates/default/steptransformers/html/transformers.erb
+lib/templates/default/steptransformers/setup.rb
+lib/templates/default/tag/html/feature.erb
+lib/templates/default/tag/html/scenario.erb
+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
+lib/yard/code_objects/cucumber/scenario.rb
+lib/yard/code_objects/cucumber/scenario_outline.rb
+lib/yard/code_objects/cucumber/step.rb
+lib/yard/code_objects/cucumber/tag.rb
+lib/yard/code_objects/namespace_object.rb
+lib/yard/code_objects/step_definition.rb
+lib/yard/code_objects/step_transform.rb
+lib/yard/handlers/cucumber/base.rb
+lib/yard/handlers/cucumber/feature_handler.rb
+lib/yard/handlers/step_definition_handler.rb
+lib/yard/handlers/step_transform_handler.rb
+lib/yard/parser/cucumber/feature.rb
+lib/yard/parser/source_parser.rb
+lib/yard/rake/city_task.rb
+lib/yard/templates/helpers/base_helper.rb

data/README.md

@@ -127,10 +127,11 @@ Roadmap
 
 **Future Feature Ideas**
 
-**1. Users are able to search Features, Scenarios, and Tags in a unified search box.**
+**1. Represent instances of scenarios for scenario outlines.**
 
-I want to rid the three added search fields and provide one unified search field that will use YARD's
-namespace structure (similar to how Class List works).
+Display all the values that would normally be substituted into a scenario for the scenario outline. To 
+make it easier to represent them to product owners.  As well as link the instance of the step definitions
+for developers.
 
 **2. Tag pages provide the ability to exclude other tags that intersect.**
 

data/Rakefile

@@ -8,7 +8,7 @@ task :gendoc do
   `yardoc -e lib/city.rb -p lib/templates 'example/**/*' --debug`
 end
 
-Echoe.new('cucumber-in-the-yard', '1.5') do |g|
+Echoe.new('cucumber-in-the-yard', '1.5.1') do |g|
   g.author = "Franklin Webber"
   g.email = "franklin.webber@gmail.com"
   g.url = "http://github.com/burtlo/Cucumber-In-The-Yard"
@@ -17,6 +17,6 @@ Echoe.new('cucumber-in-the-yard', '1.5') do |g|
     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.  }
-  g.ignore_pattern = FileList["{doc,autotest}/**/*"].to_a
+  g.ignore_pattern = FileList["{doc,pkg,spec,features,nbproject,autotest}/**/*"].to_a
   g.runtime_dependencies = [ "cucumber >=0.7.5", "yard >=0.6.1" ]
 end

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.5"
+  s.version = "1.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Franklin Webber"]
-  s.date = %q{2010-10-25}
+  s.date = %q{2010-10-26}
   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/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", "lib/templates/default/feature/html/pystring.erb", "lib/templates/default/feature/html/scenario.erb", "lib/templates/default/feature/html/steps.erb", "lib/templates/default/feature/html/table.erb", "lib/templates/default/feature/setup.rb", "lib/templates/default/fulldoc/html/css/common.css", "lib/templates/default/fulldoc/html/full_list.erb", "lib/templates/default/fulldoc/html/full_list_features.erb", "lib/templates/default/fulldoc/html/full_list_requirements.erb", "lib/templates/default/fulldoc/html/full_list_scenarios.erb", "lib/templates/default/fulldoc/html/full_list_stepdefinitions.erb", "lib/templates/default/fulldoc/html/full_list_steps.erb", "lib/templates/default/fulldoc/html/full_list_tags.erb", "lib/templates/default/fulldoc/html/index.erb", "lib/templates/default/fulldoc/html/js/cucumber.js", "lib/templates/default/fulldoc/html/setup.rb", "lib/templates/default/layout/html/headers.erb", "lib/templates/default/layout/html/search.erb", "lib/templates/default/scenario/html/scenario.erb", "lib/templates/default/scenario/setup.rb", "lib/templates/default/steptransformers/html/steptransformers.erb", "lib/templates/default/steptransformers/html/transformers.erb", "lib/templates/default/steptransformers/setup.rb", "lib/templates/default/tag/html/feature.erb", "lib/templates/default/tag/html/scenario.erb", "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", "lib/yard/code_objects/cucumber/scenario.rb", "lib/yard/code_objects/cucumber/scenario_outline.rb", "lib/yard/code_objects/cucumber/step.rb", "lib/yard/code_objects/cucumber/tag.rb", "lib/yard/code_objects/namespace_object.rb", "lib/yard/code_objects/step_definition.rb", "lib/yard/code_objects/step_transform.rb", "lib/yard/handlers/cucumber/base.rb", "lib/yard/handlers/cucumber/feature_handler.rb", "lib/yard/handlers/step_definition_handler.rb", "lib/yard/handlers/step_transform_handler.rb", "lib/yard/parser/cucumber/feature.rb", "lib/yard/parser/source_parser.rb", "lib/yard/rake/city_task.rb", "lib/yard/templates/helpers/base_helper.rb"]
-  s.files = ["History.txt", "Manifest", "README.md", "Rakefile", "example/empty.feature", "example/example.feature", "example/example.third.feature", "example/second_example.feature", "example/step_definitions/example.step.rb", "example/step_definitions/support/env.rb", "example/step_definitions/support/env_support.rb", "example/step_definitions/support/support.rb", "lib/city.rb", "lib/cucumber/city_builder.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", "lib/templates/default/feature/html/pystring.erb", "lib/templates/default/feature/html/scenario.erb", "lib/templates/default/feature/html/steps.erb", "lib/templates/default/feature/html/table.erb", "lib/templates/default/feature/setup.rb", "lib/templates/default/fulldoc/html/css/common.css", "lib/templates/default/fulldoc/html/full_list.erb", "lib/templates/default/fulldoc/html/full_list_features.erb", "lib/templates/default/fulldoc/html/full_list_requirements.erb", "lib/templates/default/fulldoc/html/full_list_scenarios.erb", "lib/templates/default/fulldoc/html/full_list_stepdefinitions.erb", "lib/templates/default/fulldoc/html/full_list_steps.erb", "lib/templates/default/fulldoc/html/full_list_tags.erb", "lib/templates/default/fulldoc/html/index.erb", "lib/templates/default/fulldoc/html/js/cucumber.js", "lib/templates/default/fulldoc/html/setup.rb", "lib/templates/default/layout/html/headers.erb", "lib/templates/default/layout/html/search.erb", "lib/templates/default/scenario/html/scenario.erb", "lib/templates/default/scenario/setup.rb", "lib/templates/default/steptransformers/html/steptransformers.erb", "lib/templates/default/steptransformers/html/transformers.erb", "lib/templates/default/steptransformers/setup.rb", "lib/templates/default/tag/html/feature.erb", "lib/templates/default/tag/html/scenario.erb", "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", "lib/yard/code_objects/cucumber/scenario.rb", "lib/yard/code_objects/cucumber/scenario_outline.rb", "lib/yard/code_objects/cucumber/step.rb", "lib/yard/code_objects/cucumber/tag.rb", "lib/yard/code_objects/namespace_object.rb", "lib/yard/code_objects/step_definition.rb", "lib/yard/code_objects/step_transform.rb", "lib/yard/handlers/cucumber/base.rb", "lib/yard/handlers/cucumber/feature_handler.rb", "lib/yard/handlers/step_definition_handler.rb", "lib/yard/handlers/step_transform_handler.rb", "lib/yard/parser/cucumber/feature.rb", "lib/yard/parser/source_parser.rb", "lib/yard/rake/city_task.rb", "lib/yard/templates/helpers/base_helper.rb", "cucumber-in-the-yard.gemspec"]
+  s.extra_rdoc_files = ["README.md", "lib/city.rb", "lib/cucumber/city_builder.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", "lib/templates/default/feature/html/pystring.erb", "lib/templates/default/feature/html/scenario.erb", "lib/templates/default/feature/html/steps.erb", "lib/templates/default/feature/html/table.erb", "lib/templates/default/feature/setup.rb", "lib/templates/default/fulldoc/html/css/common.css", "lib/templates/default/fulldoc/html/full_list.erb", "lib/templates/default/fulldoc/html/full_list_features.erb", "lib/templates/default/fulldoc/html/full_list_stepdefinitions.erb", "lib/templates/default/fulldoc/html/full_list_steps.erb", "lib/templates/default/fulldoc/html/full_list_tags.erb", "lib/templates/default/fulldoc/html/index.erb", "lib/templates/default/fulldoc/html/js/cucumber.js", "lib/templates/default/fulldoc/html/setup.rb", "lib/templates/default/layout/html/headers.erb", "lib/templates/default/layout/html/search.erb", "lib/templates/default/scenario/html/scenario.erb", "lib/templates/default/scenario/setup.rb", "lib/templates/default/steptransformers/html/steptransformers.erb", "lib/templates/default/steptransformers/html/transformers.erb", "lib/templates/default/steptransformers/setup.rb", "lib/templates/default/tag/html/feature.erb", "lib/templates/default/tag/html/scenario.erb", "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", "lib/yard/code_objects/cucumber/scenario.rb", "lib/yard/code_objects/cucumber/scenario_outline.rb", "lib/yard/code_objects/cucumber/step.rb", "lib/yard/code_objects/cucumber/tag.rb", "lib/yard/code_objects/namespace_object.rb", "lib/yard/code_objects/step_definition.rb", "lib/yard/code_objects/step_transform.rb", "lib/yard/handlers/cucumber/base.rb", "lib/yard/handlers/cucumber/feature_handler.rb", "lib/yard/handlers/step_definition_handler.rb", "lib/yard/handlers/step_transform_handler.rb", "lib/yard/parser/cucumber/feature.rb", "lib/yard/parser/source_parser.rb", "lib/yard/rake/city_task.rb", "lib/yard/templates/helpers/base_helper.rb"]
+  s.files = ["History.txt", "Manifest", "README.md", "Rakefile", "example/empty.feature", "example/example.feature", "example/example.third.feature", "example/second_example.feature", "example/step_definitions/example.step.rb", "example/step_definitions/support/env.rb", "example/step_definitions/support/env_support.rb", "example/step_definitions/support/support.rb", "lib/city.rb", "lib/cucumber/city_builder.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", "lib/templates/default/feature/html/pystring.erb", "lib/templates/default/feature/html/scenario.erb", "lib/templates/default/feature/html/steps.erb", "lib/templates/default/feature/html/table.erb", "lib/templates/default/feature/setup.rb", "lib/templates/default/fulldoc/html/css/common.css", "lib/templates/default/fulldoc/html/full_list.erb", "lib/templates/default/fulldoc/html/full_list_features.erb", "lib/templates/default/fulldoc/html/full_list_stepdefinitions.erb", "lib/templates/default/fulldoc/html/full_list_steps.erb", "lib/templates/default/fulldoc/html/full_list_tags.erb", "lib/templates/default/fulldoc/html/index.erb", "lib/templates/default/fulldoc/html/js/cucumber.js", "lib/templates/default/fulldoc/html/setup.rb", "lib/templates/default/layout/html/headers.erb", "lib/templates/default/layout/html/search.erb", "lib/templates/default/scenario/html/scenario.erb", "lib/templates/default/scenario/setup.rb", "lib/templates/default/steptransformers/html/steptransformers.erb", "lib/templates/default/steptransformers/html/transformers.erb", "lib/templates/default/steptransformers/setup.rb", "lib/templates/default/tag/html/feature.erb", "lib/templates/default/tag/html/scenario.erb", "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", "lib/yard/code_objects/cucumber/scenario.rb", "lib/yard/code_objects/cucumber/scenario_outline.rb", "lib/yard/code_objects/cucumber/step.rb", "lib/yard/code_objects/cucumber/tag.rb", "lib/yard/code_objects/namespace_object.rb", "lib/yard/code_objects/step_definition.rb", "lib/yard/code_objects/step_transform.rb", "lib/yard/handlers/cucumber/base.rb", "lib/yard/handlers/cucumber/feature_handler.rb", "lib/yard/handlers/step_definition_handler.rb", "lib/yard/handlers/step_transform_handler.rb", "lib/yard/parser/cucumber/feature.rb", "lib/yard/parser/source_parser.rb", "lib/yard/rake/city_task.rb", "lib/yard/templates/helpers/base_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/step_definitions/example.step.rb

@@ -17,6 +17,7 @@ Given /^that (#{CUSTOMER}) is a valid customer$/ do |customer|
 end
 
 When /^a customer logs in as username '([^']+)' with password '([^']+)'$/ do |username,password|
+  Given "that the customer is a valid customer"
   pending "Customer logs in with #{username} and #{password}"
 end
 

data/example/step_definitions/support/env.rb

@@ -0,0 +1,7 @@
+
+module Environment
+  module Database
+    class Connection
+    end
+  end
+end

data/example/step_definitions/support/env_support.rb

@@ -0,0 +1,12 @@
+
+class SupportClass
+  
+end
+
+module Web
+  module Interface
+   class CachedReference
+     
+   end 
+  end
+end

data/lib/cucumber/city_builder.rb

@@ -21,7 +21,7 @@ module Cucumber
       end
 
       def find_or_create_tag(tag_name,parent)
-        log.debug "Processing tag #{tag_name}"
+        #log.debug "Processing tag #{tag_name}"
         tag_code_object = YARD::Registry.all(:tag).find {|tag| tag.value == tag_name } || 
           YARD::CodeObjects::Cucumber::Tag.new(YARD::CodeObjects::Cucumber::CUCUMBER_TAG_NAMESPACE,tag_name.gsub('@','')) {|t| t.owners = [] ; t.value = tag_name }
 
@@ -32,7 +32,7 @@ module Cucumber
       end
 
       def feature(feature)
-        log.debug  "FEATURE: #{feature.name} #{feature.line} #{feature.keyword} #{feature.description}"
+        #log.debug  "FEATURE: #{feature.name} #{feature.line} #{feature.keyword} #{feature.description}"
         @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
@@ -61,7 +61,7 @@ module Cucumber
       end
 
       def scenario(statement)
-        log.debug "SCENARIO"
+        #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
@@ -109,19 +109,19 @@ module Cucumber
         @step_container.example_data.length.times do |row_index|
 
           scenario = YARD::CodeObjects::Cucumber::Scenario.new(@step_container,"example_#{@step_container.scenarios.length + 1}") do |s|
-            s.comments = @comments
-            s.description = @description
+            s.comments = @step_container.comments
+            s.description = @step_container.description
             s.add_file(@file,@step_container.line_number)
-            s.keyword = @keyword
-            s.value = "#{@value} (#{@step_container.scenarios.length + 1})"
+            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|
             step_instance = YARD::CodeObjects::Cucumber::Step.new(scenario,step.line_number) do |s|
-              s.keyword = step.keyword
-              s.value = step.value
+              s.keyword = step.keyword.dup
+              s.value = step.value.dup
               s.add_file(@file,step.line_number)
             end
 

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

@@ -18,7 +18,7 @@ $(function() {
 		<span class="name"><%= h @scenario.value %></span>
 	</div>
 	<div class="meta">
-		<div class="file">Line: <%= @scenario.line_number %></div>
+		<div class="file"><%= @scenario.location %></div>
 		<% unless @scenario.tags.empty? %>
 		<div class="tags">
 			<% @scenario.tags.each do |tag| %>

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

@@ -1,53 +1,19 @@
+.feature {}
+.tags { font-family: monospace;	font-size: 14px; }
+* .title { padding: 10px; font-size: 24px; }
 
-.feature {
-	
-}
-
-.tags {
-	font-family: monospace;
-	font-size: 14px;
-}
-
-
-* .title {
-	padding: 10px;
-	font-size: 24px;	
-}
-
-.feature > .title, .tag > .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;
-}
-
-* .title .name {
-	font-weight: bold;
-	color: #3F3F3F;
-}
+.feature > .title, .tag > .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; }
+* .title .name { font-weight: bold;	color: #3F3F3F; }
 
-.meta { 
-	margin-left: 30px;
-	color: gray;
-}
-.scenario .meta .tags {
-	margin-left: 0px;
-}
+.meta { margin-left: 30px; color: gray; }
+.scenario .meta .tags { margin-left: 0px; }
 
 .feature .description {
 	margin: 10px 20px 0px 30px;
 	padding: 10px 20px 20px 10px;
-/*	background-color: #F5F5F5;*/
 	color: #343332;
-/*	border: #C7C5C5 solid 1px;*/
 	font-family: 'Trebuchet MS', Arial, Helvetica;
 }
 
@@ -146,15 +112,14 @@
 
 
 /* Overrides for scenarios in the tag view */
-.tag .scenario {
-	margin-left: 30px;
-	margin-top: 0px;
-}
-.tag .scenario .title {
-	border-bottom: none;
-}
+
+.tag .feature { margin-left: 20px; }
+.tag .scenario { margin-top: 0px;  margin-left: 20px; padding-left: 30px;	}
+.tag .scenario .title { border-bottom: none; }
+.tag .scenario .meta { margin-top: 0px; }
 /* Overrides for scenarios in the tag view */
 
+
 .stepdef .title {
 	font-size: 14px;
 	margin-top: 30px;
@@ -166,4 +131,5 @@
 }
 .stepdef .steps .step {
 	padding: 4px;
-}
+}
+

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

@@ -25,7 +25,7 @@
       </div>
       <div id="search">Search: <input type="text" /></div>
 
-      <ul id="full_list" class="<%= @list_type %>">
+      <ul id="full_list" class="<%= @list_class || @list_type %>">
         <%= erb "full_list_#{@list_type}" %>
       </ul>
     </div>

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

@@ -1,7 +1,18 @@
-<% n = 1 %>
 <% @items.each do |feature| %>
-  <li class="r<%= n %>">
+<li>
+	<%= "<a class='toggle'></a>" unless feature.scenarios.empty? %>
 	<%= linkify feature, feature.value %>
-  </li>
-  <% n = n == 2 ? 1 : 2 %>
+	<small><%= feature.location %></small>
+</li>
+
+<% if feature.scenarios %>
+<ul>
+	<% feature.scenarios.each do |scenario| %>
+	<li>
+		<%= linkify feature, scenario.value %>
+		<small><%= scenario.location %></small>
+	</li>
+	<% end %>
+</ul>
+<% end %>
 <% end %>

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

@@ -2,7 +2,7 @@
 <% @items.each do |step| %>
   <li class="r<%= n %>">
 	<span class='object_link'>
-		<a href="<%= "#{step.scenario.feature.name}.html" %>">
+		<a href="<%= url_for step.scenario.feature %>">
 			<span class="pre"><%= step.keyword %></span>
 			<span class="name"><%= h(step.value) %></span>
 		</a>

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

@@ -1,8 +1,23 @@
 <% n = 1 %>
 <% @items.each do |tag| %>
   <li class="r<%= n %>">
+	<a class='toggle'></a>
 	<%= linkify tag, tag.value %>
 	<small><%= tag.all_scenarios.size %></small>
   </li>
+	<ul>
+	<% tag.features.each do |feature| %>
+	<li>
+		<%= linkify feature, feature.value %>
+		<small><%= feature.location %></small>
+	</li>
+	<% end %>
+	<% tag.scenarios.each do |scenario| %>
+	<li>
+		<%= linkify scenario.feature, scenario.value %>
+		<small><%= scenario.location %></small>
+	</li>
+	<% end %>
+	</ul>
   <% n = n == 2 ? 1 : 2 %>
 <% end %>

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

@@ -5,9 +5,6 @@ function cucumberSearchFrameLinks() {
 	$('#tagusage_list_link').click(function() {
 		toggleSearchFrame(this, relpath + 'tag_list.html');
 	});  
-	$('#scenario_list_link').click(function() {
-		toggleSearchFrame(this, relpath + 'scenario_list.html');
-	});
 }
 
 $(cucumberSearchFrameLinks);

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

@@ -20,8 +20,8 @@ def init
     generate_full_list @tags.sort {|x,y| y.all_scenarios.size <=> x.all_scenarios.size }
   end
 
-  @scenarios = Registry.all(:scenario).find_all {|scenario| !scenario.background? }
-  generate_full_list(@scenarios) if @scenarios
+  #@scenarios = Registry.all(:scenario).find_all {|scenario| !scenario.background? }
+  #generate_full_list(@scenarios) if @scenarios
 
   @steps = Registry.all(:step)
   generate_full_list(@steps) if @steps
@@ -39,6 +39,7 @@ def generate_full_list(objects,friendly_name=nil)
     @items = objects
     @list_type = "#{objects.first.type.to_s}s"
     @list_title = "#{friendly_name || objects.first.type.to_s.capitalize} List"
+    @list_class = "class"
     asset("#{objects.first.type}_list.html",erb(:full_list))
   else
     log.warn "Full List: Failed to create a list because the objects array is empty."

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

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

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

@@ -1,23 +1,48 @@
 <% object.features.each do |feature| %>
 <div class="feature direct">
 	<div class="title">
-		<span class="pre">Feature:</span>
+		<span class="pre"><%= feature.keyword %></span>
 		<span class="name">
 			<a href="<%= url_for feature %>"><%= feature.value %></a>
 		</span>
 	</div>
-	<div class="description"><%= feature.description %></div>
-	
-	<% feature.scenarios.each do |scenario| %>
-	<div class="scenario indirect">
-		<div class="title">
-			<span class="pre">Scenario:</span>
-			<span class="name">
-				<a href="<%= url_for feature %>"><%= scenario.value %></a>
-			</span>
+	<div class="meta">
+		<div class="file"><%= h(feature.file) %></div>
+		<div class="tags">Tags: 
+			<% feature.tags.each do |tag| %>
+			<a href="<%= url_for tag %>"><%= tag.value %></a>
+			<% end %>
+		</div>		
+	</div>
+	<div class="description">
+		<%= feature.description %>
+	</div>
+</div>
+<% feature.scenarios.each do |scenario| %>
+<div class="scenario indirect">
+	<div class="title">
+		<span class="pre"><%= scenario.keyword %></span>
+		<span class="name">
+			<a href="<%= url_for feature %>"><%= scenario.value %></a>
+		</span>
+	</div>
+	<div class="meta">
+		<div class="file">
+			<%= scenario.location %>
 		</div>
-		<div class="description"><%= scenario.description %></div>
+		<% unless scenario.tags.empty? %>
+		<div class="tags">
+			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 %>
-
+	<% end %>	
+</div>
+<% end %>
 <% end %>

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

@@ -1,21 +1,43 @@
 <% object.scenarios.each do |scenario| %>
 <div class="feature indirect">
 	<div class="title">
-		<span class="pre">Feature:</span>
+		<span class="pre"><%= scenario.feature.keyword %></span>
 		<span class="name">
 			<a href="<%= url_for scenario.feature %>"><%= scenario.feature.value %></a>
 		</span>
 	</div>
+	<div class="meta">
+		<div class="file"><%= h(scenario.feature.file) %></div>
+		<div class="tags">Tags: 
+			<% scenario.feature.tags.each do |tag| %>
+			<a href="<%= url_for tag %>"><%= tag.value %></a>
+			<% end %>
+		</div>		
+	</div>
 	<div class="description"><%= scenario.feature.description %></div>
 </div>
 
 <div class="scenario direct">
 	<div class="title">
-		<span class="pre">Scenario:</span>
+		<span class="pre"><%= scenario.keyword %></span>
 		<span class="name">
 			<a href="<%= url_for scenario.feature %>"><%= scenario.value %></a>
 		</span>
 	</div>
-	<div class="description"><%= scenario.description %></div>
+	<div class="meta">
+		<div class="file"><%= scenario.location %></div>
+		<% unless scenario.tags.empty? %>
+		<div class="tags">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>
 <% end %>

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

@@ -12,7 +12,7 @@ module YARD::CodeObjects::Cucumber
       @examples = {}
       @transforms = []
     end
-
+    
     def has_table?
       !@table.nil?
     end

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

@@ -11,7 +11,7 @@ module YARD::CodeObjects::Cucumber
     end
     
     def scenarios
-      @owners.find_all{|owner| owner.is_a?(Scenario) }
+      @owners.find_all{|owner| owner.is_a?(Scenario) || owner.is_a?(ScenarioOutline) }
     end
         
     def indirect_scenarios

data/lib/yard/handlers/step_definition_handler.rb

@@ -1,6 +1,7 @@
 
 
 class StepDefinitionHandler < YARD::Handlers::Ruby::Legacy::Base
+  #TODO: This needs to become language independent.
   MATCH = /^((When|Given|And|Then)\s*(\/[^\/]+\/).+)$/
   handles MATCH
 
@@ -17,13 +18,17 @@ class StepDefinitionHandler < YARD::Handlers::Ruby::Legacy::Base
       o.value = step_definition
       o.keyword = keyword
     end
+    
+    find_steps_defined_in_block(statement.block)
 
     begin
       # Look for all constants within the step definitions
       stepdef_instance.constants = stepdef_instance._value_constants.each do |stepdef_constant| 
         owner.constants.each do |constant|
           if stepdef_constant.to_sym == constant.name
-            #log.debug "Replacing #{constant.name} with its value in the step definition #{stepdef_instance.value}"
+            log.debug "Constant #{constant.name} was found in the step definition #{stepdef_instance.value}, attempting to replace that value"
+            returned_constant = unpack_constants(constant.value)
+            log.debug "Post procedure on CONSTANT looks like #{returned_constant}"
             stepdef_instance.constants[constant.name] = unpack_constants(constant.value)
           end
         end
@@ -54,4 +59,24 @@ class StepDefinitionHandler < YARD::Handlers::Ruby::Legacy::Base
     constant_value
   end
   
+  #
+  # Step Definitions can contain defined steps within them.  While it is likely that they could not
+  # very easily be parsed because of variables that are only calculated at runtime, it would be nice
+  # to at least list those in use within a step definition and if you can find a match, go ahead and
+  # make it
+  #
+  def find_steps_defined_in_block(block)
+    #log.debug "#{block} #{block.class}"
+    block.each_with_index do |token,index|
+      #log.debug "Token #{token.class} #{token.text}"
+        if token.is_a?(YARD::Parser::Ruby::Legacy::RubyToken::TkCONSTANT)  && 
+          token.text =~ /^(given|when|then|and)$/i &&
+          block[index + 2].is_a?(YARD::Parser::Ruby::Legacy::RubyToken::TkSTRING)
+          log.debug "Step found in Step Definition: #{block[index + 2].text} "
+        end
+          
+    end
+    
+  end
+  
 end

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  version: "1.5"
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Franklin Webber
@@ -13,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-25 00:00:00 -07:00
+date: 2010-10-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,8 +67,6 @@ extra_rdoc_files:
 - lib/templates/default/fulldoc/html/css/common.css
 - lib/templates/default/fulldoc/html/full_list.erb
 - lib/templates/default/fulldoc/html/full_list_features.erb
-- lib/templates/default/fulldoc/html/full_list_requirements.erb
-- lib/templates/default/fulldoc/html/full_list_scenarios.erb
 - lib/templates/default/fulldoc/html/full_list_stepdefinitions.erb
 - lib/templates/default/fulldoc/html/full_list_steps.erb
 - lib/templates/default/fulldoc/html/full_list_tags.erb
@@ -130,8 +129,6 @@ files:
 - lib/templates/default/fulldoc/html/css/common.css
 - lib/templates/default/fulldoc/html/full_list.erb
 - lib/templates/default/fulldoc/html/full_list_features.erb
-- lib/templates/default/fulldoc/html/full_list_requirements.erb
-- lib/templates/default/fulldoc/html/full_list_scenarios.erb
 - lib/templates/default/fulldoc/html/full_list_stepdefinitions.erb
 - lib/templates/default/fulldoc/html/full_list_steps.erb
 - lib/templates/default/fulldoc/html/full_list_tags.erb

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

@@ -1 +0,0 @@
-<%= class_list %>

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

@@ -1,8 +0,0 @@
-<% n = 1 %>
-<% @items.each do |scenario| %>
-  <li class="r<%= n %>">
-	<%= linkify scenario.feature, scenario.value %>
-	<small><%= h(scenario.location) %></small>
-  </li>
-  <% n = n == 2 ? 1 : 2 %>
-<% end %>