fix(middleware): use graphql of the adapter

RisingStack · Jul 28, 2015 · d1af1ee · d1af1ee
1 parent 1a33dc0
commit d1af1ee
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 74 deletions.
diff --git a/package.json b/package.json
@@ -25,6 +25,9 @@
     "url": "https://github.com/RisingStack/graffiti/issues"
   },
   "homepage": "https://github.com/RisingStack/graffiti#readme",
+  "dependencies": {
+    "boom": "^2.8.0"
+  },
   "devDependencies": {
     "babel-eslint": "^4.0.0",
     "chai": "^3.2.0",
@@ -42,9 +45,5 @@
   "pre-commit": [
     "eslint",
     "test"
-  ],
-  "dependencies": {
-    "boom": "^2.8.0",
-    "graphql": "^0.1.8"
-  }
+  ]
 }
diff --git a/src/express/index.js b/src/express/index.js
@@ -2,10 +2,7 @@ var checkDep = require('../util').checkDep;
 var isPrefixed = require('../util').isPrefixed;
 var isGet = require('../util').isGet;
 
-function create(options) {
-
-  var graphql = checkDep(options, 'graphql');
-
+function create() {
   return function(options) {
 
     var models = checkDep(options, 'models');
@@ -19,7 +16,7 @@ function create(options) {
       var query = request.query.q;
 
       if (isGet(request) && isPrefixed(request, prefix)) {
-        return graphql(schema, query)
+        return adapter.graphql(schema, query)
           .then(function(result) {
             respone.json(result);
           })

diff --git a/src/express/index.spec.js b/src/express/index.spec.js
@@ -8,9 +8,7 @@ describe('graffiti express', function() {
 
     it('throws an error if not all met', function() {
 
-      var mwFactory = express.create({
-        graphql: {}
-      });
+      var mwFactory = express.create();
 
       try {
         mwFactory({
@@ -27,9 +25,7 @@ describe('graffiti express', function() {
 
     it('doesn\'t throw if all is passed', function() {
 
-      var mwFactory = express.create({
-        graphql: {}
-      });
+      var mwFactory = express.create();
 
       var mw = mwFactory({
         prefix: '/graphql',
@@ -44,9 +40,7 @@ describe('graffiti express', function() {
   });
 
   it('creates the schema', function() {
-    var mwFactory = express.create({
-      graphql: {}
-    });
+    var mwFactory = express.create();
     var getSchemaSpy = this.sandbox.spy();
     var models = [{
       name: 'User'
@@ -71,17 +65,16 @@ describe('graffiti express', function() {
         data: 1
       };
 
-      var mwFactory = express.create({
-        graphql: function() {
-          return Promise.resolve(result);
-        }
-      });
+      var mwFactory = express.create();
 
       var mw = mwFactory({
         prefix: '/graphql',
         models: [],
         adapter: {
-          getSchema: function() {}
+          getSchema: function() {},
+          graphql: function() {
+            return Promise.resolve();
+          }
         }
       });
 
@@ -108,15 +101,16 @@ describe('graffiti express', function() {
 
     it('calls the next middleware', function() {
 
-      var mwFactory = express.create({
-        graphql: {}
-      });
+      var mwFactory = express.create();
 
       var mw = mwFactory({
         prefix: '/graphql',
         models: [],
         adapter: {
-          getSchema: function() {}
+          getSchema: function() {},
+          graphql: function() {
+            return Promise.resolve();
+          }
         }
       });
 

diff --git a/src/hapi/index.js b/src/hapi/index.js
@@ -1,10 +1,7 @@
 var checkDep = require('../util').checkDep;
 var boom = require('boom');
 
-function create(options) {
-
-  var graphql = checkDep(options, 'graphql');
-
+function create() {
   var plugin = {
     register: function(server, options, next) {
 
@@ -20,7 +17,7 @@ function create(options) {
 
           var query = request.query.q;
 
-          return graphql(schema, query)
+          return adapter.graphql(schema, query)
             .then(function(result) {
               reply(result);
             })

diff --git a/src/hapi/index.spec.js b/src/hapi/index.spec.js
@@ -9,9 +9,7 @@ describe('graffiti hapi', function() {
 
     it('throws an error if not all met', function() {
 
-      var mwFactory = hapi.create({
-        graphql: {}
-      });
+      var mwFactory = hapi.create();
 
       try {
         mwFactory({
@@ -38,15 +36,14 @@ describe('graffiti hapi', function() {
     };
 
     server.register({
-      register: hapi.create({
-        graphql: function() {
-          return Promise.resolve(result);
-        }
-      }),
+      register: hapi.create(),
       options: {
         models: [],
         adapter: {
-          getSchema: function() {}
+          getSchema: function() {},
+          graphql: function() {
+            return Promise.resolve();
+          }
         }
       }
     }, {

diff --git a/src/index.js b/src/index.js
@@ -1,15 +1,7 @@
-var graphql = require('graphql');
-
 var koa = require('./koa');
 var hapi = require('./hapi');
 var express = require('./express');
 
-module.exports.koa = koa.create({
-  graphql: graphql.graphql
-});
-module.exports.hapi = hapi.create({
-  graphql: graphql.graphql
-});
-module.exports.express = express.create({
-  graphql: graphql.graphql
-});
+module.exports.koa = koa.create();
+module.exports.hapi = hapi.create();
+module.exports.express = express.create();
diff --git a/src/koa/index.js b/src/koa/index.js
@@ -2,10 +2,7 @@ var checkDep = require('../util').checkDep;
 var isPrefixed = require('../util').isPrefixed;
 var isGet = require('../util').isGet;
 
-function create(options) {
-
-  var graphql = checkDep(options, 'graphql');
-
+function create() {
   return function koa(options) {
 
     var models = checkDep(options, 'models');
@@ -19,7 +16,7 @@ function create(options) {
       var query = this.query.q;
 
       if (isGet(this) && isPrefixed(this, prefix)) {
-        this.body = yield graphql(schema, query);
+        this.body = yield adapter.graphql(schema, query);
         return this.body;
       }
 

diff --git a/src/koa/index.spec.js b/src/koa/index.spec.js
@@ -8,9 +8,7 @@ describe('graffiti koa', function() {
 
     it('throws an error if not all met', function() {
 
-      var mwFactory = koa.create({
-        graphql: {}
-      });
+      var mwFactory = koa.create();
 
       try {
         mwFactory({
@@ -28,9 +26,7 @@ describe('graffiti koa', function() {
   });
 
   it('creates the schema', function() {
-    var mwFactory = koa.create({
-      graphql: {}
-    });
+    var mwFactory = koa.create();
     var getSchemaSpy = this.sandbox.spy();
     var models = [{
       name: 'User'
@@ -55,17 +51,18 @@ describe('graffiti koa', function() {
         data: 1
       };
 
-      var mwFactory = koa.create({
-        graphql: function() {
-          return Promise.resolve(result);
-        }
-      });
+      var mwFactory = koa.create();
 
       var mw = mwFactory({
         prefix: '/graphql',
         models: [],
         adapter: {
-          getSchema: function() {}
+          getSchema: function() {},
+          graphql: function() {
+            return Promise.resolve({
+              data: 1
+            });
+          }
         }
       });
 
@@ -88,9 +85,7 @@ describe('graffiti koa', function() {
 
     it('calls the next middleware', function *(done) {
 
-      var mwFactory = koa.create({
-        graphql: {}
-      });
+      var mwFactory = koa.create();
 
       var mw = mwFactory({
         prefix: '/graphql',