Prevent circular dependencies

Fixes #138

Author: gabegorelick

dist/angular-gettext.js

@@ -73,7 +73,12 @@ angular.module('gettext').provider('gettextCatalog', ["gettextPlurals", function
     angular.extend(this, provider);
 
     var self = this;
-    this.$get = /* @ngInject */ ["$http", "$interpolate", "$cacheFactory", "$rootScope", function ($http, $interpolate, $cacheFactory, $rootScope) {
+    this.$get = /* @ngInject */ ["$injector", function ($injector) {
+        // lazily inject these to prevent circular dependecies
+        var $http;
+        var $interpolate;
+        var $rootScope;
+
         function Catalog(options) {
             angular.extend(this, options);
             var self = this;
@@ -95,6 +100,7 @@ angular.module('gettext').provider('gettextCatalog', ["gettextPlurals", function
             };
 
             function broadcastUpdated() {
+                $rootScope = $rootScope || $injector.get('$rootScope');
                 $rootScope.$broadcast('gettextLanguageChanged');
             }
 
@@ -109,12 +115,16 @@ angular.module('gettext').provider('gettextCatalog', ["gettextPlurals", function
             };
 
             this.getString = function (string, scope, context) {
+                $interpolate = $interpolate || $injector.get('$interpolate');
+
                 string = this.getStringForm(string, 0, context) || prefixDebug(string);
                 string = scope ? $interpolate(string)(scope) : string;
                 return addTranslatedMarkers(string);
             };
 
             this.getPlural = function (n, string, stringPlural, scope, context) {
+                $interpolate = $interpolate || $injector.get('$interpolate');
+
                 var form = gettextPlurals(this.currentLanguage, n);
                 string = this.getStringForm(string, form, context) || prefixDebug(n === 1 ? string : stringPlural);
                 if (scope) {
@@ -125,6 +135,7 @@ angular.module('gettext').provider('gettextCatalog', ["gettextPlurals", function
             };
 
             this.loadRemote = function (url) {
+                $http = $http || $injector.get('$http');
                 return $http({
                     method: 'GET',
                     url: url,
@@ -137,7 +148,7 @@ angular.module('gettext').provider('gettextCatalog', ["gettextPlurals", function
             };
         }
 
-        self.cache = self.cache || $cacheFactory('strings');
+        self.cache = self.cache || $injector.get('$cacheFactory')('strings');
         return new Catalog(self);
     }];
 }]);

dist/angular-gettext.min.js

@@ -61,7 +61,12 @@ angular.module('gettext').provider('gettextCatalog', function (gettextPlurals) {
     angular.extend(this, provider);
 
     var self = this;
-    this.$get = /* @ngInject */ function ($http, $interpolate, $cacheFactory, $rootScope) {
+    this.$get = /* @ngInject */ function ($injector) {
+        // lazily inject these to prevent circular dependecies
+        var $http;
+        var $interpolate;
+        var $rootScope;
+
         function Catalog(options) {
             angular.extend(this, options);
             var self = this;
@@ -83,6 +88,7 @@ angular.module('gettext').provider('gettextCatalog', function (gettextPlurals) {
             };
 
             function broadcastUpdated() {
+                $rootScope = $rootScope || $injector.get('$rootScope');
                 $rootScope.$broadcast('gettextLanguageChanged');
             }
 
@@ -97,12 +103,16 @@ angular.module('gettext').provider('gettextCatalog', function (gettextPlurals) {
             };
 
             this.getString = function (string, scope, context) {
+                $interpolate = $interpolate || $injector.get('$interpolate');
+
                 string = this.getStringForm(string, 0, context) || prefixDebug(string);
                 string = scope ? $interpolate(string)(scope) : string;
                 return addTranslatedMarkers(string);
             };
 
             this.getPlural = function (n, string, stringPlural, scope, context) {
+                $interpolate = $interpolate || $injector.get('$interpolate');
+
                 var form = gettextPlurals(this.currentLanguage, n);
                 string = this.getStringForm(string, form, context) || prefixDebug(n === 1 ? string : stringPlural);
                 if (scope) {
@@ -113,6 +123,7 @@ angular.module('gettext').provider('gettextCatalog', function (gettextPlurals) {
             };
 
             this.loadRemote = function (url) {
+                $http = $http || $injector.get('$http');
                 return $http({
                     method: 'GET',
                     url: url,
@@ -125,7 +136,7 @@ angular.module('gettext').provider('gettextCatalog', function (gettextPlurals) {
             };
         }
 
-        self.cache = self.cache || $cacheFactory('strings');
+        self.cache = self.cache || $injector.get('$cacheFactory')('strings');
         return new Catalog(self);
     };
 });

src/catalog.js

@@ -0,0 +1,20 @@
+describe("Catalog", function () {
+    // don't pull module out of tests!
+
+    it("Shouldn't cause circular dependency error on $http", function () {
+        var testModule = angular.module("gettext.test", function () {});
+        testModule.factory("testInterceptor", function (gettextCatalog) {
+            gettextCatalog.getString("some message");
+            return {};
+        });
+
+        testModule.config(function ($httpProvider) {
+            $httpProvider.interceptors.push("testInterceptor");
+        });
+
+        module("gettext", "gettext.test");
+        inject(function ($http) {
+            assert.notEqual($http, false);
+        });
+    });
+});