Added object params for ".by" method.

Previously, the ".by" method could only add in increments of 1. By utilizing objects and updating the case selection, we're now able to change the increments to something customized.

fixed bug in conditional and wrote a test

not for dist, fails one test

documented

rebuilt

README.md

@@ -148,6 +148,18 @@ var acc = [];
 
 range1.by('days', function(moment) {
   // Do something with `moment`
+  acc.push(moment)
+});
+```
+
+You can also use moment.js’ object notation to specify custom intervals:
+
+``` javascript
+var custom_interval = {minutes: 30}; // every half hour
+
+range1.by(custom_interval, function(moment) {
+  // Do something with `moment`
+  acc.push(moment);
 });
 ```
 

dist/moment-range.js

@@ -202,6 +202,8 @@ DateRange.prototype.subtract = function(other) {
  * @param {(!DateRange|String)} range Date range to be used for iteration or
  *                                    shorthand string (shorthands:
  *                                    http://momentjs.com/docs/#/manipulating/add/)
+ *                              Can also use Object Literals for different intervals.
+ *                              Eg, {minutes: 30}
  * @param {!DateRange~by} hollaback Callback
  * @param {!boolean} exclusive Indicate that the end of the range should not
  *                             be included in the iter.
@@ -212,9 +214,12 @@ DateRange.prototype.by = function(range, hollaback, exclusive) {
   if (typeof range === 'string') {
     _byString.call(this, range, hollaback, exclusive);
   }
-  else {
+  else if ((range instanceof DateRange) || (typeof range === 'number')) {
     _byRange.call(this, range, hollaback, exclusive);
   }
+  else if (typeof range === 'object') {
+    _byObject.call(this, range, hollaback, exclusive);
+  }
   return this;
 };
 
@@ -239,6 +244,18 @@ function _byString(interval, hollaback, exclusive) {
   }
 }
 
+/**
+ * @private
+ */
+function _byObject(interval, hollaback, exclusive) {
+  var current = moment(this.start);
+
+  while (this.contains(current, exclusive)) {
+    hollaback.call(this, current.clone());
+    current.add(interval);
+  }
+}
+
 /**
  * @private
  */

lib/moment-range.js

@@ -186,6 +186,8 @@ DateRange.prototype.subtract = function(other) {
  * @param {(!DateRange|String)} range Date range to be used for iteration or
  *                                    shorthand string (shorthands:
  *                                    http://momentjs.com/docs/#/manipulating/add/)
+ *                              Can also use Object Literals for different intervals.
+ *                              Eg, {minutes: 30}
  * @param {!DateRange~by} hollaback Callback
  * @param {!boolean} exclusive Indicate that the end of the range should not
  *                             be included in the iter.
@@ -196,9 +198,12 @@ DateRange.prototype.by = function(range, hollaback, exclusive) {
   if (typeof range === 'string') {
     _byString.call(this, range, hollaback, exclusive);
   }
-  else {
+  else if ((range instanceof DateRange) || (typeof range === 'number')) {
     _byRange.call(this, range, hollaback, exclusive);
   }
+  else if (typeof range === 'object') {
+    _byObject.call(this, range, hollaback, exclusive);
+  }
   return this;
 };
 
@@ -223,6 +228,18 @@ function _byString(interval, hollaback, exclusive) {
   }
 }
 
+/**
+ * @private
+ */
+function _byObject(interval, hollaback, exclusive) {
+  var current = moment(this.start);
+
+  while (this.contains(current, exclusive)) {
+    hollaback.call(this, current.clone());
+    current.add(interval);
+  }
+}
+
 /**
  * @private
  */

test/moment-range.js

@@ -169,6 +169,24 @@ describe('DateRange', function() {
       acc[4].utc().date().should.eql(5);
     });
 
+    it('should iterate correctly by object literal', function(){
+      var acc = [];
+      var d1 = new Date(Date.UTC(2012, 1, 1));
+      var d2 = new Date(Date.UTC(2012, 1, 8));
+      var dr1 = moment.range(d1, d2);
+      var dr2 = {days:2};
+
+      dr1.by(dr2, function(m){
+        acc.push(m);
+      });
+
+      acc.length.should.eql(4);
+      acc[0].utc().date().should.eql(1);
+      acc[1].utc().date().should.eql(3);
+      acc[2].utc().date().should.eql(5);
+      acc[3].utc().date().should.eql(7);
+    });
+
     it('should iterate correctly by year over a Date-constructed range when leap years are involved', function() {
       var acc = [];
       var d1 = new Date(Date.UTC(2011, 1, 1));