Skip to content

Commit

Permalink
Merge branch 'master' of github.com:emberjs/data
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhuda committed Mar 23, 2012
2 parents 17fa24c + bd9998f commit 9eb2c74
Show file tree
Hide file tree
Showing 6 changed files with 7,477 additions and 7,036 deletions.
1 change: 1 addition & 0 deletions BREAKING_CHANGES.md
View file
Expand Up @@ -67,6 +67,7 @@ App.Person = DS.Model.extend({
lastName: DS.attr('string', { key: 'last_name' }),
middleName: DS.attr('string', { key: 'middle_name' })
});
```

This obviously got very annoying very fast.

Expand Down
90 changes: 51 additions & 39 deletions README.md
View file
Expand Up @@ -24,7 +24,8 @@ No. Breaking changes, indexed by date, are listed in
* Handle error states
* Better built-in attributes
* Editing "forked" records and rolling back transactions
* Out-of-the-box support for Rails apps that follow the `active_model_serializers` gem's conventions.
* Out-of-the-box support for Rails apps that follow the
[`active_model_serializers`](https://github.com/josevalim/active_model_serializers) gem's conventions.
* Handle partially-loaded records

### Creating a Store
Expand All @@ -35,23 +36,23 @@ not yet been loaded.

```javascript
App.store = DS.Store.create({
revision: 2
revision: 3
});
```

> NOTE: The revision property is used by `ember-data` to notify you of
> breaking changes to the public API before 1.0. For new applications,
> just set the revision to this number. See
> [BREAKING CHANGES](https://github.com/emberjs/data/blob/master/BREAKING_CHANGES.md)
> [BREAKING_CHANGES.md](https://github.com/emberjs/data/blob/master/BREAKING_CHANGES.md)
> for more information.
You can tell the store how to talk to your backend by specifying an *adapter*.
Ember Data comes with a RESTful JSON API adapter. You can specify this adapter
by setting the `adapter` property:

```javascript
App.store = DS.Store.create({
revision: 2,
revision: 3,
adapter: DS.RESTAdapter.create({ bulkCommit: false })
});
```
Expand Down Expand Up @@ -93,7 +94,7 @@ App.Person = DS.Model.extend({
});
```

Valid attribute types are `string`, `integer`, `boolean`, and `date`. You
Valid attribute types are `string`, `number`, `boolean`, and `date`. You
can also register custom attribute types. For example, here's a `boolString`
attribute type that converts booleans into the string `"Y"` or `"N"`:

Expand All @@ -103,7 +104,7 @@ DS.attr.transforms.boolString: {
if (serialized === 'Y') {
return true;
}

return false;
},

Expand Down Expand Up @@ -223,16 +224,21 @@ structure is as follows:
```javascript
// Author
{
"id": 1,
"name": "Tom Dale"
"author": {
"id": 1,
"name": "Tom Dale"
}
}
}

// Profile
{
"id": 1,
"about": "Tom Dale is a software engineer that drinks too much beer.",
"postCount": 1984,
"author_id": 1
"profile": {
"id": 1,
"about": "Tom Dale is a software engineer that drinks too much beer.",
"postCount": 1984,
"author_id": 1
}
}
```

Expand All @@ -255,9 +261,11 @@ As a performance optimization, the REST API can return the ID of the
```javascript
// Author with included Profile id
{
"id": 1,
"name": "Tom Dale",
"profile_id": 1
"author": {
"id": 1,
"name": "Tom Dale",
"profile_id": 1
}
}
```

Expand Down Expand Up @@ -311,21 +319,23 @@ entirety of the association above like this:
}
```

However, imagine the JSON returned from the server for a Person looked like this:
However, imagine the JSON returned from the server for a `Person` looked like this:

```javascript
{
"id": 1,
"name": "Tom Dale",
"tags": [{
"person": {
"id": 1,
"name": "good-looking"
},
"name": "Tom Dale",
"tags": [{
"id": 1,
"name": "good-looking"
},

{
"id": 2,
"name": "not-too-bright"
}]
{
"id": 2,
"name": "not-too-bright"
}]
}
}
```

Expand All @@ -340,13 +350,15 @@ App.Person = DS.Model.extend({
```

It is also possible to change the data attribute that an association is mapped
to. Suppose the JSON for a person looked like this:
to. Suppose the JSON for a `Person` looked like this:

```javascript
{
"person": {
"id": 2,
"name": "Carsten Nielsen",
"tag_ids": [1, 2]
}
}
```

Expand Down Expand Up @@ -544,7 +556,7 @@ To tell your store which adapter to use, set its `adapter` property:

```javascript
App.store = DS.Store.create({
revision: 2,
revision: 3,
adapter: App.adapter
});
```
Expand Down Expand Up @@ -606,7 +618,7 @@ DS.Adapter.create({
findMany: function(store, type, ids) {
var url = type.url;
url = url.fmt(ids.join(','));

jQuery.getJSON(url, function(data) {
// data is an Array of Hashes in the same order as the original
// Array of IDs. If your server returns a root, simply do something
Expand Down Expand Up @@ -653,7 +665,7 @@ App.Person.reopenClass({
DS.Adapter.create({
findQuery: function(store, type, query, modelArray) {
var url = type.collectionUrl;

jQuery.getJSON(url, query, function(data) {
// data is expected to be an Array of Hashes, in an order
// determined by the server. This order may be specified in
Expand Down Expand Up @@ -681,7 +693,7 @@ Invoked when `findAll()` is called on the store. If you do nothing, only
models that have already been loaded will be included in the results. Otherwise,
this is your opportunity to load any unloaded records of this type. The
implementation is similar to findMany(); see above for an example.

### createRecord()

When `commit()` is called on the store and there are records that need to be
Expand All @@ -708,7 +720,7 @@ DS.Adapter.create({
data: model.get('data'),
dataType: 'json',
type: 'POST',

success: function(data) {
// data is a hash of key/value pairs representing the record.
// In general, this hash will contain a new id, which the
Expand Down Expand Up @@ -739,7 +751,7 @@ DS.Adapter.create({
data: array.mapProperty('data'),
dataType: 'json',
type: 'POST',

success: function(data) {
// data is an array of hashes in the same order as
// the original records that were sent.
Expand Down Expand Up @@ -769,7 +781,7 @@ DS.Adapter.create({
url: url.fmt(model.get('id')),
dataType: 'json',
type: 'PUT',

success: function(data) {
// data is a hash of key/value pairs representing the record
// in its current state on the server.
Expand Down Expand Up @@ -797,7 +809,7 @@ DS.Adapter.create({
data: array.mapProperty('data'),
dataType: 'json',
type: 'PUT',

success: function(data) {
// data is an array of hashes in the same order as
// the original records that were sent.
Expand Down Expand Up @@ -827,7 +839,7 @@ DS.Adapter.create({
url: url.fmt(model.get('id')),
dataType: 'json',
type: 'DELETE',

success: function() {
store.didDeleteRecord(model);
}
Expand All @@ -853,7 +865,7 @@ DS.Adapter.create({
data: array.mapProperty('data'),
dataType: 'json',
type: 'DELETE',

success: function(data) {
store.didDeleteRecords(array);
}
Expand Down Expand Up @@ -889,8 +901,8 @@ commit: function(store, commitDetails) {

### Connecting to Views

Ember Data will always return records or arrays of records of a certain type
immediately, even though the underlying JSON objects have not yet been returned
Ember Data will always return records or arrays of records of a certain type
immediately, even though the underlying JSON objects have not yet been returned
from the server.

In general, this means that you can insert them into the DOM using Ember's
Expand Down
2 changes: 1 addition & 1 deletion packages/ember-data/lib/system/model/attributes.js
View file
Expand Up @@ -16,7 +16,7 @@ DS.Model.reopenClass({
processAttributeKeys: function() {
if (this.processedAttributeKeys) { return; }

var namingConvention = getPath(this, 'proto.namingConvention');
var namingConvention = this.proto().namingConvention;

this.eachComputedProperty(function(name, meta) {
if (meta.isAttribute && !meta.options.key) {
Expand Down
2 changes: 1 addition & 1 deletion packages/ember-data/lib/system/model/states.js
View file
Expand Up @@ -512,7 +512,7 @@ var states = {
// A record is in this state if it has already been
// saved to the server, but there are new local changes
// that have not yet been saved.
updated: updatedState,
updated: updatedState
}),

// A record is in this state if it was deleted from the store.
Expand Down
8 changes: 4 additions & 4 deletions packages/ember-data/lib/system/store.js
View file
Expand Up @@ -477,7 +477,7 @@ DS.Store = Ember.Object.extend({


didCreateRecords: function(type, array, hashes) {
var primaryKey = getPath(type, 'proto.primaryKey'),
var primaryKey = type.proto().primaryKey,
typeMap = this.typeMapFor(type),
id, clientId;

Expand All @@ -497,7 +497,7 @@ DS.Store = Ember.Object.extend({
// The hash is optional, but if it is not provided, the client must have
// provided a primary key.

primaryKey = getPath(type, 'proto.primaryKey');
primaryKey = type.proto().primaryKey;

// TODO: Make ember_assert more flexible and convert this into an ember_assert
if (hash) {
Expand Down Expand Up @@ -670,7 +670,7 @@ DS.Store = Ember.Object.extend({
load: function(type, id, hash) {
if (hash === undefined) {
hash = id;
var primaryKey = getPath(type, 'proto.primaryKey');
var primaryKey = type.proto().primaryKey;
ember_assert("A data hash was loaded for a model of type " + type.toString() + " but no primary key '" + primaryKey + "' was provided.", primaryKey in hash);
id = hash[primaryKey];
}
Expand Down Expand Up @@ -703,7 +703,7 @@ DS.Store = Ember.Object.extend({
if (hashes === undefined) {
hashes = ids;
ids = [];
var primaryKey = getPath(type, 'proto.primaryKey');
var primaryKey = type.proto().primaryKey;

ids = Ember.ArrayUtils.map(hashes, function(hash) {
return hash[primaryKey];
Expand Down

0 comments on commit 9eb2c74

Please sign in to comment.