release

Ubuntu · Ubuntu · commit efbc7839e63d · 2016-01-27T01:15:14.000Z
diff --git a/dist/rss-parser.js b/dist/rss-parser.js
@@ -1,4 +1,4 @@
-/*! rss-parser 2.2.1 */
+/*! rss-parser 2.2.2 */
 
 (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.RSSParser = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 var Entities = require("entities");
@@ -26,6 +26,17 @@ var getSnippet = function(str) {
   return Entities.decode(stripHtml(str)).trim();
 }
 
+var getContent = function(content) {
+  if (typeof content._ === 'string') {
+    return content._;
+  } else if (typeof content === 'object') {
+    var builder = new XML2JS.Builder({headless: true, explicitRoot: true, rootName: 'div', renderOpts: {pretty: false}});
+    return builder.buildObject(content);
+  } else {
+    return content;
+  }
+}
+
 var parseAtomFeed = function(xmlObj, callback) {
   var feed = xmlObj.feed;
   var json = {feed: {entries: []}};
@@ -41,12 +52,12 @@ var parseAtomFeed = function(xmlObj, callback) {
   var entries = feed.entry;
   (entries || []).forEach(function (entry) {
     var item = {};
-    item.title = entry.title[0];
-    item.link = entry.link[0].$.href;
-    item.pubDate = new Date(entry.updated[0]).toISOString();
-    item.author = entry.author[0].name[0];
+    if (entry.title) item.title = entry.title[0];
+    if (entry.link) item.link = entry.link[0].$.href;
+    if (entry.updated) item.pubDate = new Date(entry.updated[0]).toISOString();
+    if (entry.author) item.author = entry.author[0].name[0];
     if (entry.content) {
-      item.content = entry.content[0]._;
+      item.content = getContent(entry.content[0]);
       item.contentSnippet = getSnippet(item.content)
     }
     if (entry.id) {
@@ -75,11 +86,7 @@ var parseRSS2 = function(xmlObj, callback) {
       if (item[f]) entry[f] = item[f][0];
     })
     if (item.description) {
-      entry.content = item.description[0];
-      if (typeof entry.content === 'object') {
-        var builder = new XML2JS.Builder({headless: true});
-        entry.content = builder.buildObject(entry.content);
-      }
+      entry.content = getContent(item.description[0]);
       entry.contentSnippet = getSnippet(entry.content);
     }
     if (item.guid) {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rss-parser",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "main": "index.js",
   "scripts": {
     "test": "mocha"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "rss-parser",`
`3`		`- "version": "2.2.1",`
	`3`	`+ "version": "2.2.2",`
`4`	`4`	`"main": "index.js",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"test": "mocha"`