akashacms-blog-podcast - npm Package Compare versions

Comparing version 0.6.5 to 0.6.6

index.js

@@ -24,6 +24,4 @@ /**
 const url      = require('url');
-const async    = require('async');
 const akasha   = require('akasharender');
 const mahabhuta = akasha.mahabhuta;
-const co       = require('co');
 
@@ -62,3 +60,3 @@ const log   = require('debug')('akasha:blog-podcast-plugin');
 
-    onSiteRendered(config) {
+    async onSiteRendered(config) {
         /* console.log(`blog-podcast onSiteRendered ${util.inspect(config.pluginData(pluginName).bloglist)}`);
@@ -72,61 +70,59 @@ console.log(`   Object.keys ${util.inspect(Object.keys(config.pluginData(pluginName).bloglist))}`);
         } */
-        return co(function* () {
-            for (var blogkey in config.pluginData(pluginName).bloglist) {
-                if (!config.pluginData(pluginName).bloglist.hasOwnProperty(blogkey)) {
-                    continue;
-                }
-                var blogcfg = config.pluginData(pluginName).bloglist[blogkey];
-                // console.log(`blog-podcast blogcfg ${util.inspect(blogcfg)}`);
-                var documents = yield findBlogDocs(config, undefined, blogcfg);
-                var count = 0;
-                var documents2 = documents.filter(doc => {
-                    if (typeof maxEntries === "undefined"
-                    || (typeof maxEntries !== "undefined" && count++ < maxEntries)) {
-                        return true;
-                    } else return false;
-                });
-                // log('blog-news-river documents2 '+ util.inspect(documents2));
+        for (var blogkey in config.pluginData(pluginName).bloglist) {
+            if (!config.pluginData(pluginName).bloglist.hasOwnProperty(blogkey)) {
+                continue;
+            }
+            var blogcfg = config.pluginData(pluginName).bloglist[blogkey];
+            // console.log(`blog-podcast blogcfg ${util.inspect(blogcfg)}`);
+            var documents = await findBlogDocs(config, undefined, blogcfg);
+            var count = 0;
+            var documents2 = documents.filter(doc => {
+                if (typeof maxEntries === "undefined"
+                || (typeof maxEntries !== "undefined" && count++ < maxEntries)) {
+                    return true;
+                } else return false;
+            });
+            // log('blog-news-river documents2 '+ util.inspect(documents2));
 
-                var rssitems = documents2.map(doc => {
-                    return {
-                        title: doc.metadata.title,
-                        description: doc.metadata.teaser ? doc.metadata.teaser : "",
-                        url: config.root_url +'/'+ doc.renderpath,
-                        date: doc.metadata.publicationDate ? doc.metadata.publicationDate : doc.stat.mtime
-                    };
-                });
+            var rssitems = documents2.map(doc => {
+                return {
+                    title: doc.metadata.title,
+                    description: doc.metadata.teaser ? doc.metadata.teaser : "",
+                    url: config.root_url +'/'+ doc.renderpath,
+                    date: doc.metadata.publicationDate ? doc.metadata.publicationDate : doc.stat.mtime
+                };
+            });
 
-                var maxItems;
-                if (typeof blogcfg.maxItems === 'undefined') {
-                    maxItems = 60;
-                } else if (blogcfg.maxItems <= 0) {
-                    maxItems = undefined;
-                } else {
-                    maxItems = blogcfg.maxItems;
-                }
+            var maxItems;
+            if (typeof blogcfg.maxItems === 'undefined') {
+                maxItems = 60;
+            } else if (blogcfg.maxItems <= 0) {
+                maxItems = undefined;
+            } else {
+                maxItems = blogcfg.maxItems;
+            }
 
-                if (maxItems) {
-                    let rssitems2 = [];
-                    let count = 0;
-                    for (let item of rssitems) {
-                        if (count < maxItems) {
-                            rssitems2.push(item);
-                            // console.log(`${blogkey} PUSH ITEM ${count} ${util.inspect(item)}`);
-                        }
-                        count++;
+            if (maxItems) {
+                let rssitems2 = [];
+                let count = 0;
+                for (let item of rssitems) {
+                    if (count < maxItems) {
+                        rssitems2.push(item);
+                        // console.log(`${blogkey} PUSH ITEM ${count} ${util.inspect(item)}`);
                     }
-                    rssitems = rssitems2;
+                    count++;
                 }
+                rssitems = rssitems2;
+            }
 
-                // console.log(`GENERATE RSS rssitems # ${rssitems.length} maxItems ${maxItems} ${util.inspect(blogcfg)} `);
+            // console.log(`GENERATE RSS rssitems # ${rssitems.length} maxItems ${maxItems} ${util.inspect(blogcfg)} `);
 
-                // console.log(`GENERATE RSS ${config.renderDestination + blogcfg.rssurl} ${util.inspect(rssitems)}`);
+            // console.log(`GENERATE RSS ${config.renderDestination + blogcfg.rssurl} ${util.inspect(rssitems)}`);
 
-                yield akasha.generateRSS(config, blogcfg, {
-                        feed_url: config.renderDestination + blogcfg.rssurl,
-                        pubDate: new Date()
-                    },
-                    rssitems, blogcfg.rssurl);
-            }
-        });
+            await akasha.generateRSS(config, blogcfg, {
+                    feed_url: config.renderDestination + blogcfg.rssurl,
+                    pubDate: new Date()
+                },
+                rssitems, blogcfg.rssurl);
+        }
     }
@@ -178,3 +174,3 @@ }
  */
-var findBlogDocs = co.wrap(function* (config, metadata, blogcfg) {
+var findBlogDocs = async function(config, metadata, blogcfg) {
 
@@ -185,3 +181,3 @@ if (!blogcfg || !blogcfg.matchers) {
 
-    var documents = yield akasha.documentSearch(config, {
+    var documents = await akasha.documentSearch(config, {
         // rootPath: docDirPath,
@@ -208,3 +204,3 @@ pathmatch: blogcfg.matchers.path ? blogcfg.matchers.path : undefined,
     return documents;
-});
+};
 
@@ -226,3 +222,3 @@ function findBlogIndexes(config, metadata, blogcfg) {
     get elementName() { return "blog-news-river"; }
-    process($element, metadata, dirty) {
+    async process($element, metadata, dirty) {
         var blogtag = $element.attr("blogtag");
@@ -262,20 +258,18 @@ if (!blogtag) {
 
-        return findBlogDocs(metadata.config, metadata, _blogcfg)
-        .then(documents => {
+        var documents = await findBlogDocs(metadata.config, metadata, _blogcfg);
 
-            // log('blog-news-river documents '+ util.inspect(documents));
+        // log('blog-news-river documents '+ util.inspect(documents));
 
-            var count = 0;
-            var documents2 = documents.filter(doc => {
-                if (typeof maxEntries === "undefined"
-                || (typeof maxEntries !== "undefined" && count++ < maxEntries)) {
-                    return true;
-                } else return false;
-            });
-            // log('blog-news-river documents2 '+ util.inspect(documents2));
+        var count = 0;
+        var documents2 = documents.filter(doc => {
+            if (typeof maxEntries === "undefined"
+            || (typeof maxEntries !== "undefined" && count++ < maxEntries)) {
+                return true;
+            } else return false;
+        });
+        // log('blog-news-river documents2 '+ util.inspect(documents2));
 
-            return akasha.partial(metadata.config, template, {
-                documents: documents2,
-                feedUrl: _blogcfg.rssurl
-            });
+        return akasha.partial(metadata.config, template, {
+            documents: documents2,
+            feedUrl: _blogcfg.rssurl
         });
@@ -339,33 +333,31 @@ }
     get elementName() { return "blog-next-prev"; }
-    process($element, metadata, dirty) {
-        return co(function* () {
-            if (! metadata.blogtag) { return; }
-            let blogcfg = metadata.config.pluginData(pluginName).bloglist[metadata.blogtag];
-            if (!blogcfg) throw new Error(`No blog configuration found for blogtag ${metadata.blogtag} in ${metadata.document.path}`);
-    
-            let docpathNoSlash = metadata.document.path.startsWith('/') ? metadata.document.path.substring(1) : metadata.document.path;
-            let documents = yield findBlogDocs(metadata.config, metadata, blogcfg);
+    async process($element, metadata, dirty) {
+        if (! metadata.blogtag) { return; }
+        let blogcfg = metadata.config.pluginData(pluginName).bloglist[metadata.blogtag];
+        if (!blogcfg) throw new Error(`No blog configuration found for blogtag ${metadata.blogtag} in ${metadata.document.path}`);
 
-            let docIndex = -1;
-            for (var j = 0; docIndex === -1 && j < documents.length; j++) {
-                let document = documents[j];
-                // console.log(`blog-next-prev findBlogDocs blogtag ${util.inspect(metadata.blogtag)} found ${document.basedir} ${document.docpath} ${document.docfullpath} ${document.renderpath}  MATCHES? ${docpathNoSlash}  ${metadata.document.path}`);
-                if (document.docpath === docpathNoSlash /* metadata.document.path */) {
-                    docIndex = j;
-                }
+        let docpathNoSlash = metadata.document.path.startsWith('/') ? metadata.document.path.substring(1) : metadata.document.path;
+        let documents = await findBlogDocs(metadata.config, metadata, blogcfg);
+
+        let docIndex = -1;
+        for (var j = 0; docIndex === -1 && j < documents.length; j++) {
+            let document = documents[j];
+            // console.log(`blog-next-prev findBlogDocs blogtag ${util.inspect(metadata.blogtag)} found ${document.basedir} ${document.docpath} ${document.docfullpath} ${document.renderpath}  MATCHES? ${docpathNoSlash}  ${metadata.document.path}`);
+            if (path.normalize(document.docpath) === path.normalize(docpathNoSlash)) {
+                docIndex = j;
             }
-            if (docIndex >= 0) {
-                let prevDoc = docIndex === 0 ? documents[documents.length - 1] : documents[docIndex - 1];
-                let nextDoc = docIndex === documents.length - 1 ? documents[0] : documents[docIndex + 1];
-                let html = yield akasha.partial(metadata.config, 'blog-next-prev.html.ejs', {
-                    prevDoc, nextDoc
-                });
-                return html;
-            } else {
-                // console.error(`blog-next-prev did not find document ${docpathNoSlash} ${metadata.document.path} in blog`);
-                throw new Error(`did not find document ${docpathNoSlash} ${metadata.document.path} in blog`);
-            }
-        });
+        }
+        if (docIndex >= 0) {
+            let prevDoc = docIndex === 0 ? documents[documents.length - 1] : documents[docIndex - 1];
+            let nextDoc = docIndex === documents.length - 1 ? documents[0] : documents[docIndex + 1];
+            let html = await akasha.partial(metadata.config, 'blog-next-prev.html.ejs', {
+                prevDoc, nextDoc
+            });
+            return html;
+        } else {
+            // console.error(`blog-next-prev did not find document ${docpathNoSlash} ${metadata.document.path} in blog`);
+            throw new Error(`did not find document ${docpathNoSlash} ${metadata.document.path} in blog`);
+        }
     }
 }
 module.exports.mahabhuta.addMahafunc(new BlogNextPrevElement());

package.json

@@ -14,11 +14,10 @@ {
   },
-  "version": "0.6.5",
+  "version": "0.6.6",
   "engines": {
-    "node": ">=6.1"
+    "node": ">=8.4"
   },
   "dependencies": {
     "async": "*",
-    "debug": "^2.2.0",
-    "co": "*"
+    "debug": "^2.2.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

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

Wildcard dependency

Quality

Package has a dependency with a floating version range. This can cause issues if the dependency publishes a new major version.

Found 1 instance in 1 package

Improved metrics

Dependency count

2

decreased by-33.33%

Number of medium quality alerts

2

decreased by-33.33%

Worsened metrics

Total package byte prevSize

27154

decreased by-1.94%

Lines of code

308

decreased by-2.53%

Dependency changes

• - Removedco@*

• - Removedco@4.6.0(transitive)