Skip to content

Use word boundaries instead of nonword characters for matching url segments, and stop using method overides #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MichaelRFairhurst wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Use word boundaries instead of nonword characters for matching url segments, and stop using method overides #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8627d7
Use word boundaries instead of nonword characters for matching url se…
MichaelRFairhurst Oct 5, 2015
5c753ec
Don't use method override as not all servers support it out of the box
MichaelRFairhurst Oct 5, 2015
93d9b2a
Don't cache null keys
MichaelRFairhurst Oct 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions app/scripts/dabl/adapter/Adapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,20 @@ var Adapter = dabl.Class.extend({
if (!this._cache[table]) {
this._cache[table] = {};
}

var isEmptyKey = key === "" || key === 0 || key === null || typeof key === 'undefined' || isNaN(key);

if (arguments.length < 3) {
if (!this._cache[table][key]) {
if (isEmptyKey || !this._cache[table][key]) {
return null;
}
return this._cache[table][key];
}
this._cache[table][key] = value;

if(!isEmptyKey) {
this._cache[table][key] = value;
}

return this;
},

Expand Down Expand Up @@ -155,4 +162,4 @@ var Adapter = dabl.Class.extend({
}
});

dabl.Adapter = Adapter;
dabl.Adapter = Adapter;
15 changes: 4 additions & 11 deletions app/scripts/dabl/adapter/RESTAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ Route.prototype = {
val = typeof params[urlParam] !== 'undefined' || params.hasOwnProperty(urlParam) ? params[urlParam] : self.defaults[urlParam];
if (typeof val !== 'undefined' && val !== null) {
encodedVal = encodeUriSegment(val);
url = url.replace(new RegExp(":" + urlParam + "(\\W)", "g"), encodedVal + "$1");
url = url.replace(new RegExp(":" + urlParam + "(\\b)", "g"), encodedVal + "$1");
} else {
url = url.replace(new RegExp("(\/?):" + urlParam + "(\\W)", "g"), function(match, leadingSlashes, tail) {
url = url.replace(new RegExp("(\/?):" + urlParam + "(\\b)", "g"), function(match, leadingSlashes, tail) {
if (tail.charAt(0) === '/') {
return tail;
} else {
Expand Down Expand Up @@ -158,13 +158,10 @@ var RESTAdapter = dabl.Adapter.extend({

jQuery.ajax({
url: route.url(data),
type: 'POST',
type: method,
data: JSON.stringify(data),
contentType: 'application/json;charset=utf-8',
dataType: 'json',
headers: {
'X-HTTP-Method-Override': method
},
success: function(data, textStatus, jqXHR) {
if (!self._isValidResponseObject(data, model)) {
error(jqXHR, textStatus, 'Invalid response.');
Expand Down Expand Up @@ -226,13 +223,9 @@ var RESTAdapter = dabl.Adapter.extend({

jQuery.ajax({
url: route.url(instance.toJSON()),
type: 'POST',
data: {},
contentType: 'application/json;charset=utf-8',
dataType: 'json',
headers: {
'X-HTTP-Method-Override': 'DELETE'
},
method: 'DELETE',
success: function(data, textStatus, jqXHR) {
if (data && (data.error || (data.errors && data.errors.length))) {
error(jqXHR, textStatus, 'Invalid response.');
Expand Down
13 changes: 3 additions & 10 deletions app/scripts/dabl/adapter/RESTAdapterAngular.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,8 @@ angular.module('dabl', [])

$http({
url: route.url(data),
method: 'POST',
data: data,
headers: {
'X-HTTP-Method-Override': method
}
method: method,
data: data
})
.success(function(data, status, headers, config) {
if (!self._isValidResponseObject(data, model)) {
Expand Down Expand Up @@ -100,11 +97,7 @@ angular.module('dabl', [])

$http({
url: route.url(instance.toJSON()),
method: 'POST',
data: {},
headers: {
'X-HTTP-Method-Override': 'DELETE'
}
method: 'DELETE'
})
.success(function(data, status, headers, config) {
if (data && (data.error || (data.errors && data.errors.length))) {
Expand Down
2 changes: 1 addition & 1 deletion dist/scripts/dabl.adapter.rest.angular.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/scripts/dabl.adapter.rest.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading