Fixed the bug where modules created by alt_angular always return undefined when retrieved using angular.module. alt_angular will now return the module during processQueue but undefined after processQueue completes. Added associated unit test. This closes #67

Author: Marcos Lin

src/angularAMD.js

@@ -10,6 +10,8 @@
 define(function () {
     var orig_angular,
         alt_angular,
+        alternateModules = {},
+        alternateModulesTracker = {},
         alternate_queue = [],
         app_name,
         app_injector,
@@ -36,13 +38,11 @@ define(function () {
      * object into the current ng-app.  As result, if there are subsequent call to retrieve the
      * module post processQueue, it would retrieve a module that is not integrated into the ng-app.
      * 
-     * Therefore, any subsequent angular.module call to retrieve the module created with alternate
-     * angular will return undefined.
-     * 
+     * Therefore, any subsequent to call to angular.module after processQueue should return undefined
+     * to prevent obtaining a duplicated object.  However, it is critical that angular.module return
+     * appropriate object *during* processQueue.
      */
     function setAlternateAngular() {
-        var alternateModules = {};
-        
         // This method cannot be called more than once
         if (alt_angular) {
             throw Error("setAlternateAngular can only be called once.");
@@ -58,11 +58,10 @@ define(function () {
 
         // Custom version of angular.module used as cache
         alt_angular.module = function (name, requires) {
-            
             if (typeof requires === "undefined") {
-                // Return undefined if module was created using the alt_angular
-                if (alternateModules.hasOwnProperty(name)) {
-                    return undefined;
+                // Return module from alternateModules if it was created using the alt_angular
+                if (alternateModulesTracker.hasOwnProperty(name)) {
+                    return alternateModules[name];
                 } else {
                     return orig_angular.module(name);
                 }
@@ -71,7 +70,16 @@ define(function () {
                 var orig_mod = orig_angular.module.apply(null, arguments),
                     item = { name: name, module: orig_mod};
                 alternate_queue.push(item);
+                
+                /*
+                Use `alternateModulesTracker` to track which module has been created by alt_angular
+                but use `alternateModules` to cache the module created.  This is to simplify the
+                removal of cached modules after .processQueue.
+                */
+                alternateModulesTracker[name] = true;
                 alternateModules[name] = orig_mod;
+                
+                // Return created module
                 return orig_mod;
             }
         };
@@ -81,7 +89,7 @@ define(function () {
 
 
     // Constructor
-    function angularAMD() {}
+    function angularAMD() {};
 
 
     /**
@@ -193,8 +201,11 @@ define(function () {
                 });
             }
 
-            // How to remove the module??? 
-            orig_angular.module(item.name, [], orig_angular.noop);
+            /*
+            Clear the cached modules created by alt_angular so that subsequent call to
+            angular.module will return undefined.
+            */
+            alternateModules = {};
         }
 
     };

test/unit/controller.spec.js

@@ -37,6 +37,11 @@ define(['controller', 'angularAMD'], function (app, angularAMD) {
             expect(s.name).toBe(service_results.service_name);
             expect(s.val_name).toBe(service_results.value_name);
         });
+        
+        it("scope.subModule check", function () {
+            // console.log("scope.subModule check", service_results.sub_module);
+            expect(scope.utest_sub_module()).toBe(service_results.sub_module);
+        });
 
     });
 });

test/unit/lib/controller.js

@@ -4,11 +4,12 @@
 define(['app','ngload!services'], function (app) {
     'use strict';
     var ctrl_name = "MainController";
-    app.controller(ctrl_name, ['$scope', 'UtestFactory', 'UtestService', function ($scope, UtestFactory, UtestService) {
+    app.controller(ctrl_name, function ($scope, UtestFactory, UtestService, UtestSubModule) {
         $scope.ctrl_name = ctrl_name;
         $scope.utest_factory = UtestFactory;
         $scope.utest_service = UtestService;
-    }]);
+        $scope.utest_sub_module = UtestSubModule;
+    });
 
     // Return expected unit test result
     app.__utest_ctrl_result = {

test/unit/lib/services.js

@@ -1,12 +1,19 @@
 /*jslint node: true, nomen: true */
 /*globals angular */
 
-(function () {
+!function () {
     'use strict';
-
     // Services coded using regular angular approach
-    var services = angular.module("utestServices", []),
+    var sub_module = angular.module("subModuleServices", []),
+        services = angular.module("utestServices", ['subModuleServices']),
         utest_result = {};
+    
+    // Define a simple subModule
+    angular.module("subModuleServices").factory("SubConfigValue", function () {
+        return function () {
+            return "JwU9YSJMJS-HhRz4nhBuY";
+        };
+    });
 
     // Make sure provider works
     services.provider("configUtest", function () {
@@ -30,7 +37,7 @@
     services.config(function (configUtestProvider) {
         configUtestProvider.configureValue(utest_result.config_name);
     });
-
+    
     utest_result.run_name = "services.run sOdq6GNsaW";
     services.run(function ($rootScope) {
         $rootScope.run_name = utest_result.run_name;
@@ -72,6 +79,13 @@
         };
     });
 
+    utest_result.sub_module = "utestServices.sub_config_value JwU9YSJMJS-HhRz4nhBuY";
+    services.factory('UtestSubModule', function (SubConfigValue) {
+        return function () {
+            return "utestServices.sub_config_value " + SubConfigValue();
+        };
+    });
+    
     // Return the result in a factory
     services.factory('UtestServiceResult', function () {
         return utest_result;
@@ -82,5 +96,5 @@
         return configUtest.getValue();
     });
 
-}());
+}();
 

test/unit/services.spec.js

@@ -63,5 +63,13 @@ define(['angularAMD', 'ngload!services'], function (angularAMD) {
             expect(ufilter("hello")).toBe("hello " + results.filter_name);
         }));
 
+        it("sub module check.", inject(function (UtestSubModule) {
+            expect(UtestSubModule()).toBe(results.sub_module);
+        }));
+        
+        it("sub module check module.", function () {
+            expect(angular.module("subModuleServices")).toBeUndefined();
+        });
+        
     });
 });