From 49dfa815c7dfe8107231a2613137fdc1054472c3 Mon Sep 17 00:00:00 2001 From: Louis Ledey Date: Thu, 10 Nov 2016 18:40:49 +0100 Subject: [PATCH 1/2] Handle numbers in region --- index.js | 2 +- tests/tests.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/index.js b/index.js index a8fd9a9..c18c5ce 100644 --- a/index.js +++ b/index.js @@ -1,4 +1,4 @@ -var regex = /((([a-zA-Z]+(-[a-zA-Z]+){0,2})|\*)(;q=[0-1](\.[0-9]+)?)?)*/g; +var regex = /((([a-zA-Z]+(-[a-zA-Z0-9]+){0,2})|\*)(;q=[0-1](\.[0-9]+)?)?)*/g; module.exports.parse = function(al){ var strings = (al || "").match(regex); diff --git a/tests/tests.js b/tests/tests.js index 59cdaee..f81277b 100644 --- a/tests/tests.js +++ b/tests/tests.js @@ -49,6 +49,11 @@ describe('accept-language#parse()', function(){ assertResult({ code: '*', quality: 0.8}, result[1]); }); + it('should correctly parse a region with numbers', function(){ + var result = parser.parse('fr-150'); + assertResult({ code: 'fr', region: '150', quality: 1.0}, result[0]); + }); + it('should correctly parse complex set', function(){ var result = parser.parse('fr-CA,fr;q=0.8,en-US;q=0.6,en;q=0.4,*;q=0.1'); assertResult({ code: 'fr', region: 'CA', quality: 1.0}, result[0]); From bc602b6c2ee9ac457514cfe4f0bc764d3285b0c6 Mon Sep 17 00:00:00 2001 From: Louis Ledey Date: Thu, 10 Nov 2016 18:41:03 +0100 Subject: [PATCH 2/2] bump 1.3.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 696b658..6dd305b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "accept-language-parser", - "version": "1.2.0", + "version": "1.3.0", "description": "Parse the accept-language header from a HTTP request", "main": "index.js", "scripts": {