- Improve search so that it is an OR search by default, and allows quoted phrases for exact match

Author: DannyBen

app/views/search.slim

@@ -2,7 +2,7 @@
 
 .main class=(config.sidebar ? 'with-sidebar' : 'without-sidebar')
   form.search-form action="/_search" method="get"
-    input.search-field type="text" name="q" value="#{params[:q]}" placeholder="Search" autofocus=true
+    input.search-field type="text" name="q" value="#{params[:q]}" placeholder="Search (use quotes for exact match)" autofocus=true
     input type="submit" value="Search" style='display:none'
 
   hr

lib/madness/search.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 module Madness
   class Search
     include ServerHelper
@@ -13,14 +15,19 @@ def index
 
     def search(query)
       query = query.downcase
+      words = Shellwords.split query
+      word_count = words.count
       result = {}
+      return result if words.empty?
 
       index.each do |file, content|
         file = file.remove("#{@path}/")[0...-3]
         url = file_url file
         label = file_label file
-        next unless content.include? query
-        result[label] = url
+        found = 0
+        words.each { |word| found += 1 if content.include? word }
+        next unless found == word_count
+        result[label] = url 
       end
 
       result

spec/madness/search_spec.rb

@@ -37,6 +37,13 @@
       results = subject.search('file').keys
       expect(results).to eq ["With Sorting / File 1", "With Sorting / File 2", "I Do Not Belong"]
     end
+
+    context "with a quoted query" do
+      it "returns only pages that include the exact phrase" do
+        expect(subject.search('the jedi').count).to be > 1
+        expect(subject.search('"the jedi"').count).to eq 1
+      end
+    end
   end
 
 end