Shorter names for convenience methods!

And backwards-compatible with 3.x. Renamed:

    d3.requestCsv ↦ d3.csv
    d3.requestHtml ↦ d3.html
    d3.requestJson ↦ d3.json
    d3.requestText ↦ d3.text
    d3.requestTsv ↦ d3.tsv
    d3.requestXml ↦ d3.xml

See d3/d3-dsv#14.

Author: mbostock

README.md

@@ -3,7 +3,7 @@
 This module provides a convenient alternative to XMLHttpRequest. For example, to load a text file:
 
 ```js
-d3.requestText("/path/to/file.txt", function(error, text) {
+d3.text("/path/to/file.txt", function(error, text) {
   if (error) throw error;
   console.log(text); // Hello, world!
 });
@@ -12,7 +12,7 @@ d3.requestText("/path/to/file.txt", function(error, text) {
 To load and parse a CSV file:
 
 ```js
-d3.requestCsv("/path/to/file.csv", function(error, data) {
+d3.csv("/path/to/file.csv", function(error, data) {
   if (error) throw error;
   console.log(data); // [{"Hello": "world"}, …]
 });
@@ -26,7 +26,7 @@ d3.request("/path/to/resource")
     .post("a=2&b=3", callback);
 ```
 
-This module has built-in support for parsing [JSON](#requestJson), [XML](#requestXml), [CSV](#requestCsv) and [TSV](#requestTsv). You can parse additional formats by using [request](#request) or [requestText](#requestText) directly.
+This module has built-in support for parsing [JSON](#json), [XML](#xml), [CSV](#csv) and [TSV](#tsv). You can parse additional formats by using [request](#request) or [text](#text) directly.
 
 ## Installing
 
@@ -35,8 +35,8 @@ If you use NPM, `npm install d3-request`. Otherwise, download the [latest releas
 ```html
 <script src="https://d3js.org/d3-collection.v0.1.min.js"></script>
 <script src="https://d3js.org/d3-dispatch.v0.2.min.js"></script>
-<script src="https://d3js.org/d3-dsv.v0.1.min.js"></script>
-<script src="https://d3js.org/d3-request.v0.3.min.js"></script>
+<script src="https://d3js.org/d3-dsv.v0.2.min.js"></script>
+<script src="https://d3js.org/d3-request.v0.4.min.js"></script>
 ```
 
 In a vanilla environment, a `d3_request` global is exported.
@@ -88,7 +88,7 @@ If *type* is specified, sets the [response type](http://www.w3.org/TR/XMLHttpReq
 
 <a name="request_response" href="#request_response">#</a> <i>request</i>.<b>response</b>(<i>value</i>)
 
-Sets the response value function to the specified function and returns this request instance. The response value function is used to map the response XMLHttpRequest object to a useful data value. See the convenience methods [requestJson](#requestJson) and [requestText](#requestText) for examples.
+Sets the response value function to the specified function and returns this request instance. The response value function is used to map the response XMLHttpRequest object to a useful data value. See the convenience methods [json](#json) and [text](#text) for examples.
 
 <a name="request_get" href="#request_get">#</a> <i>request</i>.<b>get</b>([<i>callback</i>])
 
@@ -136,7 +136,7 @@ The type must be one of the following:
 
 To register multiple listeners for the same *type*, the type may be followed by an optional name, such as `"load.foo"` and `"load.bar"`. See [d3-dispatch](https://github.com/d3/d3-dispatch) for details.
 
-<a name="requestCsv" href="#requestCsv">#</a> d3.<b>requestCsv</b>(<i>url</i>[, <i>row</i>][, <i>callback</i>])
+<a name="csv" href="#csv">#</a> d3.<b>csv</b>(<i>url</i>[, <i>row</i>][, <i>callback</i>])
 
 Creates a request for the [CSV](https://github.com/d3/d3-dsv#csv) file at the specified *url* with the default mime type `"text/csv"`. An optional *row* conversion function may be specified to map and filter row objects to a more-specific representation; see [*dsv*.parse](https://github.com/d3/d3-dsv#dsv_parse) for details. For example:
 
@@ -154,13 +154,13 @@ function row(d) {
 The *row* conversion function can be changed by calling *request*.row on the returned instance. For example, this:
 
 ```js
-d3.requestCsv(url, row, callback);
+d3.csv(url, row, callback);
 ```
 
 Is equivalent to this:
 
 ```js
-d3.requestCsv(url)
+d3.csv(url)
     .row(row)
     .get(callback);
 ```
@@ -174,7 +174,7 @@ d3.request(url)
     .get(callback);
 ```
 
-<a name="requestHtml" href="#requestHtml">#</a> d3.<b>requestHtml</b>(<i>url</i>[, <i>callback</i>])
+<a name="html" href="#html">#</a> d3.<b>html</b>(<i>url</i>[, <i>callback</i>])
 
 Creates a request for the HTML file at the specified *url* with the default mime type "text/html". The HTML file is returned as a [document fragment](https://developer.mozilla.org/en-US/docs/DOM/range.createContextualFragment).
 
@@ -187,7 +187,7 @@ d3.request(url)
     .get(callback);
 ```
 
-<a name="requestJson" href="#requestJson">#</a> d3.<b>requestJson</b>(<i>url</i>[, <i>callback</i>])
+<a name="json" href="#json">#</a> d3.<b>json</b>(<i>url</i>[, <i>callback</i>])
 
 Creates a request for the [JSON](http://json.org) file at the specified *url* with the default mime type `"application/json"`.
 
@@ -200,7 +200,7 @@ d3.request(url)
     .get(callback);
 ```
 
-<a name="requestText" href="#requestText">#</a> d3.<b>requestText</b>(<i>url</i>[, <i>callback</i>])
+<a name="text" href="#text">#</a> d3.<b>text</b>(<i>url</i>[, <i>callback</i>])
 
 Creates a request for the text file at the specified *url* with the default mime type `"text/plain"`.
 
@@ -213,7 +213,7 @@ d3.request(url)
     .get(callback);
 ```
 
-<a name="requestTsv" href="#requestTsv">#</a> d3.<b>requestTsv</b>(<i>url</i>[, <i>row</i>][, <i>callback</i>])
+<a name="tsv" href="#tsv">#</a> d3.<b>tsv</b>(<i>url</i>[, <i>row</i>][, <i>callback</i>])
 
 Creates a request for the [TSV](https://github.com/d3/d3-dsv#tsv) file at the specified *url* with the default mime type `"text/tab-separated-values"`. An optional *row* conversion function may be specified to map and filter row objects to a more-specific representation; see [*dsv*.parse](https://github.com/d3/d3-dsv#dsv_parse) for details. For example:
 
@@ -231,13 +231,13 @@ function row(d) {
 The *row* conversion function can be changed by calling *request*.row on the returned instance. For example, this:
 
 ```js
-d3.requestTsv(url, row, callback);
+d3.tsv(url, row, callback);
 ```
 
 Is equivalent to this:
 
 ```js
-d3.requestTsv(url)
+d3.tsv(url)
     .row(row)
     .get(callback);
 ```
@@ -251,7 +251,7 @@ d3.request(url)
     .get(callback);
 ```
 
-<a name="requestXml" href="#requestXml">#</a> d3.<b>requestXml</b>(<i>url</i>[, <i>callback</i>])
+<a name="xml" href="#xml">#</a> d3.<b>xml</b>(<i>url</i>[, <i>callback</i>])
 
 Creates a request for the XML file at the specified *url* with the default mime type `"application/xml"`.
 

index.js

@@ -1,7 +1,7 @@
 export {default as request} from "./src/request";
-export {default as requestHtml} from "./src/html";
-export {default as requestJson} from "./src/json";
-export {default as requestText} from "./src/text";
-export {default as requestXml} from "./src/xml";
-export {default as requestCsv} from "./src/csv";
-export {default as requestTsv} from "./src/tsv";
+export {default as html} from "./src/html";
+export {default as json} from "./src/json";
+export {default as text} from "./src/text";
+export {default as xml} from "./src/xml";
+export {default as csv} from "./src/csv";
+export {default as tsv} from "./src/tsv";

package.json

@@ -1,6 +1,6 @@
 {
   "name": "d3-request",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "A convenient alternative to XMLHttpRequest.",
   "keywords": [
     "d3",
@@ -24,12 +24,12 @@
     "pretest": "mkdir -p build && node -e 'process.stdout.write(\"var version = \\\"\" + require(\"./package.json\").version + \"\\\"; export * from \\\"../index\\\"; export {version};\");' > build/bundle.js && rollup -f umd -g d3-collection:d3_collection,d3-dispatch:d3_dispatch,d3-dsv:d3_dsv -n d3_request -o build/d3-request.js -- build/bundle.js",
     "test": "faucet `find test -name '*-test.js'` && eslint index.js src",
     "prepublish": "npm run test && uglifyjs build/d3-request.js -c -m -o build/d3-request.min.js && rm -f build/d3-request.zip && zip -j build/d3-request.zip -- LICENSE README.md build/d3-request.js build/d3-request.min.js",
-    "postpublish": "VERSION=`node -e 'console.log(require(\"./package.json\").version)'`; git push && git tag -am \"Release $VERSION.\" v${VERSION} && git push --tags && cp build/d3-request.js ../d3.github.com/d3-request.v0.3.js && cp build/d3-request.min.js ../d3.github.com/d3-request.v0.3.min.js && cd ../d3.github.com && git add d3-request.v0.3.js d3-request.v0.3.min.js && git commit -m \"d3-request ${VERSION}\" && git push"
+    "postpublish": "VERSION=`node -e 'console.log(require(\"./package.json\").version)'`; git push && git tag -am \"Release $VERSION.\" v${VERSION} && git push --tags && cp build/d3-request.js ../d3.github.com/d3-request.v0.4.js && cp build/d3-request.min.js ../d3.github.com/d3-request.v0.4.min.js && cd ../d3.github.com && git add d3-request.v0.4.js d3-request.v0.4.min.js && git commit -m \"d3-request ${VERSION}\" && git push"
   },
   "dependencies": {
     "d3-collection": "~0.1.1",
     "d3-dispatch": "~0.2.6",
-    "d3-dsv": "~0.1.14"
+    "d3-dsv": "~0.2.0"
   },
   "devDependencies": {
     "faucet": "0.0",

src/csv.js

@@ -1,4 +1,4 @@
-import {csv} from "d3-dsv";
-import requestDsv from "./requestDsv";
+import {csvParse} from "d3-dsv";
+import dsv from "./dsv";
 
-export default requestDsv("text/csv", csv);
+export default dsv("text/csv", csvParse);

src/requestDsv.js src/dsv.js

@@ -1,17 +1,17 @@
 import request from "./request";
 
-export default function(defaultMimeType, dsv) {
+export default function(defaultMimeType, parse) {
   return function(url, row, callback) {
     if (arguments.length < 3) callback = row, row = null;
     var r = request(url).mimeType(defaultMimeType);
-    r.row = function(_) { return arguments.length ? r.response(responseOf(dsv, row = _)) : row; };
+    r.row = function(_) { return arguments.length ? r.response(responseOf(parse, row = _)) : row; };
     r.row(row);
     return callback ? r.get(callback) : r;
   };
 }
 
-function responseOf(dsv, row) {
+function responseOf(parse, row) {
   return function(request) {
-    return dsv.parse(request.responseText, row);
+    return parse(request.responseText, row);
   };
 }

src/html.js

@@ -1,5 +1,5 @@
-import requestType from "./requestType";
+import type from "./type";
 
-export default requestType("text/html", function(xhr) {
+export default type("text/html", function(xhr) {
   return document.createRange().createContextualFragment(xhr.responseText);
 });

src/json.js

@@ -1,5 +1,5 @@
-import requestType from "./requestType";
+import type from "./type";
 
-export default requestType("application/json", function(xhr) {
+export default type("application/json", function(xhr) {
   return JSON.parse(xhr.responseText);
 });

src/text.js

@@ -1,5 +1,5 @@
-import requestType from "./requestType";
+import type from "./type";
 
-export default requestType("text/plain", function(xhr) {
+export default type("text/plain", function(xhr) {
   return xhr.responseText;
 });

src/tsv.js

@@ -1,4 +1,4 @@
-import {tsv} from "d3-dsv";
-import requestDsv from "./requestDsv";
+import {tsvParse} from "d3-dsv";
+import dsv from "./dsv";
 
-export default requestDsv("text/tab-separated-values", tsv);
+export default dsv("text/tab-separated-values", tsvParse);

src/requestType.js src/type.js

@@ -1,6 +1,6 @@
-import requestType from "./requestType";
+import type from "./type";
 
-export default requestType("application/xml", function(xhr) {
+export default type("application/xml", function(xhr) {
   var xml = xhr.responseXML;
   if (!xml) throw new Error("parse error");
   return xml;

src/xml.js

@@ -4,8 +4,8 @@ var tape = require("tape"),
 
 require("./XMLHttpRequest");
 
-tape("requestCsv(url, callback) makes an asynchronous GET request for a CSV file", function(test) {
-  request.requestCsv("test/data/sample.csv", function(error, data) {
+tape("csv(url, callback) makes an asynchronous GET request for a CSV file", function(test) {
+  request.csv("test/data/sample.csv", function(error, data) {
     if (error) throw error;
     test.equal(XMLHttpRequest._last._info.url, "test/data/sample.csv");
     test.equal(XMLHttpRequest._last._info.method, "GET");
@@ -16,8 +16,8 @@ tape("requestCsv(url, callback) makes an asynchronous GET request for a CSV file
   });
 });
 
-tape("requestCsv(url, callback) is an alias csv(url).get(callback)", function(test) {
-  request.requestCsv("test/data/sample.csv").get(function(error, data) {
+tape("csv(url, callback) is an alias csv(url).get(callback)", function(test) {
+  request.csv("test/data/sample.csv").get(function(error, data) {
     if (error) throw error;
     test.equal(XMLHttpRequest._last._info.url, "test/data/sample.csv");
     test.equal(XMLHttpRequest._last._info.method, "GET");
@@ -28,24 +28,24 @@ tape("requestCsv(url, callback) is an alias csv(url).get(callback)", function(te
   });
 });
 
-tape("requestCsv(url, row, callback) observes the specified row conversion function", function(test) {
-  request.requestCsv("test/data/sample.csv", function(d) { d.Hello = -d.Hello; return d; }, function(error, data) {
+tape("csv(url, row, callback) observes the specified row conversion function", function(test) {
+  request.csv("test/data/sample.csv", function(d) { d.Hello = -d.Hello; return d; }, function(error, data) {
     if (error) throw error;
     test.deepEqual(data, table([{Hello: -42, World: "\"fish\""}], ["Hello", "World"]));
     test.end();
   });
 });
 
-tape("requestCsv(url, row, callback) is an alias for csv(url).row(row).get(callback)", function(test) {
-  request.requestCsv("test/data/sample.csv").row(function(d) { d.Hello = -d.Hello; return d; }).get(function(error, data) {
+tape("csv(url, row, callback) is an alias for csv(url).row(row).get(callback)", function(test) {
+  request.csv("test/data/sample.csv").row(function(d) { d.Hello = -d.Hello; return d; }).get(function(error, data) {
     if (error) throw error;
     test.deepEqual(data, table([{Hello: -42, World: "\"fish\""}], ["Hello", "World"]));
     test.end();
   });
 });
 
-tape("requestCsv(url).mimeType(type).get(callback) observes the specified mime type", function(test) {
-  request.requestCsv("test/data/sample.csv").mimeType("text/plain").get(function(error, data) {
+tape("csv(url).mimeType(type).get(callback) observes the specified mime type", function(test) {
+  request.csv("test/data/sample.csv").mimeType("text/plain").get(function(error, data) {
     if (error) throw error;
     test.deepEqual(data, table([{Hello: "42", World: "\"fish\""}], ["Hello", "World"]));
     test.equal(XMLHttpRequest._last._info.mimeType, "text/plain");

test/csv-test.js

@@ -3,8 +3,8 @@ var tape = require("tape"),
 
 require("./XMLHttpRequest");
 
-tape("requestJson(url, callback) makes an asynchronous GET request for a JSON file", function(test) {
-  request.requestJson("test/data/sample.json", function(error, json) {
+tape("json(url, callback) makes an asynchronous GET request for a JSON file", function(test) {
+  request.json("test/data/sample.json", function(error, json) {
     if (error) throw error;
     test.equal(XMLHttpRequest._last._info.url, "test/data/sample.json");
     test.equal(XMLHttpRequest._last._info.method, "GET");
@@ -17,15 +17,15 @@ tape("requestJson(url, callback) makes an asynchronous GET request for a JSON fi
   });
 });
 
-tape("requestJson(url, callback) returns an error when given invalid JSON", function(test) {
-  request.requestJson("test/data/sample.tsv", function(error, json) {
+tape("json(url, callback) returns an error when given invalid JSON", function(test) {
+  request.json("test/data/sample.tsv", function(error, json) {
     test.ok(error instanceof SyntaxError);
     test.end();
   });
 });
 
-tape("requestJson(url, callback) is an alias for json(url).get(callback)", function(test) {
-  request.requestJson("test/data/sample.json").get(function(error, json) {
+tape("json(url, callback) is an alias for json(url).get(callback)", function(test) {
+  request.json("test/data/sample.json").get(function(error, json) {
     if (error) throw error;
     test.equal(XMLHttpRequest._last._info.url, "test/data/sample.json");
     test.equal(XMLHttpRequest._last._info.method, "GET");
@@ -38,8 +38,8 @@ tape("requestJson(url, callback) is an alias for json(url).get(callback)", funct
   });
 });
 
-tape("requestJson(url).mimeType(type).get(callback) observes the specified mime type", function(test) {
-  request.requestJson("test/data/sample.json").mimeType("applicatin/json+test").get(function(error, json) {
+tape("json(url).mimeType(type).get(callback) observes the specified mime type", function(test) {
+  request.json("test/data/sample.json").mimeType("applicatin/json+test").get(function(error, json) {
     if (error) throw error;
     test.equal(XMLHttpRequest._last._info.mimeType, "applicatin/json+test");
     test.deepEqual(json, {message: "Hello, world!"});

test/json-test.js

@@ -3,8 +3,8 @@ var tape = require("tape"),
 
 require("./XMLHttpRequest");
 
-tape("requestText(url, callback) makes an asynchronous GET request for a plain text file", function(test) {
-  request.requestText("test/data/sample.txt", function(error, text) {
+tape("text(url, callback) makes an asynchronous GET request for a plain text file", function(test) {
+  request.text("test/data/sample.txt", function(error, text) {
     if (error) throw error;
     test.equal(XMLHttpRequest._last._info.url, "test/data/sample.txt");
     test.equal(XMLHttpRequest._last._info.method, "GET");
@@ -17,8 +17,8 @@ tape("requestText(url, callback) makes an asynchronous GET request for a plain t
   });
 });
 
-tape("requestText(url, callback) is an alias for text(url).get(callback)", function(test) {
-  request.requestText("test/data/sample.txt").get(function(error, text) {
+tape("text(url, callback) is an alias for text(url).get(callback)", function(test) {
+  request.text("test/data/sample.txt").get(function(error, text) {
     if (error) throw error;
     test.equal(XMLHttpRequest._last._info.url, "test/data/sample.txt");
     test.equal(XMLHttpRequest._last._info.method, "GET");
@@ -31,8 +31,8 @@ tape("requestText(url, callback) is an alias for text(url).get(callback)", funct
   });
 });
 
-tape("requestText(url).mimeType(type).get(callback) observes the specified mime type", function(test) {
-  request.requestText("test/data/sample.txt").mimeType("text/plain+special").get(function(error, text) {
+tape("text(url).mimeType(type).get(callback) observes the specified mime type", function(test) {
+  request.text("test/data/sample.txt").mimeType("text/plain+special").get(function(error, text) {
     if (error) throw error;
     test.equal(XMLHttpRequest._last._info.mimeType, "text/plain+special");
     test.equal(text, "Hello, world!\n");