Merge pull request #111 from samheuck/master

Fixes deprecation warnings for ember-data beta.15

bower.json

@@ -17,6 +17,6 @@
     "jquery": "1.11.1",
     "ember": "1.8.1",
     "ember-data": "1.0.0-beta.15",
-    "qunit": "1.17.1"
+    "qunit": "~1.17.1"
   }
 }

spec/document-adapter_spec.coffee

@@ -31,7 +31,7 @@ test 'retrieve belongsTo field as raw json', 1, ->
   person = @subject.create.call @, 'user', id: Math.floor(Math.random() * 10000), name: 'john'
   message = @subject.create.call @, 'message', user: person
   message.save().then @async ->
-    equal message.get('_data.user.id'), person.get('name'), 'Retrieves raw belongsTo json ok'
+    equal message.get('_data.user'), person.get('name'), 'Retrieves raw belongsTo json ok'
 
 test 'hasMany relation', 1, ->
   article = @subject.create.call @, 'article', label: 'Label'

spec/env.coffee

@@ -115,30 +115,31 @@ window.setupStore = (options) ->
   env = {}
 
   options = options or {}
-  container = env.container = new Ember.Container()
+  registry = new Ember.Registry(options)
+  container = env.container = registry.container()
   adapter = env.adapter = EmberCouchDBKit.DocumentAdapter.extend db:'doc', host: 'http://localhost:5984'
 
   delete options.adapter
 
   for prop of options
-    container.register "model:" + prop, options[prop]
+    registry.register "model:" + prop, options[prop]
 
-  container.register "store:main", DS.Store.extend adapter: adapter
+  registry.register "store:main", DS.Store.extend adapter: adapter
 
-  container.register "serializer:_default", EmberCouchDBKit.DocumentSerializer
-  container.register "serializer:history", EmberCouchDBKit.RevSerializer
-  container.register "serializer:attachment", EmberCouchDBKit.AttachmentSerializer
+  registry.register "serializer:_default", EmberCouchDBKit.DocumentSerializer
+  registry.register "serializer:history", EmberCouchDBKit.RevSerializer
+  registry.register "serializer:attachment", EmberCouchDBKit.AttachmentSerializer
 
-  container.register "adapter:_rest", DS.RESTAdapter
-  container.register "adapter:history", EmberCouchDBKit.RevAdapter.extend db:'doc', host: 'http://localhost:5984'
-  container.register "adapter:attachment", EmberCouchDBKit.AttachmentAdapter.extend db:'doc', host: 'http://localhost:5984'
+  registry.register "adapter:_rest", DS.RESTAdapter
+  registry.register "adapter:history", EmberCouchDBKit.RevAdapter.extend db:'doc', host: 'http://localhost:5984'
+  registry.register "adapter:attachment", EmberCouchDBKit.AttachmentAdapter.extend db:'doc', host: 'http://localhost:5984'
 
-  container.register 'transform:boolean', DS.BooleanTransform
-  container.register 'transform:date', DS.DateTransform
-  container.register 'transform:number', DS.NumberTransform
-  container.register 'transform:string', DS.StringTransform
+  registry.register 'transform:boolean', DS.BooleanTransform
+  registry.register 'transform:date', DS.DateTransform
+  registry.register 'transform:number', DS.NumberTransform
+  registry.register 'transform:string', DS.StringTransform
 
-  container.injection "serializer", "store", "store:main"
+  registry.injection "serializer", "store", "store:main"
 
   env.serializer = container.lookup("serializer:_default")
   env.restSerializer = container.lookup("serializer:_rest")

spec/index.html

@@ -7,7 +7,7 @@
     <script src="/bower_components/qunit/qunit/qunit.js"></script>
     <script src="/bower_components/handlebars/handlebars.js"></script>
     <script src="/bower_components/jquery/dist/jquery.js"></script>
-    <script src="/bower_components/ember/ember.js"></script>
+    <script src="/bower_components/ember/ember.debug.js"></script>
     <script src="/bower_components/ember-data/ember-data.js"></script>
     <script src="/dist/ember-couchdb-kit.js"></script>
     <!-- env setup and assertions -->

src/document-adapter.coffee

@@ -69,22 +69,18 @@ EmberCouchDBKit.DocumentSerializer = DS.RESTSerializer.extend
   serializeBelongsTo: (record, json, relationship) ->
     attribute = (relationship.options.attribute || "id")
     key = relationship.key
-    belongsTo = Ember.get(record, key)
+    belongsTo = record.belongsTo(key)
     return  if Ember.isNone(belongsTo)
-    json[key] = Ember.get(belongsTo, attribute)
-    json[key + "_type"] = belongsTo.constructor.typeKey  if relationship.options.polymorphic
+    json[key] = if (attribute == "id") then belongsTo.id else belongsTo.attr(attribute)
+    json[key + "_type"] = belongsTo.typeKey  if relationship.options.polymorphic
 
   serializeHasMany: (record, json, relationship) ->
     attribute = (relationship.options.attribute || "id")
     key = relationship.key
-    relationshipType = record.constructor.determineRelationshipType(relationship)
+    relationshipType = record.type.determineRelationshipType(relationship)
     switch relationshipType
       when "manyToNone", "manyToMany", "manyToOne"
-        if record.get(key).get('content.isLoaded') || Ember.get(record, key).get('isLoaded')
-          json[key] = Ember.get(record, key).mapBy(attribute)
-        else
-          if record.get("_data.%@".fmt(key))
-            json[key] = record.get("_data.%@".fmt(key)).mapBy('id')
+          json[key] = record.hasMany(key).mapBy(attribute)
 ###
 
   A `DocumentAdapter` should be used as a main adapter for working with models as a CouchDB documents.