From 1b803fb2334f14044a4c57640883103729ae615b Mon Sep 17 00:00:00 2001 From: mzabriskie Date: Mon, 22 Sep 2014 11:12:24 -0600 Subject: [PATCH] Moving stuff to helpers/ --- lib/adapters/http.js | 4 ++-- lib/adapters/xhr.js | 10 +++++----- lib/axios.js | 3 +-- lib/{ => helpers}/buildUrl.js | 2 +- lib/{ => helpers}/cookies.js | 2 +- lib/{ => helpers}/parseHeaders.js | 2 +- lib/{ => helpers}/spread.js | 0 lib/{ => helpers}/transformData.js | 2 +- lib/{ => helpers}/urlIsSameOrigin.js | 2 +- test/unit/{ => helpers}/buildUrl.js | 2 +- test/unit/{ => helpers}/defaults.js | 2 +- test/unit/{ => helpers}/parseHeaders.js | 2 +- test/unit/{ => helpers}/spread.js | 2 +- test/unit/{ => helpers}/transformData.js | 2 +- 14 files changed, 18 insertions(+), 19 deletions(-) rename lib/{ => helpers}/buildUrl.js (96%) rename lib/{ => helpers}/cookies.js (95%) rename lib/{ => helpers}/parseHeaders.js (95%) rename lib/{ => helpers}/spread.js (100%) rename lib/{ => helpers}/transformData.js (93%) rename lib/{ => helpers}/urlIsSameOrigin.js (97%) rename test/unit/{ => helpers}/buildUrl.js (95%) rename test/unit/{ => helpers}/defaults.js (93%) rename test/unit/{ => helpers}/parseHeaders.js (88%) rename test/unit/{ => helpers}/spread.js (78%) rename test/unit/{ => helpers}/transformData.js (89%) diff --git a/lib/adapters/http.js b/lib/adapters/http.js index 4856722..40c6198 100644 --- a/lib/adapters/http.js +++ b/lib/adapters/http.js @@ -1,7 +1,7 @@ -var buildUrl = require('./../buildUrl'); var defaults = require('./../defaults'); -var transformData = require('./../transformData'); var utils = require('./../utils'); +var buildUrl = require('./../helpers/buildUrl'); +var transformData = require('./../helpers/transformData'); var http = require('http'); var https = require('https'); var url = require('url'); diff --git a/lib/adapters/xhr.js b/lib/adapters/xhr.js index 152b026..70a6e9f 100644 --- a/lib/adapters/xhr.js +++ b/lib/adapters/xhr.js @@ -1,10 +1,10 @@ -var buildUrl = require('./../buildUrl'); -var cookies = require('./../cookies'); var defaults = require('./../defaults'); -var parseHeaders = require('./../parseHeaders'); -var transformData = require('./../transformData'); -var urlIsSameOrigin = require('./../urlIsSameOrigin'); var utils = require('./../utils'); +var buildUrl = require('./../helpers/buildUrl'); +var cookies = require('./../helpers/cookies'); +var parseHeaders = require('./../helpers/parseHeaders'); +var transformData = require('./../helpers/transformData'); +var urlIsSameOrigin = require('./../helpers/urlIsSameOrigin'); module.exports = function xhrAdapter(resolve, reject, config) { // Transform request data diff --git a/lib/axios.js b/lib/axios.js index 72ebb04..9a4986d 100644 --- a/lib/axios.js +++ b/lib/axios.js @@ -1,7 +1,6 @@ var Promise = require('es6-promise').Promise; var defaults = require('./defaults'); var utils = require('./utils'); -var spread = require('./spread'); var axios = module.exports = function axios(config) { config = utils.merge({ @@ -55,7 +54,7 @@ axios.defaults = defaults; axios.all = function (promises) { return Promise.all(promises); }; -axios.spread = spread; +axios.spread = require('./helpers/spread'); // Provide aliases for supported request methods createShortMethods('delete', 'get', 'head'); diff --git a/lib/buildUrl.js b/lib/helpers/buildUrl.js similarity index 96% rename from lib/buildUrl.js rename to lib/helpers/buildUrl.js index a0fb530..97fdb69 100644 --- a/lib/buildUrl.js +++ b/lib/helpers/buildUrl.js @@ -1,6 +1,6 @@ 'use strict'; -var utils = require('./utils'); +var utils = require('./../utils'); function encode(val) { return encodeURIComponent(val). diff --git a/lib/cookies.js b/lib/helpers/cookies.js similarity index 95% rename from lib/cookies.js rename to lib/helpers/cookies.js index 7dd54ea..3c52ef3 100644 --- a/lib/cookies.js +++ b/lib/helpers/cookies.js @@ -1,6 +1,6 @@ 'use strict'; -var utils = require('./utils'); +var utils = require('./../utils'); module.exports = { write: function write(name, value, expires, path, domain, secure) { diff --git a/lib/parseHeaders.js b/lib/helpers/parseHeaders.js similarity index 95% rename from lib/parseHeaders.js rename to lib/helpers/parseHeaders.js index 0300571..e103634 100644 --- a/lib/parseHeaders.js +++ b/lib/helpers/parseHeaders.js @@ -1,6 +1,6 @@ 'use strict'; -var utils = require('./utils'); +var utils = require('./../utils'); /** * Parse headers into an object diff --git a/lib/spread.js b/lib/helpers/spread.js similarity index 100% rename from lib/spread.js rename to lib/helpers/spread.js diff --git a/lib/transformData.js b/lib/helpers/transformData.js similarity index 93% rename from lib/transformData.js rename to lib/helpers/transformData.js index 9ec0a1e..c764a87 100644 --- a/lib/transformData.js +++ b/lib/helpers/transformData.js @@ -1,6 +1,6 @@ 'use strict'; -var utils = require('./utils'); +var utils = require('./../utils'); /** * Transform the data for a request or a response diff --git a/lib/urlIsSameOrigin.js b/lib/helpers/urlIsSameOrigin.js similarity index 97% rename from lib/urlIsSameOrigin.js rename to lib/helpers/urlIsSameOrigin.js index 8eab6e0..22b573d 100644 --- a/lib/urlIsSameOrigin.js +++ b/lib/helpers/urlIsSameOrigin.js @@ -1,7 +1,7 @@ 'use strict'; var msie = /(msie|trident)/i.test(navigator.userAgent); -var utils = require('./utils'); +var utils = require('./../utils'); var urlParsingNode = document.createElement('a'); var originUrl = urlResolve(window.location.href); diff --git a/test/unit/buildUrl.js b/test/unit/helpers/buildUrl.js similarity index 95% rename from test/unit/buildUrl.js rename to test/unit/helpers/buildUrl.js index 7257ed3..a6f53f9 100644 --- a/test/unit/buildUrl.js +++ b/test/unit/helpers/buildUrl.js @@ -1,4 +1,4 @@ -var buildUrl = require('../../lib/buildUrl'); +var buildUrl = require('../../../lib/helpers/buildUrl'); module.exports = { testNullParams: function (test) { diff --git a/test/unit/defaults.js b/test/unit/helpers/defaults.js similarity index 93% rename from test/unit/defaults.js rename to test/unit/helpers/defaults.js index 017fb6d..df1ea84 100644 --- a/test/unit/defaults.js +++ b/test/unit/helpers/defaults.js @@ -1,4 +1,4 @@ -var defaults = require('../../lib/defaults'); +var defaults = require('../../../lib/defaults'); module.exports = { testTransformRequestJson: function (test) { diff --git a/test/unit/parseHeaders.js b/test/unit/helpers/parseHeaders.js similarity index 88% rename from test/unit/parseHeaders.js rename to test/unit/helpers/parseHeaders.js index c7c197f..0926a35 100644 --- a/test/unit/parseHeaders.js +++ b/test/unit/helpers/parseHeaders.js @@ -1,4 +1,4 @@ -var parseHeaders = require('../../lib/parseHeaders'); +var parseHeaders = require('../../../lib/helpers/parseHeaders'); module.exports = { testParse: function (test) { diff --git a/test/unit/spread.js b/test/unit/helpers/spread.js similarity index 78% rename from test/unit/spread.js rename to test/unit/helpers/spread.js index 656a207..ae93742 100644 --- a/test/unit/spread.js +++ b/test/unit/helpers/spread.js @@ -1,4 +1,4 @@ -var spread = require('../../lib/spread'); +var spread = require('../../../lib/helpers/spread'); module.exports = { testSpread: function (test) { diff --git a/test/unit/transformData.js b/test/unit/helpers/transformData.js similarity index 89% rename from test/unit/transformData.js rename to test/unit/helpers/transformData.js index 45149ee..d6febf2 100644 --- a/test/unit/transformData.js +++ b/test/unit/helpers/transformData.js @@ -1,4 +1,4 @@ -var transformData = require('../../lib/transformData'); +var transformData = require('../../../lib/helpers/transformData'); module.exports = { testSingleFunction: function (test) {