Merge pull request #4 from Exelord/fix-package

Fix package

Author: Exelord

README.md

@@ -77,7 +77,7 @@ You can define your custom options in your `config/environment.js` file
 ``` js
 module.exports = function(environment) {
   var ENV = {
-    'ember-api-actions': {
+    'emberCustomActions': {
       type: 'PUT',
       ajaxOptions: {},
       pushToStore: false,

addon/actions/action.js

@@ -3,17 +3,15 @@ import UrlBuilder from '../utils/url-builder';
 import normalizePayload from '../utils/normalize-payload';
 import defaultConfig from '../config';
 
-const { assign, getOwner, computed, isArray, ArrayProxy, Object } = Ember;
+const { assign, getOwner, computed, isArray, ArrayProxy, ObjectProxy, Object } = Ember;
 
 export default Object.extend({
   model: null,
   options: {},
   payload: {},
   instance: false,
 
-  store: computed('model', function() {
-    return this.get('model').store;
-  }),
+  store: computed.reads('model.store'),
 
   modelName: computed('model', function() {
     let { constructor } = this.get('model');
@@ -29,22 +27,25 @@ export default Object.extend({
   }),
 
   appConfig: computed('model', function() {
-    return getOwner(this.get('model')).resolveRegistration('config:environment').emberApiActions || {};
+    let config = getOwner(this.get('model')).resolveRegistration('config:environment').emberApiActions || {};
+    return Object.create(config);
   }),
 
-  config: computed('model', 'options', function() {
-    return assign(defaultConfig, this.get('appConfig'), this.get('options'));
+  defaultConfig: computed(function() {
+    return Object.create(defaultConfig);
   }),
 
-  requestType: computed('config', function() {
-    return this.get('config').type.toUpperCase();
+  config: computed('defaultConfig', 'options', 'appConfig', function() {
+    return Object.create(assign(this.get('defaultConfig'), this.get('appConfig'), this.get('options')));
   }),
 
-  urlType: computed('config', 'requestType', function() {
-    return this.get('config').urlType || this.get('requestType');
+  requestType: computed('config.type', function() {
+    return this.get('config.type').toUpperCase();
   }),
 
-  url: computed('model', 'path', 'urlType', 'instance', function() {
+  urlType: computed.or('config.urlType', 'requestType'),
+
+  url: computed('model', 'path', 'urlType', 'instance', 'adapter', function() {
     return UrlBuilder.create({
       path: this.get('path'),
       adapter: this.get('adapter'),
@@ -54,15 +55,15 @@ export default Object.extend({
     }).build();
   }),
 
-  data: computed('config', 'payload', function() {
-    let payload = (this.get('payload') instanceof Object) ? this.get('payload') : {};
-    let data = normalizePayload(payload, this.get('config').normalizeOperation);
-    return assign(this.get('config').ajaxOptions, { data });
+  data: computed('config.{normalizeOperation,ajaxOptions}', 'payload', function() {
+    let payload = (this.get('payload') instanceof window.Object) ? this.get('payload') : {};
+    let data = normalizePayload(payload, this.get('config.normalizeOperation'));
+    return assign(this.get('config.ajaxOptions'), { data });
   }),
 
   callAction() {
     return this.get('adapter').ajax(this.get('url'), this.get('requestType'), this.get('data')).then((response) => {
-      if (this.get('config').pushToStore && response.data) {
+      if (this.get('config.pushToStore') && response.data) {
         return this._pushToStore(this.get('serializer').pushPayload(this.get('store'), response));
       } else {
         return response;
@@ -71,10 +72,7 @@ export default Object.extend({
   },
 
   _pushToStore(content) {
-    if (isArray(content)) {
-      return ArrayProxy.create({ content });
-    } else {
-      return content;
-    }
+    let proxy = isArray(content) ? ArrayProxy : ObjectProxy;
+    return proxy.create({ content });
   }
 });

addon/actions/model.js

@@ -1,11 +1,14 @@
+import Ember from 'ember';
 import Action from './action';
 
+const { assign } = Ember;
+
 export default function(path, options = {}) {
-  return function(payload = {}) {
+  return function(payload = {}, customOptions = {}) {
     return Action.create({
       model: this,
       instance: true,
-      options,
+      options: assign(options, customOptions),
       payload,
       path
     }).callAction();

addon/actions/resource.js

@@ -1,11 +1,14 @@
+import Ember from 'ember';
 import Action from './action';
 
+const { assign } = Ember;
+
 export default function(path, options = {}) {
-  return function(payload = {}) {
+  return function(payload = {}, customOptions = {}) {
     return Action.create({
       model: this,
+      options: assign(options, customOptions),
       path,
-      options,
       payload
     }).callAction();
   };

addon/utils/normalize-payload.js

@@ -7,7 +7,7 @@ function transformObject(object, operation) {
     let data = {};
 
     Object.keys(object).forEach((key) => {
-      data[key[operation]()] = transformObject(object[key], operation);
+      data[String[operation](key)] = transformObject(object[key], operation);
     });
 
     return data;

tests/dummy/app/models/post.js

@@ -3,5 +3,6 @@ import { modelAction, resourceAction } from 'ember-custom-actions';
 
 export default Model.extend({
   publish: modelAction('publish'),
-  list: resourceAction('list')
+  list: resourceAction('list'),
+  search: resourceAction('search', { type: 'GET', normalizeOperation: 'dasherize' })
 });

tests/unit/models/post-test.js

@@ -14,7 +14,13 @@ moduleForModel('post', 'Unit | Model | post', {
 });
 
 test('model action', function(assert) {
-  this.server.put('/posts/:id/publish', () => {
+  assert.expect(3);
+
+  this.server.put('/posts/:id/publish', (request) => {
+    let data = JSON.parse(request.requestBody);
+    assert.deepEqual(data, { myParam: 'My first param' });
+    assert.equal(request.url, '/posts/1/publish');
+
     return [200, { }, 'true'];
   });
 
@@ -31,9 +37,13 @@ test('model action', function(assert) {
 });
 
 test('model action pushes to store', function(assert) {
-  assert.expect(3);
+  assert.expect(5);
+
+  this.server.put('/posts/:id/publish', (request) => {
+    let data = JSON.parse(request.requestBody);
+    assert.deepEqual(data, { myParam: 'My first param' });
+    assert.equal(request.url, '/posts/1/publish');
 
-  this.server.put('/posts/:id/publish', () => {
     return [200, {}, '{"data": {"id": 2, "type": "Post"}}'];
   });
 
@@ -53,7 +63,13 @@ test('model action pushes to store', function(assert) {
 });
 
 test('resource action', function(assert) {
-  this.server.put('/posts/list', () => {
+  assert.expect(3);
+
+  this.server.put('/posts/list', (request) => {
+    let data = JSON.parse(request.requestBody);
+    assert.deepEqual(data, { myParam: 'My first param' });
+    assert.equal(request.url, '/posts/list');
+
     return [200, { }, 'true'];
   });
 
@@ -69,10 +85,34 @@ test('resource action', function(assert) {
   });
 });
 
-test('resource action pushes to store', function(assert) {
+test('resource action with params in GET', function(assert) {
   assert.expect(3);
 
-  this.server.put('/posts/list', () => {
+  this.server.get('/posts/search', (request) => {
+    assert.equal(request.url, '/posts/search?my-param=My%20first%20param');
+    assert.equal(request.requestHeaders.test, 'Custom header');
+    return [200, { }, 'true'];
+  });
+
+  let done = assert.async();
+  let payload = { myParam: 'My first param' };
+
+  let model = this.subject();
+  model.set('id', 1);
+  model.search(payload, { ajaxOptions: { headers: { test: 'Custom header' } } }).then((response) => {
+    assert.ok(response, true);
+    done();
+  });
+});
+
+test('resource action pushes to store', function(assert) {
+  assert.expect(5);
+
+  this.server.put('/posts/list', (request) => {
+    let data = JSON.parse(request.requestBody);
+    assert.deepEqual(data, { myParam: 'My first param' });
+    assert.equal(request.url, '/posts/list');
+
     return [200, {}, '{"data": [{"id": "2", "type": "post"},{"id": "3", "type": "post"}]}'];
   });