Make check() function call automatic.

demo/app.js

@@ -31,10 +31,6 @@ angular.module('acme', ['environment']).
 				}
 			}
 		});
-
-		// run the environment check, so the comprobation is made
-		// before controllers and services are built
-		envServiceProvider.check();
 	}).
 	controller('Pages', ['$scope', 'envService', function($scope, envService) {
 		$scope.environment = envService.get(); // store the current environment

dist/angular-environment.js

@@ -24,6 +24,9 @@ angular.module('environment', []).
 			return new RegExp(local.pregQuote(string).replace(/\\\*/g, '.*').replace(/\\\?/g, '.'), 'g');
 		};
 
+		local.hasChecked = false; // true iff the check() function has been called at least once
+		local.host = undefined; // the host URL of the current page
+
 		this.environment = 'development'; // default
 		this.data = {}; // user defined environments data
 
@@ -98,7 +101,7 @@ angular.module('environment', []).
 		 */
 		this.check = function() {
 			var	self = this,
-					location = window.location.host,
+					location = local.host ? local.host : window.location.host,
 					matches = [],
 					keepGoing = true;
 
@@ -123,9 +126,16 @@ angular.module('environment', []).
 					self.environment = v.environment;
 				}
 			});
+
+			local.hasChecked = true;
 		};
 
-		this.$get = function() {
+		this.$get = function($location) {
+			if (!local.hasChecked) {
+				local.host = $location.host();
+				this.check();
+			}
 			return this;
 		};
+		this.$get.$inject = ['$location'];
 	});

src/angular-environment.js

@@ -24,6 +24,9 @@ angular.module('environment', []).
 			return new RegExp(local.pregQuote(string).replace(/\\\*/g, '.*').replace(/\\\?/g, '.'), 'g');
 		};
 
+		local.hasChecked = false; // true iff the check() function has been called at least once
+		local.host = undefined; // the host URL of the current page
+
 		this.environment = 'development'; // default
 		this.data = {}; // user defined environments data
 
@@ -98,7 +101,7 @@ angular.module('environment', []).
 		 */
 		this.check = function() {
 			var	self = this,
-					location = window.location.host,
+					location = local.host ? local.host : window.location.host,
 					matches = [],
 					keepGoing = true;
 
@@ -123,9 +126,16 @@ angular.module('environment', []).
 					self.environment = v.environment;
 				}
 			});
+
+			local.hasChecked = true;
 		};
 
-		this.$get = function() {
+		this.$get = function($location) {
+			if (!local.hasChecked) {
+				local.host = $location.host();
+				this.check();
+			}
 			return this;
 		};
+		this.$get.$inject = ['$location'];
 	});

test/angular-environment.js

@@ -4,6 +4,7 @@ describe('Test environment provider', function () {
 
 	var theEnvServiceProvider;
 	var envService;
+	var $locationMock;
 
 	beforeEach(function () {
 		// Initialise the provider by injecting it into a fake module's
@@ -15,21 +16,39 @@ describe('Test environment provider', function () {
 		// Initialise the test.app injector.
 		module('environment', 'test.app.environment');
 		inject(function () {});
-		envService = theEnvServiceProvider.$get();
+	});
+
+	describe('with development environment by default', function () {
+		beforeEach(function () {
+			$locationMock = {
+				host: function () {
+					return 'localhost';
+				}
+			};
+			spyOn($locationMock, 'host').and.callThrough();
 
-		envService.config({
-			vars: {
-				development: {
-					backend: 'https://backend-dev/'
+			theEnvServiceProvider.config({
+				domains: {
+					development: ['localhost'],
+					production: ['app.*.com']
 				},
-				production: {
-					backend: 'https://backend/'
+				vars: {
+					development: {
+						backend: 'https://backend-dev/'
+					},
+					production: {
+						backend: 'https://backend/'
+					}
 				}
-			}
+			});
+
+			envService = theEnvServiceProvider.$get($locationMock);
+		});
+
+		it('should call $locationMock.host to obtain host URL', function () {
+			expect($locationMock.host).toHaveBeenCalledTimes(1);
 		});
-	});
 
-	describe('with envService provider', function () {
 		it('tests the envService provider can be created', function () {
 			expect(theEnvServiceProvider).toBeDefined();
 		});
@@ -53,4 +72,56 @@ describe('Test environment provider', function () {
 			expect(envService.read('backend')).toBe('https://backend/');
 		});
 	});
+
+	describe('tests matching domains', function () {
+		var i = 0, testCases = [
+			[true, 'app.web.com', 'app.*.com'],
+			[true, 'app.a.com', 'app.*.com'],
+			[true, 'app.web.com', 'app.web.com'],
+			[true, 'app.web.com', '*.com'],
+			[true, 'a.com', '*.com'],
+			[true, 'app.web.com', 'app.*'],
+			[true, 'app.a', 'app.*'],
+			[false, 'a.w.com', 'app.web.com']
+		];
+
+		for (i = 0; i < testCases.length; i++) {
+			(function (expectedMatch, actualHost, domainPattern) {
+				it('should ' + (expectedMatch ? '' : 'not') + ' identify production environment'
+				   + ' when host=' + actualHost + ' and domain pattern=' + domainPattern,
+					function () {
+						$locationMock = {
+							host: function () {
+								return actualHost;
+							}
+						};
+						spyOn($locationMock, 'host').and.callThrough();
+
+						theEnvServiceProvider.config({
+							domains: {
+								development: ['localhost'],
+								production: [domainPattern]
+							},
+							vars: {
+								development: {
+									backend: 'https://backend-dev/'
+								},
+								production: {
+									backend: 'https://backend/'
+								}
+							},
+							defaults: {
+								development: {},
+								production: {}
+							}
+						});
+
+						envService = theEnvServiceProvider.$get($locationMock);
+
+						expect(envService.is('production')).toBe(expectedMatch);
+						expect($locationMock.host).toHaveBeenCalledTimes(1);
+					});
+			})(testCases[i][0], testCases[i][1], testCases[i][2]);
+		}
+	});
 });