From 2b5269eb2c5ad3e1e61f2710866edd4ba2381ab8 Mon Sep 17 00:00:00 2001 From: avalanchy Date: Fri, 24 Oct 2014 14:39:40 +0200 Subject: [PATCH] Add missing Polish diacritics --- lib/sifter.js | 11 ++++++----- test/api.js | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/lib/sifter.js b/lib/sifter.js index a3268f8..7dbc730 100644 --- a/lib/sifter.js +++ b/lib/sifter.js @@ -425,19 +425,20 @@ }; var DIACRITICS = { - 'a': '[aÀÁÂÃÄÅàáâãäåĀā]', + 'a': '[aÀÁÂÃÄÅàáâãäåĀāąĄ]', 'c': '[cÇçćĆčČ]', 'd': '[dđĐďĎ]', - 'e': '[eÈÉÊËèéêëěĚĒē]', + 'e': '[eÈÉÊËèéêëěĚĒēęĘ]', 'i': '[iÌÍÎÏìíîïĪī]', - 'n': '[nÑñňŇ]', + 'l': '[lłŁ]', + 'n': '[nÑñňŇńŃ]', 'o': '[oÒÓÔÕÕÖØòóôõöøŌō]', 'r': '[rřŘ]', - 's': '[sŠš]', + 's': '[sŠšśŚ]', 't': '[tťŤ]', 'u': '[uÙÚÛÜùúûüůŮŪū]', 'y': '[yŸÿýÝ]', - 'z': '[zŽž]' + 'z': '[zŽžżŻźŹ]' }; // export diff --git a/test/api.js b/test/api.js index 6039660..a0504d3 100644 --- a/test/api.js +++ b/test/api.js @@ -56,7 +56,7 @@ describe('Sifter', function() { assert.equal(tokens[0].regex.test('afawfaf'), false); }); it('should match international characters', function() { - assert.equal(tokens[0].regex.test('hellö'), true); + assert.equal(tokens[0].regex.test('hęłlö'), true); assert.equal(tokens[1].regex.test('wÕrld'), true); }); }); @@ -124,7 +124,7 @@ describe('Sifter', function() { var search = sifter.prepareSearch('a', { fields: {field: 'a'}, sort: {field: 'a'}, - sort_empty: {field: 'a'}, + sort_empty: {field: 'a'} }); assert.equal(Array.isArray(search.options.fields), true); assert.equal(Array.isArray(search.options.sort), true); @@ -175,12 +175,12 @@ describe('Sifter', function() { var sifter = new Sifter([ {field: 'aaa'}, {field: 'add'}, - {field: 'abb'}, + {field: 'abb'} ]); var result = sifter.search('', { fields: 'field', sort: {field: 'field', direction: 'asc'}, - sort_empty: {field: 'field', direction: 'desc'}, + sort_empty: {field: 'field', direction: 'desc'} }); assert.equal(result.items[0].id, 1); assert.equal(result.items[1].id, 2); @@ -190,7 +190,7 @@ describe('Sifter', function() { var sifter = new Sifter([ {field: 'aaa'}, {field: 'add'}, - {field: 'abb'}, + {field: 'abb'} ]); var result = sifter.search('', { fields: 'field', @@ -204,7 +204,7 @@ describe('Sifter', function() { var sifter = new Sifter([ {field: 'aaa'}, {field: 'add'}, - {field: 'abb'}, + {field: 'abb'} ]); var result = sifter.search('', { fields: 'field', @@ -219,7 +219,7 @@ describe('Sifter', function() { {a: 'bbb', b: 'bbb'}, {a: 'bbb', b: 'ccc'}, {a: 'bbb', b: 'aaa'}, - {a: 'aaa'}, + {a: 'aaa'} ]); var result = sifter.search('', { fields: 'field', @@ -238,7 +238,7 @@ describe('Sifter', function() { {field: 1.0}, {field: 12.9}, {field: 9.1}, - {field: -9.0}, + {field: -9.0} ]); var result = sifter.search('', { fields: 'field', @@ -260,7 +260,7 @@ describe('Sifter', function() { fields: 'field', sort: [ {field: 'b', direction: 'desc'}, - {field: 'a', direction: 'asc'}, + {field: 'a', direction: 'asc'} ] }); assert.equal(result.items[0].id, 2); @@ -271,7 +271,7 @@ describe('Sifter', function() { it('should add implicit "$score" field when query present', function() { var sifter = new Sifter([ {field: 'yoo'}, - {field: 'book'}, + {field: 'book'} ]); var result = sifter.search('oo', { fields: 'field', @@ -284,7 +284,7 @@ describe('Sifter', function() { var sifter = new Sifter([ {field: 'boooo'}, {field: 'yoo'}, - {field: 'aaa'}, + {field: 'aaa'} ]); var result = sifter.search('oo', { filter: false,