Stable Version 3.0.0-alpha.4.

Author: jmdobry

README.md

@@ -31,36 +31,21 @@ To get started, visit __[http://js-data.io](http://www.js-data.io)__.
 __ES6__
 
 ```js
-import {Model} from 'js-data'
-import DSHttpAdapter from 'js-data-http-node'
+// Doesn't make much sense to use DataStore on the server
+import {Container} from 'js-data'
+import HttpAdapter from 'js-data-http-node'
 
-const adapter = new DSHttpAdapter()
+const adapter = new HttpAdapter()
+const container = new Container()
 
-class Base extends Model {}
-Base.registerAdapter('http', adapter, { default: true })
+container.registerAdapter('http', adapter, { default: true })
 
-class School extends Model {}
-class Student extends Model {}
+container.defineMapper('school')
+container.defineMapper('student')
 
-// "School" and "Student" will now use the http adapter by default
-```
-
-__ES5__
-
-```js
-var JSData = require('js-data')
-var Model = JSData.Model
-var DSHttpAdapter = require('js-data-http-node')
-
-var adapter = new DSHttpAdapter()
-
-var Base = Model.extend({}, { name: 'Base' })
-Base.registerAdapter('http', adapter, { default: true })
-
-var School = Base.extend({}, { name: 'School' })
-var Student = Base.extend({}, { name: 'Student' })
-
-// "School" and "Student" will now use the http adapter by default
+container.find('school', 1).then(function (school) {
+  // ...
+})
 ```
 
 ## Guides and Tutorials

build_examples/browserify/app.js

@@ -1,14 +1,14 @@
 var JSData = require('js-data')
-// normally this would be "var DSHttpAdapter = require('js-data-http')"
-var DSHttpAdapter = require('../../')
+// normally this would be "var HttpAdapter = require('js-data-http')"
+var HttpAdapter = require('../../')
 
-document.getElementById('main').innerHTML = DSHttpAdapter.version.full
+document.getElementById('main').innerHTML = HttpAdapter.version.full
 
-var adapter = new DSHttpAdapter()
-var Base = JSData.Model.extend({}, { name: 'Base' })
-Base.registerAdapter('http', adapter, { default: true })
-var User = Base.extend({}, { name: 'User' })
+var adapter = new HttpAdapter()
+var store = new JSData.DataStore()
+store.registerAdapter('http', adapter, { default: true })
+store.defineMapper('user')
 
-User.find(1).catch(function (err) {
+store.find('user', 1).catch(function (err) {
   console.log(err)
 })

build_examples/node/app.js

@@ -1,12 +1,12 @@
 var JSData = require('js-data')
-// normally this would be "var DSHttpAdapter = require('js-data-http-node')"
-var DSHttpAdapter = require('../../')
+// normally this would be "var HttpAdapter = require('js-data-http-node')"
+var HttpAdapter = require('../../')
 
-var adapter = new DSHttpAdapter()
-var Base = JSData.Model.extend({}, { name: 'Base' })
-Base.registerAdapter('http', adapter, { default: true })
-var User = Base.extend({}, { name: 'User' })
+var adapter = new HttpAdapter()
+var store = new JSData.DataStore()
+store.registerAdapter('http', adapter, { default: true })
+store.defineMapper('user')
 
-User.find(1).catch(function (err) {
+store.find('user', 1).catch(function (err) {
   console.log(err)
 })

build_examples/r.js/app.js

@@ -1,15 +1,15 @@
 define('app', [
   'js-data',
   'js-data-http'
-], function (JSData, DSHttpAdapter) {
-  document.getElementById('main').innerHTML = DSHttpAdapter.version.full
+], function (JSData, HttpAdapter) {
+  document.getElementById('main').innerHTML = HttpAdapter.version.full
 
-  var adapter = new DSHttpAdapter()
-  var Base = JSData.Model.extend({}, { name: 'Base' })
-  Base.registerAdapter('http', adapter, { default: true })
-  var User = Base.extend({}, { name: 'User' })
+  var adapter = new HttpAdapter()
+  var store = new DataStore()
+  store.registerAdapter('http', adapter, { default: true })
+  store.defineMapper('user')
 
-  User.find(1).catch(function (err) {
+  store.find('user', 1).catch(function (err) {
     console.log(err)
   })
 })

build_examples/webpack/app.js

@@ -1,14 +1,14 @@
 var JSData = require('js-data')
-// normally this would be "var DSHttpAdapter = require('js-data-http')"
-var DSHttpAdapter = require('../../')
+// normally this would be "var HttpAdapter = require('js-data-http')"
+var HttpAdapter = require('../../')
 
-document.getElementById('main').innerHTML = DSHttpAdapter.version.full
+document.getElementById('main').innerHTML = HttpAdapter.version.full
 
-var adapter = new DSHttpAdapter()
-var Base = JSData.Model.extend({}, { name: 'Base' })
-Base.registerAdapter('http', adapter, { default: true })
-var User = Base.extend({}, { name: 'User' })
+var adapter = new HttpAdapter()
+var store = new JSData.DataStore()
+store.registerAdapter('http', adapter, { default: true })
+store.defineMapper('user')
 
-User.find(1).catch(function (err) {
+store.find('user', 1).catch(function (err) {
   console.log(err)
 })

build_examples/webpack_es6/app.js

@@ -1,14 +1,14 @@
-import {model} from 'js-data-'
+import {DataStore} from 'js-data'
 // normally this would be "import DSHttpAdatper from 'js-data-http'"
-import DSHttpAdapter from '../../';
+import HttpAdapter from '../../';
 
-document.getElementById('main').innerHTML = DSHttpAdapter.version.full;
+document.getElementById('main').innerHTML = HttpAdapter.version.full;
 
-const adapter = new DSHttpAdapter()
-class Base extends JSData.Model {}
-Base.registerAdapter('http', adapter, { default: true })
-class User extends Base {}
+var adapter = new HttpAdapter()
+var store = new DataStore()
+store.registerAdapter('http', adapter, { default: true })
+store.defineMapper('user')
 
-User.find(1).catch(function (err) {
+store.find('user', 1).catch(function (err) {
   console.log(err)
 })