Configurable app name

demo/scripts/directives.js

@@ -31,6 +31,7 @@ angular.module('my-app')
       replace: true
     };
   })
-  .run(function(featureFlags, $http) {
-    featureFlags.set($http.get('../data/flags.json'));
+  .run(function($http, featureFlagConfig) {
+    featureFlagConfig.setAppName('myapp');
+    featureFlagConfig.setInitialFlags($http.get('../data/flags.json'));
   });

dist/featureFlags.js

@@ -76,10 +76,8 @@ angular.module('feature-flags').directive('featureFlagOverrides', ['featureFlags
   };
 }]);
 
-angular.module('feature-flags').service('featureFlagOverrides', ['$rootElement', function($rootElement) {
-  var appName = $rootElement.attr('ng-app'),
-    keyPrefix = 'featureFlags.' + appName + '.',
-
+angular.module('feature-flags').service('featureFlagOverrides', ['$rootElement', 'featureFlagConfig', function($rootElement, featureFlagConfig) {
+  var keyPrefix = 'featureFlags.',
     localStorageAvailable = (function() {
       try {
         localStorage.setItem('featureFlags.availableTest', 'test');
@@ -116,6 +114,9 @@ angular.module('feature-flags').service('featureFlagOverrides', ['$rootElement',
       }
     };
 
+  if (featureFlagConfig.getAppName().length > 0) {
+    keyPrefix += featureFlagConfig.getAppName() + '.';
+  }
   return {
     isPresent: function(key) {
       var value = get(key);
@@ -143,7 +144,7 @@ angular.module('feature-flags').service('featureFlagOverrides', ['$rootElement',
   };
 }]);
 
-function FeatureFlags($q, featureFlagOverrides, initialFlags) {
+angular.module('feature-flags').service('featureFlags', ['$q', 'featureFlagOverrides', 'featureFlagConfig', function($q, featureFlagOverrides, featureFlagConfig) {
   var serverFlagCache = {},
     flags = [],
 
@@ -205,8 +206,9 @@ function FeatureFlags($q, featureFlagOverrides, initialFlags) {
     },
 
     init = function() {
-      if (initialFlags) {
-        set(initialFlags);
+      var iniFlags = featureFlagConfig.getInitialFlags();
+      if (iniFlags) {
+        set(iniFlags);
       }
     };
   init();
@@ -221,18 +223,56 @@ function FeatureFlags($q, featureFlagOverrides, initialFlags) {
     isOnByDefault: isOnByDefault,
     isOverridden: isOverridden
   };
+}]);
+
+function FeatureFlagConfig(initialFlags, userAppName) {
+  var initFlags = [],
+    appName = '',
+
+    getInitialFlags = function() {
+      return initFlags;
+    },
+    setInitialFlags = function(value) {
+      initFlags = value;
+    },
+    getAppName = function() {
+      return appName;
+    },
+    setAppName = function(value) {
+      appName = value;
+    },
+    init = function() {
+      if (initialFlags) {
+        initFlags = initialFlags;
+      }
+      if (userAppName) {
+        appName = userAppName;
+      }
+    };
+  init();
+
+  return {
+    getInitialFlags: getInitialFlags,
+    setInitialFlags: setInitialFlags,
+    getAppName: getAppName,
+    setAppName: setAppName
+  };
 }
 
-angular.module('feature-flags').provider('featureFlags', function() {
-  var initialFlags = [];
+angular.module('feature-flags').provider('featureFlagConfig', function() {
+  var initialFlags = [],
+    appName = '';
 
   this.setInitialFlags = function(flags) {
     initialFlags = flags;
   };
 
-  this.$get = ['$q', 'featureFlagOverrides', function($q, featureFlagOverrides) {
-    return new FeatureFlags($q, featureFlagOverrides, initialFlags);
-  }];
+  this.setAppName = function(name) {
+    appName = name;
+  };
+  this.$get = function() {
+    return new FeatureFlagConfig(initialFlags, appName);
+  };
 });
 
 }());

src/featureFlagOverrides.service.js

@@ -1,7 +1,5 @@
-angular.module('feature-flags').service('featureFlagOverrides', function($rootElement) {
-  var appName = $rootElement.attr('ng-app'),
-    keyPrefix = 'featureFlags.' + appName + '.',
-
+angular.module('feature-flags').service('featureFlagOverrides', function($rootElement, featureFlagConfig) {
+  var keyPrefix = 'featureFlags.',
     localStorageAvailable = (function() {
       try {
         localStorage.setItem('featureFlags.availableTest', 'test');
@@ -38,6 +36,9 @@ angular.module('feature-flags').service('featureFlagOverrides', function($rootEl
       }
     };
 
+  if (featureFlagConfig.getAppName().length > 0) {
+    keyPrefix += featureFlagConfig.getAppName() + '.';
+  }
   return {
     isPresent: function(key) {
       var value = get(key);

src/featureFlags.provider.js → src/featureFlags.service.js

@@ -1,4 +1,4 @@
-function FeatureFlags($q, featureFlagOverrides, initialFlags) {
+angular.module('feature-flags').service('featureFlags', function($q, featureFlagOverrides, featureFlagConfig) {
   var serverFlagCache = {},
     flags = [],
 
@@ -60,8 +60,9 @@ function FeatureFlags($q, featureFlagOverrides, initialFlags) {
     },
 
     init = function() {
-      if (initialFlags) {
-        set(initialFlags);
+      var iniFlags = featureFlagConfig.getInitialFlags();
+      if (iniFlags) {
+        set(iniFlags);
       }
     };
   init();
@@ -76,16 +77,4 @@ function FeatureFlags($q, featureFlagOverrides, initialFlags) {
     isOnByDefault: isOnByDefault,
     isOverridden: isOverridden
   };
-}
-
-angular.module('feature-flags').provider('featureFlags', function() {
-  var initialFlags = [];
-
-  this.setInitialFlags = function(flags) {
-    initialFlags = flags;
-  };
-
-  this.$get = function($q, featureFlagOverrides) {
-    return new FeatureFlags($q, featureFlagOverrides, initialFlags);
-  };
 });

src/featureFlagsConfig.provider.js

@@ -0,0 +1,49 @@
+function FeatureFlagConfig(initialFlags, userAppName) {
+  var initFlags = [],
+    appName = '',
+
+    getInitialFlags = function() {
+      return initFlags;
+    },
+    setInitialFlags = function(value) {
+      initFlags = value;
+    },
+    getAppName = function() {
+      return appName;
+    },
+    setAppName = function(value) {
+      appName = value;
+    },
+    init = function() {
+      if (initialFlags) {
+        initFlags = initialFlags;
+      }
+      if (userAppName) {
+        appName = userAppName;
+      }
+    };
+  init();
+
+  return {
+    getInitialFlags: getInitialFlags,
+    setInitialFlags: setInitialFlags,
+    getAppName: getAppName,
+    setAppName: setAppName
+  };
+}
+
+angular.module('feature-flags').provider('featureFlagConfig', function() {
+  var initialFlags = [],
+    appName = '';
+
+  this.setInitialFlags = function(flags) {
+    initialFlags = flags;
+  };
+
+  this.setAppName = function(name) {
+    appName = name;
+  };
+  this.$get = function() {
+    return new FeatureFlagConfig(initialFlags, appName);
+  };
+});

test/featureFlagOverrides.service.spec.js

@@ -5,9 +5,21 @@
     inject = angular.mock.inject;
 
   describe('Service: featureFlagOverrides', function() {
-    var service, appName = '';
-
-    beforeEach(module('feature-flags'));
+    var service, appName = 'myapp';
+
+    beforeEach(module('feature-flags', function($provide) {
+      $provide.provider('featureFlagConfig', function() {
+        return {
+          $get: function() {
+            return {
+              getAppName: function() {
+                return appName;
+              }
+            };
+          }
+        };
+      });
+    }));
 
     beforeEach(inject(function(featureFlagOverrides) {
       service = featureFlagOverrides;

test/featureFlags.provider.spec.js → test/featureFlags.service.spec.js

@@ -354,19 +354,33 @@
     });
   });
 
-  describe('Provider: featureFlags', function() {
+  describe('Service with provider config: featureFlags', function() {
     var featureFlags,
       flags = [{
         active: true,
         key: 'FLAG_KEY'
       }, {
         active: false,
         key: 'FLAG_KEY_2'
-      }];
+      }],
+      appName = 'myapp';
 
     describe('When no flags are set in the config phase', function() {
-      beforeEach(module('feature-flags', function(featureFlagsProvider) {
-        featureFlagsProvider.setInitialFlags(null);
+      beforeEach(module('feature-flags', function($provide) {
+        $provide.provider('featureFlagConfig', function() {
+          return {
+            $get: function() {
+              return {
+                getInitialFlags: function() {
+                  return null;
+                },
+                getAppName: function() {
+                  return appName;
+                }
+              };
+            }
+          };
+        });
       }));
 
       beforeEach(inject(function(_featureFlags_) {
@@ -379,8 +393,21 @@
     });
 
     describe('When flags are set in the config phase', function() {
-      beforeEach(module('feature-flags', function(featureFlagsProvider) {
-        featureFlagsProvider.setInitialFlags(flags);
+      beforeEach(module('feature-flags', function($provide) {
+        $provide.provider('featureFlagConfig', function() {
+          return {
+            $get: function() {
+              return {
+                getInitialFlags: function() {
+                  return flags;
+                },
+                getAppName: function() {
+                  return appName;
+                }
+              };
+            }
+          };
+        });
       }));
 
       beforeEach(inject(function(_featureFlags_) {

test/featureFlagsConfig.provider.spec.js

@@ -0,0 +1,69 @@
+(function(angular) {
+  'use strict';
+
+  var module = angular.mock.module,
+    inject = angular.mock.inject;
+
+  describe('Provider: featureFlags', function() {
+    var appName = 'myapp',
+      featureFlagConfig,
+      flags = [{
+        active: true,
+        key: 'FLAG_KEY'
+      }, {
+        active: false,
+        key: 'FLAG_KEY_2'
+      }];
+
+    describe('When no flags are set in the config phase', function() {
+      beforeEach(module('feature-flags', function(featureFlagConfigProvider) {
+        featureFlagConfigProvider.setInitialFlags(null);
+        featureFlagConfigProvider.setAppName(null);
+      }));
+
+      beforeEach(inject(function(_featureFlagConfig_) {
+        featureFlagConfig = _featureFlagConfig_;
+      }));
+
+      it('should return an empty array for current feature flags', function() {
+        expect(featureFlagConfig).not.toBeUndefined();
+        expect(featureFlagConfig.getInitialFlags()).toEqual([]);
+        expect(featureFlagConfig.getAppName()).toEqual('');
+      });
+    });
+
+    describe('When flags are set in the config phase', function() {
+      beforeEach(module('feature-flags', function(featureFlagConfigProvider) {
+        featureFlagConfigProvider.setInitialFlags(flags);
+        featureFlagConfigProvider.setAppName(appName);
+      }));
+
+      beforeEach(inject(function(_featureFlagConfig_) {
+        featureFlagConfig = _featureFlagConfig_;
+      }));
+
+      it('should init the flags with the ones set in the config phase', function() {
+        expect(featureFlagConfig).not.toBeUndefined();
+        expect(featureFlagConfig.getInitialFlags()).toEqual(flags);
+        expect(featureFlagConfig.getAppName()).toEqual(appName);
+      });
+    });
+
+    describe('When flags are set in the run phase', function() {
+      beforeEach(module('feature-flags', function(featureFlagConfigProvider) {
+        featureFlagConfigProvider.setInitialFlags(null);
+      }));
+      beforeEach(inject(function(_featureFlagConfig_) {
+        featureFlagConfig = _featureFlagConfig_;
+      }));
+
+      it('should init the flags with the ones set in the run phase', function() {
+        expect(featureFlagConfig).not.toBeUndefined();
+        featureFlagConfig.setInitialFlags(flags);
+        featureFlagConfig.setAppName(appName);
+        expect(featureFlagConfig.getInitialFlags()).toEqual(flags);
+        expect(featureFlagConfig.getAppName()).toEqual(appName);
+      });
+    });
+  });
+}(window.angular));