cucumber-in-the-yard 1.7.2 → 1.7.3

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

@@ -21,13 +21,14 @@ def tags
 end
 
 def features
-  @features ||= Registry.all(:feature).sort {|x,y| x.value <=> y.value }
+  @features ||= Registry.all(:feature).sort {|x,y| x.value.to_s <=> y.value.to_s }
 end
 
-def scenarios
-  @scenarios ||= features.collect {|f| f.scenarios.reject {|s| s.background? } }.flatten.sort {|x,y| x.value <=> y.value }
+def feature_tags_with_all_scenario_tags(feature)
+  feature.tags.collect {|t| t.value} + feature.scenarios.collect {|s| s.tags.collect {|t| t.value} }.flatten.uniq
 end
 
+
 def tagify(tag)
   %{<span class="tag" href="#{url_for tag}">#{tag.value}</span>} 
 end

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

@@ -4,10 +4,12 @@
 .tags { font-family: monospace;	font-size: 14px; }
 .title { padding: 10px; font-size: 24px; }
 
-#view, #expand { float: right; font-size: 13px; color: gray; vertical-align: bottom; }
-.control { float: right; font-size: 13px; color: gray; vertical-align: bottom;  font-family: monospace;	font-size: 14px; cursor: pointer; }
+.control { float: right; font-size: 13px; color: #05A; vertical-align: bottom;  font-family: monospace;	font-size: 14px; cursor: pointer; }
+
+.title { margin: 20px 20px 10px 20px; padding-left: 0px; border-bottom: 1px solid #E3E3E3; }
+.noborder { border: none; }
+#header * .title { padding: 10px; margin: 0px; border: none; }
 
-.title { margin: 20px 20px 10px 20px;	padding-left: 0px; border-bottom: 1px solid #E3E3E3; }
 .meta .file { float: right; margin-top: 5px; margin-right: 20px; }
 .title .pre { color: #696969; }
 .title .name { font-weight: bold; color: #3F3F3F; }
@@ -16,11 +18,14 @@
 .scenario .meta .tags { margin-left: 0px; }
 .feature .meta .tags { float: right; margin-right: 20px; }
 
+.suggestion { color: #ff686e; }
+
 
 .feature .description, .requirements .summary {
     margin: 10px 20px 0px 30px;
     padding: 10px 20px 20px 10px;
     color: #343332;
+    font-size: 16px;
     font-family: 'Trebuchet MS', Arial, Helvetica;
 }
 
@@ -44,6 +49,10 @@
     padding: 6px 10px; margin-top: 18px;
     background: #e5e8ff; border: 1px solid #d8d8e5; -moz-border-radius: 3px; -webkit-border-radius: 3px;
 }
+.nodefinitions .title {
+    background-color: #F5EADD;  border: 1px solid #d8d8e5; -moz-border-radius: 3px; -webkit-border-radius: 3px;
+}
+
 .scenario .title { border: none; }
 .background .title { background: #cbddeb; }
 
@@ -86,11 +95,11 @@
 
 .comments { margin-left: 25px; color: gray; padding: 5px; font-size: 13px; }
 .scenario .steps .comments { margin-left: 0px; }
-
+.feature .comments { margin-left: 30px; padding: 10px 20px 20px 10px; }
 
 .step .predicate { color: #5D5C5B; }
-
 .step .defined {}
+div.undefined { padding: 6px; }
 .step .definition { float: right; color: #343332; }
 .step .details .pre {}
 .step .details .name { font-family: monospace; color: black; }
@@ -104,6 +113,7 @@
     border: 1px solid #DEDEDE;
 }
 
+/* Scenario Outline Table */
 .outline {
     margin-top: 20px;
     margin-left: 40px;
@@ -114,7 +124,6 @@
     font-size: 16px;
 }
 
-
 .multiline table tr, .outline table tr {
     padding: 4px;
 }
@@ -128,7 +137,8 @@
     padding: 4px 10px 4px 10px;
 }
 
-/* tag page */
+
+/* Tag page */
 #tags #features, #tags #scenarios { margin-right: 20px;}
 #tags * .tag { font-family: monospace;	font-size: 14px; cursor: pointer; }
 
@@ -137,39 +147,46 @@
 .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 */
-
 
 
+/* Step Transformer Page */
+.transformer { margin-top: 20px; }
 .transformer * .docstring { margin-left: 20px; margin-top: 10px; padding: 5px 5px 5px 10px; }
-.transformer .steps, .method_details_list, .steps, .method_details_list {
-    margin: 10px 20px 0px 30px;
-}
-.transformer .steps .step { padding: 4px; }
-
+.transformer .steps, .method_details_list, .steps, .method_details_list { margin: 10px 20px 0px 30px; }
+.transformer .steps .step { padding: 6px; font-size: 14px; }
 
 
+/* Tag Search Page */
 #tags * li { padding: 5px; padding-left: 12px; margin: 0 0 0 10px; font-size: 1.1em; list-style: none; }
-
 #tag_search {  margin: 10px 0px 10px 0px; width: 100%; min-width: 200px; height: 20px; }
 #tag_filtering {
-    margin: 10px 20px 0px 40px;
+    margin: 10px 20px 0px 30px;
     font-weight: bold;
     padding: 20px;
     background-color: #F8F8FF;
     color: #444444;
-    border: 1px solid #DEDEDE;
+    border: 1px solid #DEDEDE; -moz-border-radius: 3px; -webkit-border-radius: 3px;
 }
-#command_example { margin-top: 10px; margin-left: 10px; font-weight: normal; }
 
+#command_example { 
+    margin-top: 10px; 
+    margin-left: 0px; 
+    font-size: 1.1em; font-weight: normal; font-family: Monaco, Consolas, Courier, monospace;
+    color: #333;
+    padding: 8px 10px; 
+    background: #A8E795; border: 1px solid #d8d8e5; -moz-border-radius: 3px; -webkit-border-radius: 3px;
+}
 
 
-#cukes_links { margin: 10px auto 10px auto; 
-               border-bottom: 1px solid #E3E3E3;
-               width: 762px; text-align: center;
-               padding: 10px;
+#cukes_links { 
+    margin: 10px auto 10px auto; 
+    border-bottom: 1px solid #E3E3E3;
+    width: 762px; text-align: center;
+    padding: 10px;
 }
 
+/* Logo Image and Step Status Images */
+
 #cukes_logo {
     margin: 0px auto 10px auto;
     width: 762px;
@@ -188,6 +205,4 @@
     width: 15px;
     height: 15px;
     background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAIAAAC0tAIdAAAACXBIWXMAAA86AAAPOgGXOdvCAAABWUlEQVQoFS2SvVEEMQyFJdkspFcCVAAVUREZXVAHHRAwZOQwQ3YM67X4nnwe3+3afn+S18/P9366s5yZ042R6c3c3bRKDw+WwZxf791Pt/3hMcev5QBpFtauPLoBYrYr6zcem/Xr8frUbc4c59zPPoekQeSesTm47IaD74kfTjnDbNqxC5pTzrJfQcCFBQClIh7bIdDc9S+6E8WIQXTl9somfA1S4iJVbUnJmyOhJT+51AMRkXVArMtBdUNLGcpmaReDdSIGHw4m2iyNIiMslTWqBvMuZSVZB4QhMRRp6IUjzYuPctvq3TpWumq2sIfNw/KQ3DwomfIv6aVBT+ZQMFKxhB8uLfhlzkO3Sstlwh1ja3+oEKVuqipGHhMztEGvvlZEQHwyMKPD1NDtrrpBR3jbalv90hWzo05FBr1vlKGXtvGF9fz5HG8vFRpK1a5yV0/KVuZSzO+Pf3G6tVs/+L00AAAAAElFTkSuQmCC) no-repeat center;
-}
-
-.conflicted {}
+}

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

@@ -19,6 +19,8 @@
     <div id="content">
       <h1 id="full_list_header"><%= @list_title %></h1>
       <div id="nav">
+        <a target="_self" href="feature_list.html">Features</a> | 
+        <a target="_self" href="tag_list.html">Tags</a> | 
         <a target="_self" href="class_list.html">Classes</a> | 
         <a target="_self" href="method_list.html">Methods</a> |
         <a target="_self" href="file_list.html">Files</a>

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

@@ -7,7 +7,22 @@ function cucumberSearchFrameLinks() {
     });
 }
 
+function cucumberKeyboardShortcuts() {
+  if (window.top.frames.main) return;
+  $(document).keypress(function(evt) {
+    if (evt.altKey || evt.ctrlKey || evt.metaKey || evt.shiftKey) return;
+    if (typeof evt.orignalTarget !== "undefined" &&  
+        (evt.originalTarget.nodeName == "INPUT" || 
+        evt.originalTarget.nodeName == "TEXTAREA")) return;
+    switch (evt.charCode) {
+      case 82: case 114: $('#features_list_link').click(); break; // 'r'
+      case 84: case 116: $('#tags_list_link').click(); break;  // 't'
+    }
+  });
+}
+
 $(cucumberSearchFrameLinks);
+$(cucumberKeyboardShortcuts);
 
 
 $(function() {
@@ -92,6 +107,11 @@ $(function() {
 		
         if (typeof eventObject.currentTarget !== "undefined")  {
             var exampleRow = $(eventObject.currentTarget);
+            
+            if (eventObject.currentTarget.className.match(/example\d+/) == null) {
+                return false;
+            }
+            
             var exampleClass = eventObject.currentTarget.className.match(/example\d+/)[0];
             var example = exampleRow.closest('div.details').find('.' + exampleClass);
 			
@@ -151,21 +171,24 @@ function updateTagFiltering(tagString) {
     var formulaTags = determineTagsUsedInFormula(tagString);
     displayExampleCommandLine(formulaTags);
     displayQualifyingFeaturesAndScenarios(formulaTags);
-    hideEmptySections();
     fixSectionRowAlternations();
 }
 
+function clearTagFiltering() {
+    updateTagFiltering("");
+}
+
 function determineTagsUsedInFormula(tagString)  {
 
     tagString = tagString.replace(/^(\s+)|(\s+)$/,'').replace(/\s{2,}/,' ');
 
-    var tagGroup = tagString.match(/@\w+(,@\w+)*/g);
+    var tagGroup = tagString.match(/(?:~)?@\w+(,(?:~)?@\w+)*/g);
 
     var returnTags = [];
 
     if (tagGroup) {
         tagGroup.forEach(function(tag, index, array) {
-            //console.log("Tag Group: " + tag);
+            console.log("Tag Group: " + tag);
             var validTags = removeInvalidTags(tag)
             if (validTags != "") {
                 returnTags.push(validTags);
@@ -178,8 +201,11 @@ function determineTagsUsedInFormula(tagString)  {
 
 function removeInvalidTags(tagGroup) {
     tagGroup.split(",").forEach(function(tag, index, array) {
+        
+        baseTag = tag.match(/^~(.+)/) ? tag.match(/^~(.+)/)[1] : tag;
+        
         //console.log("Validating Tag: " + tag)
-        if (tag_list.indexOf(tag) === -1) {
+        if (tag_list.indexOf(baseTag) === -1) {
             //console.log("Removing Tag: " + tag);
             tagGroup = tagGroup.replace(new RegExp(',?' + tag + ',?'),"")
         }
@@ -197,28 +223,9 @@ function displayExampleCommandLine(tags) {
     }
 }
 
-function hideEmptySections() {
-	
-    ["feature","scenario"].forEach(function(section,index,sections) {
-	
-        if ( $("." + section + ":visible").length == 0 ) {
-            $("#" + section + "s")[0].style.display = "none";
-        } else {
-            $("#" + section + "s")[0].style.display = "block";
-        }
-		
-    });
-}
-
 function fixSectionRowAlternations() {
-
-    ["feature","scenario"].forEach(function(section,index,sections) {
-	
-        $("." + section + ":visible")
-        $("." + section + ":visible").each(function(index) {
-            $(this).removeClass("r1 r2").addClass("r" + ((index % 2) + 1));
-        });
-		
+    $(".feature:visible,.scenario:visible").each(function(index){
+        $(this).removeClass("odd even").addClass( ((index + 1) % 2 == 0 ? "even" : "odd") );
     });
 }
 
@@ -227,20 +234,34 @@ function displayQualifyingFeaturesAndScenarios(tags) {
     if (tags.length > 0) {
 
         $(".feature,.scenario").each(function(feature){
-            this.style.display = "none";
+            $(this).hide();
         });
 
         var tagSelectors = generateCssSelectorFromTags(tags);
 
         tagSelectors.forEach(function(selector,selectorIndex,selectorArray) {
-            $(".feature." + selector.replace(/@/g,"\\@").replace(/\s/,".") + ",.scenario." + selector.replace(/@/g,"\\@").replace(/\s/,".")).each(function(matchItem) {
-                this.style.display = "block";
+            var tags = selector;
+            
+            $(".feature." + tags).each(function(index) {
+                $(this).show();
+            });
+            $(".scenario." + tags).each(function(index) {
+                $(this).show();
+                $(this).parent().prev().show();
             });
+            
         });
+        
+        if ( $(".feature:visible,.scenario:visible").length == 0 ) {
+            $("#features div.undefined").show();
+        }  else {
+            $("#features div.undefined").hide();
+        }
+        
 
     } else {
-        $(".feature,.scenario").each(function(feature){
-            this.style.display = "block";
+        $(".feature:hidden,.scenario:hidden").each(function(feature){
+            $(this).show();
         });
     }
 
@@ -255,8 +276,15 @@ function generateCssSelectorFromTags(tagGroups) {
 
         tagSelectors.forEach(function(selector,selectorIndex,selectorArray) {
             tagGroup.split(",").forEach(function(tag,tagIndex,tagArray) {
-                //console.log("selector: " + (selector + " " + tag).trim());
-                newTagSelectors.push((selector + " " + tag).trim());
+                
+                if ( tag.match(/^~@.+$/) ) {
+                    tag = tag.match(/^~(@.+)$/)[1]
+                    //console.log("selector: " + (selector + " :not(" + tag + ")").trim());
+                    newTagSelectors.push((selector + ":not(." + tag.replace(/@/g,"\\@") +")").trim());
+                } else { 
+                    //console.log("selector: " + (selector + " " + tag).trim());
+                    newTagSelectors.push((selector + "." + tag.replace(/@/g,"\\@")).trim());
+                }
             });
 
         });

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

@@ -8,7 +8,7 @@ def init
 
   if @features
     @features.each {|feature| serialize(feature) } 
-    generate_full_list(@features)
+    generate_full_list @features.sort {|x,y| x.value.to_s <=> y.value.to_s }
   end
   
   @tags = Registry.all(:tag)

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

@@ -14,6 +14,7 @@ def all_features_by_letter
   objects = features
   objects = run_verifier(objects)
   objects.each {|o| (hash[o.value.to_s[0,1].upcase] ||= []) << o }
+  hash.values.each {|v| v.sort! {|a,b| b.value.to_s <=> a.value.to_s } }
   hash
 end
 
@@ -22,6 +23,7 @@ def all_scenarios_by_letter
   objects = scenarios
   objects = run_verifier(objects)
   objects.each {|o| (hash[o.value.to_s[0,1].upcase] ||= []) << o }
+  hash.values.each {|v| v.sort! {|a,b| b.value.to_s <=> a.value.to_s } }
   hash
 end
 
@@ -30,6 +32,7 @@ def all_directories_by_letter
   objects = feature_directories
   objects = run_verifier(objects)
   objects.each {|o| (hash[o.value.to_s[0,1].upcase] ||= []) << o }
+  hash.values.each {|v| v.sort! {|a,b| b.value.to_s <=> a.value.to_s } }
   hash
 end
 

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

@@ -1,9 +1,9 @@
 <div class="title">
-  <div class="name"><%= @item_title %></div>
-  
   <% if @item_type %>
-    <div class="control" id="<%= @item_type.gsub(/\s/,'') %>">[Collapse All]</div>
-    <div style="clear: right;"></div>
-  <% end %>
+     <a class="control" href="#" id="<%= @item_type.gsub(/\s/,'') %>">[Collapse All]</a>
+     <div style="clear: right;"></div>
+   <% end %>
+ 
+  <div class="name"><%= @item_title %></div>
 </div>
 

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

@@ -1,61 +1,67 @@
 <% @items.each do |item| %>
 
-  <div class="transformer <%= @item_type.gsub(/\s/,'') %>">
-    <a name="<%= anchor_for item %>"></a>
-    <div class="title">
-      <span class="pre"><%= h item.keyword %></span>
-      <span class="name"><%= h item.value %></span>
-      <a style="float: right;" href="http://rubular.com/?regex=<%= urlencode item.value %>" target="_blank">Rubular</a>
-      <div style="clear: both;"></div>
-    </div>
+<div class="transformer <%= @item_type.gsub(/\s/,'') %> <%= "nodefinitions" if item.steps.nil? || item.steps.empty? %>">
+  <a name="<%= anchor_for item %>"></a>
+  <div class="title">
+    <span class="pre"><%= h item.keyword %></span>
+    <span class="name"><%= h item.value %></span>
+    <a style="float: right;" href="http://rubular.com/?regex=<%= urlencode item.value %>" target="_blank">Rubular</a>
+    <div style="clear: both;"></div>
+  </div>
 
-    <div class="details">
+  <div class="details">
 
-      <div class="meta" style="clear: right;">
-        <div class="file"><%= h item.location %></div>
-      </div>
+    <!-- Comments -->
+    <div>
+      <%= T('docstring').run(options.dup.merge({:object => item})) %>
+    </div>
 
-      <!-- Comments -->
-      <div>
-        <%= T('docstring').run(options.dup.merge({:object => item})) %>
-      </div>
+    <div class="meta" style="clear: right;">
+      <div class="file"><%= h item.location %></div>
+    </div>
 
-      <!-- Source Code -->
-      <div class="method_details_list">
-        <table class="source_code">
-          <tr>
-            <td>
-              <pre class="lines"><%= "" %><%= h format_lines(item) %></pre>
-            </td>
-            <td>
-              <pre class="code"><%= "" %><%= html_syntax_highlight item.source %></pre>
-            </td>
-          </tr>
-        </table>
-      </div>
+    <!-- Source Code -->
+    <div class="method_details_list">
+      <table class="source_code">
+        <tr>
+          <td>
+            <pre class="lines"><%= "" %><%= h format_lines(item) %></pre>
+          </td>
+          <td>
+            <pre class="code"><%= "" %><%= html_syntax_highlight item.source %></pre>
+          </td>
+        </tr>
+      </table>
+    </div>
 
-      <!-- Matching Step Instances -->
-      <div class="steps">
-        <% if item.steps && !item.steps.empty? %>
-          <% item.steps.each_with_index do |step,step_index| %>
-            <div class="step <%= (step_index + 1) % 2 == 0 ? 'even' : 'odd' %>">
-              <span class="predicate">
-                <%= h step.keyword %>
-              </span>
-              <span class="defined">
-                <%= link_transformed_step(step) %>
-              </span>
-              <a class="definition" href="<%= url_for step.scenario.feature %>"><%= h step.location %></a>
-              <div style="clear: both;"></div>
-            </div>
-          <% end %>
-        <% else %>
-          <div class="undefined">No steps were found to match this <%= @item_type %>.</div>
-        <% end%>
-      </div>
+    <!-- Matching Step Instances -->
 
+    <div class="steps">
+      <% if item.steps && !item.steps.empty? %>
+      <% unique_steps(item.steps).each_with_index do |uniq_step,step_index| %>
+      <div class="step <%= (step_index + 1) % 2 == 0 ? 'even' : 'odd' %>">
+        <div>
+          <span class="predicate">
+            <%= h uniq_step.last.first.keyword %>
+          </span>
+          <span class="defined">
+            <%= link_transformed_step(uniq_step.last.first) %>
+          </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 %>
+      <% else %>
+      <div class="undefined">No steps were found to match this <%= @item_type %>.</div>
+      <% end%>
     </div>
-
   </div>
+  
+  <div style="margin: 30px 20px; border-top: 1px dotted #AAA;"></div>
+
+</div>
 
 <% end %>