Merge branch 'master' into feature/timezone

* master:
  Renamed isValid() to isValidDate().
  Undo jkbrzt#91 as it was breaking the demo app
  Allow Negative and 2-Digit Values in Demo
  Bugfix
  Updating script location in Bower, fixes jkbrzt#61.

Conflicts:
	bower.json
	lib/rrule.js

bower.json

@@ -1,39 +1,37 @@
 {
-  "name": "rrule",
-  "description": "JavaScript library for working with recurrence rules for calendar dates.",
-  "homepage": "http://jakubroztocil.github.io/rrule/",
-  "keywords": [
-    "dates",
-    "recurrences",
-    "calendar",
-    "icalendar",
-    "rfc"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/jakubroztocil/rrule.git"
-  },
-  "version": "2.1.0",
-  "authors": [
-    {
-      "name": "Jakub Roztočil",
-      "homepage": "http://subtleapps.com/"
+    "name": "rrule",
+    "description": "JavaScript library for working with recurrence rules for calendar dates.",
+    "homepage": "http://jakubroztocil.github.io/rrule/",
+    "keywords": [
+        "dates",
+        "recurrences",
+        "calendar",
+        "icalendar",
+        "rfc"
+    ],
+    "repository": {
+        "type": "git",
+        "url": "git://github.com/jakubroztocil/rrule.git"
     },
-    {
-      "name": "Lars Schöning"
+    "version": "2.1.0",
+    "authors": [
+      {
+          "name": "Jakub Roztočil",
+          "homepage": "http://subtleapps.com/"
+      },
+      {
+          "name": "Lars Schöning"
+      }
+    ],
+    "main": "lib/rrule.js",
+    "ignore": [
+        "**/.*",
+        "node_modules",
+        "components"
+    ],
+    "devDependencies": {
+        "underscore": "~1.8.3",
+        "moment-timezone": "~0.3.1",
+        "tz-date": "https://github.com/aramk/tz-date.git"
     }
-  ],
-  "main": "rrule.js",
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "components"
-  ],
-  "devDependencies": {
-    "underscore": "~1.8.3",
-    "moment-timezone": "~0.3.1"
-  },
-  "dependencies": {
-    "tz-date": "https://github.com/aramk/tz-date.git"
-  }
 }

lib/rrule.js

@@ -229,7 +229,7 @@ var dateutil = {
         return date instanceof Date;
     },    
 
-    isValid: function(date) {
+    isValidDate: function (date) {
         return this.isDate(date) && !isNaN(date.getTime());
     },
 
@@ -765,8 +765,8 @@ RRule.DEFAULT_OPTIONS = {
     interval:    1,
     timezone:    null,
     wkst:        RRule.MO,
-    count:      null,
-    until:      null,
+    count:       null,
+    until:       null,
     bysetpos:    null,
     bymonth:     null,
     bymonthday:  null,
@@ -1871,10 +1871,10 @@ IterResult.prototype = {
         var before = args.before;
         var after = args.after;
         // Fail on invalid dates to avoid infinite loops in iterators.
-        if (dateutil.isDate(before) && !dateutil.isValid(before)) {
+        if (dateutil.isDate(before) && !dateutil.isValidDate(before)) {
             throw new Error('Invalid before date');
         }
-        if (dateutil.isDate(after) && !dateutil.isValid(after)) {
+        if (dateutil.isDate(after) && !dateutil.isValidDate(after)) {
             throw new Error('Invalid after date');
         }
 

tests/demo/demo.coffee

@@ -145,7 +145,7 @@ $ ->
                         else
                             value = getDay(value)
                     else if /^by/.test(key)
-                        if not value instanceof Array
+                        if not (value instanceof Array)
                             value = value.split(/[,\s]+/)
                         value = (v for v in value when v)
                         value = value.map (n) -> parseInt(n, 10)