cucumber-in-the-yard 1.7.2 → 1.7.3

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

@@ -1,13 +1,19 @@
 <div class="transformer">
   <div class="steps">
   <% if @undefined_steps && !@undefined_steps.empty? %>
-    <% @undefined_steps.each_with_index do |step,step_index| %>
+    <% unique_steps(@undefined_steps).each_with_index do |uniq_step,step_index| %>
     <div class="step <%= (step_index + 1) % 2 == 0 ? 'even' : 'odd' %>">
-      <span class="predicate"><%= step.keyword %></span>
-      <span class="undefined">
-        <%= h step.value %>
-      </span>
-      <a class="definition" href="<%= url_for step.scenario.feature %>"><%= h(step.location) %></a>
+      <div>
+        <span class="predicate"><%= uniq_step.last.first.keyword %></span>
+        <span class="undefined">
+          <%= h uniq_step.last.first.value %>
+        </span>
+      </div>
+      <% uniq_step.last.each do |step| %>
+        <a class="definition" style="clear: right;" href="<%= url_for step.scenario.feature %>">
+          <%= h step.location %>
+        </a>
+      <% end%>
       <div style="clear: both;"></div>
     </div>
     <% end %>

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

@@ -26,6 +26,12 @@ def undefined_steps
 end
 
 
+def unique_steps(steps)
+  uniq_steps = {}
+  steps.each {|s| (uniq_steps[s.value.to_s] ||= []) << s }
+  uniq_steps
+end
+
 def link_transformed_step(step)
   value = step.value.dup
   

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

@@ -7,10 +7,10 @@ module YARD::CodeObjects::Cucumber
     attr_accessor :background, :comments, :description, :keyword, :scenarios, :tags, :value
 
     def initialize(namespace,name)
-      super(namespace,name.to_s.strip)
-      @comments = []
+      @comments = ""
       @scenarios = []
       @tags = []
+      super(namespace,name.to_s.strip)
     end
 
   end

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

@@ -23,6 +23,10 @@ module YARD::CodeObjects::Cucumber
     def outline?
       true
     end
+    
+    def examples?
+      !@examples[:rows].nil?
+    end
 
     def example_keyword
       @examples[:keyword]
@@ -33,6 +37,7 @@ module YARD::CodeObjects::Cucumber
     end
     
     def example_data
+      return "" unless @examples[:rows]
       @examples[:rows][1..-1]
     end
 
@@ -58,4 +63,4 @@ module YARD::CodeObjects::Cucumber
     
   end
 
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber-in-the-yard
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 1
   - 7
-  - 2
-  version: 1.7.2
+  - 3
+  version: 1.7.3
 platform: ruby
 authors: 
 - Franklin Webber
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-30 00:00:00 -08:00
+date: 2010-12-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,8 +81,8 @@ files:
 - README.md
 - Rakefile
 - city.gemspec
-- example/child_feature/grandchild_feature/scenario.feature
-- example/child_feature/scenario.feature
+- example/child_feature/child.feature
+- example/child_feature/grandchild_feature/grandchild.feature
 - example/empty.feature
 - example/scenario.feature
 - example/scenario_outline.feature
@@ -162,13 +162,19 @@ post_install_message: |+
   
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)
   
-    Thank you for installing Cucumber-In-The-YARD 1.7.2 / 2010-11-30.
+    Thank you for installing Cucumber-In-The-YARD 1.7.3 / 2010-12-06.
     
     Changes:
       
-    * Step Definition and Transform page enhancements
-    * Step Regex links to Rubular
-    * FIX Steps with HTML encoded characters will display correctly
+    * Shortcut Keys (t) for tags and (r) for features (f was taken)
+    * Step definitions/transforms consolidate steps for easier viewing
+      and when they have no steps they are colored differently
+    * Tag filtering supports inverse (~) of tags  
+    
+    * FIX Scenario Outlines without examples will not crash the parser
+    * FIX Features, Scenarios, and Directories should display in alphabetic order
+    * FIX Comments and multiline strings will display correctly
+    * FIX Feature comments will show
     
   
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)

data/example/child_feature/grandchild_feature/scenario.feature

@@ -1,52 +0,0 @@
-@scenarios
-Feature: Scenario
-  As a reader of the documentation I expect that scenario are documented correctly
-
-  Background:
-    Given this background step
-
-  @first
-  Scenario: No Step Scenario
-
-  @second
-  Scenario: Scenario With Steps
-    Given this first step
-	When this second step
-	Then this third step
-	
-  @third @optional_parameters
-  Scenario: Optional Parameter Step Definition
-    # This step definition has some optional parameters
-    Given a project
-    And an inactive project
-    And a project with the name 'optional', start date 10/26/2010, nicknamed 'norman'
-
-  @fourth @highlight
-  Scenario: Matched Term Highlighting
-    Given a duck that has a bill
-    Then I expect the duck to quack
-
-  @fifth @table
-  Scenario: Scenario With Table
-    Given the following table:
-      | column 1 | column 2 | column 3 |
-      | value 1  | value 2  | value 3  |
-
-  @sixth @text
-  Scenario: Scenario With Text
-    Given the following text:
-    """
-      Oh what a bother!
-    """
-
-  @seventh @comments
-  Scenario: Scenario with comments and 
-    with multiple lines for the name
-    # First Comment
-    Given this first step
-    # Second Comment
-    And this second step
-    # Third Comment
-    And this third step
-    # Comments after the last step, where do they go?
-

data/example/child_feature/scenario.feature

@@ -1,57 +0,0 @@
-@scenarios
-Feature: Scenario
-  As a reader of the documentation I expect that scenario are documented correctly
-
-  Background:
-    Given this background step
-
-  @first
-  Scenario: No Step Scenario
-
-  @second
-  Scenario: Scenario With Steps
-    Given this first step
-	When this second step
-	Then this third step
-	
-  @third @optional_parameters
-  Scenario: Optional Parameter Step Definition
-    # This step definition has some optional parameters
-    Given a project
-    And an inactive project
-    And a project with the name 'optional', start date 10/26/2010, nicknamed 'norman'
-
-  @fourth @highlight
-  Scenario: Matched Term Highlighting
-    Given a duck that has a bill
-    Then I expect the duck to quack
-
-  @fifth @table
-  Scenario: Scenario With Table
-    Given the following table:
-      | column 1 | column 2 | column 3 |
-      | value 1  | value 2  | value 3  |
-
-  @sixth @text
-  Scenario: Scenario With Text
-    Given the following text:
-    """
-      Oh what a bother!
-    """
-
-  # Comments before the scenario
-  @seventh @comments
-  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
-    And this second step
-    # Third Comment
-    And this third step
-    # Comments after the last step, where do they go?
-
-  Scenario: Step ending with a match with double-quotes
-    When searching the log for the exact match of the message "Entering application."
-    When the step definition has HTML escaped characters like: "<>&"