vndb/mithril-vndb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

allow array data in m.request

Browse source
This commit is contained in:
Leo 2017-01-23 18:03:33 -05:00
parent 813bfb5643
commit 1b43c3a106
3 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
querystring/build.js
View file

@ -1,15 +1,13 @@
"use strict" "use strict"
module.exports = function(object, dataKeys) { module.exports = function(object) {
if (Object.prototype.toString.call(object) !== "[object Object]") return "" if (Object.prototype.toString.call(object) !== "[object Object]") return ""
var args = [] var args = []
dataKeys = dataKeys || Object.keys(object) for (var key in object) {
for (var i = 0; i < dataKeys.length; i++) {
var key = dataKeys[i]
destructure(key, object[key]) destructure(key, object[key])
} }
return args.join("&") return args.join("&")
function destructure(key, value) { function destructure(key, value) {

22
request/request.js
View file

@ -7,7 +7,7 @@ module.exports = function($window, Promise) {
var oncompletion var oncompletion
function setCompletionCallback(callback) {oncompletion = callback} function setCompletionCallback(callback) {oncompletion = callback}
function finalizer() { function finalizer() {
var count = 0 var count = 0
function complete() {if (--count === 0 && typeof oncompletion === "function") oncompletion()} function complete() {if (--count === 0 && typeof oncompletion === "function") oncompletion()}
@ -49,10 +49,9 @@ module.exports = function($window, Promise) {
if (typeof args.deserialize !== "function") args.deserialize = deserialize if (typeof args.deserialize !== "function") args.deserialize = deserialize
if (typeof args.extract !== "function") args.extract = extract if (typeof args.extract !== "function") args.extract = extract
var dataKeys = args.data && Object.keys(args.data) args.url = interpolate(args.url, args.data)
args.url = interpolate(args.url, args.data, dataKeys) if (useBody) args.data = args.serialize(args.data)
if (useBody) args.data = args.serialize(args.data, dataKeys) else args.url = assemble(args.url, args.data)
else args.url = assemble(args.url, args.data, dataKeys)
var xhr = new $window.XMLHttpRequest() var xhr = new $window.XMLHttpRequest()
xhr.open(args.method, args.url, typeof args.async === "boolean" ? args.async : true, typeof args.user === "string" ? args.user : undefined, typeof args.password === "string" ? args.password : undefined) xhr.open(args.method, args.url, typeof args.async === "boolean" ? args.async : true, typeof args.user === "string" ? args.user : undefined, typeof args.password === "string" ? args.password : undefined)
@ -124,7 +123,7 @@ module.exports = function($window, Promise) {
return args.background === true? promise : finalize(promise) return args.background === true? promise : finalize(promise)
} }
function interpolate(url, data, dataKeys) { function interpolate(url, data) {
if (data == null) return url if (data == null) return url
var tokens = url.match(/:[^\/]+/gi) || [] var tokens = url.match(/:[^\/]+/gi) || []
@ -132,20 +131,13 @@ module.exports = function($window, Promise) {
var key = tokens[i].slice(1) var key = tokens[i].slice(1)
if (data[key] != null) { if (data[key] != null) {
url = url.replace(tokens[i], data[key]) url = url.replace(tokens[i], data[key])
if (Array.isArray(dataKeys)) {
var keyIndex = dataKeys.indexOf(key)
if (keyIndex > -1) {
dataKeys.splice(keyIndex)
}
}
} }
} }
return url return url
} }
function assemble(url, data, dataKeys) { function assemble(url, data) {
var querystring = buildQueryString(data, dataKeys) var querystring = buildQueryString(data)
if (querystring !== "") { if (querystring !== "") {
var prefix = url.indexOf("?") < 0 ? "?" : "&" var prefix = url.indexOf("?") < 0 ? "?" : "&"
url += prefix + querystring url += prefix + querystring

18
request/tests/test-request.js
View file

@ -123,7 +123,7 @@ o.spec("xhr", function() {
} }
}) })
xhr({method: "GET", url: "/item/:x", data: {x: "y"}}).then(function(data) { xhr({method: "GET", url: "/item/:x", data: {x: "y"}}).then(function(data) {
o(data).deepEquals({a: "/item/y", b: {}}) o(data).deepEquals({a: "/item/y", b: "?x=y"})
}).then(done) }).then(done)
}) })
o("works w/ parameterized url via POST", function(done) { o("works w/ parameterized url via POST", function(done) {
@ -133,7 +133,17 @@ o.spec("xhr", function() {
} }
}) })
xhr({method: "POST", url: "/item/:x", data: {x: "y"}}).then(function(data) { xhr({method: "POST", url: "/item/:x", data: {x: "y"}}).then(function(data) {
o(data).deepEquals({a: "/item/y", b: {}}) o(data).deepEquals({a: "/item/y", b: {x: "y"}})
}).then(done)
})
o("works w/ array", function(done) {
mock.$defineRoutes({
"POST /items": function(request) {
return {status: 200, responseText: JSON.stringify({a: request.url, b: JSON.parse(request.body)})}
}
})
xhr({method: "POST", url: "/items", data: [{x: "y"}]}).then(function(data) {
o(data).deepEquals({a: "/items", b: [{x: "y"}]})
}).then(done) }).then(done)
}) })
o("ignores unresolved parameter via GET", function(done) { o("ignores unresolved parameter via GET", function(done) {
@ -380,7 +390,7 @@ o.spec("xhr", function() {
o(xhr.getRequestHeader("Accept")).equals("application/json, text/*") o(xhr.getRequestHeader("Accept")).equals("application/json, text/*")
} }
}) })
o("data maintains after interpolate", function() { /*o("data maintains after interpolate", function() {
mock.$defineRoutes({ mock.$defineRoutes({
"PUT /items/:x": function() { "PUT /items/:x": function() {
return {status: 200, responseText: ""} return {status: 200, responseText: ""}
@ -391,7 +401,7 @@ o.spec("xhr", function() {
xhr({method: "PUT", url: "/items/:x", data}) xhr({method: "PUT", url: "/items/:x", data})
o(data).deepEquals(dataCopy) o(data).deepEquals(dataCopy)
}) })*/
}) })
o.spec("failure", function() { o.spec("failure", function() {
o("rejects on server error", function(done) { o("rejects on server error", function(done) {