Merge pull request #101 from nsanitate/master

fix(npm): Updated to beta 16

Author: ocombe

bundles/ng2-translate.js

@@ -80,8 +80,12 @@ System.registerDynamic("src/translate.pipe", ["angular2/core", "./translate.serv
         _this._ref.markForCheck();
       });
     };
-    TranslatePipe.prototype.transform = function(query, args) {
+    TranslatePipe.prototype.transform = function(query) {
       var _this = this;
+      var args = [];
+      for (var _i = 1; _i < arguments.length; _i++) {
+        args[_i - 1] = arguments[_i];
+      }
       if (!query || query.length === 0) {
         return query;
       }

package.json

@@ -30,7 +30,7 @@
     "angular2": ">= 2.0.0-beta.10"
   },
   "devDependencies": {
-    "angular2": "2.0.0-beta.15",
+    "angular2": "2.0.0-beta.16",
     "commitizen": "~2.5.0",
     "cz-conventional-changelog": "~1.1.4",
     "es6-promise": "^3.0.2",

src/translate.pipe.ts

@@ -75,7 +75,7 @@ export class TranslatePipe implements PipeTransform, OnDestroy {
         });
     }
 
-    transform(query: string, args: any[]): any {
+    transform(query: string, ...args: any[]): any {
         if(!query || query.length === 0) {
             return query;
         }

tests/translate.pipe.spec.ts

@@ -2,7 +2,7 @@ import {TranslatePipe} from '../src/translate.pipe';
 import {MockConnection, MockBackend} from "angular2/src/http/backends/mock_backend";
 import {TRANSLATE_PROVIDERS, TranslateService} from "./../ng2-translate";
 import {ResponseOptions, Response, XHRBackend, HTTP_PROVIDERS} from "angular2/http";
-import {provide, Injector, ChangeDetectorRef} from "angular2/core";
+import {provide, Injector, ReflectiveInjector, ChangeDetectorRef} from "angular2/core";
 import {LangChangeEvent} from "../src/translate.service";
 
 class FakeChangeDetectorRef extends ChangeDetectorRef {
@@ -31,7 +31,7 @@ export function main() {
         let ref: any;
 
         beforeEach(() => {
-            injector = Injector.resolveAndCreate([
+            injector = ReflectiveInjector.resolveAndCreate([
                 HTTP_PROVIDERS,
                 // Provide a mocked (fake) backend for Http
                 provide(XHRBackend, {useClass: MockBackend}),
@@ -65,31 +65,31 @@ export function main() {
             translate.setTranslation('en', {"TEST": "This is a test"});
             translate.use('en');
 
-            expect(translatePipe.transform('TEST', [])).toEqual("This is a test");
+            expect(translatePipe.transform('TEST')).toEqual("This is a test");
         });
 
         it('should call markForChanges when it translates a string', () => {
             translate.setTranslation('en', {"TEST": "This is a test"});
             translate.use('en');
             spyOn(ref, 'markForCheck').and.callThrough();
 
-            translatePipe.transform('TEST', []);
+            translatePipe.transform('TEST');
             expect(ref.markForCheck).toHaveBeenCalled();
         });
 
         it('should translate a string with object parameters', () => {
             translate.setTranslation('en', {"TEST": "This is a test {{param}}"});
             translate.use('en');
 
-            expect(translatePipe.transform('TEST', [{param: "with param"}])).toEqual("This is a test with param");
+            expect(translatePipe.transform('TEST', {param: "with param"})).toEqual("This is a test with param");
         });
 
         it('should translate a string with object as string parameters', () => {
             translate.setTranslation('en', {"TEST": "This is a test {{param}}"});
             translate.use('en');
 
-            expect(translatePipe.transform('TEST', ['{param: "with param"}'])).toEqual("This is a test with param");
-            expect(translatePipe.transform('TEST', ['{"param": "with param"}'])).toEqual("This is a test with param");
+            expect(translatePipe.transform('TEST', '{param: "with param"}')).toEqual("This is a test with param");
+            expect(translatePipe.transform('TEST', '{"param": "with param"}')).toEqual("This is a test with param");
         });
 
         it('should update the value when the parameters change', () => {
@@ -99,11 +99,11 @@ export function main() {
             spyOn(translatePipe, 'updateValue').and.callThrough();
             spyOn(ref, 'markForCheck').and.callThrough();
 
-            expect(translatePipe.transform('TEST', [{param: "with param"}])).toEqual("This is a test with param");
+            expect(translatePipe.transform('TEST', {param: "with param"})).toEqual("This is a test with param");
             // same value, shouldn't call 'updateValue' again
-            expect(translatePipe.transform('TEST', [{param: "with param"}])).toEqual("This is a test with param");
+            expect(translatePipe.transform('TEST', {param: "with param"})).toEqual("This is a test with param");
             // different param, should call 'updateValue'
-            expect(translatePipe.transform('TEST', [{param: "with param2"}])).toEqual("This is a test with param2");
+            expect(translatePipe.transform('TEST', {param: "with param2"})).toEqual("This is a test with param2");
             expect(translatePipe.updateValue).toHaveBeenCalledTimes(2);
             expect(ref.markForCheck).toHaveBeenCalledTimes(2);
         });
@@ -114,7 +114,7 @@ export function main() {
             let param = 'param: "with param"';
 
             expect(() => {
-                translatePipe.transform('TEST', [param]);
+                translatePipe.transform('TEST', param);
             }).toThrowError(`Wrong parameter in TranslatePipe. Expected a valid Object, received: ${param}`)
         });
 
@@ -124,12 +124,12 @@ export function main() {
                 translate.setTranslation('fr', {"TEST": "C'est un test"});
                 translate.use('en');
 
-                expect(translatePipe.transform('TEST', [])).toEqual("This is a test");
+                expect(translatePipe.transform('TEST')).toEqual("This is a test");
 
                 // this will be resolved at the next lang change
                 translate.onLangChange.subscribe((res: LangChangeEvent) => {
                     expect(res.lang).toEqual('fr');
-                    expect(translatePipe.transform('TEST', [])).toEqual("C'est un test");
+                    expect(translatePipe.transform('TEST')).toEqual("C'est un test");
                     done();
                 });
 
@@ -139,12 +139,12 @@ export function main() {
             it('with file loader', (done) => {
                 translate.use('en');
                 mockBackendResponse(connection, '{"TEST": "This is a test"}');
-                expect(translatePipe.transform('TEST', [])).toEqual("This is a test");
+                expect(translatePipe.transform('TEST')).toEqual("This is a test");
 
                 // this will be resolved at the next lang change
                 translate.onLangChange.subscribe((res: LangChangeEvent) => {
                     expect(res.lang).toEqual('fr');
-                    expect(translatePipe.transform('TEST', [])).toEqual("C'est un test");
+                    expect(translatePipe.transform('TEST')).toEqual("C'est un test");
                     done();
                 });
 

tests/translate.service.spec.ts

@@ -1,5 +1,5 @@
 import {it} from "angular2/testing";
-import {provide, Injector} from "angular2/core";
+import {provide, Injector, ReflectiveInjector} from "angular2/core";
 import {ResponseOptions, Response, HTTP_PROVIDERS, XHRBackend} from "angular2/http";
 import {MockBackend, MockConnection} from "angular2/http/testing";
 import {
@@ -24,7 +24,7 @@ export function main() {
         let connection: MockConnection; // this will be set when a new connection is emitted from the backend.
 
         beforeEach(() => {
-            injector = Injector.resolveAndCreate([
+            injector = ReflectiveInjector.resolveAndCreate([
                 HTTP_PROVIDERS,
                 // Provide a mocked (fake) backend for Http
                 provide(XHRBackend, {useClass: MockBackend}),
@@ -261,7 +261,7 @@ export function main() {
         }
 
         let prepare = ((handlerClass: Function) => {
-            injector = Injector.resolveAndCreate([
+            injector = ReflectiveInjector.resolveAndCreate([
                 HTTP_PROVIDERS,
                 // Provide a mocked (fake) backend for Http
                 provide(XHRBackend, {useClass: MockBackend}),
@@ -419,7 +419,7 @@ export function main() {
         };
 
         it('should be able to provide TranslateStaticLoader', () => {
-            injector = Injector.resolveAndCreate([
+            injector = ReflectiveInjector.resolveAndCreate([
                 HTTP_PROVIDERS,
                 // Provide a mocked (fake) backend for Http
                 provide(XHRBackend, {useClass: MockBackend}),
@@ -449,7 +449,7 @@ export function main() {
                     return Observable.of({"TEST": "This is a test"});
                 }
             }
-            injector = Injector.resolveAndCreate([
+            injector = ReflectiveInjector.resolveAndCreate([
                 HTTP_PROVIDERS,
                 // Provide a mocked (fake) backend for Http
                 provide(XHRBackend, {useClass: MockBackend}),