change wrapping functionality to match new gremlin-node

lib/titan-edge-wrapper.js

@@ -1,10 +1,10 @@
 'use strict';
 
 var util = require('util');
-var TitanElementWrapper = require('./titan-element-wrapper');
+var Gremlin = require('gremlin');
 
 var TitanEdgeWrapper = module.exports = function (gremlin, el) {
-  TitanElementWrapper.call(this, gremlin, el);
+  Gremlin.EdgeWrapper.call(this, gremlin, el);
 };
 
-util.inherits(TitanEdgeWrapper, TitanElementWrapper);
+util.inherits(TitanEdgeWrapper, Gremlin.EdgeWrapper);

lib/titan-graph-wrapper.js

@@ -44,6 +44,6 @@ TitanGraphWrapper.prototype.getVertex = function (key, attr, callback) {
 
   txn.getVertex(key, attr, function (err, v) {
     if (err) return callback(err);
-    callback(null, v ? new gremlin.VertexWrapper(gremlin, v) : null);
+    callback(null, v ? gremlin.wrapVertex(v) : null);
   });
 };

lib/titan-gremlin.js

@@ -52,15 +52,22 @@ var TitanGremlin = module.exports = function (opts) {
 
   this.ClassTypes.Geoshape = this.java.getClassLoader().loadClassSync('com.thinkaurelius.titan.core.attribute.Geoshape');
 
-  // use our custom wrappers
-  this.GraphWrapper = TitanGraphWrapper;
-  this.VertexWrapper = TitanVertexWrapper;
-  this.EdgeWrapper = TitanEdgeWrapper;
-
   // set loglevel
   this.java.import('org.slf4j.LoggerFactory')
     .getLoggerSync(this.java.import('org.slf4j.Logger').ROOT_LOGGER_NAME)
     .setLevelSync(this.java.import('ch.qos.logback.classic.Level')[opts.loglevel]);
 };
 
 util.inherits(TitanGremlin, Gremlin);
+
+TitanGremlin.prototype.wrap = function (val) {
+  return new TitanGraphWrapper(this, val);
+};
+
+TitanGremlin.prototype.wrapVertex = function (val) {
+  return new TitanVertexWrapper(this, val);
+};
+
+TitanGremlin.prototype.wrapEdge = function (val) {
+  return new TitanEdgeWrapper(this, val);
+};

lib/titan-vertex-wrapper.js

@@ -1,10 +1,10 @@
 'use strict';
 
 var util = require('util');
-var TitanElementWrapper = require('./titan-element-wrapper');
+var Gremlin = require('gremlin');
 
 var TitanVertexWrapper = module.exports = function (gremlin, el) {
-  TitanElementWrapper.call(this, gremlin, el);
+  Gremlin.VertexWrapper.call(this, gremlin, el);
 };
 
-util.inherits(TitanVertexWrapper, TitanElementWrapper);
+util.inherits(TitanVertexWrapper, Gremlin.VertexWrapper);

package.json

@@ -28,7 +28,7 @@
     "install": "make package"
   },
   "dependencies": {
-    "gremlin": "~0.3.0"
+    "gremlin": "~0.3.11"
   },
   "devDependencies": {
     "mocha": "~1.14.0",