wally 0.0.13 → 0.0.14

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

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

data/features/search_features.feature

@@ -61,3 +61,17 @@ Feature: Search features
     When I search for "btman"
     Then I should see "Did you mean"
     And I should see a search result link to "Batman" with the url "/search?q=Batman"
+
+  Scenario: Search displays tags
+    Given a feature file named "sample.feature" with the contents:
+    """
+    @feature_tag
+    Feature: Batman
+
+    @scenario_tag
+    Scenario: Batman?
+    """
+    And I am on the search page
+    When I search for "Batman"
+    Then I should see "feature_tag" in the search results
+    And I should see "scenario_tag" in the search results

data/features/step_definitions/search_features_steps.rb

@@ -12,3 +12,9 @@ Then /^I should see a search result link to "([^"]*)" with the url "([^"]*)"$/ d
     page.should have_link text, :href => url
   end
 end
+
+Then /^I should see "([^"]*)" in the search results$/ do |text|
+  within ".content" do
+    page.should have_content text
+  end
+end

data/lib/wally/version.rb

@@ -1,3 +1,3 @@
 module Wally
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/lib/wally/views/feature.haml

@@ -10,6 +10,4 @@
         %a{:href => get_scenario_url(scenario)}
           = scenario["name"]
         - if scenario["tags"]
-          - scenario["tags"].each do |tag|
-            %span.label.notice
-              = tag["name"]
+          = haml :tag_links, {:locals => {:tags => scenario["tags"]}, :layout => false}

data/lib/wally/views/feature_link.haml

@@ -0,0 +1,6 @@
+%li
+  %a{:href => "/features/#{feature["id"]}"}
+    = feature["name"]
+  - if feature["tags"]
+    - tags = feature["tags"]
+    = haml :tag_links, {:locals => {:tags => tags}, :layout => false}

data/lib/wally/views/layout.haml

@@ -21,12 +21,6 @@
           Features
         %ul
           - @features.each do |feature|
-            %li
-              %a{:href => "/features/#{feature["id"]}"}
-                = feature["name"]
-              - if feature["tags"]
-                - feature["tags"].each do |tag|
-                  %span.label.notice
-                    = tag["name"]
+            = haml :feature_link, {:locals => {:feature => feature}, :layout => false}
       %div.content
         = yield

data/lib/wally/views/scenario.haml

@@ -1,18 +1,10 @@
 %h2
   = @scenario["keyword"] + ": " + @scenario["name"]
-  %span.label.notice
-    - if @scenario["tags"]
-      - @scenario["tags"].each do |tag|
-        %a{:href => "/search?q=#{tag["name"]}"}
-          = tag["name"]
+  - if @scenario["tags"]
+    = haml :tag_links, {:locals => {:tags => @scenario["tags"]}, :layout => false}
 - if @background
   %h3
     = @background["keyword"] + ":"
-    - if @scenario["tags"]
-      - @scenario["tags"].each do |tag|
-        %span.label.notice
-          %a{:href => "/search?q=#{tag["name"]}"}
-            = tag["name"]
   - @background["steps"].each do |step|
     %p
       %span.step-keyword

data/lib/wally/views/search.haml

@@ -11,10 +11,14 @@
       %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}
         %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}
 - else
   %p Where's Wally? This search returned no results.

data/lib/wally/views/tag_links.haml

@@ -0,0 +1,4 @@
+- tags.each do |tag|
+  %span.label.notice
+    %a{:href => "/search?q=#{tag["name"]}"}
+      = tag["name"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wally
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70318162034440 !ruby/object:Gem::Requirement
+  requirement: &70325799865360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318162034440
+  version_requirements: *70325799865360
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70318162033880 !ruby/object:Gem::Requirement
+  requirement: &70325799864940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318162033880
+  version_requirements: *70325799864940
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70318162033400 !ruby/object:Gem::Requirement
+  requirement: &70325799864520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318162033400
+  version_requirements: *70325799864520
 - !ruby/object:Gem::Dependency
   name: gherkin
-  requirement: &70318162026260 !ruby/object:Gem::Requirement
+  requirement: &70325799860000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318162026260
+  version_requirements: *70325799860000
 - !ruby/object:Gem::Dependency
   name: komainu
-  requirement: &70318162025760 !ruby/object:Gem::Requirement
+  requirement: &70325799859560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318162025760
+  version_requirements: *70325799859560
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70318162025280 !ruby/object:Gem::Requirement
+  requirement: &70325799859120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70318162025280
+  version_requirements: *70325799859120
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70318162024760 !ruby/object:Gem::Requirement
+  requirement: &70325799858600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70318162024760
+  version_requirements: *70325799858600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70318162024260 !ruby/object:Gem::Requirement
+  requirement: &70325799858140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70318162024260
+  version_requirements: *70325799858140
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70318162023740 !ruby/object:Gem::Requirement
+  requirement: &70325799857520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70318162023740
+  version_requirements: *70325799857520
 description: ''
 email:
 - andrew.vos@gmail.com
@@ -127,6 +127,7 @@ files:
 - config.ru
 - example-features/example-with-background.feature
 - example-features/example_with_tags.feature
+- example-features/has-lots-of-tags.feature
 - features/browse_features.feature
 - features/search_features.feature
 - features/step_definitions/browse_features_steps.rb
@@ -142,10 +143,12 @@ files:
 - lib/wally/search_features.rb
 - lib/wally/version.rb
 - lib/wally/views/feature.haml
+- lib/wally/views/feature_link.haml
 - lib/wally/views/index.haml
 - lib/wally/views/layout.haml
 - lib/wally/views/scenario.haml
 - lib/wally/views/search.haml
+- lib/wally/views/tag_links.haml
 - spec/spec_helper.rb
 - spec/wally/lists_features_spec.rb
 - spec/wally/search_features_spec.rb