fix(modules): fix duplicate warnings on controller and modules

Author: erwinmombay

src/modules/controllers.js

@@ -15,8 +15,14 @@ var nameToControllerMap = {};
 * log a message if the controller is instantiated on the window
 */
 angular.module('ngHintControllers', []).
-  config(['$provide', function ($provide) {
+  config(['$provide', '$controllerProvider', function ($provide, $controllerProvider) {
     $provide.decorator('$controller', ['$delegate', controllerDecorator]);
+
+    var originalRegister = $controllerProvider.register;
+    $controllerProvider.register = function(name, constructor) {
+      stringOrObjectRegister(name);
+      originalRegister.apply($controllerProvider, arguments);
+    }
   }]);
 
 function controllerDecorator($delegate) {
@@ -25,7 +31,10 @@ function controllerDecorator($delegate) {
       var match = ctrl.match(CNTRL_REG);
       var ctrlName = (match && match[1]) || ctrl;
 
-      sendMessageForControllerName(ctrlName);
+      if (!nameToControllerMap[ctrlName]) {
+        sendMessageForControllerName(ctrlName);
+      }
+
       if (!nameToControllerMap[ctrlName] && typeof window[ctrlName] === 'function') {
         sendMessageForGlobalController(ctrlName);
       }
@@ -41,6 +50,14 @@ function controllerDecorator($delegate) {
 */
 var originalModule = angular.module;
 
+function stringOrObjectRegister(controllerName) {
+  if ((controllerName !== null) && (typeof controllerName === 'object')) {
+    Object.keys(controllerName).forEach(processController);
+  } else {
+    processController(controllerName);
+  }
+}
+
 function processController(ctrlName) {
   nameToControllerMap[ctrlName] = true;
   sendMessageForControllerName(ctrlName);
@@ -98,11 +115,7 @@ angular.module = function() {
       originalController = module.controller;
 
   module.controller = function(controllerName, controllerConstructor) {
-    if ((controllerName !== null) && (typeof controllerName === 'object')) {
-      Object.keys(controllerName).forEach(processController);
-    } else {
-      processController(controllerName);
-    }
+    stringOrObjectRegister(controllerName);
     return originalController.apply(this, arguments);
   };
 

src/modules/modules.js

@@ -19,11 +19,13 @@ angular.module = function(name, requiresOriginal) {
 
   module.requiresOriginal = requiresOriginal;
   modules[name] = module;
-  hasNameSpace(name);
   var modToCheck = getModule(name, true);
   //check arguments to determine if called as setter or getter
   var modIsSetter = arguments.length > 1;
 
+  if (modIsSetter) {
+    hasNameSpace(name);
+  }
 
   if(modToCheck && modToCheck.requiresOriginal !== module.requiresOriginal && modIsSetter) {
     if(!modData.createdMulti[name]) {

test/controllers.spec.js

@@ -184,6 +184,20 @@ describe('controllerDecorator', function() {
         'Name controllers according to best practices');
   });
 
+  it('should only warn once about formatting of controller name', function() {
+    $controllerProvider.register('sampleController', function() {});
+    $controller('sampleController');
+    $controller('sampleController');
+    var formattingWarning = angular.hint.emit.calls.allArgs()
+      .filter(function(warningArray) {
+        return warningArray[0] === 'Controllers:rename' &&
+          warningArray[1] ===  'Consider renaming `sampleController`' +
+          ' to `SampleController`.' &&
+          warningArray[2] === SEVERITY_WARNING;
+      });
+    expect(formattingWarning.length).toBe(1);
+  });
+
 
   it('should not warn if a controller name begins with an uppercase letter', function(){
     $controllerProvider.register('SampleController', function() {});

test/hasNameSpace.spec.js

@@ -1,10 +1,32 @@
 var hasNameSpace = require('../src/modules/angular-hint-modules/hasNameSpace');
 var hintLog = angular.hint;
+var start = require('../src/modules/angular-hint-modules/start');
+
+var SEVERITY_SUGGESTION = 3;
 
 describe('hasNameSpace()', function() {
+  beforeEach(function() {
+    spyOn(hint, 'emit');
+  });
+
   it('should check that a module has a correctly formatted name', function() {
     expect(hasNameSpace('MyApp')).toBe(false);
     expect(hasNameSpace('myapp')).toBe(false);
     expect(hasNameSpace('myApp')).toBe(true);
   });
-});
+
+  it('should only warn once about incorrect formatting for a module', function() {
+    angular.module('MyApp', []);
+    angular.module('MyApp');
+    angular.module('MyApp');
+    start();
+    var formattingWarning = angular.hint.emit.calls.allArgs()
+      .filter(function(warningArray) {
+        return warningArray[0] === 'Modules' &&
+          warningArray[1] === 'The best practice for module names is' +
+          ' to use lowerCamelCase. Check the name of "MyApp".' &&
+          warningArray[2] === SEVERITY_SUGGESTION;
+      });
+    expect(formattingWarning.length).toBe(1);
+  });
+});