Merge branch 'master' of github.com:fknop/angular-pipes

Author: fknop

.travis.yml

@@ -1,8 +1,9 @@
 language: node_js
 node_js:
-  - 7
   - 8
   - 9
+  - 10
+  - 11
 
 cache: 
   yarn: true

docs/math.md

@@ -10,6 +10,7 @@
 * [`pow`](#pow)
 * [`sqrt`](#sqrt)
 * [`abs`](#abs)
+* [`ordinal`](#ordinal)
 
 You can check the module import [`here`](./modules.md).
 

src/math/bytes.pipe.ts

@@ -44,12 +44,14 @@ export class BytesPipe implements PipeTransform {
         }
 
         for (const key in BytesPipe.formats) {
-            const format = BytesPipe.formats[key];
-            if (bytes < format.max) {
+            if (BytesPipe.formats.hasOwnProperty(key)) {
+                const format = BytesPipe.formats[key];
+                if (bytes < format.max) {
 
-                const result = toDecimal(BytesPipe.calculateResult(format, bytes), decimal);
+                    const result = toDecimal(BytesPipe.calculateResult(format, bytes), decimal);
 
-                return BytesPipe.formatResult(result, key);
+                    return BytesPipe.formatResult(result, key);
+                }
             }
         }
     }
@@ -62,4 +64,4 @@ export class BytesPipe implements PipeTransform {
         const prev = format.prev ? BytesPipe.formats[format.prev] : undefined;
         return prev ? bytes / prev.max : bytes;
     }
-}
+}

src/math/ordinal.pipe.spec.ts

@@ -1,35 +1,54 @@
 import { OrdinalPipe } from './ordinal.pipe';
 
 describe('OrdinalPipe', () => {
-    
+
     let pipe: OrdinalPipe;
-    
+
     beforeEach(() => {
-       pipe = new OrdinalPipe(); 
+        pipe = new OrdinalPipe();
     });
-    
+
     it('Should return 123rd', () => {
-        
+
         expect(pipe.transform(123)).toEqual('123rd');
     });
 
     it('Should return 221st', () => {
-        
+
         expect(pipe.transform(221)).toEqual('221st');
     });
-    
+
     it('Should return 2nd', () => {
-       
-        expect(pipe.transform(2)).toEqual('2nd'); 
+
+        expect(pipe.transform(2)).toEqual('2nd');
     });
 
     it('Should return 15th', () => {
-       
-        expect(pipe.transform(15)).toEqual('15th'); 
+
+        expect(pipe.transform(15)).toEqual('15th');
+    });
+
+    it('Should return 11th', () => {
+
+        expect(pipe.transform(11)).toEqual('11th');
+    });
+
+    it('Should return 12th', () => {
+
+        expect(pipe.transform(12)).toEqual('12th');
+    });
+
+    it('Should return 133313th', () => {
+
+        expect(pipe.transform(133313)).toEqual('133313th');
     });
 
     it('Should return NaN', () => {
         expect(pipe.transform('a')).toEqual('NaN');
     });
-  
+
+    it('Should return 35th', () => {
+        expect(pipe.transform(35)).toEqual('35th');
+    });
+
 });

src/math/ordinal.pipe.ts

@@ -1,29 +1,38 @@
-import { Pipe, PipeTransform  } from '@angular/core';
+import { Pipe, PipeTransform } from '@angular/core';
 import { isNumberFinite } from '../utils/utils';
 
 @Pipe({
-  name: 'ordinal'
+    name: 'ordinal'
 })
 export class OrdinalPipe implements PipeTransform {
-  
-    transform (input: any): any {
+
+    transform(input: any): any {
 
         if (!isNumberFinite(input)) {
             return 'NaN';
         }
 
-        const cardinal = input.toString().charAt(input.toString().length - 1);
+        if (this.endsWithTenth(input)) {
+            return input + 'th';
+        } else {
+            const cardinal = input.toString().charAt(input.toString().length - 1);
 
-        switch(cardinal) {
-            case '1':
-                return input + 'st';
-            case '2':
-                return input + 'nd';
-            case '3':
-                return input + 'rd';
-            default: 
-                return input + 'th';
-        }
-        
+            switch (cardinal) {
+                case '1':
+                    return input + 'st';
+                case '2':
+                    return input + 'nd';
+                case '3':
+                    return input + 'rd';
+                default:
+                    return input + 'th';
+            }
+        } 
+    }
+            
+    private endsWithTenth(input: any): boolean {
+        const beforeLastDigit = input.toString().charAt(input.toString().length - 2);
+
+        return beforeLastDigit === '1';
     }
 }