Rename all modules to be named consistently, under ui-router

Author: nateabele

README.md

@@ -65,10 +65,10 @@ To evolve the concept of an [angularjs](http://angularjs.org/) [***route***](htt
       <script src="angular-ui-router.min.js"></script> <!-- Insert after main angular.js file -->
 ```
 
-2. Set `ui.state` as a dependency in your module
+2. Set `ui.router` as a dependency in your module
 >
 ```javascript
-var myapp = angular.module('myapp', ['ui.state']) 
+var myapp = angular.module('myapp', ['ui.router'])
 ```
 
 ### Nested States & Views

sample/index.html

@@ -45,7 +45,7 @@
   }
 }
 
-angular.module('sample', ['ui.compat'])
+angular.module('sample', ['ui.router.compat'])
   .config(
     [        '$stateProvider', '$routeProvider', '$urlRouterProvider',
     function ($stateProvider,   $routeProvider,   $urlRouterProvider) {

src/common.js

@@ -78,7 +78,9 @@ function inheritParams(currentParams, newParams, $current, $to) {
   return extend({}, inherited, newParams);
 }
 
-angular.module('ui.util', ['ng']);
-angular.module('ui.router', ['ui.util']);
-angular.module('ui.state', ['ui.router', 'ui.util']);
-angular.module('ui.compat', ['ui.state']);
+angular.module('ui.router.util', ['ng']);
+angular.module('ui.router.router', ['ui.router.util']);
+angular.module('ui.router.state', ['ui.router.router', 'ui.router.util']);
+angular.module('ui.router', ['ui.router.state']);
+angular.module('ui.router.compat', ['ui.router']);
+

src/compat.js

@@ -79,6 +79,6 @@ function $RouteProvider(  $stateProvider,    $urlRouterProvider) {
   }
 }
 
-angular.module('ui.compat')
+angular.module('ui.router.compat')
   .provider('$route', $RouteProvider)
   .directive('ngView', $ViewDirective);

src/state.js

@@ -438,6 +438,6 @@ function $StateProvider(   $urlRouterProvider,   $urlMatcherFactory,           $
   }
 }
 
-angular.module('ui.state')
+angular.module('ui.router.state')
   .value('$stateParams', {})
   .provider('$state', $StateProvider);

src/stateDirectives.js

@@ -48,4 +48,4 @@ function $StateRefDirective($state) {
   };
 }
 
-angular.module('ui.state').directive('uiSref', $StateRefDirective);
+angular.module('ui.router.state').directive('uiSref', $StateRefDirective);

src/templateFactory.js

@@ -84,4 +84,4 @@ function $TemplateFactory(  $http,   $templateCache,   $injector) {
   };
 }
 
-angular.module('ui.util').service('$templateFactory', $TemplateFactory);
+angular.module('ui.router.util').service('$templateFactory', $TemplateFactory);

src/urlMatcherFactory.js

@@ -253,4 +253,4 @@ function $UrlMatcherFactory() {
 }
 
 // Register as a provider so it's available to other providers
-angular.module('ui.util').provider('$urlMatcherFactory', $UrlMatcherFactory);
+angular.module('ui.router.util').provider('$urlMatcherFactory', $UrlMatcherFactory);

src/urlRouter.js

@@ -114,4 +114,4 @@ function $UrlRouterProvider(  $urlMatcherFactory) {
     }];
 }
 
-angular.module('ui.router').provider('$urlRouter', $UrlRouterProvider);
+angular.module('ui.router.router').provider('$urlRouter', $UrlRouterProvider);

src/view.js

@@ -25,4 +25,4 @@ function $ViewProvider() {
   }
 }
 
-angular.module('ui.state').provider('$view', $ViewProvider);
+angular.module('ui.router.state').provider('$view', $ViewProvider);

src/viewDirective.js

@@ -114,4 +114,4 @@ function $ViewDirective(   $state,   $compile,   $controller,   $injector,   $an
   return directive;
 }
 
-angular.module('ui.state').directive('uiView', $ViewDirective);
+angular.module('ui.router.state').directive('uiView', $ViewDirective);

test/stateDirectivesSpec.js

@@ -2,7 +2,7 @@ describe('uiStateRef', function() {
 
   var el, scope, document;
 
-  beforeEach(module('ui.state'));
+  beforeEach(module('ui.router'));
 
   beforeEach(module(function($stateProvider) {
     $stateProvider.state('index', {

test/stateSpec.js

@@ -2,7 +2,7 @@ describe('state', function () {
 
   var locationProvider;
 
-  beforeEach(module('ui.state', function($locationProvider) {
+  beforeEach(module('ui.router', function($locationProvider) {
     locationProvider = $locationProvider;
     $locationProvider.html5Mode(false);
   }));

test/templateFactorySpec.js

@@ -1,6 +1,6 @@
 describe('templateFactory', function () {
 
-  beforeEach(module('ui.util'));
+  beforeEach(module('ui.router.util'));
 
   it('exists', inject(function ($templateFactory) {
     expect($templateFactory).toBeDefined();

test/testUtils.js

@@ -71,4 +71,4 @@ function resolvedError(promise) {
 // Utils for test from core angular
 var noop = angular.noop,
     toJson = angular.toJson;
-beforeEach(module('ui.compat'));
+beforeEach(module('ui.router.compat'));

test/urlMatcherFactorySpec.js

@@ -99,7 +99,7 @@ describe("urlMatcherFactory", function () {
 
   var $umf;
 
-  beforeEach(module('ui.util'));
+  beforeEach(module('ui.router.util'));
   beforeEach(inject(function($urlMatcherFactory) {
     $umf = $urlMatcherFactory;
   }));

test/urlRouterSpec.js

@@ -3,7 +3,7 @@ describe("UrlRouter", function () {
   var $urp, $ur, location, match, scope;
 
   beforeEach(function() {
-    angular.module('ui.router.test', function() {}).config(function ($urlRouterProvider) {
+    angular.module('ui.router.router.test', function() {}).config(function ($urlRouterProvider) {
       $urp = $urlRouterProvider;
 
       $urp.rule(function ($injector, $location) {
@@ -17,7 +17,7 @@ describe("UrlRouter", function () {
       });
     });
 
-    module('ui.router', 'ui.router.test');
+    module('ui.router.router', 'ui.router.router.test');
 
     inject(function($rootScope, $location, $injector) {
       scope = $rootScope.$new();

test/viewDirectiveSpec.js

@@ -6,7 +6,7 @@ describe('uiView', function () {
 
   var scope, $compile, elem;
 
-  beforeEach(module('ui.state'));
+  beforeEach(module('ui.router'));
 
   var aState = {
     template: 'aState template'