rrule - npm Package Compare versions

Comparing version 2.0.0 to 2.0.1

lib/nlp.js

@@ -252,3 +252,3 @@ /*!
             } else {
-                this.add(gettext('ON')).add(gettext('weekdays'));
+                this.add(gettext('on')).add(gettext('weekdays'));
             }
@@ -298,2 +298,4 @@
             this._bymonthday();
+        } else if (this.byweekday && this.byweekday.isWeekdays) {
+            this.add(gettext('on')).add(gettext('weekdays'));
         } else if (this.byweekday) {
@@ -300,0 +302,0 @@ this._byweekday();

lib/rrule.js

@@ -484,3 +484,3 @@ /*!
 
-    if (!RRule.FREQUENCIES[options.freq]) {
+    if (!RRule.FREQUENCIES[options.freq] && options.byeaster === null) {
         throw 'Invalid frequency: ' + String(options.freq)
@@ -495,3 +495,3 @@ }
     if (opts.byeaster !== null) {
-        throw new Error('byeaster not implemented');
+        opts.freq = RRule.YEARLY;
     }
@@ -717,3 +717,2 @@
     bysecond:    null,
-    // not implemented:
     byeaster:    null
@@ -1103,3 +1102,3 @@ };
                     (plb(ii.nwdaymask) && !ii.nwdaymask[i]) ||
-                    (plb(byeaster) && !ii.eastermask[i]) ||
+                    (byeaster !== null && !_.include(ii.eastermask, i)) ||
                     (
@@ -1449,2 +1448,5 @@ (plb(bymonthday) || plb(bynmonthday)) &&
                 break;
+            case 'BYEASTER':
+                options.byeaster = Number(value);
+                break;
             default:
@@ -1485,3 +1487,25 @@ throw new Error("Unknown RRULE property '" + key + "'");
 
+Iterinfo.prototype.easter = function(y, offset) {
+    offset = offset || 0;
 
+    var a = y % 19,
+        b = Math.floor(y / 100),
+        c = y % 100,
+        d = Math.floor(b / 4),
+        e = b % 4,
+        f = Math.floor((b + 8) / 25),
+        g = Math.floor((b - f + 1) / 3),
+        h = Math.floor(19 * a + b - d - g + 15) % 30,
+        i = Math.floor(c / 4),
+        k = c % 4,
+        l = Math.floor(32 + 2 * e + 2 * i - h - k) % 7,
+        m = Math.floor((a + 11 * h + 22 * l) / 451),
+        month = Math.floor((h + l - 7 * m + 114) / 31),
+        day = (h + l - 7 * m + 114) % 31 + 1,
+        date = Date.UTC(y, month - 1, day + offset),
+        yearStart = Date.UTC(y, 0, 1);
+
+    return [ Math.ceil((date - yearStart) / (1000 * 60 * 60 * 24)) ];
+}
+
 Iterinfo.prototype.rebuild = function(year, month) {
@@ -1616,3 +1640,2 @@
         }
-
     }
@@ -1662,4 +1685,2 @@
 
-        if (plb(rr.options.byeaster)) {/* not implemented */}
-
         this.lastyear = year;
@@ -1669,2 +1690,5 @@ this.lastmonth = month;
 
+    if (rr.options.byeaster !== null) {
+        this.eastermask = this.easter(year, rr.options.byeaster);
+    }
 };
@@ -1671,0 +1695,0 @@

package.json

 {
     "name": "rrule",
-    "version": "2.0.0",
+    "version": "2.0.1",
     "description": "JavaScript library for working with recurrence rules for calendar dates.",
-    "homepage": "https://github.com/jkbr/rrule",
+    "homepage": "http://jkbr.github.io/rrule/",
     "keywords":[
@@ -7,0 +7,0 @@ "dates",

README.md

@@ -26,5 +26,9 @@ rrule.js
 
-Download
-[rrule.js](https://raw.github.com/jkbr/rrule/master/lib/rrule.js). If
-you want to use `RRule.prototype.toText()` or `RRule.fromText()`, you'll
+```bash
+$ bower install rrule
+```
+
+Alternatively, download
+[rrule.js](https://raw.github.com/jkbr/rrule/master/lib/rrule.js) manually. If
+you intend to use `RRule.prototype.toText()` or `RRule.fromText()`, you'll
 also need [nlp.js](https://raw.github.com/jkbr/rrule/master/lib/nlp.js).
@@ -271,4 +275,6 @@
     <dd>Processed options applied to the rule. Includes default options
-    (such us `wkstart`). Currently, `rule.options.byweekday` isn't equal
-    to `rule.origOptions.byweekday` (which is an inconsistency).</dd>
+    (such us <code>wkstart</code>). Currently,
+    <code>rule.options.byweekday</code> isn't equal
+    to <code>rule.origOptions.byweekday</code> (which is an inconsistency).
+    </dd>
 
@@ -328,3 +334,3 @@ <dt><code>rule.origOptions</code></dt>
 
-##### `RRule.prototype.after(dt, inc=false)`
+##### `RRule.prototype.before(dt, inc=false)`
 
@@ -336,5 +342,5 @@ Returns the last recurrence before the given `Date` instance. The `inc`
 
-##### `RRule.prototype.before(dt, inc=false)`
+##### `RRule.prototype.after(dt, inc=false)`
 
-Returns the last recurrence
+Returns the first recurrence
 after the given `Date` instance. The `inc` argument defines what happens
@@ -400,3 +406,3 @@ if `dt` is an occurrence. With `inc == true`, if `dt` itself is an
 ```javascript
-var options = RRule.parseString('FREQ=DAY;INTERVAL=6')
+var options = RRule.parseString('FREQ=DAILY;INTERVAL=6')
 options.dtstart = new Date(2000, 1, 1)
@@ -461,2 +467,4 @@ var rule = new RRule(options)
 
+* 2.0.1
+   * Added bower.json.
 * 2.0.0 (2013-07-16)
@@ -494,4 +502,4 @@ * Fixed a February 28-related issue.
 
-* [Jakub Roztocil](http://roztocil.name/)
-    ([@jakubroztocil](http://twitter.com/jakubroztocil))
+* [Jakub Roztocil](http://subtleapps.com/)
+    ([@jkbrzt](http://twitter.com/jkbrzt))
 * Lars Schöning ([@lyschoening](http://twitter.com/lyschoening))
@@ -498,0 +506,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Native code

Supply chain risk

Contains native code (e.g., compiled binaries or shared libraries). Including native code can obscure malicious behavior.

Found 1 instance in 1 package

Filesystem access

Supply chain risk

Accesses the file system, and could potentially read sensitive data.

Found 1 instance in 1 package

Mixed license

License

(Experimental) Package contains multiple licenses.

Found 1 instance in 1 package

No website

Quality

Package does not have a website.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1718750

increased by158%

Number of package files

75

increased by134.38%

Lines of code

19716

increased by19.31%

Number of lines in readme file

505

increased by1.61%

Worsened metrics

Number of low license alerts

1

increased byInfinity%

Number of low quality alerts

1

increased byInfinity%

Number of low supply chain risk alerts

2

increased byInfinity%

Number of medium supply chain risk alerts

1

increased byInfinity%

No dependency changes