Make graph API use endpoints.

Author: pluma

lib/graph.js

@@ -11,29 +11,21 @@ module.exports = Graph;
 function Graph(connection, body) {
   this._connection = connection;
   this._api = this._connection.endpoint('_api');
+  this._gharial = this._api.endpoint('gharial/' + this.name);
   extend(this, body);
 }
 
-Graph._GraphBaseCollection = GraphBaseCollection;
 Graph.VertexCollection = VertexCollection;
 Graph.EdgeCollection = EdgeCollection;
 
 extend(Graph.prototype, {
-  _post: function (path, data, callback) {
-    if (!callback) callback = noop;
-    this._api.post('gharial/' + this.name + '/' + path, data, callback);
-  },
-  _delete: function (path, data, callback) {
-    if (!callback) callback = noop;
-    this._api.delete('gharial/' + this.name + '/' + path, data, callback);
-  },
   drop: function (dropCollections, callback) {
     if (typeof dropCollections === 'function') {
       callback = dropCollections;
       dropCollections = undefined;
     }
     if (!callback) callback = noop;
-    this._api.delete('gharial/' + this.name, {
+    this._gharial.delete({
       dropCollections: dropCollections
     }, callback);
   },
@@ -46,14 +38,14 @@ extend(Graph.prototype, {
     });
   },
   addVertexCollection: function (collectionName, callback) {
-    this._post('vertex', {collection: collectionName}, callback);
+    this._gharial.post('vertex', {collection: collectionName}, callback);
   },
   removeVertexCollection: function (collectionName, dropCollection, callback) {
     if (typeof dropCollection === 'function') {
       callback = dropCollection;
       dropCollection = undefined;
     }
-    this._delete('vertex/' + collectionName, {dropCollection: dropCollection}, callback);
+    this._gharial.delete('vertex/' + collectionName, {dropCollection: dropCollection}, callback);
   },
   edgeCollection: function (collectionName, callback) {
     if (!callback) callback = noop;
@@ -64,7 +56,7 @@ extend(Graph.prototype, {
     });
   },
   addEdgeDefinition: function (definition, callback) {
-    this._post('edge', definition, callback);
+    this._gharial.post('edge', definition, callback);
   },
   replaceEdgeDefinition: function (definitionName, definition, callback) {
     if (!callback) callback = noop;
@@ -75,42 +67,28 @@ extend(Graph.prototype, {
       callback = dropCollection;
       dropCollection = undefined;
     }
-    this._delete('edge/' + definitionName, {dropCollection: dropCollection}, callback);
+    this._gharial.delete('edge/' + definitionName, {dropCollection: dropCollection}, callback);
   }
 });
 
-function GraphBaseCollection(connection, body, graph) {
+function VertexCollection(connection, body, graph) {
   this.graph = graph;
   BaseCollection.call(this, connection, body);
+  this._gharial = this._api.endpoint('gharial/' + this.graph.name + '/vertex/' + this.name);
 }
-inherits(GraphBaseCollection, BaseCollection);
-
-extend(GraphBaseCollection.prototype, {
-  _documentPath: function (documentHandle) {
-    var tokens = documentHandle.split('/');
-    return this._relativePath(tokens[tokens.length - 1]);
-  }
-});
-
-function VertexCollection(connection, body, graph) {
-  GraphBaseCollection.call(this, connection, body, graph);
-}
-inherits(VertexCollection, GraphBaseCollection);
+inherits(VertexCollection, BaseCollection);
 
 extend(VertexCollection.prototype, {
-  _relativePath: function (path) {
-    return 'gharial/' + this.graph.name + '/vertex/' + this.name + '/' + (path || '');
-  },
   vertex: function (documentHandle, callback) {
     if (!callback) callback = noop;
-    this._api.get(this._documentPath(documentHandle), function (err, body) {
+    this._gharial.get(documentHandle, function (err, body) {
       if (err) callback(err);
       else callback(null, body);
     });
   },
   save: function (data, callback) {
     if (!callback) callback = noop;
-    this._api.post(this._relativePath(''), data, {
+    this._gharial.post(data, {
       collection: this.name
     }, function (err, body) {
       if (err) callback(err);
@@ -120,24 +98,23 @@ extend(VertexCollection.prototype, {
 });
 
 function EdgeCollection(connection, body, graph) {
-  GraphBaseCollection.call(this, connection, body, graph);
+  this.graph = graph;
+  BaseCollection.call(this, connection, body);
+  this._gharial = this._api.endpoint('gharial/' + this.graph.name + '/edge/' + this.name);
 }
-inherits(EdgeCollection, GraphBaseCollection);
+inherits(EdgeCollection, BaseCollection);
 
 extend(EdgeCollection.prototype, {
-  _relativePath: function (path) {
-    return 'gharial/' + this.graph.name + '/edge/' + this.name + '/' + (path || '');
-  },
   edge: function (documentHandle, callback) {
     if (!callback) callback = noop;
-    this._api.get(this._documentPath(documentHandle), function (err, body) {
+    this._gharial.get(documentHandle, function (err, body) {
       if (err) callback(err);
       else callback(null, body);
     });
   },
   save: function (data, fromId, toId, callback) {
     if (!callback) callback = noop;
-    this._api.post(this._relativePath(''), data, {
+    this._gharial.post(data, {
       collection: this.name,
       from: fromId,
       to: toId