Skip to content

Commit 272420f

Browse files
jmdobryjmdobry
committed
Stable Version 3.0.0-alpha.4.
1 parent ffa6866 commit 272420f

28 files changed

+2850
-3001
lines changed

‎.npmignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ fetch/
55
node/
66
scripts/
77
src/
8+
junit/
89
test/
910
.gitignore
1011
bower.json

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
##### 3.0.0-alpha.4 - 12 February 2016
2+
3+
###### Backwards compatible API changes
4+
- Better debugging/logging
5+
- Updates for the newest js-data alpha
6+
17
##### 3.0.0-alpha.3 - 10 January 2016
28

39
###### Backwards compatible API changes

‎README.md‎

Lines changed: 25 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -36,34 +36,25 @@ Tested on IE9, Chrome 46, Firefox 41 & Safari 7.1 using
3636

3737
#### Browser
3838

39-
`bower install --save js-data js-data-http` or `npm install --save js-data js-data-http`.
40-
41-
__ES6__
39+
`npm install --save js-data js-data-http` or `bower install --save js-data js-data-http`.
4240

4341
```js
44-
const adapter = new DSHttpAdapter()
45-
46-
class Base extends JSData.Model {}
47-
Base.registerAdapter('http', adapter, { default: true })
48-
49-
class School extends Model {}
50-
class Student extends Model {}
42+
// JSData.DataStore extends JSData.Container, it adds caching capabilities.
43+
// Makes more sense to use JSData.DataStore in the browser
44+
import {DataStore} from 'js-data'
45+
import HttpAdapter from 'js-data-http-node'
5146

52-
// "School" and "Student" will now use the http adapter by default
53-
```
54-
55-
__ES5__
56-
57-
```js
58-
var adapter = new DSHttpAdapter()
47+
const adapter = new HttpAdapter()
48+
const store = new DataStore()
5949

60-
var Base = JSData.Model.extend({}, { name: 'Base' })
61-
Base.registerAdapter('http', adapter, { default: true })
50+
store.registerAdapter('http', adapter, { default: true })
6251

63-
var School = Base.extend({}, { name: 'School' })
64-
var Student = Base.extend({}, { name: 'Student' })
52+
store.defineMapper('school')
53+
store.defineMapper('student')
6554

66-
// "School" and "Student" will now use the http adapter by default
55+
store.find('school', 1).then(function (school) {
56+
// ...
57+
})
6758
```
6859

6960
#### Node.js
@@ -73,36 +64,21 @@ var Student = Base.extend({}, { name: 'Student' })
7364
__ES6__
7465

7566
```js
76-
import {Model} from 'js-data'
77-
import DSHttpAdapter from 'js-data-http-node'
78-
79-
const adapter = new DSHttpAdapter()
80-
81-
class Base extends Model {}
82-
Base.registerAdapter('http', adapter, { default: true })
83-
84-
class School extends Model {}
85-
class Student extends Model {}
86-
87-
// "School" and "Student" will now use the http adapter by default
88-
```
89-
90-
__ES5__
91-
92-
```js
93-
var JSData = require('js-data')
94-
var Model = JSData.Model
95-
var DSHttpAdapter = require('js-data-http-node')
67+
// Doesn't make much sense to use DataStore on the server
68+
import {Container} from 'js-data'
69+
import HttpAdapter from 'js-data-http-node'
9670

97-
var adapter = new DSHttpAdapter()
71+
const adapter = new HttpAdapter()
72+
const container = new Container()
9873

99-
var Base = Model.extend({}, { name: 'Base' })
100-
Base.registerAdapter('http', adapter, { default: true })
74+
container.registerAdapter('http', adapter, { default: true })
10175

102-
var School = Base.extend({}, { name: 'School' })
103-
var Student = Base.extend({}, { name: 'Student' })
76+
container.defineMapper('school')
77+
container.defineMapper('student')
10478

105-
// "School" and "Student" will now use the http adapter by default
79+
container.find('school', 1).then(function (school) {
80+
// ...
81+
})
10682
```
10783

10884
## Dependencies
@@ -119,7 +95,7 @@ See [JSData's dependencies](https://github.com/js-data/js-data/blob/master/READM
11995

12096
## API Reference
12197
- [DS](http://www.js-data.io/docs/ds)
122-
- [DSHttpAdapter](http://www.js-data.io/docs/dshttpadapter)
98+
- [HttpAdapter](http://www.js-data.io/docs/dshttpadapter)
12399

124100
## Support
125101

‎build_examples/browserify/app.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
var JSData = require('js-data')
2-
// normally this would be "var DSHttpAdapter = require('js-data-http')"
3-
var DSHttpAdapter = require('../../')
2+
// normally this would be "var HttpAdapter = require('js-data-http')"
3+
var HttpAdapter = require('../../')
44

5-
document.getElementById('main').innerHTML = DSHttpAdapter.version.full
5+
document.getElementById('main').innerHTML = HttpAdapter.version.full
66

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' })
7+
var adapter = new HttpAdapter()
8+
var store = new JSData.DataStore()
9+
store.registerAdapter('http', adapter, { default: true })
10+
store.defineMapper('user')
1111

12-
User.find(1).catch(function (err) {
12+
store.find('user', 1).catch(function (err) {
1313
console.log(err)
1414
})

‎build_examples/node/app.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
var JSData = require('js-data')
2-
// normally this would be "var DSHttpAdapter = require('js-data-http-node')"
3-
var DSHttpAdapter = require('../../')
2+
// normally this would be "var HttpAdapter = require('js-data-http-node')"
3+
var HttpAdapter = require('../../')
44

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' })
5+
var adapter = new HttpAdapter()
6+
var store = new JSData.DataStore()
7+
store.registerAdapter('http', adapter, { default: true })
8+
store.defineMapper('user')
99

10-
User.find(1).catch(function (err) {
10+
store.find('user', 1).catch(function (err) {
1111
console.log(err)
1212
})

‎build_examples/r.js/app.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
define('app', [
22
'js-data',
33
'js-data-http'
4-
], function (JSData, DSHttpAdapter) {
5-
document.getElementById('main').innerHTML = DSHttpAdapter.version.full
4+
], function (JSData, HttpAdapter) {
5+
document.getElementById('main').innerHTML = HttpAdapter.version.full
66

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' })
7+
var adapter = new HttpAdapter()
8+
var store = new DataStore()
9+
store.registerAdapter('http', adapter, { default: true })
10+
store.defineMapper('user')
1111

12-
User.find(1).catch(function (err) {
12+
store.find('user', 1).catch(function (err) {
1313
console.log(err)
1414
})
1515
})

‎build_examples/webpack/app.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
var JSData = require('js-data')
2-
// normally this would be "var DSHttpAdapter = require('js-data-http')"
3-
var DSHttpAdapter = require('../../')
2+
// normally this would be "var HttpAdapter = require('js-data-http')"
3+
var HttpAdapter = require('../../')
44

5-
document.getElementById('main').innerHTML = DSHttpAdapter.version.full
5+
document.getElementById('main').innerHTML = HttpAdapter.version.full
66

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' })
7+
var adapter = new HttpAdapter()
8+
var store = new JSData.DataStore()
9+
store.registerAdapter('http', adapter, { default: true })
10+
store.defineMapper('user')
1111

12-
User.find(1).catch(function (err) {
12+
store.find('user', 1).catch(function (err) {
1313
console.log(err)
1414
})

‎build_examples/webpack_es6/app.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import {model} from 'js-data-'
1+
import {DataStore} from 'js-data'
22
// normally this would be "import DSHttpAdatper from 'js-data-http'"
3-
import DSHttpAdapter from '../../';
3+
import HttpAdapter from '../../';
44

5-
document.getElementById('main').innerHTML = DSHttpAdapter.version.full;
5+
document.getElementById('main').innerHTML = HttpAdapter.version.full;
66

7-
const adapter = new DSHttpAdapter()
8-
class Base extends JSData.Model {}
9-
Base.registerAdapter('http', adapter, { default: true })
10-
class User extends Base {}
7+
var adapter = new HttpAdapter()
8+
var store = new DataStore()
9+
store.registerAdapter('http', adapter, { default: true })
10+
store.defineMapper('user')
1111

12-
User.find(1).catch(function (err) {
12+
store.find('user', 1).catch(function (err) {
1313
console.log(err)
1414
})

0 commit comments

Comments
 (0)