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

rename ajaxt o xhr, expose jsonp

Browse source
This commit is contained in:
Leo Horie 2016-05-26 15:22:36 -04:00
parent 0ed3d20c4c
commit 41ac2bf002
7 changed files with 42 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
index.js
View file

@ -3,8 +3,10 @@
var m = require("./render/hyperscript") var m = require("./render/hyperscript")
var renderService = require("./render/render")(window) var renderService = require("./render/render")(window)
var redrawService = require("./api/pubsub")() var redrawService = require("./api/pubsub")()
var requestService = require("./request/request")(window, Promise)
m.request = require("./request/request")(window, Promise).ajax m.request = requestService.xhr
m.request = requestService.jsonp
m.route = require("./api/router")(window, renderService, redrawService) m.route = require("./api/router")(window, renderService, redrawService)
m.mount = require("./api/mount")(renderService, redrawService) m.mount = require("./api/mount")(renderService, redrawService)
m.trust = require("./render/trust") m.trust = require("./render/trust")

14
request/request.js
View file

@ -5,7 +5,7 @@ var buildQueryString = require("../querystring/build")
module.exports = function($window, Promise) { module.exports = function($window, Promise) {
var callbackCount = 0 var callbackCount = 0
function ajax(args) { function xhr(args) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
var useBody = args.useBody != null ? args.useBody : args.method !== "GET" && args.method !== "TRACE" var useBody = args.useBody != null ? args.useBody : args.method !== "GET" && args.method !== "TRACE"
@ -60,21 +60,21 @@ module.exports = function($window, Promise) {
function jsonp(args) { function jsonp(args) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
var callbackKey = "_mithril_" + Math.round(Math.random() * 1e16) + "_" + callbackCount++ var callbackName = args.callbackName || "_mithril_" + Math.round(Math.random() * 1e16) + "_" + callbackCount++
var script = $window.document.createElement("script") var script = $window.document.createElement("script")
$window[callbackKey] = function(data) { $window[callbackName] = function(data) {
script.parentNode.removeChild(script) script.parentNode.removeChild(script)
resolve(data) resolve(data)
$window[callbackKey] = undefined delete $window[callbackName]
} }
script.onerror = function() { script.onerror = function() {
script.parentNode.removeChild(script) script.parentNode.removeChild(script)
reject(new Error("JSONP request failed")) reject(new Error("JSONP request failed"))
$window[callbackKey] = undefined delete $window[callbackName]
} }
if (args.data == null) args.data = {} if (args.data == null) args.data = {}
args.url = interpolate(args.url, args.data) args.url = interpolate(args.url, args.data)
args.data[args.callbackKey || "callback"] = callbackKey args.data[args.callbackKey || "callback"] = callbackName
script.src = assemble(args.url, args.data) script.src = assemble(args.url, args.data)
$window.document.documentElement.appendChild(script) $window.document.documentElement.appendChild(script)
}) })
@ -110,5 +110,5 @@ module.exports = function($window, Promise) {
function extract(xhr) {return xhr.responseText} function extract(xhr) {return xhr.responseText}
return {ajax: ajax, jsonp: jsonp} return {xhr: xhr, jsonp: jsonp}
} }

2
request/tests/index.html
View file

@ -13,7 +13,7 @@
<script src="../../querystring/build.js"></script> <script src="../../querystring/build.js"></script>
<script src="../../request/request.js"></script> <script src="../../request/request.js"></script>
<script src="test-ajax.js"></script> <script src="test-xhr.js"></script>
<script src="test-jsonp.js"></script> <script src="test-jsonp.js"></script>
<script>require("../../ospec/ospec").run()</script> <script>require("../../ospec/ospec").run()</script>

4
request/tests/test-jsonp.js
View file

@ -1,14 +1,14 @@
"use strict" "use strict"
var o = require("../../ospec/ospec") var o = require("../../ospec/ospec")
var ajaxMock = require("../../test-utils/ajaxMock") var xhrMock = require("../../test-utils/xhrMock")
var Request = require("../../request/request") var Request = require("../../request/request")
var parseQueryString = require("../../querystring/parse") var parseQueryString = require("../../querystring/parse")
o.spec("jsonp", function() { o.spec("jsonp", function() {
var mock, jsonp var mock, jsonp
o.beforeEach(function() { o.beforeEach(function() {
mock = ajaxMock() mock = xhrMock()
jsonp = new Request(mock, Promise).jsonp jsonp = new Request(mock, Promise).jsonp
}) })

52
request/tests/test-ajax.js → request/tests/test-xhr.js
View file

@ -1,14 +1,14 @@
"use strict" "use strict"
var o = require("../../ospec/ospec") var o = require("../../ospec/ospec")
var ajaxMock = require("../../test-utils/ajaxMock") var xhrMock = require("../../test-utils/xhrMock")
var Request = require("../../request/request") var Request = require("../../request/request")
o.spec("ajax", function() { o.spec("xhr", function() {
var mock, ajax var mock, xhr
o.beforeEach(function() { o.beforeEach(function() {
mock = ajaxMock() mock = xhrMock()
ajax = new Request(mock, Promise).ajax xhr = new Request(mock, Promise).xhr
}) })
o.spec("success", function() { o.spec("success", function() {
@ -19,7 +19,7 @@ o.spec("ajax", function() {
return {status: 200, responseText: JSON.stringify({a: 1})} return {status: 200, responseText: JSON.stringify({a: 1})}
} }
}) })
ajax({method: "GET", url: "/item"}).then(function(data) { xhr({method: "GET", url: "/item"}).then(function(data) {
o(data).deepEquals({a: 1}) o(data).deepEquals({a: 1})
}).then(function() { }).then(function() {
done() done()
@ -31,7 +31,7 @@ o.spec("ajax", function() {
return {status: 200, responseText: JSON.stringify({a: 1})} return {status: 200, responseText: JSON.stringify({a: 1})}
} }
}) })
ajax({method: "GET", url: "/item"}).then(function(data) { xhr({method: "GET", url: "/item"}).then(function(data) {
o(data).deepEquals({a: 1}) o(data).deepEquals({a: 1})
}).then(done) }).then(done)
}) })
@ -41,7 +41,7 @@ o.spec("ajax", function() {
return {status: 200, responseText: JSON.stringify({a: request.query})} return {status: 200, responseText: JSON.stringify({a: request.query})}
} }
}) })
ajax({method: "GET", url: "/item", data: {x: "y"}}).then(function(data) { xhr({method: "GET", url: "/item", data: {x: "y"}}).then(function(data) {
o(data).deepEquals({a: "?x=y"}) o(data).deepEquals({a: "?x=y"})
}).then(done) }).then(done)
}) })
@ -51,7 +51,7 @@ o.spec("ajax", function() {
return {status: 200, responseText: JSON.stringify({a: JSON.parse(request.body)})} return {status: 200, responseText: JSON.stringify({a: JSON.parse(request.body)})}
} }
}) })
ajax({method: "POST", url: "/item", data: {x: "y"}}).then(function(data) { xhr({method: "POST", url: "/item", data: {x: "y"}}).then(function(data) {
o(data).deepEquals({a: {x: "y"}}) o(data).deepEquals({a: {x: "y"}})
}).then(done) }).then(done)
}) })
@ -61,7 +61,7 @@ o.spec("ajax", function() {
return {status: 200, responseText: JSON.stringify({a: request.query})} return {status: 200, responseText: JSON.stringify({a: request.query})}
} }
}) })
ajax({method: "GET", url: "/item", data: {x: ":y"}}).then(function(data) { xhr({method: "GET", url: "/item", data: {x: ":y"}}).then(function(data) {
o(data).deepEquals({a: "?x=%3Ay"}) o(data).deepEquals({a: "?x=%3Ay"})
}).then(done) }).then(done)
}) })
@ -71,7 +71,7 @@ o.spec("ajax", function() {
return {status: 200, responseText: JSON.stringify({a: JSON.parse(request.body)})} return {status: 200, responseText: JSON.stringify({a: JSON.parse(request.body)})}
} }
}) })
ajax({method: "POST", url: "/item", data: {x: ":y"}}).then(function(data) { xhr({method: "POST", url: "/item", data: {x: ":y"}}).then(function(data) {
o(data).deepEquals({a: {x: ":y"}}) o(data).deepEquals({a: {x: ":y"}})
}).then(done) }).then(done)
}) })
@ -81,7 +81,7 @@ o.spec("ajax", function() {
return {status: 200, responseText: JSON.stringify({a: request.url, b: request.query})} return {status: 200, responseText: JSON.stringify({a: request.url, b: request.query})}
} }
}) })
ajax({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: {}})
}).then(done) }).then(done)
}) })
@ -91,7 +91,7 @@ o.spec("ajax", function() {
return {status: 200, responseText: JSON.stringify({a: request.url, b: JSON.parse(request.body)})} return {status: 200, responseText: JSON.stringify({a: request.url, b: JSON.parse(request.body)})}
} }
}) })
ajax({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: {}})
}).then(done) }).then(done)
}) })
@ -101,7 +101,7 @@ o.spec("ajax", function() {
return {status: 200, responseText: JSON.stringify({a: request.url})} return {status: 200, responseText: JSON.stringify({a: request.url})}
} }
}) })
ajax({method: "GET", url: "/item/:x"}).then(function(data) { xhr({method: "GET", url: "/item/:x"}).then(function(data) {
o(data).deepEquals({a: "/item/:x"}) o(data).deepEquals({a: "/item/:x"})
}).then(done) }).then(done)
}) })
@ -111,7 +111,7 @@ o.spec("ajax", function() {
return {status: 200, responseText: JSON.stringify({a: request.url})} return {status: 200, responseText: JSON.stringify({a: request.url})}
} }
}) })
ajax({method: "GET", url: "/item/:x"}).then(function(data) { xhr({method: "GET", url: "/item/:x"}).then(function(data) {
o(data).deepEquals({a: "/item/:x"}) o(data).deepEquals({a: "/item/:x"})
}).then(done) }).then(done)
}) })
@ -125,7 +125,7 @@ o.spec("ajax", function() {
return {status: 200, responseText: JSON.stringify([{id: 1}, {id: 2}, {id: 3}])} return {status: 200, responseText: JSON.stringify([{id: 1}, {id: 2}, {id: 3}])}
} }
}) })
ajax({method: "GET", url: "/item", type: Entity}).then(function(data) { xhr({method: "GET", url: "/item", type: Entity}).then(function(data) {
o(data).deepEquals([{_id: 1}, {_id: 2}, {_id: 3}]) o(data).deepEquals([{_id: 1}, {_id: 2}, {_id: 3}])
}).then(done) }).then(done)
}) })
@ -139,7 +139,7 @@ o.spec("ajax", function() {
return {status: 200, responseText: JSON.stringify({id: 1})} return {status: 200, responseText: JSON.stringify({id: 1})}
} }
}) })
ajax({method: "GET", url: "/item", type: Entity}).then(function(data) { xhr({method: "GET", url: "/item", type: Entity}).then(function(data) {
o(data).deepEquals({_id: 1}) o(data).deepEquals({_id: 1})
}).then(done) }).then(done)
}) })
@ -153,7 +153,7 @@ o.spec("ajax", function() {
return {status: 200, responseText: JSON.stringify({body: request.query})} return {status: 200, responseText: JSON.stringify({body: request.query})}
} }
}) })
ajax({method: "GET", url: "/item", serialize: serialize, data: {id: 1}}).then(function(data) { xhr({method: "GET", url: "/item", serialize: serialize, data: {id: 1}}).then(function(data) {
o(data.body).equals("?id=1") o(data.body).equals("?id=1")
}).then(done) }).then(done)
}) })
@ -167,7 +167,7 @@ o.spec("ajax", function() {
return {status: 200, responseText: JSON.stringify({body: request.body})} return {status: 200, responseText: JSON.stringify({body: request.body})}
} }
}) })
ajax({method: "POST", url: "/item", serialize: serialize, data: {id: 1}}).then(function(data) { xhr({method: "POST", url: "/item", serialize: serialize, data: {id: 1}}).then(function(data) {
o(data.body).equals("id=1") o(data.body).equals("id=1")
}).then(done) }).then(done)
}) })
@ -181,7 +181,7 @@ o.spec("ajax", function() {
return {status: 200, responseText: JSON.stringify({test: 123})} return {status: 200, responseText: JSON.stringify({test: 123})}
} }
}) })
ajax({method: "GET", url: "/item", deserialize: deserialize}).then(function(data) { xhr({method: "GET", url: "/item", deserialize: deserialize}).then(function(data) {
o(data).equals("{\"test\":123}") o(data).equals("{\"test\":123}")
}).then(done) }).then(done)
}) })
@ -195,7 +195,7 @@ o.spec("ajax", function() {
return {status: 200, responseText: JSON.stringify({test: 123})} return {status: 200, responseText: JSON.stringify({test: 123})}
} }
}) })
ajax({method: "POST", url: "/item", deserialize: deserialize}).then(function(data) { xhr({method: "POST", url: "/item", deserialize: deserialize}).then(function(data) {
o(data).equals("{\"test\":123}") o(data).equals("{\"test\":123}")
}).then(done) }).then(done)
}) })
@ -209,7 +209,7 @@ o.spec("ajax", function() {
return {status: 200, responseText: ""} return {status: 200, responseText: ""}
} }
}) })
ajax({method: "GET", url: "/item", extract: extract}).then(function(data) { xhr({method: "GET", url: "/item", extract: extract}).then(function(data) {
o(data).deepEquals({test: 123}) o(data).deepEquals({test: 123})
}).then(done) }).then(done)
}) })
@ -223,7 +223,7 @@ o.spec("ajax", function() {
return {status: 200, responseText: ""} return {status: 200, responseText: ""}
} }
}) })
ajax({method: "POST", url: "/item", extract: extract}).then(function(data) { xhr({method: "POST", url: "/item", extract: extract}).then(function(data) {
o(data).deepEquals({test: 123}) o(data).deepEquals({test: 123})
}).then(done) }).then(done)
}) })
@ -233,7 +233,7 @@ o.spec("ajax", function() {
return {status: 200, responseText: ""} return {status: 200, responseText: ""}
} }
}) })
ajax({method: "POST", url: "/item", config: config}).then(done) xhr({method: "POST", url: "/item", config: config}).then(done)
function config(xhr) { function config(xhr) {
o(typeof xhr.setRequestHeader).equals("function") o(typeof xhr.setRequestHeader).equals("function")
@ -249,7 +249,7 @@ o.spec("ajax", function() {
return {status: 500, responseText: JSON.stringify({error: "error"})} return {status: 500, responseText: JSON.stringify({error: "error"})}
} }
}) })
ajax({method: "GET", url: "/item"}).catch(function(e) { xhr({method: "GET", url: "/item"}).catch(function(e) {
o(e.message).equals(JSON.stringify({error: "error"})) o(e.message).equals(JSON.stringify({error: "error"}))
}).then(done) }).then(done)
}) })
@ -259,7 +259,7 @@ o.spec("ajax", function() {
return {status: 500, responseText: "error"} return {status: 500, responseText: "error"}
} }
}) })
ajax({method: "GET", url: "/item"}).catch(function(e) { xhr({method: "GET", url: "/item"}).catch(function(e) {
o(e.message).equals("error") o(e.message).equals("error")
}).then(done) }).then(done)
}) })

6
test-utils/tests/test-ajaxMock.js → test-utils/tests/test-xhrMock.js
View file

@ -1,13 +1,13 @@
"use strict" "use strict"
var o = require("../../ospec/ospec") var o = require("../../ospec/ospec")
var ajaxMock = require("../../test-utils/ajaxMock") var xhrMock = require("../../test-utils/xhrMock")
var parseQueryString = require("../../querystring/parse") var parseQueryString = require("../../querystring/parse")
o.spec("ajaxMock", function() { o.spec("xhrMock", function() {
var $window, ajax var $window, ajax
o.beforeEach(function() { o.beforeEach(function() {
$window = ajaxMock() $window = xhrMock()
}) })
o.spec("xhr", function() { o.spec("xhr", function() {

0
test-utils/ajaxMock.js → test-utils/xhrMock.js
View file