Merge pull request #26 from download13/validation-fixes

Validation fixes
jpmonette · Sep 16, 2014 · 1e80b3d · 1e80b3d
2 parents 761272c + 38319e3
commit 1e80b3d
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/feed.js b/lib/feed.js
@@ -6,6 +6,7 @@ var generatorName = 'Feed for Node.js';
 // Feed Main Module
 // ============================================================================
 function Feed(options) {
+    this.id          = options.id;
     this.title       = options.title;
     this.description = options.description;
     this.link        = options.link;
@@ -32,6 +33,7 @@ function Feed(options) {
             author:         options.author,
             contributor:    options.contributor,	// Atom only
             guid:           options.guid,
+            id:             options.id,
             content:        options.content,
             copyright:		options.copyright	// Atom only
         };
@@ -104,6 +106,10 @@ function atom_1_0(options) {
     /**************************************************************************
      * "feed" node: REQUIRED elements
      *************************************************************************/
+    if(options.id == undefined)
+        throw new Error('feed id is mandatory');
+    else
+        feed.push({ id: options.id });
 
     if(options.title == undefined)
         throw new Error('feed title is mandatory');
@@ -115,8 +121,6 @@ function atom_1_0(options) {
     else
         if(!validateURL(options.link))
             throw new Error('invalid feed link');
-        else
-            feed.push({ link: options.link });
 
     if(Object.prototype.toString.call(options.updated) === '[object Date]')
         feed.push({ updated: RFC3339(options.updated) });
@@ -213,7 +217,7 @@ function atom_1_0(options) {
 
         var entry = [
             { title:        { _attr: { type: 'html' }, _cdata: entries[i].title }},
-            { id:           entries[i].link },
+            { id:           entries[i].id || entries[i].link },
             { link:         [{ _attr: { href: entries[i].link } }]},
             { updated:      RFC3339(entries[i].date) }
         ];