Skip to content

Commit

Permalink
Merge pull request #108 from Zatvobor/rc
Browse files Browse the repository at this point in the history
v1.0.3
  • Loading branch information
Zatvobor committed Mar 4, 2015
2 parents f8b807a + d2f17a9 commit 16a6f1a
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 13 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ ember-couchdb-kit

Versions:

* `v1.0.2` works with `ember 1.8.1` and `ember-data 1.0.0-beta.15`
* `v1.0.0` works with `ember 1.5.1` and `ember-data 1.0.0-beta.7`
* `v0.9.0` works with `ember 1.0.0` and `ember-data 1.0.0-beta.3`
* `v0.8.0` works with `ember 1.0.0` and `ember-data 1.0.0-beta.2`
Expand Down
7 changes: 1 addition & 6 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
{
"name": "ember-couchdb-kit",
"version": "1.0.1",
"description": "An Ember.js adapter for Apache CouchDB",
"repository": {
"type": "git", "url": "git://github.com/zatvobor/ember-couchdb-kit.git"
},
"main": "dist/ember-couchdb-kit.min.js",
"ignore": [
"example", "spec", "src", "Gruntfile.js", "package.json"
],
"dependencies": {
"ember": "1.5.1",
"ember-data": "1.0.0-beta.7"
}
]
}
2 changes: 1 addition & 1 deletion dist/ember-couchdb-kit.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/ember-couchdb-kit.min.js

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"name": "ember-couchdb-kit",
"version": "0.0.0",
"repository": "https://github.com/roundscope/ember-couchdb-kit",
"scripts": {
"postinstall": "bower install",
"test": "grunt test"
Expand Down
4 changes: 2 additions & 2 deletions src/document-adapter.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ EmberCouchDBKit.DocumentSerializer = DS.RESTSerializer.extend
serializeHasMany: (record, json, relationship) ->
attribute = (relationship.options.attribute || "id")
key = relationship.key
relationshipType = record.constructor.determineRelationshipType(relationship);
relationshipType = record.constructor.determineRelationshipType(relationship)
switch relationshipType
when "manyToNone", "manyToMany", "manyToOne"
if record.get(key).get('content.isLoaded') || Ember.get(record, key).get('isLoaded')
Expand Down Expand Up @@ -285,7 +285,7 @@ EmberCouchDBKit.DocumentAdapter = DS.Adapter.extend
})

createRecord: (store, type, record) ->
json = store.serializerFor(type.typeKey).serialize(record);
json = store.serializerFor(type.typeKey).serialize(record)
@_push(store, type, record, json)

updateRecord: (store, type, record) ->
Expand Down
2 changes: 1 addition & 1 deletion src/ember-couchdb-kit.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#= require changes-feed

window.EmberCouchDBKit = Ember.Namespace.create
VERSION: '1.0.1'
VERSION: '1.0.2'

EmberCouchDBKit.sharedStore = do ->
_data = {}
Expand Down

0 comments on commit 16a6f1a

Please sign in to comment.