@dhyasama/totem-models 6.21.2 → 6.21.4

package/.npmignore

@@ -0,0 +1,14 @@
+lib-cov
+*.seed
+*.log
+*.csv
+*.dat
+*.out
+*.pid
+*.gz
+
+npm-debug.log
+node_modules
+
+.DS_Store
+.idea

package/lib/Note.js

@@ -44,6 +44,10 @@ module.exports = function(mongoose, config) {
 
   };
 
+  // Note.statics.getByCreator = function(personId, cb) {
+  //   this.find({ 'createdBy': personId }).exec(cb);
+  // };
+
   Note.statics.getById = function(id, cb) {
     this.findOne({
       '_id': id,

package/lib/Organization.js

@@ -922,7 +922,7 @@ module.exports = function(mongoose, config) {
 
   Organization.methods.merge = function(id) {
     if (this.merged.indexOf(id) == -1) {
-      this.merged.push(id);
+      this.merged = this.merged.concat([id]);
       return true;
     }
     else {
@@ -1306,48 +1306,33 @@ module.exports = function(mongoose, config) {
     var getUsername = function getUsername(val) {
 
       var URL = require('url');
-      var result = URL.parse(val);
+      var parsedUrl = URL.parse(val);
+      var protocol = parsedUrl.protocol;
 
-      result = result.pathname;
+      if (!protocol) { parsedUrl = URL.parse('http://' + val); }
 
-      if (result.indexOf('/') === 0) { result = result.replace('/', ''); }
-      if (result.indexOf('in/') === 0) { result = result.replace('in/', ''); }
-      if (result.indexOf('organization/') === 0) { result = result.replace('organization/', ''); }
-      if (result.indexOf('/') >= 0) { result = result.split('/')[0]; }
+      var pathname = parsedUrl.pathname;
 
-      console.log(val, '-->', result);
+      if (pathname.indexOf('/') === 0) { pathname = pathname.replace('/', ''); }
+      if (pathname.indexOf('company/') === 0) { pathname = pathname.replace('company/', ''); }
+      if (pathname.indexOf('organization/') === 0) { pathname = pathname.replace('organization/', ''); }
+      if (pathname.indexOf('/') >= 0) { pathname = pathname.split('/')[0]; }
 
-      return result;
+      console.log('Username:', val, '-->', pathname);
 
-    };
+      return pathname;
 
-    var domains = {
-      facebook: 'https://facebook.com',
-      linkedin: 'https://linkedin.com/company',
-      twitter: 'https://twitter.com',
-      crunchbase: 'https://crunchbase.com/organization'
     };
 
     var username = getUsername(value);
 
-    // todo - tests
-    // getUsername('dhyasama');
-    // getUsername('in/dhyasama');
-    // getUsername('http://facebook.com/dhyasama');
-    // getUsername('http://linkedin.com/in/dhyasama');
-    // getUsername('https://twitter.com/dhyasama');
-    // getUsername('http://www.facebook.com/dhyasama');
-    // getUsername('http://www.linkedin.com/dhyasama/');
-    // getUsername('http://www.twitter.com/dhyasama?hello=world');
-    // getUsername('http://www.facebook.com');
-
     self
       .find({ $or:
           [
-            { 'social.facebook': domains.facebook + '/' + username },
-            { 'social.linkedin': domains.linkedin + '/in/' + username },
-            { 'social.twitter': domains.twitter + '/' + username },
-            { 'crunchbase.url': domains.crunchbase + '/' + username }
+            { 'social.facebook': new RegExp('facebook.com/' + username, 'i') },
+            { 'social.linkedin': new RegExp('linkedin.com/company/' + username, 'i') },
+            { 'social.twitter': new RegExp('twitter.com/' + username, 'i') },
+            { 'crunchbase.url': new RegExp('crunchbase.com/organization/' + username, 'i') }
           ],
         'deleted': { $ne: true }
       })

package/lib/Person.js

@@ -223,7 +223,7 @@ module.exports = function(mongoose, config) {
 
   Person.methods.addMerged = function(id) {
     if (this.merged.indexOf(id) == -1) {
-      this.merged.push(id);
+     this.merged = this.merged.concat([id]);
       return true;
     }
     else {
@@ -715,45 +715,31 @@ module.exports = function(mongoose, config) {
     var getUsername = function getUsername(val) {
 
       var URL = require('url');
-      var result = URL.parse(val);
+      var parsedUrl = URL.parse(val);
+      var protocol = parsedUrl.protocol;
 
-      result = result.pathname;
+      if (!protocol) { parsedUrl = URL.parse('http://' + val); }
 
-      if (result.indexOf('/') === 0) { result = result.replace('/', ''); }
-      if (result.indexOf('in/') === 0) { result = result.replace('in/', ''); }
-      if (result.indexOf('/') >= 0) { result = result.split('/')[0]; }
+      var pathname = parsedUrl.pathname;
 
-      console.log(val, '-->', result);
+      if (pathname.indexOf('/') === 0) { pathname = pathname.replace('/', ''); }
+      if (pathname.indexOf('in/') === 0) { pathname = pathname.replace('in/', ''); }
+      if (pathname.indexOf('/') >= 0) { pathname = pathname.split('/')[0]; }
 
-      return result;
+      console.log('Username:', val, '-->', pathname);
 
-    };
+      return pathname;
 
-    var domains = {
-      facebook: 'https://facebook.com',
-      linkedin: 'https://linkedin.com',
-      twitter: 'https://twitter.com'
     };
 
     var username = getUsername(value);
 
-    // todo - tests
-    // getUsername('dhyasama');
-    // getUsername('in/dhyasama');
-    // getUsername('http://facebook.com/dhyasama');
-    // getUsername('http://linkedin.com/in/dhyasama');
-    // getUsername('https://twitter.com/dhyasama');
-    // getUsername('http://www.facebook.com/dhyasama');
-    // getUsername('http://www.linkedin.com/dhyasama/');
-    // getUsername('http://www.twitter.com/dhyasama?hello=world');
-    // getUsername('http://www.facebook.com');
-
     self
       .find({ $or:
           [
-            { 'social.facebook': domains.facebook + '/' + username },
-            { 'social.linkedin': domains.linkedin + '/in/' + username },
-            { 'social.twitter': domains.twitter + '/' + username }
+            { 'social.facebook': new RegExp('facebook.com/' + username, 'i') },
+            { 'social.linkedin': new RegExp('linkedin.com/in/' + username, 'i') },
+            { 'social.twitter': new RegExp('twitter.com/' + username, 'i') }
           ],
         'deleted': { $ne: true }
       })
@@ -874,7 +860,7 @@ module.exports = function(mongoose, config) {
 
     this
       .find({ 'contact.email.email': { $in : emails }, 'deleted': {$ne: true}})
-      .select('name avatarUrl')
+      .select('name avatarUrl title doNotDisplay')
       .exec(function (err, people) {
         cb(err, _.sortBy(people, function(person) { return person.name.full; }));
       });