Merge pull request #3 from neilboyd/exact-search

exact search with quotes
neilboyd · Jul 18, 2024 · f9bc704 · f9bc704
2 parents 8207606 + bb39886
commit f9bc704
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 8 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -2,7 +2,7 @@ name: Simple-Jekyll-Search
 on: [push]
 jobs:
   build_deploy:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@master
         with:
@@ -26,4 +26,4 @@ jobs:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
           npm config set '//registry.npmjs.org/:_authToken' "${{ secrets.NPM_TOKEN }}"
-          npm publish || true
+          npm publish
diff --git a/dest/simple-jekyll-search.js b/dest/simple-jekyll-search.js
@@ -83,7 +83,17 @@ function LiteralSearchStrategy () {
   this.matches = function (str, crit) {
     if (!str) return false
     str = str.trim().toLowerCase()
-    crit = crit.endsWith(' ') ? [crit.toLowerCase()] : crit.trim().toLowerCase().split(' ')
+
+    let exact = false
+    if (crit.endsWith(' ')) {
+      exact = true
+    }
+    if (crit.startsWith('"') && crit.endsWith('"')) {
+      exact = true
+      crit = crit.substring(1, crit.length - 2)
+    }
+    crit = crit.toLowerCase()
+    crit = exact ? [crit] : crit.split(' ')
 
     return crit.filter(word => str.indexOf(word) >= 0).length === crit.length
   }

diff --git a/dest/simple-jekyll-search.min.js b/dest/simple-jekyll-search.min.js
diff --git a/example/js/simple-jekyll-search.js b/example/js/simple-jekyll-search.js
@@ -83,7 +83,17 @@ function LiteralSearchStrategy () {
   this.matches = function (str, crit) {
     if (!str) return false
     str = str.trim().toLowerCase()
-    crit = crit.endsWith(' ') ? [crit.toLowerCase()] : crit.trim().toLowerCase().split(' ')
+
+    let exact = false
+    if (crit.endsWith(' ')) {
+      exact = true
+    }
+    if (crit.startsWith('"') && crit.endsWith('"')) {
+      exact = true
+      crit = crit.substring(1, crit.length - 2)
+    }
+    crit = crit.toLowerCase()
+    crit = exact ? [crit] : crit.split(' ')
 
     return crit.filter(word => str.indexOf(word) >= 0).length === crit.length
   }

diff --git a/example/js/simple-jekyll-search.min.js b/example/js/simple-jekyll-search.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "simple-jekyll-search",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "Simple Jekyll site search using javascript and json",
   "main": "dest/simple-jekyll-search.js",
   "scripts": {

diff --git a/src/SearchStrategies/LiteralSearchStrategy.js b/src/SearchStrategies/LiteralSearchStrategy.js
@@ -6,7 +6,17 @@ function LiteralSearchStrategy () {
   this.matches = function (str, crit) {
     if (!str) return false
     str = str.trim().toLowerCase()
-    crit = crit.endsWith(' ') ? [crit.toLowerCase()] : crit.trim().toLowerCase().split(' ')
+
+    let exact = false
+    if (crit.endsWith(' ')) {
+      exact = true
+    }
+    if (crit.startsWith('"') && crit.endsWith('"')) {
+      exact = true
+      crit = crit.substring(1, crit.length - 2)
+    }
+    crit = crit.toLowerCase()
+    crit = exact ? [crit] : crit.split(' ')
 
     return crit.filter(word => str.indexOf(word) >= 0).length === crit.length
   }