Merge pull request #103 from ampatspell/issue-101/storage-ref-metadat…

…a-ref Move storage.ref.metadata.reference to ref, deprecate reference
ampatspell · Aug 23, 2018 · 2f58e9a · 2f58e9a
2 parents 7c50ce5 + 8e6e333
commit 2f58e9a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/addon/-private/storage/reference/base/model.js b/addon/-private/storage/reference/base/model.js
@@ -1,4 +1,4 @@
-import EmberObject from '@ember/object';
+import EmberObject, { computed } from '@ember/object';
 import { readOnly } from '@ember/object/computed';
 import ModelMixin from '../../../internal/model-mixin';
 import Mixin from '@ember/object/mixin';
@@ -12,6 +12,10 @@ const StatePropertiesMixin = Mixin.create(state.reduce((hash, key) => {
 
 export default EmberObject.extend(ModelMixin, StatePropertiesMixin, {
 
+  ref: computed(function() {
+    return this._internal.ref.model(true);
+  }).readOnly(),
+
   // { optional }
   load: invokePromiseReturningThis('load')
 

diff --git a/addon/-private/storage/reference/metadata/metadata.js b/addon/-private/storage/reference/metadata/metadata.js
@@ -2,7 +2,7 @@ import Model from '../base/model';
 import { state } from '../base/internal';
 import serialized from '../../../util/serialized';
 import { computed } from '@ember/object';
-import { readOnly } from '@ember/object/computed';
+import { readOnly, deprecatingAlias } from '@ember/object/computed';
 import { invokePromiseReturningThis } from '../../../internal/invoke';
 
 const raw = () => computed('raw', function(key) {
@@ -23,9 +23,10 @@ const rawDate = key => computed('raw', function() {
 
 export default Model.extend({
 
-  reference: computed(function() {
-    return this._internal.ref.model(true);
-  }).readOnly(),
+  reference: deprecatingAlias('ref', {
+    id: 'ember-cli-zuglet-store-reference-metadata-ref',
+    until: '0.9.0'
+  }),
 
   raw: readOnly('_internal._metadata'),
 

diff --git a/tests/unit/storage-test.js b/tests/unit/storage-test.js
@@ -324,7 +324,8 @@ module('storage', function(hooks) {
     let metadata = ref.get('metadata');
     assert.ok(metadata);
     assert.ok(metadata._internal);
-    assert.ok(metadata.get('reference') === ref);
+    assert.ok(metadata.get('reference') === ref); // deprecated
+    assert.ok(metadata.get('ref') === ref);
 
     assert.deepEqual(metadata.get('serialized'), {
       "error": null,
@@ -535,6 +536,11 @@ module('storage', function(hooks) {
     assert.equal(images.get('fullPath'), 'images');
   });
 
+  test('url has ref', async function(assert) {
+    let ref = this.storage.ref({ path: 'hello' });
+    assert.ok(ref.get('url.ref') === ref);
+  });
+
   test('load url', async function(assert) {
     await this.signIn();
     await this._put();