Skip to content

Commit

Permalink
Merge pull request #3926 from seanpdoyle/sd-ember-watson
Browse files Browse the repository at this point in the history 
Run `ember watson: methodify` on `addon/` and `test/`
  • Loading branch information
@fivetanley
fivetanley committed Dec 2, 2015
2 parents f10941a + 9a57fa0 commit 7bef33d
Show file tree
Hide file tree
Showing 102 changed files with 769 additions and 769 deletions.
28 changes: 14 additions & 14 deletions addon/adapters/build-url-mixin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default Ember.Mixin.create({
@param {Object} query object of query parameters to send for query requests.
@return {String} url
*/
buildURL: function(modelName, id, snapshot, requestType, query) {
buildURL(modelName, id, snapshot, requestType, query) {
switch (requestType) {
case 'findRecord':
return this.urlForFindRecord(id, modelName, snapshot);
Expand Down Expand Up @@ -83,7 +83,7 @@ export default Ember.Mixin.create({
@param {String} id
@return {String} url
*/
_buildURL: function(modelName, id) {
_buildURL(modelName, id) {
var url = [];
var host = get(this, 'host');
var prefix = this.urlPrefix();
Expand Down Expand Up @@ -112,7 +112,7 @@ export default Ember.Mixin.create({
* @param {DS.Snapshot} snapshot
* @return {String} url
*/
urlForFindRecord: function(id, modelName, snapshot) {
urlForFindRecord(id, modelName, snapshot) {
return this._buildURL(modelName, id);
},

Expand All @@ -121,7 +121,7 @@ export default Ember.Mixin.create({
* @param {String} modelName
* @return {String} url
*/
urlForFindAll: function(modelName) {
urlForFindAll(modelName) {
return this._buildURL(modelName);
},

Expand All @@ -131,7 +131,7 @@ export default Ember.Mixin.create({
* @param {String} modelName
* @return {String} url
*/
urlForQuery: function(query, modelName) {
urlForQuery(query, modelName) {
return this._buildURL(modelName);
},

Expand All @@ -141,7 +141,7 @@ export default Ember.Mixin.create({
* @param {String} modelName
* @return {String} url
*/
urlForQueryRecord: function(query, modelName) {
urlForQueryRecord(query, modelName) {
return this._buildURL(modelName);
},

Expand All @@ -152,7 +152,7 @@ export default Ember.Mixin.create({
* @param {Array} snapshots
* @return {String} url
*/
urlForFindMany: function(ids, modelName, snapshots) {
urlForFindMany(ids, modelName, snapshots) {
return this._buildURL(modelName);
},

Expand All @@ -162,7 +162,7 @@ export default Ember.Mixin.create({
* @param {String} modelName
* @return {String} url
*/
urlForFindHasMany: function(id, modelName) {
urlForFindHasMany(id, modelName) {
return this._buildURL(modelName, id);
},

Expand All @@ -172,7 +172,7 @@ export default Ember.Mixin.create({
* @param {String} modelName
* @return {String} url
*/
urlForFindBelongsTo: function(id, modelName) {
urlForFindBelongsTo(id, modelName) {
return this._buildURL(modelName, id);
},

Expand All @@ -182,7 +182,7 @@ export default Ember.Mixin.create({
* @param {DS.Snapshot} snapshot
* @return {String} url
*/
urlForCreateRecord: function(modelName, snapshot) {
urlForCreateRecord(modelName, snapshot) {
return this._buildURL(modelName);
},

Expand All @@ -193,7 +193,7 @@ export default Ember.Mixin.create({
* @param {DS.Snapshot} snapshot
* @return {String} url
*/
urlForUpdateRecord: function(id, modelName, snapshot) {
urlForUpdateRecord(id, modelName, snapshot) {
return this._buildURL(modelName, id);
},

Expand All @@ -204,7 +204,7 @@ export default Ember.Mixin.create({
* @param {DS.Snapshot} snapshot
* @return {String} url
*/
urlForDeleteRecord: function(id, modelName, snapshot) {
urlForDeleteRecord(id, modelName, snapshot) {
return this._buildURL(modelName, id);
},

Expand All @@ -215,7 +215,7 @@ export default Ember.Mixin.create({
@param {String} parentURL
@return {String} urlPrefix
*/
urlPrefix: function(path, parentURL) {
urlPrefix(path, parentURL) {
var host = get(this, 'host');
var namespace = get(this, 'namespace');
var url = [];
Expand Down Expand Up @@ -277,7 +277,7 @@ export default Ember.Mixin.create({
@param {String} modelName
@return {String} path
**/
pathForType: function(modelName) {
pathForType(modelName) {
var camelized = Ember.String.camelize(modelName);
return Ember.String.pluralize(camelized);
}
Expand Down
8 changes: 4 additions & 4 deletions addon/adapters/json-api-adapter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default RESTAdapter.extend({
@param {Object} options
@return {Object}
*/
ajaxOptions: function(url, type, options) {
ajaxOptions(url, type, options) {
let hash = this._super(...arguments);

if (hash.contentType) {
Expand Down Expand Up @@ -96,7 +96,7 @@ export default RESTAdapter.extend({
@param {Array} snapshots
@return {Promise} promise
*/
findMany: function(store, type, ids, snapshots) {
findMany(store, type, ids, snapshots) {
var url = this.buildURL(type.modelName, ids, snapshots, 'findMany');
return this.ajax(url, 'GET', { data: { filter: { id: ids.join(',') } } });
},
Expand All @@ -106,7 +106,7 @@ export default RESTAdapter.extend({
@param {String} modelName
@return {String} path
**/
pathForType: function(modelName) {
pathForType(modelName) {
var dasherized = Ember.String.dasherize(modelName);
return Ember.String.pluralize(dasherized);
},
Expand All @@ -119,7 +119,7 @@ export default RESTAdapter.extend({
@param {DS.Snapshot} snapshot
@return {Promise} promise
*/
updateRecord: function(store, type, snapshot) {
updateRecord(store, type, snapshot) {
var data = {};
var serializer = store.serializerFor(type.modelName);

Expand Down
42 changes: 21 additions & 21 deletions addon/adapters/rest-adapter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ export default Adapter.extend(BuildURLMixin, {
@param {Object} obj
@return {Object}
*/
sortQueryParams: function(obj) {
sortQueryParams(obj) {
var keys = Object.keys(obj);
var len = keys.length;
if (len < 2) {
Expand Down Expand Up @@ -370,7 +370,7 @@ export default Adapter.extend(BuildURLMixin, {
@param {DS.Snapshot} snapshot
@return {Promise} promise
*/
findRecord: function(store, type, id, snapshot) {
findRecord(store, type, id, snapshot) {
return this.ajax(this.buildURL(type.modelName, id, snapshot, 'findRecord'), 'GET');
},

Expand All @@ -388,7 +388,7 @@ export default Adapter.extend(BuildURLMixin, {
@param {DS.SnapshotRecordArray} snapshotRecordArray
@return {Promise} promise
*/
findAll: function(store, type, sinceToken, snapshotRecordArray) {
findAll(store, type, sinceToken, snapshotRecordArray) {
var query, url;

if (sinceToken) {
Expand Down Expand Up @@ -417,7 +417,7 @@ export default Adapter.extend(BuildURLMixin, {
@param {Object} query
@return {Promise} promise
*/
query: function(store, type, query) {
query(store, type, query) {
var url = this.buildURL(type.modelName, null, null, 'query', query);

if (this.sortQueryParams) {
Expand All @@ -444,7 +444,7 @@ export default Adapter.extend(BuildURLMixin, {
@param {Object} query
@return {Promise} promise
*/
queryRecord: function(store, type, query) {
queryRecord(store, type, query) {
var url = this.buildURL(type.modelName, null, null, 'queryRecord', query);

if (this.sortQueryParams) {
Expand Down Expand Up @@ -487,7 +487,7 @@ export default Adapter.extend(BuildURLMixin, {
@param {Array} snapshots
@return {Promise} promise
*/
findMany: function(store, type, ids, snapshots) {
findMany(store, type, ids, snapshots) {
var url = this.buildURL(type.modelName, ids, snapshots, 'findMany');
return this.ajax(url, 'GET', { data: { ids: ids } });
},
Expand Down Expand Up @@ -519,7 +519,7 @@ export default Adapter.extend(BuildURLMixin, {
@param {String} url
@return {Promise} promise
*/
findHasMany: function(store, snapshot, url, relationship) {
findHasMany(store, snapshot, url, relationship) {
var id = snapshot.id;
var type = snapshot.modelName;

Expand Down Expand Up @@ -555,7 +555,7 @@ export default Adapter.extend(BuildURLMixin, {
@param {String} url
@return {Promise} promise
*/
findBelongsTo: function(store, snapshot, url, relationship) {
findBelongsTo(store, snapshot, url, relationship) {
var id = snapshot.id;
var type = snapshot.modelName;

Expand All @@ -579,7 +579,7 @@ export default Adapter.extend(BuildURLMixin, {
@param {DS.Snapshot} snapshot
@return {Promise} promise
*/
createRecord: function(store, type, snapshot) {
createRecord(store, type, snapshot) {
var data = {};
var serializer = store.serializerFor(type.modelName);
var url = this.buildURL(type.modelName, null, snapshot, 'createRecord');
Expand All @@ -605,7 +605,7 @@ export default Adapter.extend(BuildURLMixin, {
@param {DS.Snapshot} snapshot
@return {Promise} promise
*/
updateRecord: function(store, type, snapshot) {
updateRecord(store, type, snapshot) {
var data = {};
var serializer = store.serializerFor(type.modelName);

Expand All @@ -628,13 +628,13 @@ export default Adapter.extend(BuildURLMixin, {
@param {DS.Snapshot} snapshot
@return {Promise} promise
*/
deleteRecord: function(store, type, snapshot) {
deleteRecord(store, type, snapshot) {
var id = snapshot.id;

return this.ajax(this.buildURL(type.modelName, id, snapshot, 'deleteRecord'), "DELETE");
},

_stripIDFromURL: function(store, snapshot) {
_stripIDFromURL(store, snapshot) {
var url = this.buildURL(snapshot.modelName, snapshot.id, snapshot);

var expandedURL = url.split('/');
Expand Down Expand Up @@ -676,8 +676,8 @@ export default Adapter.extend(BuildURLMixin, {
@return {Array} an array of arrays of records, each of which is to be
loaded separately by `findMany`.
*/
groupRecordsForFindMany: function (store, snapshots) {
var groups = MapWithDefault.create({ defaultValue: function() { return []; } });
groupRecordsForFindMany(store, snapshots) {
var groups = MapWithDefault.create({ defaultValue() { return []; } });
var adapter = this;
var maxURLLength = this.maxURLLength;

Expand Down Expand Up @@ -745,7 +745,7 @@ export default Adapter.extend(BuildURLMixin, {
@param {Object} payload
@return {Object | DS.AdapterError} response
*/
handleResponse: function(status, headers, payload) {
handleResponse(status, headers, payload) {
if (this.isSuccess(status, headers, payload)) {
return payload;
} else if (this.isInvalid(status, headers, payload)) {
Expand All @@ -767,7 +767,7 @@ export default Adapter.extend(BuildURLMixin, {
@param {Object} payload
@return {Boolean}
*/
isSuccess: function(status, headers, payload) {
isSuccess(status, headers, payload) {
return status >= 200 && status < 300 || status === 304;
},

Expand All @@ -781,7 +781,7 @@ export default Adapter.extend(BuildURLMixin, {
@param {Object} payload
@return {Boolean}
*/
isInvalid: function(status, headers, payload) {
isInvalid(status, headers, payload) {
return status === 422;
},

Expand Down Expand Up @@ -809,7 +809,7 @@ export default Adapter.extend(BuildURLMixin, {
@param {Object} options
@return {Promise} promise
*/
ajax: function(url, type, options) {
ajax(url, type, options) {
var adapter = this;

return new Ember.RSVP.Promise(function(resolve, reject) {
Expand Down Expand Up @@ -864,7 +864,7 @@ export default Adapter.extend(BuildURLMixin, {
@param {Object} options
@return {Object}
*/
ajaxOptions: function(url, type, options) {
ajaxOptions(url, type, options) {
var hash = options || {};
hash.url = url;
hash.type = type;
Expand Down Expand Up @@ -892,7 +892,7 @@ export default Adapter.extend(BuildURLMixin, {
@param {String} responseText
@return {Object}
*/
parseErrorResponse: function(responseText) {
parseErrorResponse(responseText) {
var json = responseText;

try {
Expand All @@ -910,7 +910,7 @@ export default Adapter.extend(BuildURLMixin, {
@param {Object} payload
@return {Object} errors payload
*/
normalizeErrorResponse: function(status, headers, payload) {
normalizeErrorResponse(status, headers, payload) {
if (payload && typeof payload === 'object' && payload.errors) {
return payload.errors;
} else {
Expand Down
Loading

0 comments on commit 7bef33d

Please sign in to comment.