Use whitespace as delimiter like Qiita

ryamaguchi0220 · Dec 4, 2020 · b989226 · b989226
1 parent 5c5cbee
commit b989226
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 59 deletions.
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ This module is perfect for integrating complex search (like Qiita search) into y
 | Query for not-equality | `-user:sampleuser` |
 | Query for values greater than another value | `stocks:>10`, `stocks:>=10` |
 | Query for values less than another value | `stocks:<100`, `stocks:<=100` |
-| Query for multiple conditions | `tag:JavaScript+created:>=2020-01-01` |
+| Query for multiple conditions | `tag:JavaScript created:>=2020-01-01` |
 
 ### How to use it?
 
@@ -30,7 +30,7 @@ Parse a query string:
 ```js
 var qiitable = require("qiitable");
 
-var query = qiitable.Query('tag:Javascript+created:>=2020-01-01').parse();
+var query = qiitable.Query('tag:Javascript created:>=2020-01-01').parse();
 ```
 
 Filter and customize queries using `QueryBuilder`:
@@ -50,7 +50,7 @@ builder.field('created', {
 builder.reject('email');
 
 // Parse queries (return a Query object)
-builder.parse('tag:JavaScript+stocks:>=10created:>=2020-01-01')
+builder.parse('tag:JavaScript stocks:>=10 created:>=2020-01-01')
 ```
 
 ### Origin

diff --git a/lib/engine.js b/lib/engine.js
@@ -1,6 +1,6 @@
 var _ = require('lodash');
 
-var GROUP_DELIMITER = /(?:[^+"]+|"[^"]*")+/g;
+var GROUP_DELIMITER = /(?:[^\s"]+|"[^"]*")+/g;
 var FILTER_DELIMITER = ":";
 var NOT_QUALIFIER = "-";
 var INVERT = {

diff --git a/lib/query.js b/lib/query.js
@@ -27,7 +27,7 @@ Query.prototype.parse = function() {
 
     this.allGroups = _.chain(engine.splitInGroup(that.querystring))
         .map(function(group) {
-            return engine.parseGroup(group.trim(), that.opts);
+            return engine.parseGroup(group, that.opts);
         })
         .value();
     this.groups = engine.filterFields(this.allGroups, this.opts)

diff --git a/test/parse.js b/test/parse.js
@@ -19,7 +19,7 @@ describe('Query#parse', function() {
     });
 
     it('can parse multiple conditions', function() {
-        assertQuery('user:sampleuser+tag:JavaScript', [
+        assertQuery('user:sampleuser tag:JavaScript', [
             {
                 field: 'user',
                 operator: '=',
@@ -110,7 +110,7 @@ describe('Query#parse', function() {
     });
 
     it('can parse - (not-qualifier)', function() {
-        assertQuery("-user:sampleuser+stocks:>10",[
+        assertQuery("-user:sampleuser stocks:>10",[
             {
                 field: 'user',
                 operator: '!=',
@@ -128,19 +128,7 @@ describe('Query#parse', function() {
         ]);
     });
 
-    it('single quotation marks are removed', function() {
-        assertQuery("'user':'sample user'", [
-            {
-                operator: '=',
-                field: 'user',
-                value: 'sample user',
-                originalField: 'user',
-                invalid: false
-            }
-        ]);
-    });
-
-    it('double quotation marks are removed', function() {
+    it('quotation marks are removed', function() {
         assertQuery('"user":"sample user"', [
             {
                 operator: '=',
@@ -152,44 +140,6 @@ describe('Query#parse', function() {
         ]);
     });
 
-    it('white spaces are trimed', function() {
-        assertQuery(" tag:JavaScript + stocks:>10 ",[
-            {
-                field: 'tag',
-                operator: '=',
-                value: 'JavaScript',
-                originalField: 'tag',
-                invalid: false
-            },
-            {
-                field: 'stocks',
-                operator: '>',
-                value: '10',
-                originalField: 'stocks',
-                invalid: false
-            }
-        ]);
-    });
-
-    it('white spaces with quotation marks are not trimed', function() {
-        assertQuery("' tag':'JavaScript '+' stocks':'10 '",[
-            {
-                field: ' tag',
-                operator: '=',
-                value: 'JavaScript ',
-                originalField: ' tag',
-                invalid: false
-            },
-            {
-                field: ' stocks',
-                operator: '=',
-                value: '10 ',
-                originalField: ' stocks',
-                invalid: false
-            }
-        ]);
-    });
-
     it('invalid is true if :(filter delimiter) is not specified', function() {
         assertQuery('usersampleuser',[
             {
@@ -220,7 +170,7 @@ describe('Query#parse', function() {
     });
 
     it('can detect non-complete queries', function() {
-        var q = filterable.Query('user:sampleuser+invalid:test', { rejected: ['invalid'] }).parse();
+        var q = filterable.Query('user:sampleuser invalid:test', { rejected: ['invalid'] }).parse();
         assert.equal(q.isComplete(), false);
     });
 });