cucumber-in-the-yard 1.3 → 1.4

data/lib/cucumber/city_builder.rb

@@ -5,6 +5,8 @@ module Cucumber
       include Gherkin::Rubify
 
       def initialize(file)
+        @namespace = YARD::CodeObjects::Cucumber::CUCUMBER_NAMESPACE
+        find_or_create_namespace(file)
         @file = file
       end
 
@@ -12,9 +14,25 @@ module Cucumber
         @feature || @multiline_arg
       end
 
+      def find_or_create_namespace(file)
+        file.split('/')[0..-2].each do |directory|
+          @namespace = @namespace.children.find {|child| child.name == directory } || YARD::CodeObjects::Cucumber::NamespaceObject.new(@namespace,directory)
+        end
+      end
+
+      def find_or_create_tag(tag_name,parent)
+        #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 }
+
+        parent.tags << tag_code_object
+        tag_code_object.add_file(@file,parent.line)
+        tag_code_object.owners << parent
+      end
+
       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(@namespace,File.basename(@file.gsub('.feature','').gsub('.','_'))) do |f|
           f.comments = feature.comments.map{|comment| comment.value}.join("\n")
           f.description = feature.description
           f.add_file(@file,feature.line)
@@ -22,27 +40,20 @@ module Cucumber
           f.value = feature.name
           f.tags = []
 
-          feature.tags.map{|tag| tag.name}.each_with_index do |tag,index|
-            f.tags << YARD::CodeObjects::Cucumber::Tag.new(:root,"#{f.name}_feature_tag_#{index}") do |t| 
-              t.value = tag
-              t.add_file(@file,feature.line)
-              t.feature = f
-            end
-          end
-      end
-          
+          feature.tags.each {|feature_tag| find_or_create_tag(feature_tag.name,f) }
+        end
       end
 
       def background(background)
         #log.debug "BACKGROUND #{background.keyword} #{background.name} #{background.line} #{background.description}"
-        @background = YARD::CodeObjects::Cucumber::Scenario.new(:root,"#{@feature.name}_background") do |b|
+        @background = YARD::CodeObjects::Cucumber::Scenario.new(@feature,"background") do |b|
           b.comments = background.comments.map{|comment| comment.value}.join("\n")
           b.description = background.description
           b.keyword = background.keyword
           b.value = background.name
           b.add_file(@file,background.line)
         end
-        
+
         @feature.background = @background
         @background.feature = @feature
         @step_container = @background
@@ -50,22 +61,16 @@ module Cucumber
 
       def scenario(statement)
         #log.debug "SCENARIO"
-        scenario = YARD::CodeObjects::Cucumber::Scenario.new(:root,"#{@feature.name}_scenario_#{@feature.scenarios.length + 1}") do |s|
+        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
           s.add_file(@file,statement.line)
           s.keyword = statement.keyword
           s.value = statement.name
-          
-          statement.tags.map{|tag| tag.name}.each_with_index do |tag,index|
-            s.tags << YARD::CodeObjects::Cucumber::Tag.new(:root,"#{s.name}_tag_#{index}") do |t| 
-              t.value = tag
-              t.add_file(@file,@feature.line)
-              t.scenario = s
-            end
-          end
+
+          statement.tags.each {|scenario_tag| find_or_create_tag(scenario_tag.name,s) }
         end
-        
+
         scenario.feature = @feature
         @feature.scenarios << scenario
         @step_container = scenario
@@ -83,47 +88,47 @@ module Cucumber
           examples.line,
           examples.comments.map{|comment| comment.value}.join("\n"),
           matrix(examples.rows) ]
-      end
-
-      def step(step)
-        #log.debug "STEP #{step.multiline_arg}"
-        @table_owner = YARD::CodeObjects::Cucumber::Step.new(:root,"#{@feature.name}_#{step.line}") do |s|
-          s.keyword = step.keyword
-          s.value = step.name
-          s.add_file(@file,step.line)
         end
-                
-        multiline_arg = rubify(step.multiline_arg)
-        case(multiline_arg)
-        when Gherkin::Formatter::Model::PyString
-          @table_owner.text = multiline_arg.value
-        when Array
-          @table_owner.table = matrix(multiline_arg)
+
+        def step(step)
+          #log.debug "STEP #{step.multiline_arg}"
+          @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
+
+          multiline_arg = rubify(step.multiline_arg)
+          case(multiline_arg)
+          when Gherkin::Formatter::Model::PyString
+            @table_owner.text = multiline_arg.value
+          when Array
+            @table_owner.table = matrix(multiline_arg)
+          end
+
+          @table_owner.scenario = @step_container
+          @step_container.steps << @table_owner
         end
-        
-        @table_owner.scenario = @step_container
-        @step_container.steps << @table_owner
-      end
 
-      def eof
-      end
+        def eof
+        end
 
-      def syntax_error(state, event, legal_events, line)
-        # raise "SYNTAX ERROR"
-      end
+        def syntax_error(state, event, legal_events, line)
+          # raise "SYNTAX ERROR"
+        end
 
-      private
+        private
 
-      def matrix(gherkin_table)
-        gherkin_table.map do |gherkin_row|
-          row = gherkin_row.cells
-          class << row
-            attr_accessor :line
+        def matrix(gherkin_table)
+          gherkin_table.map do |gherkin_row|
+            row = gherkin_row.cells
+            class << row
+              attr_accessor :line
+            end
+            row.line = gherkin_row.line
+            row
           end
-          row.line = gherkin_row.line
-          row
         end
       end
     end
   end
-end

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

@@ -0,0 +1,92 @@
+
+<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>

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

@@ -0,0 +1,22 @@
+<div class="feature">
+	<div class="title">
+		<span class="pre"><%= @feature.keyword %>:</span>
+		<span class="name"><%= @feature.value %></span>
+	</div>
+
+	<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 class="description">
+		<%= @feature.description %>
+	</div>
+
+	<%= yieldall %>
+</div>
+

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

@@ -0,0 +1 @@
+<span>No Steps Defined</span>

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

@@ -0,0 +1,19 @@
+<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 %>
+			</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 %>
+		</tr>
+		<% end %>
+	</table>
+</div>

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

@@ -0,0 +1,3 @@
+<div class="text">
+	<%= h @step.text %>
+</div>

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

@@ -0,0 +1,43 @@
+<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">Line: <%= @scenario.line_number %></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 ? erb(:steps) : erb(:no_steps_defined) %>
+		
+	</div>
+
+	<%= erb(:outline) if @scenario.outline? %>
+
+</div>

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

@@ -0,0 +1,34 @@
+<% @scenario.steps.each_with_index do |step,index| %>
+	<% @step = step %>
+
+
+	<div <%= "id='#{@id}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">
+		$('<%= "#{@id}Step#{index}" %>').hover(
+			function () { $('<%= "#{@id}Step#{index} div.details" %>').toggle('slide'); },
+			function () { $('<%= "#{@id}Step#{index} div.details" %>').toggle('slide'); }
+		);
+
+		$('<%= "#{@id}Step#{index} div.details" %>').show();
+
+		</script>
+		<span class="defined">
+			<a href="<%= url_for step.definition %>"><%= 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>
+
+	<%= erb(:table) if step.has_table? %>
+	<%= erb(:pystring) if step.has_text? %>
+
+
+	<% end %>

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

@@ -0,0 +1,20 @@
+<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>

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

@@ -0,0 +1,28 @@
+def init
+  super
+  @feature = object
+    
+  sections.push :feature
+  
+  sections.push :background if object.background
+  sections.push :scenarios if object.scenarios  
+    
+end
+
+def background
+  @scenario = @feature.background
+  @id = "background"
+  erb(:scenario)  
+end
+
+def scenarios
+  scenarios = ""
+  
+  @feature.scenarios.each_with_index do |scenario,index|
+    @scenario = scenario
+    @id = "scenario#{index}"
+    scenarios += erb(:scenario)
+  end
+  
+  scenarios
+end