Merge pull request #12 from mike-north/legacy-ember-data

Support for ember-data 1.0.0-beta.16
mike-north · Sep 14, 2015 · 04b2515 · 04b2515
2 parents b1189fa + 4fb3373
commit 04b2515
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,7 @@ cache:
     - node_modules
 
 env:
+  - EMBER_TRY_SCENARIO=ember-1.11-ember-data-beta.16
   - EMBER_TRY_SCENARIO=ember-1.11
   - EMBER_TRY_SCENARIO=ember-1.12
   - EMBER_TRY_SCENARIO=ember-1.13

diff --git a/addon/utils/build-url.js b/addon/utils/build-url.js
@@ -4,7 +4,7 @@ const { assert } = Ember;
 
 export default function buildOperationUrl(record, opPath, requestType, intance=true) {
   assert('You must provide a path for instanceOp', opPath);
-  const { modelName } = record.constructor;
+  const modelName = record.constructor.modelName || record.constructor.typeKey;
   let adapter = record.store.adapterFor(modelName);
   let path = opPath;
   let baseUrl = adapter.buildURL(modelName, intance ? record.get('id') : null, requestType);

diff --git a/addon/utils/collection-action.js b/addon/utils/collection-action.js
@@ -3,7 +3,7 @@ import buildOperationUrl from './build-url';
 
 export default function instanceOp(options) {
   return function(payload) {
-    const { modelName } = this.constructor;
+    const modelName = this.constructor.modelName || this.constructor.typeKey;
     let requestType = options.type || 'PUT';
     let adapter = this.store.adapterFor(modelName);
     let fullUrl = buildOperationUrl(this, options.path, requestType, false);

diff --git a/addon/utils/member-action.js b/addon/utils/member-action.js
@@ -3,10 +3,10 @@ import buildOperationUrl from './build-url';
 
 export default function instanceOp(options) {
   return function(payload) {
-    const { modelName } = this.constructor;
+    const modelName = this.constructor.modelName || this.constructor.typeKey;
     let requestType = options.type || 'PUT';
     let adapter = this.store.adapterFor(modelName);
     let fullUrl = buildOperationUrl(this, options.path, requestType);
     return adapter.ajax(fullUrl, requestType, Ember.$.extend(options.ajaxOptions || {}, { data: payload }));
   };
-}
+}
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -4,6 +4,17 @@ module.exports = {
       name: 'default',
       dependencies: { }
     },
+    {
+      name: 'ember-1.11-ember-data-beta.16',
+      dependencies: {
+        'ember': '~1.11.0',
+        'ember-data': '1.0.0-beta.16.1'
+      },
+      resolutions: {
+        'ember': '~1.11.0',
+        'ember-data': '1.0.0-beta.16.1'
+      }
+    },
     {
       name: 'ember-1.11',
       dependencies: {