Merge pull request #43 from mwaylabs/feature/filter-type

add longrange filter and test cases

src/mw-backbone/collection/filter.js

@@ -4,6 +4,22 @@ mwUI.Backbone.Filter = function () {
     return (_.isUndefined(value) || value === null || value === '' || value.length===0 || (_.isArray(value) && _.compact(value).length===0)) ? null : object;
   };
 
+  var returnNullOrObjectForMultipleValues = function (values, object) {
+    var hasValue = false;
+    if(!_.isObject(values)){
+      console.log(values);
+      throw new Error('The argument values has to be an object');
+    }
+    for(var key in values){
+      if(returnNullOrObjectFor(values[key], true)){
+        hasValue = true;
+      } else {
+        delete object[key];
+      }
+    }
+    return hasValue ? object : null;
+  };
+
   return {
     containsString: function (fieldName, value) {
       return returnNullOrObjectFor(value, {
@@ -95,12 +111,21 @@ mwUI.Backbone.Filter = function () {
     },
 
     dateRange: function(fieldName, min, max){
-      return returnNullOrObjectFor(max, returnNullOrObjectFor(min, {
+      return returnNullOrObjectForMultipleValues({min: min, max: max}, {
         type: 'dateRange',
         fieldName: fieldName,
         min: min,
         max: max
-      }));
+      });
+    },
+
+    longRange: function(fieldName, min, max){
+      return returnNullOrObjectForMultipleValues({min: min, max: max}, {
+        type: 'longRange',
+        fieldName: fieldName,
+        min: min,
+        max: max
+      });
     }
   };
 

src/mw-backbone/collection/filter_test.js

@@ -0,0 +1,85 @@
+describe('Collection Selectable', function () {
+
+  beforeEach(function () {
+    this.filter = new mwUI.Backbone.Filter();
+  });
+
+  describe('dateRange Filter', function(){
+    it('returns dateRange filter when min and max are defined', function(){
+      var filter = this.filter.dateRange('xxx', 1, 5);
+
+      expect(filter).toEqual({
+        type: 'dateRange',
+        fieldName: 'xxx',
+        min: 1,
+        max: 5
+      });
+    });
+
+    it('returns dateRange filter with only min value set when only min is defined', function(){
+      var filter = this.filter.dateRange('xxx', 1);
+
+      expect(filter).toEqual({
+        type: 'dateRange',
+        fieldName: 'xxx',
+        min: 1
+      });
+    });
+
+    it('returns dateRange filter with only max value set when only min is defined', function(){
+      var filter = this.filter.dateRange('xxx', null, 5);
+
+      expect(filter).toEqual({
+        type: 'dateRange',
+        fieldName: 'xxx',
+        max: 5
+      });
+    });
+
+    it('returns no dateRange filter when neither min nor max is defined', function(){
+      var filter = this.filter.dateRange('xxx');
+
+      expect(filter).toEqual(null);
+    });
+  });
+
+  describe('longRange Filter', function(){
+    it('returns longRange filter when min and max are defined', function(){
+      var filter = this.filter.longRange('xxx', 1, 5);
+
+      expect(filter).toEqual({
+        type: 'longRange',
+        fieldName: 'xxx',
+        min: 1,
+        max: 5
+      });
+    });
+
+    it('returns longRange filter with only min value set when only min is defined', function(){
+      var filter = this.filter.longRange('xxx', 1);
+
+      expect(filter).toEqual({
+        type: 'longRange',
+        fieldName: 'xxx',
+        min: 1
+      });
+    });
+
+    it('returns longRange filter with only max value set when only min is defined', function(){
+      var filter = this.filter.longRange('xxx', null, 5);
+
+      expect(filter).toEqual({
+        type: 'longRange',
+        fieldName: 'xxx',
+        max: 5
+      });
+    });
+
+    it('returns no longRange filter when neither min nor max is defined', function(){
+      var filter = this.filter.longRange('xxx');
+
+      expect(filter).toEqual(null);
+    });
+  });
+
+});