wally 0.0.15 → 0.0.16

data/config.ru

@@ -1,2 +1,2 @@
-require './lib/application'
+require './lib/wally'
 run Sinatra::Application

data/example-features/has-lots-of-tags.feature

@@ -1,5 +1,5 @@
-@tag1 @tag2
+@batman @robin
 Feature: Has lots of tags
 
-@tag @another_tag
+@green_lantern @spider_man
 Scenario: Also has some tags

data/example-features/multiple-scenarios.feature

@@ -0,0 +1,7 @@
+Feature: Multiple Scenarios
+  Scenario: Scenario 1
+  Scenario: Scenario 2
+  Scenario: Scenario 3
+  Scenario: Scenario 4
+  Scenario: Scenario 5
+  Scenario: Scenario 6

data/features/list_tags.feature

@@ -0,0 +1,20 @@
+Feature: List Tags
+  In order to be informed of all tags
+  As a stakeholder
+  I want a list of tags to be displayed
+
+  Scenario: Multiple tags
+    Given a feature file named "sample.feature" with the contents:
+    """
+    @tag1
+    Feature: Tag Feature
+    @tag2 @multiple
+    Scenario: Tag Scenario 1
+    @tag3 @multiple
+    Scenario: Tag Scenario 2
+    """
+    When I visit the home page
+    Then I should see a link to "@tag1 (1)" with the url "/search?q=@tag1"
+    And I should see a link to "@tag2 (1)" with the url "/search?q=@tag2"
+    And I should see a link to "@tag3 (1)" with the url "/search?q=@tag3"
+    And I should see a link to "@multiple (2)" with the url "/search?q=@multiple"

data/lib/wally.rb

@@ -7,3 +7,4 @@ require "wally/version"
 require "wally/application"
 require "wally/lists_features"
 require "wally/search_features"
+require "wally/counts_tags"

data/lib/wally/application.rb

@@ -7,16 +7,11 @@ configure do
   set :haml, { :ugly=>true }
 end
 
-def features_path
-  ARGV.first || "features"
-end
-
-def lists_features
-  Wally::ListsFeatures.new(features_path)
-end
-
 before do
-  @features = lists_features.features
+  features_path = ARGV.first || "features"
+  @lists_features = Wally::ListsFeatures.new(features_path)
+  @features = @lists_features.features
+  @tag_count = Wally::CountsTags.new(@lists_features).count_tags
 end
 
 get '/?' do
@@ -32,7 +27,7 @@ end
 
 get '/search/?' do
   if params[:q]
-    @search_results = Wally::SearchFeatures.new(lists_features).find(:query => params[:q])
+    @search_results = Wally::SearchFeatures.new(@lists_features).find(:query => params[:q])
   end
   haml :search
 end

data/lib/wally/counts_tags.rb

@@ -0,0 +1,27 @@
+module Wally
+  class CountsTags
+    def initialize lists_features
+      @lists_features = lists_features
+    end
+
+    def count_tags
+      @lists_features.features.inject(Hash.new(0)) do |tag_count, feature|
+        if feature["tags"]
+          feature["tags"].each do |tag|
+            tag_count[tag["name"]] += 1
+          end
+        end
+        if feature["elements"]
+          feature["elements"].each do |element|
+            if element["tags"]
+              element["tags"].each do |tag|
+                tag_count[tag["name"]] += 1
+              end
+            end
+          end
+        end
+        tag_count
+      end
+    end
+  end
+end

data/lib/wally/public/skin.css

@@ -101,3 +101,7 @@ p {
   font-size: 15px;
   content: "\2691";
 }
+
+section.feature p:first-child {
+    white-space: pre-wrap
+}

data/lib/wally/version.rb

@@ -1,3 +1,3 @@
 module Wally
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

data/lib/wally/views/index.haml

@@ -0,0 +1 @@
+

data/lib/wally/views/layout.haml

@@ -17,6 +17,12 @@
           %input.btn{:type => "submit", :id => "search", :value => "Search"}
     %div.container-fluid
       %div.sidebar
+        - if @tag_count.any?
+          %h2 Tags
+          - @tag_count.each do |tag, count|
+            %span.label.notice
+              %a{:href => "/search?q=#{tag}"}
+                = "#{tag} (#{count})"
         %h2
           Features
         %ul

data/lib/wally/views/search.haml

@@ -7,18 +7,21 @@
       %a{:href => "/search?q=#{@search_results.suggestion}"}
         = @search_results.suggestion
   %ul
-    - @search_results.items.each do |search_result|
+    - @search_results.items.map {|i| i.feature["id"] }.uniq.each do |current_feature_id|
+      - root_search_result = @search_results.items.find { |r| r.feature["id"] == current_feature_id }
       %li
-        %a{:href => "/features/#{search_result.feature["id"]}"}
-          = search_result.feature["name"]
-        - if search_result.feature["tags"]
-          = haml :tag_links, {:locals => {:tags => search_result.feature["tags"]}, :layout => false}
+        %a{:href => "/features/#{root_search_result.feature["id"]}"}
+          = root_search_result.feature["name"]
+        - if root_search_result.feature["tags"]
+          = haml :tag_links, {:locals => {:tags => root_search_result.feature["tags"]}, :layout => false}
+
         %ul
-          - if search_result.scenario && search_result.scenario["id"]
-            %li
-              %a{:href => "/features/#{search_result.scenario["id"].gsub(";", "/scenario/")}"}
-                = search_result.scenario["name"]
-              - if search_result.scenario["tags"]
-                = haml :tag_links, {:locals => {:tags => search_result.scenario["tags"]}, :layout => false}
+          - @search_results.items.select { |r| r.feature["id"] == current_feature_id }.each do |search_result|
+            - if search_result.scenario && search_result.scenario["id"]
+              %li
+                %a{:href => "/features/#{search_result.scenario["id"].gsub(";", "/scenario/")}"}
+                  = search_result.scenario["name"]
+                - if search_result.scenario["tags"]
+                  = haml :tag_links, {:locals => {:tags => search_result.scenario["tags"]}, :layout => false}
 - else
   %p Where's Wally? This search returned no results.

data/spec/wally/counts_tags_spec.rb

@@ -0,0 +1,42 @@
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require 'fileutils'
+require "wally/counts_tags"
+
+module Wally
+  describe CountsTags do
+    before do
+      FileUtils.mkdir_p "application-features"
+    end
+
+    after do
+      FileUtils.rm_rf "application-features"
+    end
+
+    def write_feature(name, contents)
+      File.open("application-features/#{name}", "w") do |file|
+        file.write(contents)
+      end
+    end
+
+    it "counts feature tags" do
+      write_feature("feature-1.feature", "@tag1 @tag2\nFeature: Feature 1")
+      write_feature("feature-2.feature", "@tag2 @tag2\nFeature: Feature 2")
+      lists_features = ListsFeatures.new("application-features")
+
+      CountsTags.new(lists_features).count_tags.should == {
+        "@tag1" => 1,
+        "@tag2" => 3
+      }
+    end
+
+    it "counts scenario tags" do
+      write_feature("feature-1.feature", "Feature: Feature 1\n@tag1@tag1\nScenario: Scenario 1")
+      write_feature("feature-2.feature", "Feature: Feature 2\n@tag3@tag1\nScenario: Scenario 1")
+      lists_features = ListsFeatures.new("application-features")
+      CountsTags.new(lists_features).count_tags.should == {
+        "@tag1" => 3,
+        "@tag3" => 1
+      }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wally
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-23 00:00:00.000000000Z
+date: 2011-11-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70131146162700 !ruby/object:Gem::Requirement
+  requirement: &70288097150820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131146162700
+  version_requirements: *70288097150820
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70131146162280 !ruby/object:Gem::Requirement
+  requirement: &70288097150260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131146162280
+  version_requirements: *70288097150260
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70131146161780 !ruby/object:Gem::Requirement
+  requirement: &70288097149660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131146161780
+  version_requirements: *70288097149660
 - !ruby/object:Gem::Dependency
   name: gherkin
-  requirement: &70131146161320 !ruby/object:Gem::Requirement
+  requirement: &70288097149000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131146161320
+  version_requirements: *70288097149000
 - !ruby/object:Gem::Dependency
   name: komainu
-  requirement: &70131146160860 !ruby/object:Gem::Requirement
+  requirement: &70288097134480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131146160860
+  version_requirements: *70288097134480
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70131146160300 !ruby/object:Gem::Requirement
+  requirement: &70288097133960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70131146160300
+  version_requirements: *70288097133960
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70131146159800 !ruby/object:Gem::Requirement
+  requirement: &70288097133180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70131146159800
+  version_requirements: *70288097133180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70131146159080 !ruby/object:Gem::Requirement
+  requirement: &70288097132520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70131146159080
+  version_requirements: *70288097132520
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70131146157960 !ruby/object:Gem::Requirement
+  requirement: &70288097131960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70131146157960
+  version_requirements: *70288097131960
 description: ''
 email:
 - andrew.vos@gmail.com
@@ -128,7 +128,9 @@ files:
 - example-features/example-with-background.feature
 - example-features/example_with_tags.feature
 - example-features/has-lots-of-tags.feature
+- example-features/multiple-scenarios.feature
 - features/browse_features.feature
+- features/list_tags.feature
 - features/search_features.feature
 - features/step_definitions/browse_features_steps.rb
 - features/step_definitions/search_features_steps.rb
@@ -136,6 +138,7 @@ files:
 - features/support/env.rb
 - lib/wally.rb
 - lib/wally/application.rb
+- lib/wally/counts_tags.rb
 - lib/wally/lists_features.rb
 - lib/wally/public/bootstrap.min.css
 - lib/wally/public/skin.css
@@ -150,6 +153,7 @@ files:
 - lib/wally/views/search.haml
 - lib/wally/views/tag_links.haml
 - spec/spec_helper.rb
+- spec/wally/counts_tags_spec.rb
 - spec/wally/lists_features_spec.rb
 - spec/wally/search_features_spec.rb
 - wally.gemspec
@@ -179,11 +183,13 @@ specification_version: 3
 summary: ''
 test_files:
 - features/browse_features.feature
+- features/list_tags.feature
 - features/search_features.feature
 - features/step_definitions/browse_features_steps.rb
 - features/step_definitions/search_features_steps.rb
 - features/step_definitions/steps.rb
 - features/support/env.rb
 - spec/spec_helper.rb
+- spec/wally/counts_tags_spec.rb
 - spec/wally/lists_features_spec.rb
 - spec/wally/search_features_spec.rb