Revert "Merge pull request #396 from saponifi3d/josh-revert-collections"

This reverts commit 0ebca7c, reversing
changes made to ef52957.

shared/syncer.js

@@ -32,7 +32,8 @@ var syncer = module.exports;
 function clientSync(method, model, options) {
   var error;
   options = _.clone(options);
-  options.url = this.getUrl(options.url, true);
+  options.data = _.clone(options.data);
+  options.url = this.getUrl(options.url, true, options.data);
   error = options.error;
   if (error) {
     options.error = function(xhr) {
@@ -55,18 +56,25 @@ function clientSync(method, model, options) {
 }
 
 function serverSync(method, model, options) {
-  var api, urlParts, verb, req;
+  var api, urlParts, verb, req, queryStr;
 
   options = _.clone(options);
-  options.url = this.getUrl(options.url, false);
+  options.data = _.clone(options.data);
+  options.url = this.getUrl(options.url, false, options.data);
   verb = methodMap[method];
   urlParts = options.url.split('?');
   req = this.app.req;
+  queryStr = urlParts[1] || '';
+  if (!_.isEmpty(options.data)) queryStr += '&' + qs.stringify(options.data);
+  /**
+   * if queryStr is initially an empty string, leading '&' will still get parsed correctly by qs.parse below.
+   * e.g.  qs.parse('&baz=quux') => { baz: quux }
+   */
 
   api = {
     method: verb,
     path: urlParts[0],
-    query: qs.parse(urlParts[1]) || {},
+    query: qs.parse(queryStr),
     headers: options.headers || {},
     api: _.result(this, 'api'),
     body: {}
@@ -229,5 +237,10 @@ syncer.interpolateParams = function interpolateParams(model, url, params) {
       delete params[property];
     });
   }
+  /**
+   * Separate deletion of idAttribute from params hash necessary if using urlRoot in the model
+   * so we don't get urls like: /v1/threads/1234?id=1234
+   */
+  delete params[model.idAttribute]
   return url;
 };