Merge pull request #38 from rmariuzzo/fix-lang-choice

Implemented math intervals.

Author: rmariuzzo

dist/lang.min.js

@@ -30,6 +30,19 @@
         }
     };
 
+    function convertNumber(str) {
+        if (str === '-Inf') {
+            return -Infinity;
+        } else if (str === '+Inf' || str === 'Inf') {
+            return Infinity;
+        }
+        return parseInt(str, 10);
+    }
+
+    // Derived from: https://github.com/symfony/translation/blob/460390765eb7bb9338a4a323b8a4e815a47541ba/Interval.php
+    var intervalRegexp = /^({\s*(\-?\d+(\.\d+)?[\s*,\s*\-?\d+(\.\d+)?]*)\s*})|([\[\]])\s*(-Inf|\-?\d+(\.\d+)?)\s*,\s*(\+?Inf|\-?\d+(\.\d+)?)\s*([\[\]])$/;
+    var anyIntervalRegexp = /({\s*(\-?\d+(\.\d+)?[\s*,\s*\-?\d+(\.\d+)?]*)\s*})|([\[\]])\s*(-Inf|\-?\d+(\.\d+)?)\s*,\s*(\+?Inf|\-?\d+(\.\d+)?)\s*([\[\]])/;
+
     // Default options //
 
     var defaults = {
@@ -184,12 +197,11 @@
 
         // Get the explicit rules, If any
         var explicitRules = [];
-        var regex = /{\d+}\s(.+)|\[\d+,\d+\]\s(.+)|\[\d+,Inf\]\s(.+)/;
 
         for (var i = 0; i < messageParts.length; i++) {
             messageParts[i] = messageParts[i].trim();
 
-            if (regex.test(messageParts[i])) {
+            if (anyIntervalRegexp.test(messageParts[i])) {
                 var messageSpaceSplit = messageParts[i].split(/\s/);
                 explicitRules.push(messageSpaceSplit.shift());
                 messageParts[i] = messageSpaceSplit.join(' ');
@@ -297,22 +309,63 @@
     /**
      * Checks if the given `count` is within the interval defined by the {string} `interval`
      *
-     * @param  count {int}  The amount of items.
-     * @param  interval {string}    The interval to be compared with the count.
-     * @return {boolean}    Returns true if count is within interval; false otherwise.
+     * @param  count     {int}    The amount of items.
+     * @param  interval  {string} The interval to be compared with the count.
+     * @return {boolean}          Returns true if count is within interval; false otherwise.
      */
     Lang.prototype._testInterval = function(count, interval) {
         /**
          * From the Symfony\Component\Translation\Interval Docs
          *
          * Tests if a given number belongs to a given math interval.
-         * An interval can represent a finite set of numbers: {1,2,3,4}
-         * An interval can represent numbers between two numbers: [1, +Inf] ]-1,2[
+         *
+         * An interval can represent a finite set of numbers:
+         *
+         *  {1,2,3,4}
+         *
+         * An interval can represent numbers between two numbers:
+         *
+         *  [1, +Inf]
+         *  ]-1,2[
+         *
          * The left delimiter can be [ (inclusive) or ] (exclusive).
          * The right delimiter can be [ (exclusive) or ] (inclusive).
          * Beside numbers, you can use -Inf and +Inf for the infinite.
          */
 
+        if (typeof interval !== 'string') {
+            throw 'Invalid interval: should be a string.';
+        }
+
+        interval = interval.trim();
+
+        var matches = interval.match(intervalRegexp);
+        if (!matches) {
+            throw new 'Invalid interval: ' + interval;
+        }
+
+        if (matches[2]) {
+            var items = matches[2].split(',');
+            for (var i = 0; i < items.length; i++) {
+                if (parseInt(items[i], 10) === count) {
+                    return true;
+                }
+            }
+        } else {
+            // Remove falsy values.
+            matches = matches.filter(function(match) {
+                return !!match;
+            });
+
+            var leftDelimiter = matches[1];
+            var leftNumber = convertNumber(matches[2]);
+            var rightNumber = convertNumber(matches[3]);
+            var rightDelimiter = matches[4];
+
+            return (leftDelimiter === '[' ? count >= leftNumber : count > leftNumber)
+                && (rightDelimiter === ']' ? count <= rightNumber : count < rightNumber);
+        }
+
         return false;
     };
 

src/lang.js

@@ -31,18 +31,47 @@ describe('The lang.choice() method', function () {
         expect(lang.choice('messages.plural', 10)).toBe('a million apples');
     });
 
-    it('should return the expected message', function () {
-        lang.setLocale('en');
+    it('should return the expected message with different count', function () {
+        lang.setMessages({
+            'en.plural': {
+                'year': ':count year|:count years'
+            }
+        });
         expect(lang.choice('plural.year', 1)).toBe('1 year');
         expect(lang.choice('plural.year', 2)).toBe('2 years');
         expect(lang.choice('plural.year', 5)).toBe('5 years');
 
+        lang.setMessages({
+            'ru.plural': {
+                'year': ':count год|:count года|:count лет'
+            }
+        });
         lang.setLocale('ru');
         expect(lang.choice('plural.year', 1)).toBe('1 год');
         expect(lang.choice('plural.year', 2)).toBe('2 года');
         expect(lang.choice('plural.year', 5)).toBe('5 лет');
     });
 
+    it('should return the expected message using math intervals', function() {
+        lang.setMessages({
+            'en.test': {
+                'set': '{0} a|{1} :count b|[2,Inf] :count c',
+                'range': '[0,10] a| [11,20] b|[21,30] c',
+                'infinity': '[-Inf,-1] :count Negative|[0,+Inf] :count Positive',
+            }
+        });
+        expect(lang.choice('test.set', 0)).toBe('a');
+        expect(lang.choice('test.set', 1)).toBe('1 b');
+        expect(lang.choice('test.set', 2)).toBe('2 c');
+        expect(lang.choice('test.range', 0)).toBe('a');
+        expect(lang.choice('test.range', 15)).toBe('b');
+        expect(lang.choice('test.range', 30)).toBe('c');
+        expect(lang.choice('test.infinity', -Infinity)).toBe('-Infinity Negative');
+        expect(lang.choice('test.infinity', -5)).toBe('-5 Negative');
+        expect(lang.choice('test.infinity', 5)).toBe('5 Positive');
+        expect(lang.choice('test.infinity', Infinity)).toBe('Infinity Positive');
+    });
+
     it('should return the expected message with replacements', function () {
         expect(lang.choice('validation.accepted', 1)).toBe('The :attribute must be accepted.');
         expect(lang.choice('validation.accepted', 1, {