wally 0.0.22 → 0.0.24

data/.gitignore

@@ -3,3 +3,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.wally

data/README.md

@@ -1,18 +1,31 @@
-About
------
+# Wally
+Wally is a web-based Cucumber viewer and navigator.
 
-Gherkin is a great way to write feature files to describe the behaviour of your application but the
-files are hard to casually browse.
+## About
+The first cut of a feature is collabatively written; but it then seems to become the property of developers, who commit it to a version control system.
 
-What's wrong with Relish?
--------------------------
+The product owner or business analyst usually does not want to use an IDE or VCS client to view requiements. They also want to search or group features and scenarios.
 
-* It has no mobile view
-* It's private & requires a log in, which is a massive pain on a Nokia C3-00
-* Tags can be made more useful - Eg, cuts of all tags marked '@touch'
-* I can't hyperlink my step definitions
+## What's wrong with Relish?
+Many of the ideas have been borrowed from Matt Wynne's Relish product, but we;
 
-Wally?
-------
+### Didn't want
+* To sign-in
 
+### Wanted to
+* Use it through mobile devices
+* Easily group features and scenarios by tags 
+* Count features and tags
+* Include a project progress bar (based on tags)
+
+### Installation
+* Install [mongodb](http://www.mongodb.org/display/DOCS/Quickstart "mongodb") (> v. 2.0.0) and ensure it is running  
+* gem install wally  
+* wally server  
+* http://localhost:4567/  
+* create a '.wally' file and enter any authentication text you like  
+* wally push http://localhost:4567/ feature_dir  
+
+
+## Wally?
 If you walk in to a British fish shop and ask for a wally you'll receive a [pickled gherkin](https://github.com/cucumber/cucumber/wiki/Gherkin).

data/features/feature_page.feature

@@ -0,0 +1,61 @@
+Feature: Feature Page
+  In order to view a feature and its intent
+  As a stakeholder
+  I want a page that displays the feature's name,
+       free-form narrative and scenario titles
+
+  Scenario: Feature Content
+    Given a feature file named "sample.feature" with the contents:
+    """
+    Feature: Sample Feature
+      In order to get some value
+      As a person
+      I want to create value
+     """
+    When I visit the sample feature page
+    Then I should see the feature free-form narrative
+
+ Scenario: View Scenario Links
+    Given a feature file named "sample.feature" with the contents:
+    """
+    Feature: Sample Feature
+      In order to get some value
+      As a person
+      I want to create value
+
+    Scenario: Sample Aidy
+      Given my name is "Aidy"
+      When I drink alcohol
+      Then I go nuts
+
+    Scenario: Sample Andrew
+      Given my name is 'Andrew'
+      When I drink alcohol
+      Then I go happy
+     """
+    When I visit the sample feature page
+    Then I should see Scenario headers as links
+    
+  Scenario: Sort Scenario Links in Alphabetical Order
+    Given a feature file named "sample.feature" with the contents:
+    """
+    Feature: Sample Feature
+      Scenario: V
+      Scenario: C
+      Scenario: I
+      Scenario: N
+     """
+    When I visit the sample feature page
+   Then the scenario links are sorted
+
+  Scenario: View Scenario Tags - Feature Page
+    Given a feature file named "sample.feature" with the contents:
+    """
+    Feature: Sample Feature
+
+    @tag1 @tag2
+    Scenario: Sample Aidy
+     """
+    When I visit the sample feature page
+    Then I should see "tag1"
+    And I should see "tag2"

data/features/home_page.feature

@@ -34,15 +34,5 @@ Feature: Home Page
     When I visit the sample feature page
     Then I should see "sample_tag"
 
-  Scenario: Feature Content
-    Given a feature file named "sample.feature" with the contents:
-    """
-    Feature: Sample Feature
-      In order to get some value
-      As a person
-      I want to create value
-     """
-    When I visit the sample feature page
-    Then I should see the feature free-form narrative
 
 

data/features/search_features.feature

@@ -75,3 +75,21 @@ Feature: Search features
     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
+
+  Scenario: Higlighted search result
+    Given a feature file named "sample.feature" with the contents:
+    """
+    @feature_tag
+    Feature: Some long WORD feature word name
+    Scenario: Some long WORD scenario word name
+    """
+    And I am on the search page
+    When I search for "word"
+    Then I should see the html:
+    """
+    Some long <span class="search-result">WORD</span> feature <span class="search-result">word</span> name
+    """
+    And I should see the html:
+    """
+    Some long <span class="search-result">WORD</span> scenario <span class="search-result">word</span> name
+    """

data/features/step_definitions/search_features_steps.rb

@@ -18,3 +18,7 @@ Then /^I should see "([^"]*)" in the search results$/ do |text|
     page.should have_content text
   end
 end
+
+Then /^I should see the html:$/ do |html|
+  page.body.should include html
+end

data/lib/wally/application.rb

@@ -34,6 +34,20 @@ def scenario_count
   lists_features.features.to_s.scan(/scenario/).length
 end
 
+def highlighted_search_result_blurb search_result
+  offset = 0
+  highlighted = search_result.object.text
+  span_start = "<span class=\"search-result\">"
+  span_end = "</span>"
+  search_result.matches.each do |match|
+    highlighted.insert(match.index + offset, span_start)
+    offset += span_start.length
+    highlighted.insert(match.index + match.text.length + offset, span_end)
+    offset += span_end.length
+  end
+  highlighted
+end
+
 put '/features/?' do
   if File.exist?(".wally") && params[:authentication_code] == File.read(".wally").strip
     Wally::Feature.delete_all

data/lib/wally/public/skin.css

@@ -166,3 +166,7 @@ section.feature p:first-child {
 .chartlist li:hover { 
   background: #EFEFEF; 
 }
+
+.search-result {
+  background: #F7F77E;
+}

data/lib/wally/version.rb

@@ -1,3 +1,3 @@
 module Wally
-  VERSION = "0.0.22"
+  VERSION = "0.0.24"
 end

data/lib/wally/views/progress.haml

@@ -1,11 +1,11 @@
 %h2
   Progress
 - #{@scenario_count}
-- if @tag_count.any?
+- if tag_count
   %p
     This project has #{@scenario_count} scenarios, of which :-
   %ul{:class => 'chartlist'}
-    - @tag_count.each do |tag, count|
+    - tag_count.each do |tag, count|
     - ratio = (count.to_f / @scenario_count) * 100
       %li
         %a{:href => "/search?q=#{tag}"}
@@ -13,4 +13,4 @@
         %span{:class => "count #{tag}"}
           = ratio.ceil
         %span{:class => 'index', :style => "width: #{ratio.ceil}%"}
-          = ratio
+          = ratio

data/lib/wally/views/search.haml

@@ -8,23 +8,26 @@
       %a{:href => "/search?q=#{@search_results.suggestion}"}
         = @search_results.suggestion
   %ul
-    - @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 }
+    - @search_results.items.map {|i| i.object.feature["id"] }.uniq.each do |current_feature_id|
+      - root_search_result = @search_results.items.find { |r| r.object.feature["id"] == current_feature_id }
       %li
-        %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}
-
+        %a{:href => "/features/#{root_search_result.object.feature["id"]}"}
+          = root_search_result.object.feature["name"]
+        %p
+          != highlighted_search_result_blurb root_search_result
+        - if root_search_result.object.feature["tags"]
+          = haml :tag_links, {:locals => {:tags => root_search_result.object.feature["tags"]}, :layout => false}
         %ul
-          - @search_results.items.select { |r| r.feature["id"] == current_feature_id }.each do |search_result|
-            - if search_result.scenario && search_result.scenario["id"]
+          - @search_results.items.select { |r| r.object.feature["id"] == current_feature_id }.each do |search_result|
+            - if search_result.object.scenario && search_result.object.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}
-  - if @search_results.items.length === 0
+                %a{:href => "/features/#{search_result.object.scenario["id"].gsub(";", "/scenario/")}"}
+                  = search_result.object.scenario["name"]
+                %p
+                  != highlighted_search_result_blurb(search_result)
+                - if search_result.object.scenario["tags"]
+                  = haml :tag_links, {:locals => {:tags => search_result.object.scenario["tags"]}, :layout => false}
+  - if @search_results.items.empty?
     %p{:class => 'alert-message error'}
       Where's Wally? This search returned no results.
 

data/spec/wally/search_features_spec.rb

@@ -23,14 +23,14 @@ module Wally
 
       results = SearchFeatures.new(lists_features).find(:query => "Meh")
       results.items.size.should == 1
-      results.items.first.feature["name"].should == "Meh"
+      results.items.first.object.feature["name"].should == "Meh"
     end
 
     it "finds features by narrative" do
       create_feature("sample1.feature", "Feature: bla\nIn order to bananas")
       results = SearchFeatures.new(lists_features).find(:query => "bananas")
       results.items.size.should == 1
-      results.items.first.feature["name"].should == "bla"
+      results.items.first.object.feature["name"].should == "bla"
     end
 
     it "has a suggestion" do
@@ -61,13 +61,13 @@ module Wally
       it "finds scenarios containing text" do
         results = SearchFeatures.new(lists_features).find(:query => "MATCHED")
         results.items.size.should == 1
-        results.items.first.scenario["name"].should == "Matched Scenario"
+        results.items.first.object.scenario["name"].should == "Matched Scenario"
       end
 
       it "finds scenario steps" do
         results = SearchFeatures.new(lists_features).find(:query => "DOUGHNUTS")
         results.items.size.should == 1
-        results.items.first.scenario["name"].should == "Matched Scenario"
+        results.items.first.object.scenario["name"].should == "Matched Scenario"
       end
     end
 
@@ -75,13 +75,13 @@ module Wally
       it "finds features by tag" do
         create_feature("example-feature.feature", "@tag_name\nFeature: Example Feature")
         results = SearchFeatures.new(lists_features).find(:query => "@tag_NAME")
-        results.items.first.feature["name"].should == "Example Feature"
+        results.items.first.object.feature["name"].should == "Example Feature"
       end
 
       it "finds scenarios by tag" do
         create_feature("example-feature.feature", "Feature: Example Feature\n@scenario_tag\nScenario: Example Scenario")
         results = SearchFeatures.new(lists_features).find(:query => "@scenario_TAG")
-        results.items.first.scenario["name"].should == "Example Scenario"
+        results.items.first.object.scenario["name"].should == "Example Scenario"
       end
     end
   end

data/wally.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "komainu"
   s.add_runtime_dependency "mongoid"
   s.add_runtime_dependency "bson_ext"
+  s.add_runtime_dependency "rest-client"
 
   s.add_development_dependency "cucumber"
   s.add_development_dependency "capybara"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wally
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.24
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-30 00:00:00.000000000Z
+date: 2011-12-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70144712321920 !ruby/object:Gem::Requirement
+  requirement: &70108116103100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144712321920
+  version_requirements: *70108116103100
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70144712318380 !ruby/object:Gem::Requirement
+  requirement: &70108116102080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144712318380
+  version_requirements: *70108116102080
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70144712317720 !ruby/object:Gem::Requirement
+  requirement: &70108116101440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144712317720
+  version_requirements: *70108116101440
 - !ruby/object:Gem::Dependency
   name: gherkin
-  requirement: &70144712317020 !ruby/object:Gem::Requirement
+  requirement: &70108116100100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144712317020
+  version_requirements: *70108116100100
 - !ruby/object:Gem::Dependency
   name: komainu
-  requirement: &70144712316380 !ruby/object:Gem::Requirement
+  requirement: &70108116098780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144712316380
+  version_requirements: *70108116098780
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70144712315760 !ruby/object:Gem::Requirement
+  requirement: &70108116096040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144712315760
+  version_requirements: *70108116096040
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70144712314860 !ruby/object:Gem::Requirement
+  requirement: &70108116095560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144712314860
+  version_requirements: *70108116095560
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &70108116095100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70108116095100
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70144712314000 !ruby/object:Gem::Requirement
+  requirement: &70108116094600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144712314000
+  version_requirements: *70108116094600
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70144712312980 !ruby/object:Gem::Requirement
+  requirement: &70108116093920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144712312980
+  version_requirements: *70108116093920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70144712311920 !ruby/object:Gem::Requirement
+  requirement: &70108116093320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144712311920
+  version_requirements: *70108116093320
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70144712311160 !ruby/object:Gem::Requirement
+  requirement: &70108116086420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144712311160
+  version_requirements: *70108116086420
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70144712305800 !ruby/object:Gem::Requirement
+  requirement: &70108116085900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144712305800
+  version_requirements: *70108116085900
 description: ''
 email:
 - andrew.vos@gmail.com
@@ -164,6 +175,7 @@ files:
 - example-features/generic/multiple-scenarios.feature
 - example-features/too-many-wip-tags/too-many-wip-tags.feature
 - features/counts.feature
+- features/feature_page.feature
 - features/home_page.feature
 - features/list_tags.feature
 - features/notifications.feature
@@ -226,6 +238,7 @@ specification_version: 3
 summary: ''
 test_files:
 - features/counts.feature
+- features/feature_page.feature
 - features/home_page.feature
 - features/list_tags.feature
 - features/notifications.feature