Stable Version 3.0.0-beta.1.

jmdobry · jmdobry · commit 85a98d0ea2b3 · 2016-02-23T12:51:18.000-08:00
diff --git a/bower.json b/bower.json
@@ -29,6 +29,7 @@
     "karma.start.js"
   ],
   "dependencies": {
+    "axios": "0.5.x",
     "js-data": ">=2.0.0"
   }
 }
diff --git a/build_examples/browserify/README.md b/build_examples/browserify/README.md
@@ -0,0 +1,3 @@
+Running `browserify -x axios app.js > bundle.js` in this directory will produce `bundle.js`
+
+Note the external dependency "axios" that is excluded from the build (it's not needed when using js-data-angular).
diff --git a/build_examples/browserify/app.js b/build_examples/browserify/app.js
@@ -0,0 +1,17 @@
+var JSData = require('js-data');
+var axios = require('axios');
+// normally this would be var DSHttpAdapter = require('js-data-http');
+var DSHttpAdapter = require('../../');
+
+document.getElementById('main').innerHTML = JSData.version.full;
+
+var adapter = new DSHttpAdapter({
+  http: axios
+});
+var store = new JSData.DS();
+store.registerAdapter('http', adapter, { default: true });
+var User = store.defineResource('user');
+
+User.find(1).catch(function (err) {
+  console.log(err);
+});
diff --git a/build_examples/browserify/index.html b/build_examples/browserify/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>My App</title>
+</head>
+<body>
+<h1 id="main"></h1>
+<!-- load bundled scripts -->
+<script src="bundle.js"></script>
+</body>
+</html>
diff --git a/build_examples/node/app.js b/build_examples/node/app.js
@@ -0,0 +1,15 @@
+var Promise = require('es6-promise');
+var JSData = require('js-data');
+var axios = require('axios');
+var DSHttpAdapter = require('../../');
+
+var adapter = new DSHttpAdapter({
+  http: axios
+});
+var store = new JSData.DS();
+store.registerAdapter('http', adapter, { default: true });
+var User = store.defineResource('user');
+
+User.find(1).catch(function (err) {
+  console.log(err);
+});
diff --git a/build_examples/r.js/README.md b/build_examples/r.js/README.md
@@ -0,0 +1,3 @@
+Running `r.js -o require.config.js` in this directory will produce `bundle.js`
+
+In `index.html` switch `script/main` between `main` (load scripts dynamically) and `bundle` (load bundled scripts)
diff --git a/build_examples/r.js/app.js b/build_examples/r.js/app.js
@@ -0,0 +1,14 @@
+define('app', [
+  'js-data',
+  'axios',
+  'js-data-http'
+], function (JSData, axios, DSHttpAdapter) {
+  document.getElementById('main').innerHTML = JSData.version.full;
+
+  var adapter = new DSHttpAdapter({
+    http: axios
+  });
+  var store = new JSData.DS();
+  store.registerAdapter('http', adapter, { default: true });
+  return store.defineResource('user');
+});
diff --git a/build_examples/r.js/index.html b/build_examples/r.js/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>My App</title>
+</head>
+<body>
+<h1 id="main"></h1>
+<!-- load scripts dynamically -->
+<script data-main="main" src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.17/require.min.js"></script>
+
+<!-- load bundled scripts -->
+<!--<script data-main="bundle" src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.17/require.min.js"></script>-->
+</body>
+</html>
diff --git a/build_examples/r.js/main.js b/build_examples/r.js/main.js
@@ -0,0 +1,17 @@
+require.config({
+  paths: {
+    'js-data-http': '../../dist/js-data-http',
+    'js-data': '../../bower_components/js-data/dist/js-data',
+    'axios': '../../bower_components/axios/dist/axios'
+  }
+});
+
+require([
+    'app'
+  ], function (User) {
+
+    User.find(1).catch(function (err) {
+      console.log(err);
+    });
+  }
+);
diff --git a/build_examples/r.js/require.config.js b/build_examples/r.js/require.config.js
@@ -0,0 +1,6 @@
+({
+  name: 'main',
+  mainConfigFile: 'main.js',
+  out: 'bundle.js',
+  optimize: 'none'
+})
diff --git a/build_examples/webpack/README.md b/build_examples/webpack/README.md
@@ -0,0 +1,3 @@
+Running `webpack` in this directory will produce `bundle.js`
+
+Note the external dependency "axios" that is excluded from the build (it's not needed when using js-data-angular).
diff --git a/build_examples/webpack/app.js b/build_examples/webpack/app.js
@@ -0,0 +1,17 @@
+var JSData = require('js-data');
+var axios = require('axios');
+// normally this would be var DSHttpAdapter = require('js-data-http');
+var DSHttpAdapter = require('../../');
+
+document.getElementById('main').innerHTML = JSData.version.full;
+
+var adapter = new DSHttpAdapter({
+  http: axios
+});
+var store = new JSData.DS();
+store.registerAdapter('http', adapter, { default: true });
+var User = store.defineResource('user');
+
+User.find(1).catch(function (err) {
+  console.log(err);
+});
diff --git a/build_examples/webpack/index.html b/build_examples/webpack/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>My App</title>
+</head>
+<body>
+<h1 id="main"></h1>
+<!-- load bundled scripts -->
+<script src="bundle.js"></script>
+</body>
+</html>
diff --git a/build_examples/webpack/webpack.config.js b/build_examples/webpack/webpack.config.js
@@ -0,0 +1,11 @@
+module.exports = {
+  entry: './app.js',
+  output: {
+    filename: 'bundle.js'
+  },
+  resolve: {
+    alias: {
+      'js-data-http': '../../dist/js-data-http.js'
+    }
+  }
+};
diff --git a/build_examples/webpack_es6/README.md b/build_examples/webpack_es6/README.md
@@ -0,0 +1,3 @@
+Running `webpack` in this directory will produce `bundle.js`
+
+Note the external dependency "axios" that is excluded from the build (it's not needed when using js-data-angular).
diff --git a/build_examples/webpack_es6/app.js b/build_examples/webpack_es6/app.js
@@ -0,0 +1,17 @@
+import JSData from 'js-data';
+import axios from 'axios';
+// normally this would be import DSHttpAdatper from 'js-data-http';
+import DSHttpAdapter from '../../';
+
+document.getElementById('main').innerHTML = JSData.version.full;
+
+let adapter = new DSHttpAdapter({
+  http: axios
+});
+let store = new JSData.DS();
+store.registerAdapter('http', adapter, { default: true });
+let User = store.defineResource('user');
+
+User.find(1).catch(err => {
+  console.log(err);
+});
diff --git a/build_examples/webpack_es6/index.html b/build_examples/webpack_es6/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>My App</title>
+</head>
+<body>
+<h1 id="main"></h1>
+<!-- load bundled scripts -->
+<script src="bundle.js"></script>
+</body>
+</html>
diff --git a/build_examples/webpack_es6/webpack.config.js b/build_examples/webpack_es6/webpack.config.js
@@ -0,0 +1,20 @@
+var path = require('path');
+module.exports = {
+  entry: './app.js',
+  output: {
+    filename: 'bundle.js'
+  },
+  resolve: {
+    alias: {
+      'js-data-http': '../../dist/js-data-http.js'
+    }
+  },
+  module: {
+    loaders: [
+      {test: /(.+)\.js$/, loader: 'babel-loader?blacklist=useStrict'}
+    ]
+  },
+  resolveLoader: {
+    root: path.join(__dirname, '../../node_modules')
+  }
+};
diff --git a/dist/js-data-http.js b/dist/js-data-http.js
diff --git a/karma.conf.js b/karma.conf.js
@@ -39,11 +39,12 @@ module.exports = function (config) {
 
 		// list of files / patterns to load in the browser
 		files: [
+			'bower_components/axios/dist/axios.js',
 			'node_modules/es6-promise/dist/es6-promise.js',
 			'node_modules/js-data/dist/js-data.js',
 			'dist/js-data-http.js',
 			'karma.start.js',
-			'test/**/*.js'
+			'test/browser/**/*.js'
 		],
 
 		reporters: ['dots', 'coverage', 'junit'],
diff --git a/mocha.start.js b/mocha.start.js
@@ -0,0 +1,84 @@
+/*global assert:true */
+'use strict';
+
+require('es6-promise').polyfill();
+
+var assert = require('chai').assert;
+var mocha = require('mocha');
+var sinon = require('sinon');
+var JSData = require('js-data');
+var http = require('http');
+var DSHttpAdapter = require('./');
+
+var dsHttpAdapter, User, Post, datastore, DSUtils, queryTransform, p1, p2, p3, p4, p5;
+
+var globals = module.exports = {
+  fail: function (msg) {
+    assert.equal('should not reach this!: ' + msg, 'failure');
+  },
+  TYPES_EXCEPT_STRING: [123, 123.123, null, undefined, {}, [], true, false, function () {
+  }],
+  TYPES_EXCEPT_STRING_OR_ARRAY: [123, 123.123, null, undefined, {}, true, false, function () {
+  }],
+  TYPES_EXCEPT_STRING_OR_NUMBER: [null, undefined, {}, [], true, false, function () {
+  }],
+  TYPES_EXCEPT_STRING_OR_OBJECT: [123, 123.123, null, undefined, [], true, false, function () {
+  }],
+  TYPES_EXCEPT_STRING_OR_NUMBER_OBJECT: [null, undefined, [], true, false, function () {
+  }],
+  TYPES_EXCEPT_ARRAY: ['string', 123, 123.123, null, undefined, {}, true, false, function () {
+  }],
+  TYPES_EXCEPT_STRING_OR_ARRAY_OR_NUMBER: [null, undefined, {}, true, false, function () {
+  }],
+  TYPES_EXCEPT_NUMBER: ['string', null, undefined, {}, [], true, false, function () {
+  }],
+  TYPES_EXCEPT_OBJECT: ['string', 123, 123.123, null, undefined, true, false, function () {
+  }],
+  TYPES_EXCEPT_BOOLEAN: ['string', 123, 123.123, null, undefined, {}, [], function () {
+  }],
+  TYPES_EXCEPT_FUNCTION: ['string', 123, 123.123, null, undefined, {}, [], true, false],
+  assert: assert,
+  sinon: sinon,
+  store: undefined,
+  http: http
+};
+
+var test = new mocha();
+
+var testGlobals = [];
+
+beforeEach(function () {
+  globals.queryTransform = queryTransform = function (resourceName, query) {
+    queryTransform.callCount += 1;
+    return query;
+  };
+
+  globals.DSUtils = DSUtils = JSData.DSUtils;
+  datastore = new JSData.DS();
+
+  globals.User = User = datastore.defineResource('user');
+  globals.Post = Post = datastore.defineResource({
+    name: 'posts',
+    basePath: 'api'
+  });
+  globals.dsHttpAdapter = dsHttpAdapter = new DSHttpAdapter({
+    queryTransform: queryTransform,
+    http: require('axios'),
+    basePath: 'http://localhost:4444/'
+  });
+  datastore.registerAdapter('http', dsHttpAdapter, { default: true });
+
+  queryTransform.callCount = 0;
+
+  globals.p1 = p1 = { author: 'John', age: 30, id: 5 };
+  globals.p2 = p2 = { author: 'Sally', age: 31, id: 6 };
+  globals.p3 = p3 = { author: 'Mike', age: 32, id: 7 };
+  globals.p4 = p4 = { author: 'Adam', age: 33, id: 8 };
+  globals.p5 = p5 = { author: 'Adam', age: 33, id: 9 };
+
+  for (var key in globals) {
+    global[key] = globals[key];
+    testGlobals.push(globals[key]);
+  }
+  test.globals(testGlobals);
+});
diff --git a/src/index.js b/src/index.js
@@ -36,6 +36,8 @@ defaultsPrototype.httpConfig = {}
 
 defaultsPrototype.verbsUseBasePath = false
 
+defaultsPrototype.useFetch = false;
+
 class DSHttpAdapter {
   constructor (options) {
     options = options || {}
diff --git a/test/browser/create.spec.js b/test/browser/create.spec.js
diff --git a/test/browser/destroy.spec.js b/test/browser/destroy.spec.js
diff --git a/test/browser/destroyAll.spec.js b/test/browser/destroyAll.spec.js
diff --git a/test/browser/find.spec.js b/test/browser/find.spec.js
diff --git a/test/browser/findAll.spec.js b/test/browser/findAll.spec.js
diff --git a/test/browser/update.spec.js b/test/browser/update.spec.js
diff --git a/test/browser/updateAll.spec.js b/test/browser/updateAll.spec.js
diff --git a/test/node/create.spec.js b/test/node/create.spec.js
@@ -0,0 +1,16 @@
+describe('DSHttpAdapter.create(resourceConfig, attrs, options)', function () {
+
+  it('should make a POST request', function (done) {
+    var server = http.createServer(function (req, res) {
+      res.setHeader('Content-Type', 'application/json;charset=utf-8');
+      res.end(DSUtils.toJson(p1));
+    }).listen(4444, function () {
+      dsHttpAdapter.create(Post, {author: 'John', age: 30}).then(function (data) {
+        assert.deepEqual(data, p1, 'post should have been created');
+        assert.equal(queryTransform.callCount, 1, 'queryTransform should have been called');
+        server.close();
+        done();
+      }).catch(done);
+    });
+  });
+});

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`"karma.start.js"`
`30`	`30`	`],`
`31`	`31`	`"dependencies": {`
	`32`	`+ "axios": "0.5.x",`
`32`	`33`	`"js-data": ">=2.0.0"`
`33`	`34`	`}`
`34`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+Running `browserify -x axios app.js > bundle.js` in this directory will produce `bundle.js`
	`2`	`+`
	`3`	`+Note the external dependency "axios" that is excluded from the build (it's not needed when using js-data-angular).`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+Running `r.js -o require.config.js` in this directory will produce `bundle.js`
	`2`	`+`
	`3`	+In `index.html` switch `script/main` between `main` (load scripts dynamically) and `bundle` (load bundled scripts)