merge url when new value is https

Author: dailyrandomphoto

lib/index.js

@@ -29,13 +29,19 @@ function loadBlogs() {
     .then(blogs => blogs.filter(blog => blog && typeof blog.url === 'string'))
     .then(blogs => {
       blogs.forEach(blog => {
-        BLOG_MAP[blog.url] = blog;
-        BLOG_INDEX[blog.url] = 1;
+        BLOG_MAP[urlNoProtocal(blog.url)] = blog;
+        BLOG_INDEX[urlNoProtocal(blog.url)] = 1;
         BLOG_INDEX[urlAlias(blog.url)] = 1;
       });
     });
 }
 
+function urlNoProtocal(url) {
+  const regex = /https?:\/\//g;
+  url = url.replace(regex, '');
+  return url;
+}
+
 function urlAlias(url) {
   const regex = /https?:\/\/|www\.|\?.+|#.+|\/$/g;
   url = url.replace(regex, '');
@@ -45,7 +51,7 @@ function urlAlias(url) {
 }
 
 function findUrlInDocuments(url) {
-  if (BLOG_MAP[url]) {
+  if (BLOG_MAP[urlNoProtocal(url)]) {
     return true;
   }
 
@@ -235,13 +241,20 @@ function mergeObject(obj1, obj2) {
     }
 
     const value = obj2[key];
-    if (value) {
-      if (isArray(value) || isArray(obj1[key])) {
-        const arr = unique(filterEmpties([].concat(obj1[key]).concat(value)));
-        obj1[key] = arr;
-      } else {
+    if (!value) {
+      continue;
+    }
+
+    if (isArray(value) || isArray(obj1[key])) {
+      const arr = unique(filterEmpties([].concat(obj1[key]).concat(value)));
+      obj1[key] = arr;
+    } else if (key === 'url') {
+      // Copy the value of url only when https.
+      if (value.indexOf('https') === 0) {
         obj1[key] = value;
       }
+    } else {
+      obj1[key] = value;
     }
   }
 
@@ -250,7 +263,7 @@ function mergeObject(obj1, obj2) {
 
 function _merge(doc) {
   const {url} = doc;
-  const oldDoc = BLOG_MAP[url];
+  const oldDoc = BLOG_MAP[urlNoProtocal(url)];
   if (!oldDoc) {
     return Promise.resolve().then(() => _save(doc));
   }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dev-blog-directory-save",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "API for save new blogs to dev-blog-directory.",
   "main": "lib/index.js",
   "scripts": {

test/merge.js

@@ -43,6 +43,62 @@ describe('merge', () => {
       expect(newDoc.rss).to.be.eql('https://myblog.com/feed/');
     });
 
+    it('merge url - no overwrite', () => {
+      const obj1 = {
+        _id: '123456',
+        url: 'https://myblog.com',
+        name: 'myblog',
+        author: null,
+        rss: 'http://myblog.com/wrong-feed/',
+        tags: ['foo', 'bar'],
+        categories: ['foo', 'bar']
+      };
+
+      const obj2 = {
+        url: 'http://myblog.com',
+        name: null,
+        author: 'blogger',
+        rss: 'https://myblog.com/feed/',
+        tags: ['foo', 'bar'],
+        categories: ['foo', 'bar']
+      };
+
+      const newDoc = mergeObject(obj1, obj2);
+      expect(newDoc._id).to.be.an('string').to.be.have.lengthOf(6);
+      expect(newDoc.url).to.be.eql('https://myblog.com');
+      expect(newDoc.name).to.be.eql('myblog');
+      expect(newDoc.author).to.be.eql('blogger');
+      expect(newDoc.rss).to.be.eql('https://myblog.com/feed/');
+    });
+
+    it('merge url - overwite', () => {
+      const obj1 = {
+        _id: '123456',
+        url: 'http://myblog.com',
+        name: 'myblog',
+        author: null,
+        rss: 'http://myblog.com/wrong-feed/',
+        tags: ['foo', 'bar'],
+        categories: ['foo', 'bar']
+      };
+
+      const obj2 = {
+        url: 'https://myblog.com',
+        name: null,
+        author: 'blogger',
+        rss: 'https://myblog.com/feed/',
+        tags: ['foo', 'bar'],
+        categories: ['foo', 'bar']
+      };
+
+      const newDoc = mergeObject(obj1, obj2);
+      expect(newDoc._id).to.be.an('string').to.be.have.lengthOf(6);
+      expect(newDoc.url).to.be.eql('https://myblog.com');
+      expect(newDoc.name).to.be.eql('myblog');
+      expect(newDoc.author).to.be.eql('blogger');
+      expect(newDoc.rss).to.be.eql('https://myblog.com/feed/');
+    });
+
     it('merge array 1', () => {
       const obj1 = {
         _id: '123456',
@@ -150,6 +206,18 @@ describe('merge', () => {
       return expect(_merge(doc)).to.be.fulfilled;
     });
 
+    it('merge url', () => {
+      const doc = {
+        url: 'http://myblog.com/',
+        name: 'myblog',
+        author: 'blogger',
+        tags: ['foo', 'bar'],
+        categories: ['foo', 'bar']
+      };
+
+      return expect(_merge(doc)).to.be.fulfilled;
+    });
+
     it('save new blog', () => {
       const doc = {
         url: 'https://myblog.com/new-blog/',