Keep utils in main modules folder

Author: mjackson

modules/Match.js

@@ -1,6 +1,6 @@
 /* jshint -W084 */
 
-var Path = require('./utils/Path');
+var PathUtils = require('./PathUtils');
 
 class Match {
 
@@ -34,16 +34,16 @@ function deepSearch(route, pathname, query) {
 
   // No child routes matched; try the default route.
   var defaultRoute = route.defaultRoute;
-  if (defaultRoute && (params = Path.extractParams(defaultRoute.path, pathname)))
+  if (defaultRoute && (params = PathUtils.extractParams(defaultRoute.path, pathname)))
     return new Match(pathname, params, query, [ route, defaultRoute ]);
 
   // Does the "not found" route match?
   var notFoundRoute = route.notFoundRoute;
-  if (notFoundRoute && (params = Path.extractParams(notFoundRoute.path, pathname)))
+  if (notFoundRoute && (params = PathUtils.extractParams(notFoundRoute.path, pathname)))
     return new Match(pathname, params, query, [ route, notFoundRoute ]);
 
   // Last attempt: check this route.
-  var params = Path.extractParams(route.path, pathname);
+  var params = PathUtils.extractParams(route.path, pathname);
   if (params)
     return new Match(pathname, params, query, [ route ]);
 
@@ -56,8 +56,8 @@ function deepSearch(route, pathname, query) {
  * succeeds, null if no match can be made.
  */
 Match.findMatchForPath = function (routes, path) {
-  var pathname = Path.withoutQuery(path);
-  var query = Path.extractQuery(path);
+  var pathname = PathUtils.withoutQuery(path);
+  var query = PathUtils.extractQuery(path);
   var match = null;
 
   for (var i = 0, len = routes.length; match == null && i < len; ++i)

modules/utils/Path.js renamed to modules/PathUtils.js

@@ -33,7 +33,7 @@ function compilePattern(pattern) {
   return _compiledPatterns[pattern];
 }
 
-var Path = {
+var PathUtils = {
 
   /**
    * Returns true if the given path is absolute.
@@ -141,19 +141,19 @@ var Path = {
    * query merged into the query string.
    */
   withQuery: function (path, query) {
-    var existingQuery = Path.extractQuery(path);
+    var existingQuery = PathUtils.extractQuery(path);
 
     if (existingQuery)
       query = query ? merge(existingQuery, query) : existingQuery;
 
     var queryString = qs.stringify(query, { indices: false });
 
     if (queryString)
-      return Path.withoutQuery(path) + '?' + queryString;
+      return PathUtils.withoutQuery(path) + '?' + queryString;
 
     return path;
   }
 
 };
 
-module.exports = Path;
+module.exports = PathUtils;

modules/Route.js

@@ -1,14 +1,14 @@
 var assign = require('react/lib/Object.assign');
 var invariant = require('react/lib/invariant');
 var warning = require('react/lib/warning');
-var Path = require('./utils/Path');
+var PathUtils = require('./PathUtils');
 
 class Route {
 
   constructor(name, path, ignoreScrollBehavior, isDefault, isNotFound, onEnter, onLeave, handler) {
     this.name = name;
     this.path = path;
-    this.paramNames = Path.extractParamNames(this.path);
+    this.paramNames = PathUtils.extractParamNames(this.path);
     this.ignoreScrollBehavior = !!ignoreScrollBehavior;
     this.isDefault = !!isDefault;
     this.isNotFound = !!isNotFound;
@@ -104,7 +104,7 @@ Route.createRoute = function (options, callback) {
   var path = options.path || name;
 
   if (path) {
-    if (Path.isAbsolute(path)) {
+    if (PathUtils.isAbsolute(path)) {
       if (parentRoute) {
         invariant(
           parentRoute.paramNames.length === 0,
@@ -114,7 +114,7 @@ Route.createRoute = function (options, callback) {
       }
     } else if (parentRoute) {
       // Relative paths extend their parent.
-      path = Path.join(parentRoute.path, path);
+      path = PathUtils.join(parentRoute.path, path);
     } else {
       path = '/' + path;
     }

modules/ScrollHistory.js

@@ -1,6 +1,6 @@
 var invariant = require('react/lib/invariant');
 var canUseDOM = require('react/lib/ExecutionEnvironment').canUseDOM;
-var getWindowScrollPosition = require('./utils/getWindowScrollPosition');
+var getWindowScrollPosition = require('./getWindowScrollPosition');
 
 function shouldUpdateScroll(state, prevState) {
   if (!prevState)

modules/StateContext.js

@@ -1,6 +1,6 @@
 var assign = require('react/lib/Object.assign');
 var PropTypes = require('./PropTypes');
-var Path = require('./utils/Path');
+var PathUtils = require('./PathUtils');
 
 function routeIsActive(activeRoutes, routeName) {
   return activeRoutes.some(function (route) {
@@ -68,7 +68,7 @@ var StateContext = {
    * Returns true if the given route, params, and query are active.
    */
   isActive: function (to, params, query) {
-    if (Path.isAbsolute(to))
+    if (PathUtils.isAbsolute(to))
       return to === this.state.path;
 
     return routeIsActive(this.state.routes, to) &&

modules/utils/TestHandlers.js renamed to modules/TestUtils.js

@@ -1,6 +1,6 @@
 var React = require('react');
-var RouteHandler = require('../components/RouteHandler');
-var State = require('../State');
+var RouteHandler = require('./components/RouteHandler');
+var State = require('./State');
 
 exports.Nested = React.createClass({
   render: function () {

modules/__tests__/History-test.js

@@ -1,6 +1,6 @@
 var expect = require('expect');
 var React = require('react');
-var { Foo, RedirectToFoo } = require('../utils/TestHandlers');
+var { Foo, RedirectToFoo } = require('../TestUtils');
 var TestLocation = require('../locations/TestLocation');
 var Route = require('../components/Route');
 var History = require('../History');