Take into account new ShareDb API

Author: zag2art

README.md

@@ -1,4 +1,4 @@
-## Derby-hook
+## sharedb-hooks
 
 The way to hook db-interactions on the server
 
@@ -11,10 +11,10 @@ server.js
 ```js
   // ...
 
-  var derbyHook = require('derby-hook');
+  var shareDbHooks = require('sharedb-hooks');
 
   // Add 'hook' and 'onQuery' functions to the store 
-  derbyHook(store);
+  shareDbHooks(store);
 
   // ...
 ```
@@ -49,24 +49,6 @@ then you can use the function to hook model events, for example:
 
 ```
 
-## MIT License
-Copyright (c) 2014 by Artur Zayats
+## MIT License 2015
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
 

index.js

@@ -2,51 +2,48 @@
 module.exports = function(store) {
 
   store.hook = function(method, pattern, fn) {
-    return store.shareClient.use('after submit', function(shareRequest, next) {
-      var backend, collectionName, docName, firstDot, fullPath, matches, op, opData, regExp, relPath, segments, session, snapshot, _i, _len, _ref;
-      opData = shareRequest.opData;
+    var emitter = store.backend || store.shareClient;
+
+    emitter.use('after submit', function(shareRequest, next) {
+      var collectionName, firstDot, fullPath, matches, regExp, relPath, segments, op;
+
+      var opData = shareRequest.opData || shareRequest.op;
+
       if (opData.del || opData.create) {
         collectionName = pattern;
-        if (collectionName !== shareRequest.collection) {
-          return next();
-        }
+        if (collectionName !== shareRequest.collection) return next();
       } else {
         firstDot = pattern.indexOf('.');
         if (firstDot === -1) {
-          if (!patternToRegExp(pattern).test(collectionName)) {
-            return next();
-          }
+          if (!patternToRegExp(pattern).test(shareRequest.collection)) return next();
         } else {
           collectionName = pattern.slice(0, firstDot);
-          if (collectionName !== shareRequest.collection) {
-            return next();
-          }
+          if (collectionName !== shareRequest.collection) return next();
         }
       }
-      snapshot = shareRequest.snapshot, docName = shareRequest.docName, backend = shareRequest.backend;
-      session = shareRequest.agent.connectSession;
+
+      var snapshot = shareRequest.snapshot;
+      var docName = shareRequest.docName || shareRequest.id;
+      var backend = shareRequest.backend;
+      var session = shareRequest.agent.connectSession;
+
       switch (method) {
         case 'del':
-          if (!opData.del) {
-            return next();
-          }
+          if (!opData.del) return next();
           fn(docName, shareRequest, session, backend);
           break;
         case 'create':
-          if (!opData.create) {
-            return next();
-          }
+          if (!opData.create) return next();
           fn(docName, shareRequest.snapshot.data, session, backend);
           break;
         case 'change':
-          _ref = opData.op;
-          if (_ref) {
-            for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-              op = _ref[_i];
+          var ops = opData.op;
+          if (ops) {
+            for (var i = 0; i < ops.length; i++) {
+              op = ops[i];
               segments = op.p;
-              if (op.si || op.sd) {
-                segments = segments.slice(0, -1);
-              }
+              if (op.si || op.sd) segments = segments.slice(0, -1);
+
               relPath = segments.join('.');
               fullPath = collectionName + '.' + docName + '.' + relPath;
               regExp = patternToRegExp(pattern);
@@ -57,28 +54,29 @@ module.exports = function(store) {
             }
           }
       }
-      return next();
+      next();
     });
 
   };
 
   store.onQuery = function(collectionName, cb) {
-    return this.shareClient.use('query', function(shareRequest, next) {
-      var session;
+    var emitter = store.backend || store.shareClient;
+
+    emitter.use('query', function(shareRequest, next) {
 
-      session = shareRequest.agent.connectSession;
+      var session = shareRequest.agent.connectSession;
 
       if (collectionName === '*') {
         return cb(shareRequest.collection, shareRequest.query, session, next);
-      } else {
-        if (shareRequest.collection !== collectionName) {
-          return next();
-        }
-        return cb(shareRequest.query, session, next);
       }
+
+      if (shareRequest.collection !== collectionName) return next();
+
+      cb(shareRequest.query, session, next);
+
     });
   };
-  return true;
+
 };
 
 

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "derby-hook",
+  "name": "sharedb-hooks",
   "version": "0.0.6",
-  "description": "Derby store hook",
+  "description": "ShareDb hooks",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"