wally 0.0.33 → 0.0.34

data/features/step_definitions/welcome_page.rb

@@ -0,0 +1,19 @@
+Given /^there aren't any projects$/ do
+end
+
+When /^I view the welcome page$/ do
+  visit "/"
+end
+
+Then /^I should redirected to the "([^"]*)" project page$/ do |project|
+  page.current_url.should include "/projects/#{project}"
+end
+
+When /^I select the project "([^"]*)"$/ do |project|
+  select(project, :from => "projects")
+end
+
+Then /^"([^"]*)" should be rendered$/ do |text|
+  page.should have_content text
+end
+

data/features/support/env.rb

@@ -9,12 +9,34 @@ require "fakefs/spec_helpers"
 Capybara.app = Sinatra::Application
 
 After do
-  Wally::Feature.delete_all
+  Wally::Project.delete_all
 end
 
-def create_feature path, content
-  feature = Wally::Feature.new
-  feature.path = path
-  feature.gherkin = Wally::ParsesFeatures.new.parse(content)
-  feature.save
+require 'headless'
+headless = Headless.new
+at_exit do
+  headless.destroy
+end
+
+Before("@selenium,@javascript", "~@no-headless") do
+  headless.start if Capybara.current_driver == :selenium
+end
+
+After("@selenium,@javascript", "~@no-headless") do
+  headless.stop if Capybara.current_driver == :selenium
+end
+
+def project name
+  project = Wally::Project.first(:name => name)
+  unless project
+    project = Wally::Project.create(:name => name)
+  end
+  project
+end
+
+def create_feature project, path, content
+  project = project(project)
+  feature = Wally::Feature.new(:path => path, :gherkin => Wally::ParsesFeatures.new.parse(content))
+  project.features << feature
+  project.save
 end

data/features/welcome_page.feature

@@ -0,0 +1,30 @@
+Feature: Welcome Page
+  As a stakeholder
+  I want a welcome page
+
+  Scenario: No projects
+    Given there aren't any projects
+    When I view the welcome page
+    Then "Wally is a web-based Cucumber viewer and navigator" should be rendered
+
+  @javascript
+  Scenario: Project links on home page
+    Given a feature file on the project "sample1" with the contents:
+    """
+    Feature: Sample1
+    """
+    And a feature file on the project "sample2" with the contents:
+    """
+    Feature: Sample2
+    """
+    When I view the welcome page
+    And I select the project "sample2"
+    Then I should redirected to the "sample2" project page
+
+  Scenario: Redirect to first project
+    Given a feature file on the project "sample1" with the contents:
+    """
+    Feature: Sample1
+    """
+    When I view the welcome page
+    Then I should redirected to the "sample1" project page

data/lib/wally.rb

@@ -5,6 +5,3 @@ $:.unshift(File.expand_path(File.dirname(__FILE__)))
 
 require "wally/version"
 require "wally/application"
-require "wally/search_features"
-require "wally/counts_tags"
-require "wally/parses_features"

data/lib/wally/application.rb

@@ -4,6 +4,10 @@ require "haml"
 require "rdiscount"
 require "mongo_mapper"
 require "wally/feature"
+require "wally/project"
+require "wally/search_features"
+require "wally/counts_tags"
+require "wally/parses_features"
 require "cgi"
 
 configure do
@@ -19,18 +23,23 @@ else
   MongoMapper.database = "wally"
 end
 
+def current_project
+  Wally::Project.first(:name => params[:project])
+end
+
 def tag_count
-  Wally::CountsTags.new(Wally::Feature).count_tags
+  return {} if current_project.nil?
+  Wally::CountsTags.new(current_project).count_tags
 end
 
 def excessive_wip_tags
-  tag_count["@wip"] >= 10
+  tag_count["@wip"] >= 10 if tag_count["@wip"]
 end
 
 def scenario_count
-  Feature.all.inject(0) do |count, feature|
+  current_project.features.inject(0) do |count, feature|
     if feature.gherkin["elements"]
-      count += feature.gherkin["elements"].select { |e| e["type"] == "scenario" }
+      count += feature.gherkin["elements"].select { |e| e["type"] == "scenario" }.size
     end
     count
   end
@@ -53,16 +62,15 @@ def highlighted_search_result_blurb search_result
   highlighted
 end
 
-put '/features/?' do
+put '/projects/:project/features/?' do
   if File.exist?(".wally") && params[:authentication_code] == File.read(".wally").strip
-    Wally::Feature.delete_all
+    current_project.delete if current_project
+    project = Wally::Project.create(:name => params[:project])
 
     JSON.parse(request.body.read).each do |json|
-      feature = Wally::Feature.new
-      feature.path = json["path"]
-      feature.gherkin = json["gherkin"]
-      feature.save
+      project.features << Wally::Feature.new(:path => json["path"], :gherkin => json["gherkin"])
     end
+    project.save
     halt 201
   else
     error 403
@@ -70,36 +78,45 @@ put '/features/?' do
 end
 
 get '/?' do
-  haml :index
+  first_project = Wally::Project.first
+  if first_project
+    redirect "/projects/#{first_project.name}"
+  else
+    markdown File.read("README.md"), :layout => false
+  end
+end
+
+get '/projects/:project/?' do
+  haml :project
 end
 
-get '/features/:feature/?' do |id|
-  Wally::Feature.all.each do |feature|
-    @feature = feature if feature.gherkin["id"] == id
+get '/projects/:project/features/:feature/?' do
+  current_project.features.each do |feature|
+    @feature = feature if feature.gherkin["id"] == params[:feature]
   end
   haml :feature
 end
 
-get '/progress/?' do
+get '/projects/:project/progress/?' do
   haml :progress
 end
 
-get '/search/?' do
+get '/projects/:project/search/?' do
   if params[:q]
-    @search_results = Wally::SearchFeatures.new(Wally::Feature).find(:query => params[:q])
+    @search_results = Wally::SearchFeatures.new(current_project).find(:query => params[:q])
   end
   haml :search
 end
 
-get '/features/:feature/scenario/:scenario/?'  do  |feature_id, scenario_id|
-  Wally::Feature.all.each do |feature|
-    if feature.gherkin["id"] == feature_id
+get '/projects/:project/features/:feature/scenario/:scenario/?' do
+  current_project.features.each do |feature|
+    if feature.gherkin["id"] == params[:feature]
       @feature = feature
       feature.gherkin["elements"].each do |element|
         if element["type"] == "background"
           @background = element
         end
-        if (element["type"] == "scenario" || element["type"] == "scenario_outline") && element["id"] == "#{feature_id};#{scenario_id}"
+        if (element["type"] == "scenario" || element["type"] == "scenario_outline") && element["id"] == "#{params[:feature]};#{params[:scenario]}"
           @scenario = element
         end
       end
@@ -109,7 +126,7 @@ get '/features/:feature/scenario/:scenario/?'  do  |feature_id, scenario_id|
 end
 
 def get_scenario_url(scenario)
-  url = "/features/#{scenario["id"].gsub(";", "/scenario/")}"
+  url = "/projects/#{current_project.name}/features/#{scenario["id"].gsub(";", "/scenario/")}"
 end
 
 def get_sorted_scenarios(feature)

data/lib/wally/counts_tags.rb

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

data/lib/wally/feature.rb

@@ -1,6 +1,6 @@
 module Wally
   class Feature
-    include MongoMapper::Document
+    include MongoMapper::EmbeddedDocument
 
     key :path, String
     key :gherkin, Hash

data/lib/wally/project.rb

@@ -0,0 +1,8 @@
+module Wally
+  class Project
+    include MongoMapper::Document
+
+    key :name, String
+    many :features, :class => Wally::Feature
+  end
+end

data/lib/wally/public/scripts/projects.js

@@ -0,0 +1,6 @@
+$().ready(function(){
+  $("#projects").change(function(){
+    var project = $("#projects option:selected").val();
+    window.location = "/projects/" + project;
+  });
+});

data/lib/wally/public/skin.css

@@ -187,3 +187,10 @@ section.feature p:first-child {
 .search-result {
   background: #F7F77E;
 }
+
+.project-list {
+  float: right;
+  padding-top: 10px;
+  background: white;
+}
+

data/lib/wally/search_features.rb

@@ -9,7 +9,7 @@ module Wally
     def find(query)
       searchables = []
 
-      @lists_features.all.each do |feature|
+      @lists_features.features.each do |feature|
         feature_text = feature.gherkin["name"]
         if feature.gherkin["tags"]
           feature_text += " " + feature.gherkin["tags"].map { |tag| tag["name"] }.join(" ")

data/lib/wally/version.rb

@@ -1,3 +1,3 @@
 module Wally
-  VERSION = "0.0.33"
+  VERSION = "0.0.34"
 end

data/lib/wally/views/feature_link.haml

@@ -1,5 +1,5 @@
 %li
-  %a{:href => "/features/#{feature.gherkin["id"]}"}
+  %a{:href => "/#{current_project.name}/features/#{feature.gherkin["id"]}"}
     = feature.gherkin["name"]
   - if feature.gherkin["tags"]
     - tags = feature.gherkin["tags"]

data/lib/wally/views/layout.haml

@@ -4,39 +4,50 @@
     %title Wally
     %link{:rel => 'stylesheet', :type => 'text/css', :href => '/bootstrap.min.css'}
     %link{:rel => 'stylesheet', :type => 'text/css', :href => '/skin.css'}
+    %script{:type => "text/javascript", :src => "http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"}
+    %script{:type => "text/javascript", :src => "/scripts/projects.js"}
     %meta{:'http-equiv' => 'X-UA-Compatible', :content => 'IE=edge,chrome=1'}
     %meta{:name => 'viewport', :content => 'width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;'}
   %body
     %div.container-fluid
       %div.logo
         %h1
-          %a{:href => "/"} Wally
+          %a{:href => "/#{current_project ? "projects/" + current_project.name : nil}"} Wally
+
+      %div.project-list
+        %select#projects{:name => "projects"}
+          - Wally::Project.all.each do |project|
+            %option{:value =>  project.name}
+              = project.name
+
       %div.search-bar
-        %form{:method => "GET", :action => "/search", :id => "search"}
+        %form{:method => "GET", :action => "/projects/#{current_project.name}/search", :id => "search"}
           %input{:type => "text", :id => "q", :name => "q", :placeholder => 'text, @tags etc.', :value => @q }
           %input.btn{:type => "submit", :id => "search", :value => "Search"}
-    %div.container-fluid
-      %div.sidebar
-        %ul
-          %li
-            %a{:href => "/progress"}
-              Progress
-        %h2
-          = "Features (#{Wally::Feature.all.count})"
-        %ul
-          - Wally::Feature.sort(:name).each do |feature|
-            = haml :feature_link, {:locals => {:feature => feature}, :layout => false}
-        - if tag_count.any?
+      %div.container-fluid
+        %div.sidebar
+          %ul
+            %li
+              %a{:href => "/projects/#{current_project.name}/progress"}
+                Progress
+          %h2
+            = "Features (#{current_project.features.count})"
+          %ul
+            - current_project.features.sort{|a,b| a.name <=> b.name}.each do |feature|
+              = haml :feature_link, {:locals => {:feature => feature}, :layout => false}
+
           %h2
             = "Tags (#{tag_count.values.sum})"
           %ul
             - tag_count.each do |tag, count|
               %li
-                %a{:href => "/search?q=#{tag}"}
+                %a{:href => "/projects/#{current_project.name}/search?q=#{tag}"}
                   = "#{tag} (#{count})"
-      %div.content
-        - if excessive_wip_tags
-          %div.alert-message.error
-            %p
-              = "You have #{tag_count["@wip"]} @wip tags :("
-        = yield
+
+        %div.content
+          - if excessive_wip_tags
+            %div.alert-message.error
+              %p
+                = "You have #{tag_count["@wip"]} @wip tags :("
+          = yield
+

data/lib/wally/views/search.haml

@@ -5,13 +5,13 @@
   - if @search_results.suggestion
     %p
       Did you mean
-      %a{:href => "/search?q=#{@search_results.suggestion}"}
+      %a{:href => "/projects/#{current_project.name}/search?q=#{@search_results.suggestion}"}
         = @search_results.suggestion
   %ul
     - @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.object.feature["id"]}"}
+        %a{:href => "/projects/#{current_project.name}/features/#{root_search_result.object.feature["id"]}"}
           = root_search_result.object.feature["name"]
         - if root_search_result.object.feature["tags"]
           = haml :tag_links, {:locals => {:tags => root_search_result.object.feature["tags"]}, :layout => false}
@@ -21,7 +21,7 @@
           - @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.object.scenario["id"].gsub(";", "/scenario/")}"}
+                %a{:href => "/projects/#{current_project.name}/features/#{search_result.object.scenario["id"].gsub(";", "/scenario/")}"}
                   = search_result.object.scenario["name"]
                 - if search_result.object.scenario["tags"]
                   = haml :tag_links, {:locals => {:tags => search_result.object.scenario["tags"]}, :layout => false}

data/spec/spec_helper.rb

@@ -9,3 +9,27 @@ before do
   ARGV.clear
   ARGV << "application-features"
 end
+
+RSpec.configure do |config|
+  config.after :each do
+    Wally::Project.delete_all
+  end
+end
+
+def project name
+  project = Wally::Project.first(:name => name)
+  unless project
+    project = Wally::Project.create(:name => name)
+  end
+  project
+end
+
+def create_feature project_name, path, content
+  project = project(project_name)
+  feature = Wally::Feature.new({
+    :path => path,
+    :gherkin => Wally::ParsesFeatures.new.parse(content)
+  })
+  project.features << feature
+  project.save
+end

data/spec/wally/counts_tags_spec.rb

@@ -3,43 +3,31 @@ require 'fileutils'
 
 module Wally
   describe CountsTags do
-    after do
-      Feature.delete_all
-    end
-
-    def create_feature path, content
-      feature = Feature.new
-      feature.path = path
-      feature.gherkin = ParsesFeatures.new.parse(content)
-      feature.save
-    end
-
     it "counts feature tags" do
-      create_feature("feature-1.feature", "@tag1 @tag2\nFeature: Feature 1")
-      create_feature("feature-2.feature", "@tag2 @tag2\nFeature: Feature 2")
-      CountsTags.new(Feature).count_tags.should == {
+      create_feature("project1", "feature-1.feature", "@tag1 @tag2\nFeature: Feature 1")
+      create_feature("project1", "feature-2.feature", "@tag2 @tag2\nFeature: Feature 2")
+      CountsTags.new(project("project1")).count_tags.should == {
         "@tag1" => 1,
         "@tag2" => 3
       }
     end
 
     it "counts scenario tags" do
-      create_feature("feature-1.feature", "Feature: Feature 1\n@tag1@tag1\nScenario: Scenario 1")
-      create_feature("feature-2.feature", "Feature: Feature 2\n@tag3@tag1\nScenario: Scenario 1")
-      CountsTags.new(Feature).count_tags.should == {
+      create_feature("project1", "feature-1.feature", "Feature: Feature 1\n@tag1@tag1\nScenario: Scenario 1")
+      create_feature("project1", "feature-2.feature", "Feature: Feature 2\n@tag3@tag1\nScenario: Scenario 1")
+      CountsTags.new(project("project1")).count_tags.should == {
         "@tag1" => 3,
         "@tag3" => 1
       }
     end
 
     it "counts feature tags irrespective of their case" do
-      create_feature("feature-1.feature", "@tag1\nFeature: Feature 1")
-      create_feature("feature-2.feature", "@TAG1\nFeature: Feature 2")
-      create_feature("feature-3.feature", "Feature: Feature 2\n@TAG1\nScenario: Scenario 1")
-      CountsTags.new(Feature).count_tags.should == {
+      create_feature("project1", "feature-1.feature", "@tag1\nFeature: Feature 1")
+      create_feature("project1", "feature-2.feature", "@TAG1\nFeature: Feature 2")
+      create_feature("project1", "feature-3.feature", "Feature: Feature 2\n@TAG1\nScenario: Scenario 1")
+      CountsTags.new(project("project1")).count_tags.should == {
         "@tag1" => 3
       }
     end
-
   end
 end