cucumber-in-the-yard 1.6.4 → 1.7.0

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.7.0 / 2010-11-18
+
+* Dynamic Tag Union / Intersection
+
 === 1.6.4 / 2010-11-16
 
 * `yard server` can now serve up requirements with YARD 0.6.2

data/README.md

@@ -24,6 +24,8 @@ The implemented example has been deployed at [http://recursivegames.com/cukes/](
 
 **2. Search through features, scenarios, and tags** [example](http://recursivegames.com/cukes/feature_list.html) & [example](http://recursivegames.com/cukes/tag_list.html)
 
+**3. Dynamic Tag Unions and Intersections** [example](http://recursivegames.com/cukes/requirements/tags.html)
+
 **4. View features and scenarios by tag** [example](http://recursivegames.com/cukes/requirements/tags/bvt.html)
 
 **5. Steps link to their step definitions** [example](http://recursivegames.com/cukes/requirements/example/scenario.html)
@@ -110,37 +112,33 @@ Roadmap
 
 **Future Feature Ideas**
 
-**1. Feature/Scenario Tag unions and intersections**
-
-Create an AJAX interface that would allow the user to specify tags to union, intersect, or exclude to 
-produce a list of features and scenarios that would execute.  The output could also provide an example
-command line parameter list to produce the feature/scenario execution results.
+**1. Table Step Transforms**
 
-Visualization of this execution with some graphing library for some extra points.
+The table step transform matching would be nice to show which tables are affected by table transforms
 
-**2. Performance enhancements**
+**2. Before, After, and Around Hooks**
 
-The current rate of documentation is not dreadfully slow anymore but more performance enhancements could
-always be performed to produce the documentation faster.
+Document the additional before, after, and around hooks that Cucumber uses.  Specifically display the before, after, and around
+hooks that are tied to tags (unions and intersections) on the tag pages.
 
-**3. Requirements Only Docuementation**
+**3. Layout refinements of the step definition / step tranform page**
 
-'fulldoc' is the default documentation generated but I have this thought that a requirements-only document
-may be useful.  Essentially the first draft would be the current documentation minus the class and method
-links/searches and replacing the index.html.
+More work could be done to make this page more searchable, sortable, and usable.
 
-**4. Before, After, and Around Hooks**
+**4. Visualization of /Scenario Tag unions and intersections**
 
-Document the additional before, after, and around hooks that Cucumber uses.  Specifically display the before, after, and around
-hooks that are tied to tags (unions and intersections) on the tag pages.
+Continue to expand the tag union/intersection tool.  Visualization of this execution with some graphing library for some extra points.
 
-**5. Layout refinements of the step definition / step tranform page**
+**5. Requirements Only Docuementation**
 
-More work could be done to make this page more searchable, sortable, and usable.
+'fulldoc' is the default documentation generated but I have this thought that a requirements-only document
+may be useful.  Essentially the first draft would be the current documentation minus the class and method
+links/searches and replacing the index.html.
 
-**6. Table Step Transforms**
+**6. Performance enhancements**
 
-The table step transform matching would be nice to show which tables are affected by table transforms
+The current rate of documentation is not dreadfully slow anymore but more performance enhancements could
+always be performed to produce the documentation faster.
 
 
 

data/lib/city.rb

@@ -4,7 +4,7 @@ require 'gherkin/parser/parser'
 require 'gherkin/formatter/tag_count_formatter'
 
 module CucumberInTheYARD
-  VERSION = '1.6.4' unless defined?(CucumberInTheYARD::VERSION)
+  VERSION = '1.7.0' unless defined?(CucumberInTheYARD::VERSION)
 end
 
 

data/lib/templates/default/featuretags/html/namespace.erb

@@ -4,28 +4,55 @@
       var tag_list = [ <%= tags.collect{|t| "'#{t.value}'" }.join(',') %> ];
 
       $(function() {
-        $("#tag_search").keyup(function(event) {
-          var tags = determine_tags_used_in_formula($("#tag_search")[0].value);
-          display_example_command_line(tags);
-          display_qualifying_features_and_scenarios(tags);
+        $("#tag_search").keyup(function(evt) {
+          updateTagFiltering($("#tag_search")[0].value);
+        });
+        
+         $(".tag").click(function(evt) {
+            if (typeof evt !== "undefined") {
+
+              if (evt.ctrlKey === true)  {
+                window.location = $(this).attr("href");
+              } else if (evt.altKey === true ) {
+                $("#tag_search")[0].value += ($("#tag_search")[0].value != "" ? "," : "") + this.innerHTML;
+                updateTagFiltering($("#tag_search")[0].value);
+              } else {
+                $("#tag_search")[0].value += ($("#tag_search")[0].value != "" ? " " : "") + this.innerHTML;
+                updateTagFiltering($("#tag_search")[0].value);
+              }
+            }
         });
       });
     </script>
 
     <div class="title">
-      <span class="name">Requirements Tags</span>
+      <span class="name">Tags</span>
     </div>
 
-    <div class="tags"><span class="name">Tags:</span>
-      <%= tags.collect {|tag| linkify(tag,tag.value) }.join(",\n") %>
+    <div id="tag_filtering" >
+        <span>Tag Filtering <a href="https://github.com/aslakhellesoy/cucumber/wiki/Tags" target="_blank">?</a></span>
+        
+        <div style="clear: both"></div>
+        
+        <div style="float: left; margin-top: 10px; font-size: 10px; font-style: italic;">
+          Left-click tags to 'AND'; ALT left-click tags to 'OR'
+        </div>
+        
+        <div style="float: right;">
+          <a href="" onclick=" updateTagFiltering(""); return true;">clear</a>
+        </div>
+        
+        <div style="clear: both"></div>
+        
+        <input id="tag_search" type="text" />
+        <span>Example command line execution:</span>
+        <div id="command_example">cucumber</div>
     </div>
 
-    <div>
-      <input id="tag_search" type="text" />
+    <div class="tags" style="margin-top: 20px;"><span class="name">Tags:</span>
+      <%= tags.collect {|tag| tagify(tag) }.join(",\n") %>
     </div>
 
-    <div id="command_example">cucumber</div>
-
     <div id="features">
       <div class="title">
         <span class="name">Features</span>
@@ -33,8 +60,11 @@
       <% n = 1 %>
       <% features.each do |feature| %>
         <li class="feature r<%= n %> <%= feature.tags.collect{|t| t.value }.join(" ") %>">
-          <%= linkify feature, feature.value %>
-          <small>(<%= h(feature.location) %>)</small>
+        <%= linkify feature, feature.value %>
+          <% itags = feature.tags.collect{|t| tagify(t) }.join(", ") %>
+          <% if itags && itags != "" %>
+            - <small><%= itags %></small>
+          <% end %>
         </li>
         <% n = n == 2 ? 1 : 2 %>
         <% end %>
@@ -47,8 +77,11 @@
       <% n = 1 %>
       <% scenarios.each_with_index do |scenario,index| %>
         <li class="scenario r<%= n %> <%= scenario.tags.collect{|t| t.value }.join(" ") %>">
-          <%= linkify scenario.feature,  scenario.value %>
-          <small>(<%= h(scenario.feature.location) %>)</small>
+          <%= linkify scenario.feature, scenario.value %>
+          <% itags = scenario.tags.collect{|t| tagify(t) }.join(", ") %>
+          <% if itags && itags != "" %>
+            - <small><%= itags %></small>
+          <% end %>
         </li>
       <% n = n == 2 ? 1 : 2 %>
       <% end %>

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

@@ -27,3 +27,7 @@ end
 def scenarios
   @scenarios ||= Registry.all(:scenario).reject {|s| s.outline? || s.background? }.sort {|x,y| x.value <=> y.value }
 end
+
+def tagify(tag)
+  %{<span class="tag" href="#{url_for tag}">#{tag.value}</span>} 
+end

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

@@ -91,7 +91,6 @@
     border: 1px solid #DEDEDE;
 }
 
-
 .outline {
     margin-top: 20px;
     margin-left: 40px;
@@ -115,6 +114,9 @@
     padding: 4px 10px 4px 10px;
 }
 
+/* tag page */
+#tags #features, #tags #scenarios { margin-right: 20px;}
+#tags * .tag { font-family: monospace;	font-size: 14px; cursor: pointer; }
 
 /* Overrides for scenarios in the tag view */
 .tag .feature { margin-left: 20px; }
@@ -139,15 +141,17 @@
 }
 #tags * li { padding: 5px; padding-left: 12px; margin: 0 0 0 10px; font-size: 1.1em; list-style: none; }
 
-.tag_search { margin-left: 40px; }
-#tag_search {  margin-left: 40px; width: 500px; height: 20px; }
-#command_example { 
-    margin: 10px 0px 0px 40px;
+#tag_search {  margin: 10px 0px 10px 0px; width: 100%; min-width: 200px; height: 20px; }
+#tag_filtering {
+    margin: 10px 20px 0px 40px;
+    font-weight: bold;
     padding: 20px;
     background-color: #F8F8FF;
     color: #444444;
     border: 1px solid #DEDEDE;
 }
+#command_example { margin-top: 10px; margin-left: 10px; font-weight: normal; }
+
 
 
 #cukes_links { margin: 10px auto 10px auto; 

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

@@ -33,29 +33,48 @@ function toggleScenarioExample(id,example) {
 
 }
 
-function determine_tags_used_in_formula(tag_string)  {
-    //$("#tag_debug")[0].innerHTML = "";
-	
-    tag_string = tag_string.replace(/^(\s+)|(\s+)$/,'').replace(/\s{2,}/,' ');
 
-    var tags = tag_string.match(/@\w+/g);
+function updateTagFiltering(tagString) {
+    var formulaTags = determineTagsUsedInFormula(tagString);
+    displayExampleCommandLine(formulaTags);
+    displayQualifyingFeaturesAndScenarios(formulaTags);
+    hideEmptySections();
+    fixSectionRowAlternations();
+}
+
+function determineTagsUsedInFormula(tagString)  {
+
+    tagString = tagString.replace(/^(\s+)|(\s+)$/,'').replace(/\s{2,}/,' ');
+
+    var tagGroup = tagString.match(/@\w+(,@\w+)*/g);
 
-    var return_tags = [];
+    var returnTags = [];
 
-    if (tags != null) {
-        tags.forEach(function(tag, index, array) {
-            //$("#tag_debug")[0].innerHTML += tag + " ";
-            if (tag_list.indexOf(tag) != -1) {
-                return_tags.push(tag);
-            }
+    if (tagGroup) {
+        tagGroup.forEach(function(tag, index, array) {
+            //console.log("Tag Group: " + tag);
+            var validTags = removeInvalidTags(tag)
+            if (validTags != "") { returnTags.push(validTags); }
         });
     }
 
-    return return_tags;
+    return returnTags;
 }
 
+function removeInvalidTags(tagGroup) {
+    tagGroup.split(",").forEach(function(tag, index, array) {
+        //console.log("Validating Tag: " + tag)
+        if (tag_list.indexOf(tag) === -1) {
+            //console.log("Removing Tag: " + tag);
+            tagGroup = tagGroup.replace(new RegExp(',?' + tag + ',?'),"")
+        }
+    });
+
+    return tagGroup;
+}
 
-function display_example_command_line(tags) {
+
+function displayExampleCommandLine(tags) {
     $("#command_example")[0].innerHTML = "cucumber ";
 
     if (tags.length > 0)  {
@@ -63,24 +82,74 @@ function display_example_command_line(tags) {
     }
 }
 
-function display_qualifying_features_and_scenarios(tags) {
-    //$("#tag_debug")[0].innerHTML = "";
+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";
+		}
+		
+	});
+}
 
-    if (tags.length > 0) {
+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));
+		});
 		
+	});
+}
+
+function displayQualifyingFeaturesAndScenarios(tags) {
+
+    if (tags.length > 0) {
+
         $(".feature,.scenario").each(function(feature){
             this.style.display = "none";
         });
 
-        $(".feature.\\" + tags.join(".\\") + ",.scenario.\\" + tags.join(".\\")).each(function(feature) {
-            //$("#tag_debug")[0].innerHTML += feature + " " + this;
-            this.style.display = "block";
+        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";
+            });
         });
-		
+
     } else {
         $(".feature,.scenario").each(function(feature){
             this.style.display = "block";
         });
     }
 
+}
+
+function generateCssSelectorFromTags(tagGroups) {
+
+    var tagSelectors = [ "" ];
+
+    tagGroups.forEach(function(tagGroup,index,array) {
+        var newTagSelectors = [];
+
+        tagSelectors.forEach(function(selector,selectorIndex,selectorArray) {
+            tagGroup.split(",").forEach(function(tag,tagIndex,tagArray) {
+                //console.log("selector: " + (selector + " " + tag).trim());
+                newTagSelectors.push((selector + " " + tag).trim());
+            });
+
+        });
+
+        tagSelectors = newTagSelectors;
+
+    });
+
+
+    return tagSelectors;
 }

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

@@ -20,9 +20,10 @@ def init
 
   feature_directories = YARD::CodeObjects::Cucumber::CUCUMBER_NAMESPACE.children.find_all {|child| child.is_a?(YARD::CodeObjects::Cucumber::FeatureDirectory) }
 
+
   serialize(YARD::CodeObjects::Cucumber::CUCUMBER_NAMESPACE)
   serialize(YARD::CodeObjects::Cucumber::CUCUMBER_STEPTRANSFORM_NAMESPACE)
-  serialize(YARD::CodeObjects::Cucumber::CUCUMBER_TAG_NAMESPACE)  
+  serialize(YARD::CodeObjects::Cucumber::CUCUMBER_TAG_NAMESPACE)
   serialize_feature_directories(feature_directories)
 
 end

data/lib/yard/templates/helpers/base_helper.rb

@@ -3,7 +3,11 @@ module YARD::Templates::Helpers
   module BaseHelper
 
     def format_object_title(object)
-      if object.is_a?(YARD::CodeObjects::Cucumber::NamespaceObject)
+      if object.is_a?(YARD::CodeObjects::Cucumber::FeatureTags)
+        "Tags"
+      elsif object.is_a?(YARD::CodeObjects::Cucumber::StepTransformersObject)
+        "Step Definitions and Transforms"
+      elsif object.is_a?(YARD::CodeObjects::Cucumber::NamespaceObject)
         "#{format_object_type(object)}#{object.value ? ": #{object.value}" : ''}"
       else
         case object

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber-in-the-yard
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 11
   prerelease: false
   segments: 
   - 1
-  - 6
-  - 4
-  version: 1.6.4
+  - 7
+  - 0
+  version: 1.7.0
 platform: ruby
 authors: 
 - Franklin Webber
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 -08:00
+date: 2010-11-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -164,15 +164,11 @@ post_install_message: |+
   
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)
   
-    Thank you for installing Cucumber-In-The-YARD 1.6.4 / 2010-11-16.
+    Thank you for installing Cucumber-In-The-YARD 1.7.0 / 2010-11-18.
     
     Changes:
       
-    * `yard server` can now serve up requirements with YARD 0.6.2
-    * 'All Tags' page now has a cucumber tag AND filtering tool (beta)
-    * Step Defs and Transforms will show comments
-    
-    * FIX removed warnings by no longer requiring YARD
+    * Dynamic Tag Union / Intersection
     
   
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)