support all JSON schemas

Author: colinskow

.travis.yml

@@ -2,7 +2,8 @@ language: node_js
 cache:
   - node_modules
 node_js:
-  - "4.0"
+  - "4"
+  - "5"
 services:
   - couchdb
 before_script:

README.md

@@ -18,22 +18,28 @@ var PouchDB = require('pouchdb');
 var seed = require('pouchdb-seed-design');
 var db = new PouchDB('http://localhost:5984/design');
 
-seed(db, {
-  person: {
-    views: {
-      byFirstName: function (doc) {
-        emit(doc.firstName);
-      },
-      byLastName: function (doc) {
-        emit(doc.lastName);
-      },
-      byFullName: function (doc) {
-        emit(doc.firstName + ' ' + doc.lastName);
-      }
-    }
+var ddoc = {
+ person: {
+   views: {
+     byFirstName: function (doc) {
+       emit(doc.firstName);
+     },
+     byLastName: function (doc) {
+       emit(doc.lastName);
+     },
+     byFullName: function (doc) {
+       emit(doc.firstName + ' ' + doc.lastName);
+     }
+   }
+ }
+};
+
+var promise = seed(db, ddoc).then(function(updated) {
+  if(updated) {
+    console.log('DDocs updated!');
+  } else {
+    console.log('No update was necessary');
   }
-}, function () {
-  console.dir(arguments);
 });
 ```
 
@@ -49,21 +55,15 @@ Creates a set of CouchDB design documents basing on `design` object. Each key in
 
 If no changes between remote design documents and `design` object are detected, no updates are sent to CouchDB.
 
-In addition to invoking the optional callback, seed also returns a [Bluebird Promise](https://github.com/petkaantonov/bluebird/blob/master/API.md).
-
-```js
-seed(db, design)
-  .then(function(results) {
-    console.log(results);
-  }, function(err){
-    console.log(err);
-  });
-```
+Seed will return a Promise that fulfills with `false` if no updates were necessary, or the result of the `bulkDocs` operation if changes were pushed. (You will need a `Promise` shim if you are using an older browser or version of Node.)
 
 ## Updates
 
+##### (0.3.0) 2016-05-08
+You can now use docs with absolutely any JSON schema. All functions in the tree are converted to strings. This will future proof `pouchdb-seed-design` as the design doc standards evolve. Added browser support.
+
 ##### (0.2.0) 2015-09-16 
-Added support for `filters`, `lists`, `shows`, and `validate_doc_update` thanks to [Will Holley](https://github.com/colinskow/pouchdb-seed-design/pull/2). Updated to PouchDB `4.0.X`. Removed Bluebird Promise dependency, preferring native and using [lie](https://github.com/calvinmetcalf/lie) as a fallback.
+Added support for `filters`, `lists`, `shows`, and `validate_doc_update` thanks to [Will Holley](https://github.com/colinskow/pouchdb-seed-design/pull/2).
 
 ## Credits
 

index.js

@@ -1,100 +1,37 @@
 var objmap = require('object-map');
-var objfilter = require('object-filter');
 var objkeysmap = require('object-keys-map');
-var objmaptoarr = require('object-map-to-array');
-var objsome = require('object-some');
+var deepEqual = require('deep-equal');
 
-if(typeof Promise !== 'function') {
-  var Promise = require('lie');
-}
+var extend = typeof Object.assign === 'function' ? Object.assign : require('node-extend');
 
 function addDesign(s) {
   return '_design/' + s;
 }
 
 function normalizeDoc(doc, id) {
-  var normalized = {
-    _id: id || doc._id,
-    _rev: doc._rev
-  };
-  if(doc.views) normalized.views = objmap(doc.views, normalizeView);
-  if(doc.updates) normalized.updates = objmap(doc.updates, stringify);
-  if(doc.filters) normalized.filters = objmap(doc.filters, stringify);
-  if(doc.lists) normalized.lists = objmap(doc.lists, stringify);
-  if(doc.shows) normalized.shows = objmap(doc.shows, stringify);
-  if(doc.validate_doc_update) normalized.validate_doc_update = stringify(doc.validate_doc_update);
-  return normalized;
-}
-
-function stringify(obj) {
-  return obj.toString();
-}
-
-function normalizeView(view) {
-  var r = {};
-  if (typeof view === 'function' || typeof view === 'string') {
-    return { map: view.toString() };
-  }
-  // Make sure that functions are stringified.
-  if (view.map) {
-    r.map = view.map.toString();
-  }
-  if (view.reduce) {
-    r.reduce = view.reduce.toString();
-  }
-  return r;
-}
 
-function objEqual(a, b) {
-  // If neither are specified, they are equal
-  if(!a && !b) {
-    return true;
-  }
-  // if either a or b exist, but one of them is undefined they are not equal
-  if((a || b) && (!a || !b)) {
-    return false;
-  }
-  // Crawl
-  return !objsome(a, function (v, k) {
-    return v !== b[k];
-  });
-}
-
-function viewEqual(a, b) {
-  if(!a && !b) {
-    return true;
-  }
-  if((a || b) && (!a || !b)) {
-    return false;
+  function normalize(doc) {
+    doc = extend({}, doc);
+    Object.keys(doc).forEach(function(prop) {
+      var type = typeof doc[prop];
+      if(type === 'object') {
+        doc[prop] = normalize(doc[prop]);
+      } else if(type === 'function') {
+        doc[prop] = doc[prop].toString();
+      }
+    });
+    return doc;
   }
-  return b && a.map === b.map && a.reduce === b.reduce;
-}
 
-function viewsEqual(a, b) {
-  // If neither are specified, they are equal
-  if(!a && !b) {
-    return true;
-  }
-  // if either a or b exist, but one of them is undefined they are not equal
-  if((a || b) && (!a || !b)) {
-    return false;
-  }
-  return !objsome(a, function (v, k) {
-    return !viewEqual(v, b[k]);
-  });
+  var output = normalize(doc);
+  output._id = id || doc._id;
+  output._rev = doc._rev;
+  return output;
 }
 
 function docEqual(local, remote) {
-  if (!remote) {
-    return false;
-  }
-
-  return viewsEqual(local.views, remote.views) &&
-         objEqual(local.updates, remote.updates) &&
-         objEqual(local.filters, remote.filters) &&
-         objEqual(local.lists, remote.lists) &&
-         objEqual(local.shows, remote.shows) &&
-         local.validate_doc_update === remote.validate_doc_update;
+  if(!remote) return false;
+  return deepEqual(local, remote, {strict: true});
 }
 
 module.exports = function (db, design, cb) {
@@ -108,24 +45,20 @@ module.exports = function (db, design, cb) {
 
     .then(function (docs) {
 
-      var diff;
       var remote = {};
-      var update;
 
       docs.rows.forEach(function (doc) {
         if (doc.doc) {
-          remote[doc.key] = normalizeDoc(doc.doc);
+          remote[doc.key] = doc.doc;
         }
       });
 
-      update = objmaptoarr(objfilter(local, function (value, key) {
-        return !docEqual(value, remote[key]);
-      }), function (v, k) {
-        if (remote[k]) {
-          v._rev = remote[k]._rev;
-        }
-
-        return v;
+      var update = Object.keys(local).filter(function(key) {
+        if(!remote[key]) return true;
+        local[key]._rev = remote[key]._rev;
+        return !docEqual(local[key], remote[key]);
+      }).map(function(key) {
+        return local[key];
       });
 
       if (update.length > 0) {
@@ -144,6 +77,7 @@ module.exports = function (db, design, cb) {
       if(typeof cb === 'function') {
         cb(err, null);
       }
+      console.log(err);
       return Promise.reject(err);
     });
 

package.json

@@ -11,13 +11,14 @@
   ],
   "description": "Seed CouchDB's design documents with PouchDB",
   "devDependencies": {
-    "chai": "^3.2.0",
-    "gulp": "^3.9.0",
-    "gulp-jshint": "^1.11.2",
-    "gulp-mocha": "^2.1.3",
-    "jshint-stylish": "^2.0.1",
-    "mocha": "^2.2.5",
-    "pouchdb": "^4.0.3"
+    "chai": "^3.5.0",
+    "gulp": "^3.9.1",
+    "gulp-jshint": "^2.0.0",
+    "gulp-mocha": "^2.2.0",
+    "jshint": "^2.9.2",
+    "jshint-stylish": "^2.2.0",
+    "mocha": "^2.4.5",
+    "pouchdb": "^5.3.2"
   },
   "repository": {
     "type": "git",
@@ -27,12 +28,10 @@
     "test": "gulp test"
   },
   "dependencies": {
-    "lie": "^3.0.1",
-    "object-filter": "~1.0.1",
+    "deep-equal": "^1.0.1",
+    "node-extend": "^0.2.0",
     "object-keys-map": "~1.0.1",
-    "object-map": "0.0.0",
-    "object-map-to-array": "~1.0.0",
-    "object-some": "~1.0.0"
+    "object-map": "0.0.0"
   },
   "license": "MIT"
 }