Skip to content

Commit 85b791f

Browse files
jmdobryjmdobry
committed
Upgrade to use js-data v3.
1 parent 85a98d0 commit 85b791f

File tree

23 files changed

+2317
-166
lines changed

23 files changed

+2317
-166
lines changed

‎README.md‎

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,41 @@ To get started, visit __[http://js-data.io](http://www.js-data.io)__.
2626
## Quick Start
2727
`npm install --save js-data js-data-http` or `bower install --save js-data js-data-http`.
2828

29-
Load `js-data-http.js` after `js-data.js`.
29+
`npm install --save axios js-data js-data-http-node`
30+
31+
__ES6__
3032

3133
```js
32-
var adapter = new DSHttpAdapter();
34+
import {Model} from 'js-data'
35+
import DSHttpAdapter from 'js-data-http-node'
36+
37+
const adapter = new DSHttpAdapter()
38+
39+
class Base extends Model {}
40+
Base.registerAdapter('http', adapter, { default: true })
41+
42+
class School extends Model {}
43+
class Student extends Model {}
44+
45+
// "School" and "Student" will now use the http adapter by default
46+
```
47+
48+
__ES5__
49+
50+
```js
51+
var JSData = require('js-data')
52+
var Model = JSData.Model
53+
var DSHttpAdapter = require('js-data-http-node')
54+
55+
var adapter = new DSHttpAdapter()
56+
57+
var Base = Model.extend({}, { name: 'Base' })
58+
Base.registerAdapter('http', adapter, { default: true })
3359

34-
var store = new JSData.DS();
35-
store.registerAdapter('http', adapter, { default: true });
60+
var School = Base.extend({}, { name: 'School' })
61+
var Student = Base.extend({}, { name: 'Student' })
3662

37-
// "store" will now use the http adapter for all async operations
63+
// "School" and "Student" will now use the http adapter by default
3864
```
3965

4066
## Guides and Tutorials

‎bower.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"coverage/",
2424
"Gruntfile.js",
2525
"node_modules/",
26+
"node/",
2627
"test/",
2728
"package.json",
2829
"karma.conf.js",

‎build_examples/browserify/app.js‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
var JSData = require('js-data');
2-
var axios = require('axios');
3-
// normally this would be var DSHttpAdapter = require('js-data-http');
4-
var DSHttpAdapter = require('../../');
1+
var JSData = require('js-data')
2+
// normally this would be "var DSHttpAdapter = require('js-data-http')"
3+
var DSHttpAdapter = require('../../')
54

6-
document.getElementById('main').innerHTML = JSData.version.full;
5+
document.getElementById('main').innerHTML = DSHttpAdapter.version.full
76

8-
var adapter = new DSHttpAdapter({
9-
http: axios
10-
});
11-
var store = new JSData.DS();
12-
store.registerAdapter('http', adapter, { default: true });
13-
var User = store.defineResource('user');
7+
var adapter = new DSHttpAdapter()
8+
var Base = JSData.Model.extend({}, { name: 'Base' })
9+
Base.registerAdapter('http', adapter, { default: true })
10+
var User = Base.extend({}, { name: 'User' })
1411

1512
User.find(1).catch(function (err) {
16-
console.log(err);
17-
});
13+
console.log(err)
14+
})

‎build_examples/node/app.js‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
var Promise = require('es6-promise');
2-
var JSData = require('js-data');
3-
var axios = require('axios');
4-
var DSHttpAdapter = require('../../');
1+
var JSData = require('js-data')
2+
// normally this would be "var DSHttpAdapter = require('js-data-http-node')"
3+
var DSHttpAdapter = require('../../')
54

6-
var adapter = new DSHttpAdapter({
7-
http: axios
8-
});
9-
var store = new JSData.DS();
10-
store.registerAdapter('http', adapter, { default: true });
11-
var User = store.defineResource('user');
5+
var adapter = new DSHttpAdapter()
6+
var Base = JSData.Model.extend({}, { name: 'Base' })
7+
Base.registerAdapter('http', adapter, { default: true })
8+
var User = Base.extend({}, { name: 'User' })
129

1310
User.find(1).catch(function (err) {
14-
console.log(err);
15-
});
11+
console.log(err)
12+
})

‎build_examples/r.js/app.js‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
define('app', [
22
'js-data',
3-
'axios',
43
'js-data-http'
5-
], function (JSData, axios, DSHttpAdapter) {
6-
document.getElementById('main').innerHTML = JSData.version.full;
4+
], function (JSData, DSHttpAdapter) {
5+
document.getElementById('main').innerHTML = DSHttpAdapter.version.full
76

8-
var adapter = new DSHttpAdapter({
9-
http: axios
10-
});
11-
var store = new JSData.DS();
12-
store.registerAdapter('http', adapter, { default: true });
13-
return store.defineResource('user');
14-
});
7+
var adapter = new DSHttpAdapter()
8+
var Base = JSData.Model.extend({}, { name: 'Base' })
9+
Base.registerAdapter('http', adapter, { default: true })
10+
var User = Base.extend({}, { name: 'User' })
11+
12+
User.find(1).catch(function (err) {
13+
console.log(err)
14+
})
15+
})

‎build_examples/r.js/main.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
require.config({
22
paths: {
3-
'js-data-http': '../../dist/js-data-http',
4-
'js-data': '../../bower_components/js-data/dist/js-data',
5-
'axios': '../../bower_components/axios/dist/axios'
3+
// customize these ass needed
4+
'js-data-http': '../../node/dist/js-data-http-node',
5+
'js-data': '../../node_modules/js-data/dist/js-data',
66
}
77
});
88

‎build_examples/webpack/app.js‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
var JSData = require('js-data');
2-
var axios = require('axios');
3-
// normally this would be var DSHttpAdapter = require('js-data-http');
4-
var DSHttpAdapter = require('../../');
1+
var JSData = require('js-data')
2+
// normally this would be "var DSHttpAdapter = require('js-data-http')"
3+
var DSHttpAdapter = require('../../')
54

6-
document.getElementById('main').innerHTML = JSData.version.full;
5+
document.getElementById('main').innerHTML = DSHttpAdapter.version.full
76

8-
var adapter = new DSHttpAdapter({
9-
http: axios
10-
});
11-
var store = new JSData.DS();
12-
store.registerAdapter('http', adapter, { default: true });
13-
var User = store.defineResource('user');
7+
var adapter = new DSHttpAdapter()
8+
var Base = JSData.Model.extend({}, { name: 'Base' })
9+
Base.registerAdapter('http', adapter, { default: true })
10+
var User = Base.extend({}, { name: 'User' })
1411

1512
User.find(1).catch(function (err) {
16-
console.log(err);
17-
});
13+
console.log(err)
14+
})

‎build_examples/webpack/webpack.config.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module.exports = {
33
output: {
44
filename: 'bundle.js'
55
},
6+
// only necessary for this demo
67
resolve: {
78
alias: {
89
'js-data-http': '../../dist/js-data-http.js'

‎build_examples/webpack_es6/app.js‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
import JSData from 'js-data';
2-
import axios from 'axios';
3-
// normally this would be import DSHttpAdatper from 'js-data-http';
1+
import {model} from 'js-data-'
2+
// normally this would be "import DSHttpAdatper from 'js-data-http'"
43
import DSHttpAdapter from '../../';
54

6-
document.getElementById('main').innerHTML = JSData.version.full;
5+
document.getElementById('main').innerHTML = DSHttpAdapter.version.full;
76

8-
let adapter = new DSHttpAdapter({
9-
http: axios
10-
});
11-
let store = new JSData.DS();
12-
store.registerAdapter('http', adapter, { default: true });
13-
let User = store.defineResource('user');
7+
const adapter = new DSHttpAdapter()
8+
class Base extends JSData.Model {}
9+
Base.registerAdapter('http', adapter, { default: true })
10+
class User extends Base {}
1411

15-
User.find(1).catch(err => {
16-
console.log(err);
17-
});
12+
User.find(1).catch(function (err) {
13+
console.log(err)
14+
})

‎build_examples/webpack_es6/webpack.config.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ module.exports = {
44
output: {
55
filename: 'bundle.js'
66
},
7+
// only necessary for this demo
78
resolve: {
89
alias: {
910
'js-data-http': '../../dist/js-data-http.js'

0 commit comments

Comments
 (0)