wally 0.0.5 → 0.0.6

data/features/search_features.feature

@@ -39,3 +39,13 @@ Feature: Search features
     And I am on the search page
     When I search for "I do something"
     Then I should see a link to "Sample Scenario" with the url "/features/sample-feature/scenario/sample-scenario"
+
+  Scenario: Search suggests other searches
+    Given a feature file named "sample.feature" with the contents:
+    """
+    Feature: Batman
+    """
+    And I am on the search page
+    When I search for "btman"
+    Then I should see "Did you mean"
+    And I should see a link to "Batman" with the url "/search?q=Batman"

data/lib/wally/search_features.rb

@@ -1,3 +1,5 @@
+require "komainu"
+
 module Wally
   class SearchFeatures
     def initialize lists_features
@@ -5,43 +7,38 @@ module Wally
     end
 
     def find(query)
-      results = []
-      @lists_features.features.each do |feature|
-        result = SearchResult.new(feature)
+      searchables = []
 
+      @lists_features.features.each do |feature|
+        feature_text = feature["name"]
         if feature["tags"]
-          feature["tags"].each do |tag|
-            if tag["name"].downcase.include? query[:query].downcase
-              result.matched_feature = feature
-            end
-          end
-        end
-
-        if feature["name"].downcase.include? query[:query].downcase
-          result.matched_feature = feature
+          feature_text += " " + feature["tags"].map { |tag| tag["name"] }.join(" ")
         end
+        feature_data = OpenStruct.new
+        feature_data.feature = feature
+        feature_data.text = feature_text
+        searchables << feature_data
 
         if feature["elements"]
-          result.matched_scenarios = feature["elements"].select do |element|
-            if element["name"].downcase.include? query[:query].downcase
-              true
-            elsif element["steps"]
-              element["steps"].any? do |step|
-                step["name"].downcase.include? query[:query].downcase
-              end
-            elsif element["tags"]
-              element["tags"].any? do |tag|
-                tag["name"].downcase.include? query[:query].downcase
-              end
+          feature["elements"].each do |element|
+            element_text = [element["name"]]
+            if element["steps"]
+              element_text << element["steps"].map { |s| s["name"] }
+            end
+            if element["tags"]
+              element_text << element["tags"].map { |t| t["name"] }
             end
+            scenario_data = OpenStruct.new
+            scenario_data.feature = feature
+            scenario_data.scenario = element
+            scenario_data.text = element_text.join(" ")
+            searchables << scenario_data
           end
         end
-
-        if result.matches?
-          results << result
-        end
       end
-      results
+
+      searches_text = Komainu::SearchesText.new(searchables)
+      searches_text.search(query[:query])
     end
   end
 end

data/lib/wally/version.rb

@@ -1,3 +1,3 @@
 module Wally
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/wally/views/search.haml

@@ -1,15 +1,19 @@
-%h2
-  = "Search for '#{params[:q]}'"
 - if params[:q]
+  %h2
+    = "Search for '#{params[:q]}'"
+  %p
+    Did you mean
+    %a{:href => "/search?q=#{@search_results.suggestion}"}
+      = @search_results.suggestion
   %ul
-    - @search_results.each do |search_result|
+    - @search_results.items.each do |search_result|
       %li
         %a{:href => "/features/#{search_result.feature["id"]}"}
           = search_result.feature["name"]
         %ul
-          - search_result.matched_scenarios.each do |scenario|
+          - if search_result.scenario
             %li
-              %a{:href => "/features/#{scenario["id"].gsub(";", "/scenario/")}"}
-                = scenario["name"]
+              %a{:href => "/features/#{search_result.scenario["id"].gsub(";", "/scenario/")}"}
+                = search_result.scenario["name"]
 - else
   %p Where's Wally? This search returned no results.

data/lib/wally.rb

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

data/spec/wally/search_features_spec.rb

@@ -25,23 +25,14 @@ module Wally
       write_feature("sample2.feature", "Feature: Meh")
 
       results = SearchFeatures.new(lists_features).find(:query => "Meh")
-      results.size.should == 1
-      results.first.matched_feature["name"].should == "Meh"
+      results.items.size.should == 1
+      results.items.first.feature["name"].should == "Meh"
     end
 
-    it "stores the original feature in the result" do
-      write_feature("sample1.feature", "Feature: Bla")
-      results = SearchFeatures.new(lists_features).find(:query => "Bla")
-      results.first.feature["name"].should == "Bla"
-    end
-
-    it "finds features containing text with any case" do
-      write_feature("sample1.feature", "Feature: Bla")
-      write_feature("sample2.feature", "Feature: Meh")
-
-      results = SearchFeatures.new(lists_features).find(:query => "MEH")
-      results.size.should == 1
-      results.first.matched_feature["name"].should == "Meh"
+    it "has a suggestion" do
+      write_feature("sample1.feature", "Feature: Monkeys")
+      results = SearchFeatures.new(lists_features).find(:query => "mnkeys")
+      results.suggestion.should == "Monkeys"
     end
 
     context "feature with multiple scenarios" do
@@ -50,22 +41,22 @@ module Wally
           Feature: Sample Feature
           Scenario: Sample Scenario
           Scenario: Matched Scenario
-            Given I do some things
+            Given I eat some doughnuts
           Scenario: Another Scenario
         CONTENTS
         write_feature("sample1.feature", contents)
       end
 
       it "finds scenarios containing text" do
-        results = SearchFeatures.new(lists_features).find(:query => "Matched SCENARIO")
-        results.first.matched_scenarios.size.should == 1
-        results.first.matched_scenarios.first["name"].should == "Matched Scenario"
+        results = SearchFeatures.new(lists_features).find(:query => "MATCHED")
+        results.items.size.should == 1
+        results.items.first.scenario["name"].should == "Matched Scenario"
       end
 
       it "finds scenario steps" do
-        results = SearchFeatures.new(lists_features).find(:query => "I DO SOME THINGS")
-        results.first.matched_scenarios.size.should == 1
-        results.first.matched_scenarios.first["name"].should == "Matched Scenario"
+        results = SearchFeatures.new(lists_features).find(:query => "DOUGHNUTS")
+        results.items.size.should == 1
+        results.items.first.scenario["name"].should == "Matched Scenario"
       end
     end
 
@@ -73,13 +64,13 @@ module Wally
       it "finds features by tag" do
         write_feature("example-feature.feature", "@tag_name\nFeature: Example Feature")
         results = SearchFeatures.new(lists_features).find(:query => "@tag_NAME")
-        results.first.matched_feature["name"].should == "Example Feature"
+        results.items.first.feature["name"].should == "Example Feature"
       end
 
       it "finds scenarios by tag" do
         write_feature("example-feature.feature", "Feature: Example Feature\n@scenario_tag\nScenario: Example Scenario")
         results = SearchFeatures.new(lists_features).find(:query => "@scenario_TAG")
-        results.first.matched_scenarios.first["name"].should == "Example Scenario"
+        results.items.first.scenario["name"].should == "Example Scenario"
       end
     end
   end

data/wally.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "haml"
   s.add_runtime_dependency "rdiscount"
   s.add_runtime_dependency "gherkin"
+  s.add_runtime_dependency "komainu"
 
   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.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-22 00:00:00.000000000Z
+date: 2011-11-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70185102349080 !ruby/object:Gem::Requirement
+  requirement: &70328576388100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70185102349080
+  version_requirements: *70328576388100
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70185102348660 !ruby/object:Gem::Requirement
+  requirement: &70328576387400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70185102348660
+  version_requirements: *70328576387400
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70185102348240 !ruby/object:Gem::Requirement
+  requirement: &70328576386660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70185102348240
+  version_requirements: *70328576386660
 - !ruby/object:Gem::Dependency
   name: gherkin
-  requirement: &70185102347820 !ruby/object:Gem::Requirement
+  requirement: &70328576386240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70185102347820
+  version_requirements: *70328576386240
+- !ruby/object:Gem::Dependency
+  name: komainu
+  requirement: &70328576385760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70328576385760
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70185102347400 !ruby/object:Gem::Requirement
+  requirement: &70328576385100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70185102347400
+  version_requirements: *70328576385100
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70185102346980 !ruby/object:Gem::Requirement
+  requirement: &70328576384380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70185102346980
+  version_requirements: *70328576384380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70185102346560 !ruby/object:Gem::Requirement
+  requirement: &70328576383780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70185102346560
+  version_requirements: *70328576383780
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70185102337160 !ruby/object:Gem::Requirement
+  requirement: &70328576383160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70185102337160
+  version_requirements: *70328576383160
 description: ''
 email:
 - andrew.vos@gmail.com
@@ -126,7 +137,6 @@ files:
 - lib/wally/lists_features.rb
 - lib/wally/public/bootstrap.min.css
 - lib/wally/search_features.rb
-- lib/wally/search_result.rb
 - lib/wally/version.rb
 - lib/wally/views/feature.haml
 - lib/wally/views/index.haml
@@ -136,7 +146,6 @@ files:
 - spec/spec_helper.rb
 - spec/wally/lists_features_spec.rb
 - spec/wally/search_features_spec.rb
-- spec/wally/search_result_spec.rb
 - wally.gemspec
 homepage: ''
 licenses: []
@@ -172,4 +181,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/wally/lists_features_spec.rb
 - spec/wally/search_features_spec.rb
-- spec/wally/search_result_spec.rb

data/lib/wally/search_result.rb

@@ -1,16 +0,0 @@
-module Wally
-  class SearchResult
-    attr_accessor :feature, :matched_feature, :matched_scenarios
-
-    def initialize feature
-      @feature = feature
-      @matched_scenarios = []
-    end
-
-    def matches?
-      return true if matched_feature
-      return true unless matched_scenarios.empty?
-      false
-    end
-  end
-end

data/spec/wally/search_result_spec.rb

@@ -1,25 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
-
-module Wally
-  describe SearchResult do
-    subject { SearchResult.new(nil) }
-
-    it "knows when there are no results" do
-      subject.matches?.should == false
-    end
-
-    it "contains no matched scenarios" do
-      subject.matched_scenarios.should == []
-    end
-
-    it "knows when there is a feature match" do
-      subject.matched_feature = {}
-      subject.matches?.should == true
-    end
-
-    it "knows when there are scenario matches" do
-      subject.matched_scenarios = [{}]
-      subject.matches?.should == true
-    end
-  end
-end