feat(cutoff_frequency): make cutoff_frequency variable optional

Author: missinglink

test/view/address.js

@@ -7,7 +7,6 @@ function getBaseVariableStore(toExclude) {
   vs.var('address:asdf:analyzer', 'analyzer value');
   vs.var('address:asdf:field', 'field value');
   vs.var('address:asdf:boost', 'boost value');
-  vs.var('address:asdf:cutoff_frequency', 'cutoff_frequency value');
 
   if (toExclude) {
     vs.unset(toExclude);

test/view/admin.js

@@ -7,7 +7,6 @@ function getBaseVariableStore(toExclude) {
   vs.var('admin:asdf:analyzer', 'analyzer value');
   vs.var('admin:asdf:field', 'field value');
   vs.var('admin:asdf:boost', 'boost value');
-  vs.var('admin:asdf:cutoff_frequency', 'cutoff_frequency value');
 
   if (toExclude) {
     vs.unset(toExclude);
@@ -67,6 +66,36 @@ module.exports.tests.no_exceptions_conditions = function(test, common) {
 
     var actual = admin(vs);
 
+    var expected = {
+      match: {
+        'field value': {
+          analyzer: {
+            $: 'analyzer value'
+          },
+          boost: {
+            $: 'boost value'
+          },
+          query: {
+            $: 'input value'
+          }
+        }
+      }
+    };
+
+    t.deepEquals(actual, expected, 'should have returned object');
+    t.end();
+
+  });
+};
+
+module.exports.tests.cutoff_frequency = function(test, common) {
+  test('cutoff_frequency value used if provided', function(t) {
+    var vs = getBaseVariableStore();
+
+    vs.var('admin:asdf:cutoff_frequency', 'cutoff_frequency value');
+
+    var actual = admin(vs);
+
     var expected = {
       match: {
         'field value': {
@@ -90,7 +119,6 @@ module.exports.tests.no_exceptions_conditions = function(test, common) {
     t.end();
 
   });
-
 };
 
 module.exports.all = function (tape, common) {

test/view/ngrams.js

@@ -7,7 +7,6 @@ function getBaseVariableStore(toExclude) {
   vs.var('ngram:analyzer', 'analyzer value');
   vs.var('ngram:field', 'field value');
   vs.var('ngram:boost', 'boost value');
-  vs.var('ngram:cutoff_frequency', 'cutoff_frequency value');
 
   if (toExclude) {
     vs.unset(toExclude);
@@ -52,7 +51,6 @@ module.exports.tests.no_exceptions_conditions = function(test, common) {
         'field value': {
           analyzer: { $: 'analyzer value' },
           boost: { $: 'boost value' },
-          cutoff_frequency: { $: 'cutoff_frequency value' },
           query: { $: 'name value' }
         }
       }
@@ -78,7 +76,6 @@ module.exports.tests.fuzziness_variable = function(test, common) {
           analyzer: { $: 'analyzer value' },
           boost: { $: 'boost value' },
           query: { $: 'name value' },
-          cutoff_frequency: { $: 'cutoff_frequency value' },
           fuzziness: { $: 'fuzziness value' }
         }
       }
@@ -90,6 +87,30 @@ module.exports.tests.fuzziness_variable = function(test, common) {
   });
 };
 
+module.exports.tests.cutoff_frequency = function(test, common) {
+  test('cutoff_frequency variable should be presented in query', function(t) {
+    var store = getBaseVariableStore();
+    store.var('ngram:cutoff_frequency', 'cutoff_frequency value');
+
+    var actual = ngrams(store);
+
+    var expected = {
+      match: {
+        'field value': {
+          analyzer: { $: 'analyzer value' },
+          boost: { $: 'boost value' },
+          query: { $: 'name value' },
+          cutoff_frequency: { $: 'cutoff_frequency value' }
+        }
+      }
+    };
+
+    t.deepEquals(actual, expected, 'should have returned object with cutoff_frequency field');
+    t.end();
+
+  });
+};
+
 module.exports.all = function (tape, common) {
   function test(name, testFunction) {
     return tape('ngrams ' + name, testFunction);

test/view/phrase.js

@@ -8,7 +8,6 @@ function getBaseVariableStore(toExclude) {
   vs.var('phrase:field', 'field value');
   vs.var('phrase:boost', 'boost value');
   vs.var('phrase:slop', 'slop value');
-  vs.var('phrase:cutoff_frequency', 'cutoff_frequency value');
 
   if (toExclude) {
     vs.unset(toExclude);
@@ -55,7 +54,6 @@ module.exports.tests.no_exceptions_conditions = function(test, common) {
           type: 'phrase',
           boost: { $: 'boost value' },
           slop: { $: 'slop value' },
-          cutoff_frequency: { $: 'cutoff_frequency value' },
           query: { $: 'name value' }
         }
       }
@@ -83,7 +81,6 @@ module.exports.tests.fuzziness_variable = function(test, common) {
           boost: { $: 'boost value' },
           slop: { $: 'slop value' },
           query: { $: 'name value' },
-          cutoff_frequency: { $: 'cutoff_frequency value' },
           fuzziness: { $: 'fuzziness value' }
         }
       }
@@ -95,6 +92,32 @@ module.exports.tests.fuzziness_variable = function(test, common) {
   });
 };
 
+module.exports.tests.cutoff_frequency = function(test, common) {
+  test('cutoff_frequency variable should be presented in query', function(t) {
+    var store = getBaseVariableStore();
+    store.var('phrase:cutoff_frequency', 'cutoff_frequency value');
+
+    var actual = phrase(store);
+
+    var expected = {
+      match: {
+        'field value': {
+          analyzer: { $: 'analyzer value' },
+          type: 'phrase',
+          boost: { $: 'boost value' },
+          slop: { $: 'slop value' },
+          query: { $: 'name value' },
+          cutoff_frequency: { $: 'cutoff_frequency value' }
+        }
+      }
+    };
+
+    t.deepEquals(actual, expected, 'should have returned object with cutoff_frequency field');
+    t.end();
+
+  });
+};
+
 
 module.exports.all = function (tape, common) {
   function test(name, testFunction) {

view/address.js

@@ -12,22 +12,25 @@ module.exports = function( property ){
         !vs.isset('input:'+property) ||
         !vs.isset('address:'+property+':analyzer') ||
         !vs.isset('address:'+property+':field') ||
-        !vs.isset('address:'+property+':cutoff_frequency') ||
         !vs.isset('address:'+property+':boost') ){
       return null;
     }
 
     // base view
-    var view = { 'match': {} };
+    let view = { 'match': {} };
 
     // match query
-    view.match[ vs.var('address:'+property+':field') ] = {
+    let section = view.match[ vs.var('address:'+property+':field') ] = {
       analyzer: vs.var('address:'+property+':analyzer'),
       boost: vs.var('address:'+property+':boost'),
-      cutoff_frequency: vs.var('address:'+property+':cutoff_frequency'),
       query: vs.var('input:'+property)
     };
 
+    // optional 'cutoff_frequency' property
+    if( vs.isset('address:'+property+':cutoff_frequency') ){
+      section.cutoff_frequency = vs.var('address:'+property+':cutoff_frequency');
+    }
+
     return view;
   };
 };

view/admin.js

@@ -12,22 +12,25 @@ module.exports = function( property ){
         !vs.isset('input:'+property) ||
         !vs.isset('admin:'+property+':analyzer') ||
         !vs.isset('admin:'+property+':field') ||
-        !vs.isset('admin:'+property+':cutoff_frequency') ||
         !vs.isset('admin:'+property+':boost') ){
       return null;
     }
 
     // base view
-    var view = { 'match': {} };
+    let view = { 'match': {} };
 
     // match query
-    view.match[ vs.var('admin:'+property+':field') ] = {
+    let section = view.match[ vs.var('admin:'+property+':field') ] = {
       analyzer: vs.var('admin:'+property+':analyzer'),
       boost: vs.var('admin:'+property+':boost'),
-      cutoff_frequency: vs.var('admin:'+property+':cutoff_frequency'),
       query: vs.var('input:'+property)
     };
 
+    // optional 'cutoff_frequency' property
+    if( vs.isset('admin:'+property+':cutoff_frequency') ){
+      section.cutoff_frequency = vs.var('admin:'+property+':cutoff_frequency');
+    }
+
     return view;
   };
 };

view/ngrams.js

@@ -5,7 +5,6 @@ module.exports = function( vs ){
   if( !vs.isset('input:name') ||
       !vs.isset('ngram:analyzer') ||
       !vs.isset('ngram:field') ||
-      !vs.isset('ngram:cutoff_frequency') ||
       !vs.isset('ngram:boost') ){
     return null;
   }
@@ -17,13 +16,16 @@ module.exports = function( vs ){
   view.match[ vs.var('ngram:field') ] = {
     analyzer: vs.var('ngram:analyzer'),
     boost: vs.var('ngram:boost'),
-    cutoff_frequency: vs.var('ngram:cutoff_frequency'),
     query: vs.var('input:name')
   };
 
   if (vs.isset('ngram:fuzziness')) {
     view.match[ vs.var('ngram:field') ].fuzziness = vs.var('ngram:fuzziness');
   }
 
+  if (vs.isset('ngram:cutoff_frequency')) {
+    view.match[ vs.var('ngram:field') ].cutoff_frequency = vs.var('ngram:cutoff_frequency');
+  }
+
   return view;
 };

view/phrase.js

@@ -6,7 +6,6 @@ module.exports = function( vs ){
       !vs.isset('phrase:analyzer') ||
       !vs.isset('phrase:field') ||
       !vs.isset('phrase:boost') ||
-      !vs.isset('phrase:cutoff_frequency') ||
       !vs.isset('phrase:slop') ){
     return null;
   }
@@ -20,13 +19,16 @@ module.exports = function( vs ){
     type: 'phrase',
     boost: vs.var('phrase:boost'),
     slop: vs.var('phrase:slop'),
-    cutoff_frequency: vs.var('phrase:cutoff_frequency'),
     query: vs.var('input:name')
   };
 
   if (vs.isset('phrase:fuzziness')) {
     view.match[ vs.var('phrase:field') ].fuzziness = vs.var('phrase:fuzziness');
   }
 
+  if (vs.isset('phrase:cutoff_frequency')) {
+    view.match[ vs.var('phrase:field') ].cutoff_frequency = vs.var('phrase:cutoff_frequency');
+  }
+
   return view;
 };