refactor($route): pull $route and friends into angular-route.js

Gruntfile.js

@@ -55,7 +55,8 @@ module.exports = function(grunt) {
 
     autotest: {
       jqlite: 'karma-jqlite.conf.js',
-      jquery: 'karma-jquery.conf.js'
+      jquery: 'karma-jquery.conf.js',
+      modules: 'karma-modules.conf.js'
     },
 
 
@@ -104,13 +105,22 @@ module.exports = function(grunt) {
         src: util.wrap([
           'src/ngSanitize/sanitize.js',
           'src/ngSanitize/directive/ngBindHtml.js',
-          'src/ngSanitize/filter/linky.js',
+          'src/ngSanitize/filter/linky.js'
         ], 'module')
       },
       resource: {
         dest: 'build/angular-resource.js',
         src: util.wrap(['src/ngResource/resource.js'], 'module')
       },
+      route: {
+        dest: 'build/angular-route.js',
+        src: util.wrap([
+          'src/ngRoute/routeUtils.js',
+          'src/ngRoute/route.js',
+          'src/ngRoute/routeParams.js',
+          'src/ngRoute/directive/ngView.js'
+        ], 'module')
+      },
       cookies: {
         dest: 'build/angular-cookies.js',
         src: util.wrap(['src/ngCookies/cookies.js'], 'module')
@@ -136,6 +146,7 @@ module.exports = function(grunt) {
       loader: 'build/angular-loader.js',
       mobile: 'build/angular-mobile.js',
       resource: 'build/angular-resource.js',
+      route: 'build/angular-route.js',
       sanitize: 'build/angular-sanitize.js',
       bootstrap: 'build/docs/components/angular-bootstrap.js',
       bootstrapPrettify: 'build/docs/components/angular-bootstrap-prettify.js',

angularFiles.js

@@ -23,8 +23,6 @@ angularFiles = {
     'src/ng/log.js',
     'src/ng/parse.js',
     'src/ng/q.js',
-    'src/ng/route.js',
-    'src/ng/routeParams.js',
     'src/ng/rootScope.js',
     'src/ng/sniffer.js',
     'src/ng/window.js',
@@ -60,7 +58,6 @@ angularFiles = {
     'src/ng/directive/ngStyle.js',
     'src/ng/directive/ngSwitch.js',
     'src/ng/directive/ngTransclude.js',
-    'src/ng/directive/ngView.js',
     'src/ng/directive/script.js',
     'src/ng/directive/select.js',
     'src/ng/directive/style.js'
@@ -69,6 +66,10 @@ angularFiles = {
   'angularSrcModules': [
     'src/ngCookies/cookies.js',
     'src/ngResource/resource.js',
+    'src/ngRoute/routeUtils.js',
+    'src/ngRoute/route.js',
+    'src/ngRoute/routeParams.js',
+    'src/ngRoute/directive/ngView.js',
     'src/ngSanitize/sanitize.js',
     'src/ngSanitize/directive/ngBindHtml.js',
     'src/ngSanitize/filter/linky.js',
@@ -106,19 +107,14 @@ angularFiles = {
     'test/ngScenario/jstd-scenario-adapter/*.js',
     'test/*.js',
     'test/auto/*.js',
-    'test/ng/*.js',
-    'test/ng/directive/*.js',
-    'test/ng/filter/*.js',
+    'test/ng/**/*.js',
     'test/ngCookies/*.js',
     'test/ngResource/*.js',
-    'test/ngSanitize/*.js',
-    'test/ngSanitize/directive/*.js',
-    'test/ngSanitize/filter/*.js',
+    'test/ngRoute/**/*.js',
+    'test/ngSanitize/**/*.js',
     'test/ngMock/*.js',
-    'test/ngMobile/*.js',
-    'test/ngMobile/directive/*.js',
-    'docs/component-spec/bootstrap/*.js',
-    'docs/component-spec/*.js'
+    'test/ngMobile/**/*.js',
+    'docs/component-spec/**/*.js'
   ],
 
   'jstd': [
@@ -153,25 +149,15 @@ angularFiles = {
     'lib/jasmine/jasmine.js',
     'lib/jasmine-jstd-adapter/JasmineAdapter.js',
     'build/angular.js',
-    'src/ngMock/angular-mocks.js',
-    'src/ngCookies/cookies.js',
-    'src/ngResource/resource.js',
-    'src/ngMobile/mobile.js',
-    'src/ngMobile/swipe.js',
-    'src/ngMobile/directive/ngClick.js',
-    'src/ngMobile/directive/ngSwipe.js',
-    'src/ngSanitize/sanitize.js',
-    'src/ngSanitize/directive/ngBindHtml.js',
-    'src/ngSanitize/filter/linky.js',
+    '@angularSrcModules',
     'src/ngScenario/browserTrigger.js',
     'test/matchers.js',
     'test/testabilityPatch.js',
     'test/ngMock/*.js',
     'test/ngCookies/*.js',
+    'test/ngRoute/**/*.js',
     'test/ngResource/*.js',
-    'test/ngSanitize/*.js',
-    'test/ngSanitize/directive/*.js',
-    'test/ngSanitize/filter/*.js',
+    'test/ngSanitize/**/*.js',
     'test/ngMobile/**/*.js'
   ],
 

docs/components/bootstrap/bootstrap-prettify.js

@@ -6,6 +6,7 @@ var service = { value: {} };
 var DEPENDENCIES = {
   'angular.js': 'http://code.angularjs.org/' + angular.version.full + '/angular.min.js',
   'angular-resource.js': 'http://code.angularjs.org/' + angular.version.full + '/angular-resource.min.js',
+  'angular-route.js': 'http://code.angularjs.org/' + angular.version.full + '/angular-route.min.js',
   'angular-sanitize.js': 'http://code.angularjs.org/' + angular.version.full + '/angular-sanitize.min.js',
   'angular-cookies.js': 'http://code.angularjs.org/' + angular.version.full + '/angular-cookies.min.js'
 };

docs/content/cookbook/deeplinking.ngdoc

@@ -30,9 +30,9 @@ In this example we have a simple app which consist of two screens:
 * Welcome: url `welcome` Show the user contact information.
 * Settings: url `settings` Show an edit screen for user contact information.
 
-<example module="deepLinking" deps="angular-sanitize.js">
+<example module="deepLinking" deps="angular-route.js, angular-sanitize.js">
  <file name="script.js">
-   angular.module('deepLinking', ['ngSanitize'])
+   angular.module('deepLinking', ['ngRoute', 'ngSanitize'])
      .config(function($routeProvider) {
         $routeProvider.
           when("/welcome",  {templateUrl:'welcome.html',  controller:WelcomeCntl}).
@@ -141,11 +141,11 @@ In this example we have a simple app which consist of two screens:
 # Things to notice
 
 * Routes are defined in the `AppCntl` class. The initialization of the controller causes the
-  initialization of the {@link api/ng.$route $route} service with the proper URL
+  initialization of the {@link api/ngRoute.$route $route} service with the proper URL
   routes.
-* The  {@link api/ng.$route $route} service then watches the URL and instantiates the
+* The  {@link api/ngRoute.$route $route} service then watches the URL and instantiates the
   appropriate controller when the URL changes.
-* The  {@link api/ng.directive:ngView ngView} widget loads the
+* The  {@link api/ngRoute.directive:ngView ngView} widget loads the
   view when the URL changes. It also sets the view scope to the newly instantiated controller.
 * Changing the URL is sufficient to change the controller and view. It makes no difference whether
   the URL is changed programatically or by the user.

docs/content/guide/dev_guide.mvc.understanding_controller.ngdoc

@@ -84,7 +84,7 @@ instances).
 # Associating Controllers with Angular Scope Objects
 
 You can associate controllers with scope objects implicitly via the {@link api/ng.directive:ngController ngController
-directive} or {@link api/ng.$route $route service}.
+directive} or {@link api/ngRoute.$route $route service}.
 
 
 ## Controller Constructor and Methods Example

docs/content/guide/dev_guide.mvc.understanding_view.ngdoc

@@ -10,7 +10,7 @@ the DOM based on information in the template, controller and model.
 In the Angular implementation of MVC, the view has knowledge of both the model and the controller.
 The view knows about the model where two-way data-binding occurs. The view has knowledge of the
 controller through Angular directives, such as {@link api/ng.directive:ngController
-ngController} and {@link api/ng.directive:ngView ngView}, and through bindings of this form:
+ngController} and {@link api/ngRoute.directive:ngView ngView}, and through bindings of this form:
 `{{someControllerFunction()}}`. In these ways, the view can call functions in an associated
 controller function.
 

docs/content/guide/dev_guide.services.managing_dependencies.ngdoc

@@ -91,7 +91,7 @@ Things to notice in this example:
 * The `batchLog` service depends on the built-in {@link api/ng.$timeout $timeout} and
 {@link api/ng.$log $log} services, and allows messages to be logged into the
 `console.log` in batches.
-* The `routeTemplateMonitor` service depends on the built-in {@link api/ng.$route
+* The `routeTemplateMonitor` service depends on the built-in {@link api/ngRoute.$route
 $route} service as well as our custom `batchLog` service.
 * Both of our services use the factory function signature and array notation for inject annotations
 to declare their dependencies. It is important that the order of the string identifiers in the array

docs/content/guide/dev_guide.templates.ngdoc

@@ -41,8 +41,8 @@ with {@link expression expressions}:
 In a simple single-page app, the template consists of HTML, CSS, and angular directives contained
 in just one HTML file (usually `index.html`). In a more complex app, you can display multiple views
 within one main page using "partials", which are segments of template located in separate HTML
-files.  You "include" the partials in the main page using the {@link api/ng.$route
-$route} service in conjunction with the {@link api/ng.directive:ngView ngView} directive. An
+files.  You "include" the partials in the main page using the {@link api/ngRoute.$route
+$route} service in conjunction with the {@link api/ngRoute.directive:ngView ngView} directive. An
 example of this technique is shown in the {@link tutorial/ angular tutorial}, in steps seven and
 eight.
 

docs/content/guide/directive.ngdoc

@@ -250,7 +250,7 @@ In this example we will build a directive that displays the current time.
 
 # Writing directives (long version)
 
-There are different ways to declare a directive. The difference resides in the return 
+There are different ways to declare a directive. The difference resides in the return
 value of the factory function. You can either return a Directive Definition Object
 (see below) that defines the directive properties, or just the postLink function
 of such an object (all other properties will have the default values).
@@ -284,7 +284,7 @@ Here's an example directive declared with a Directive Definition Object:
 
 In most cases you will not need such fine control and so the above can be simplified. You can still
 return a Directive Definition Object, but only setting the 'compile' function property of the Object,
-and rely on the default values for other properties. 
+and rely on the default values for other properties.
 
 Therefore the above can be simplified as:
 
@@ -462,7 +462,7 @@ The compile function deals with transforming the template DOM. Since most direct
 template transformation, it is not used often. Examples that require compile functions are
 directives that transform template DOM, such as {@link
 api/ng.directive:ngRepeat ngRepeat}, or load the contents
-asynchronously, such as {@link api/ng.directive:ngView ngView}. The
+asynchronously, such as {@link api/ngRoute.directive:ngView ngView}. The
 compile function takes the following arguments.
 
   * `tElement` - template element - The element where the directive has been declared. It is

docs/src/ngdoc.js

@@ -145,7 +145,7 @@ Doc.prototype = {
             example.addSource(name, content);
           });
           content.replace(/<file\s+src="([^"]+)"(?:\s+tag="([^"]+)")?(?:\s+name="([^"]+)")?\s*\/?>/gmi, function(_, file, tag, name) {
-            if(fspath.existsSync(file)) {
+            if(fs.existsSync(file)) {
               var content = fs.readFileSync(file, 'utf8');
               if(content && content.length > 0) {
                 if(tag && tag.length > 0) {
@@ -160,7 +160,7 @@ Doc.prototype = {
           return placeholder(example.toHtml());
         }).
         replace(/(?:\*\s+)?<file.+?src="([^"]+)"(?:\s+tag="([^"]+)")?\s*\/?>/i, function(_, file, tag) {
-          if(fspath.existsSync(file)) {
+          if(fs.existsSync(file)) {
             var content = fs.readFileSync(file, 'utf8');
             if(tag && tag.length > 0) {
               content = extractInlineDocCode(content, tag);
@@ -361,7 +361,7 @@ Doc.prototype = {
 
   html_usage_parameters: function(dom) {
     var self = this;
-    var params = this.param ? this.param : []; 
+    var params = this.param ? this.param : [];
     if(params.length > 0) {
       dom.html('<h2 id="parameters">Parameters</h2>');
       dom.html('<table class="variables-matrix table table-bordered table-striped">');

docs/src/templates/index.html

@@ -38,6 +38,7 @@
       if (jQuery) addTag('script', {src: debug ? 'js/jquery.js' : 'js/jquery.min.js'});
       addTag('script', {src: path('angular.js')}, sync);
       addTag('script', {src: path('angular-resource.js') }, sync);
+      addTag('script', {src: path('angular-route.js') }, sync);
       addTag('script', {src: path('angular-cookies.js') }, sync);
       addTag('script', {src: path('angular-sanitize.js') }, sync);
       addTag('script', {src: path('angular-mobile.js') }, sync);

docs/src/templates/js/docs.js

@@ -679,7 +679,7 @@ docsApp.controller.DocsController = function($scope, $location, $window, $cookie
 };
 
 
-angular.module('docsApp', ['ngResource', 'ngCookies', 'ngSanitize', 'bootstrap', 'bootstrapPrettify']).
+angular.module('docsApp', ['ngResource', 'ngRoute', 'ngCookies', 'ngSanitize', 'bootstrap', 'bootstrapPrettify']).
   config(function($locationProvider) {
     $locationProvider.html5Mode(true).hashPrefix('!');
   }).

src/AngularPublic.js

@@ -95,7 +95,6 @@ function publishExternalAPI(angular){
             ngSwitchWhen: ngSwitchWhenDirective,
             ngSwitchDefault: ngSwitchDefaultDirective,
             ngOptions: ngOptionsDirective,
-            ngView: ngViewDirective,
             ngTransclude: ngTranscludeDirective,
             ngModel: ngModelDirective,
             ngList: ngListDirective,
@@ -122,8 +121,6 @@ function publishExternalAPI(angular){
         $location: $LocationProvider,
         $log: $LogProvider,
         $parse: $ParseProvider,
-        $route: $RouteProvider,
-        $routeParams: $RouteParamsProvider,
         $rootScope: $RootScopeProvider,
         $q: $QProvider,
         $sniffer: $SnifferProvider,