Replace jquery-params with URL API and authorize undefined action name

addon/utils/url-builder.js

@@ -1,8 +1,22 @@
-import param from 'jquery-param';
+import URL from 'url';
 
 export default function(url, path, queryParams) {
-  let query = param(queryParams);
-  let pathUrl = url.charAt(url.length - 1) === '/' ? `${url}${path}` : `${url}/${path}`;
+  let pathUrl;
+  if (path) {
+    let maybeMissingSlash = url.endsWith('/') || path.startsWith('/') ? '' : '/'
+    pathUrl = `${url}${maybeMissingSlash}${path}`;
+  } else {
+    pathUrl = url
+  }
+
+  // Use native URL API to generate query
+  let queryObj = new URL('https://exelord.com/ember-custom-actions/').searchParams;
+  if (queryParams) {
+    Object.keys(queryParams).forEach(key =>
+      queryObj.set(key, queryParams[key])
+    );
+  }
+  let query = queryObj.toString();
 
   return query ? `${pathUrl}?${query}` : pathUrl;
 }

index.js

@@ -13,11 +13,5 @@ module.exports = {
         { transformation: 'cjs', as: 'lodash.merge' }
       ]
     });
-
-    this.import('node_modules/jquery-param/jquery-param.js', {
-      using: [
-        { transformation: 'amd', as: 'jquery-param' }
-      ]
-    });
   },
 };

package.json

@@ -31,7 +31,7 @@
   "dependencies": {
     "ember-cli-babel": "6.16.0",
     "ember-cli-cjs-transform": "2.0.0",
-    "jquery-param": "1.0.1",
+    "ember-url": "0.6.0",
     "lodash.merge": "4.6.2"
   },
   "devDependencies": {

tests/dummy/app/models/bike.js

@@ -4,5 +4,9 @@ import { modelAction } from 'ember-custom-actions';
 
 export default Model.extend({
   name: attr(),
-  ride: modelAction('ride', { method: 'PUT', data: { defaultParam: 'ok' } })
+  ride: modelAction('ride', { method: 'PUT', data: { defaultParam: 'ok' } }),
+  clean: modelAction(undefined, {
+    method: 'PATCH',
+    data: { defaultParam: 'ok' }
+  })
 });

tests/unit/models/bike-test.js

@@ -113,3 +113,28 @@ test('model action set serialized errors in error object', function(assert) {
     done();
   });
 });
+
+test('model action without actionId', function(assert) {
+  assert.expect(4);
+
+  this.server.patch('/bikes/:id', (request) => {
+    let data = JSON.parse(request.requestBody);
+
+    assert.deepEqual(data, { myParam: 'My first param', defaultParam: 'ok' });
+    assert.deepEqual(request.queryParams, { soap: 'true', include: 'sponge' });
+    assert.equal(request.url, '/bikes/1?include=sponge&soap=true');
+
+    return [200, { }, 'true'];
+  });
+
+  let done = assert.async();
+  let payload = { myParam: 'My first param' };
+
+  let model = this.subject();
+  model.set('id', 1);
+
+  model.clean(payload, { queryParams: { soap: true, include: 'sponge' } }).then((response) => {
+    assert.ok(response, true);
+    done();
+  });
+});