Archives/lancedikson_bowser
1
0
Fork 0
mirror of https://github.com/lancedikson/bowser synced 2024-10-27 20:34:22 +00:00
Code Issues Releases Wiki Activity

Finish Parser#_parseBrowser function

Browse Source
This commit is contained in:
Denis Demchenko 2017-04-09 22:09:47 +03:00
parent 9e46db26ed
commit d57094d857
3 changed files with 61 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/parser-browsers.js
View File

@ -1,5 +1,6 @@
import {
getFirstMatch
getFirstMatch,
getSecondMatch
} from './utils';
const commonVersionIdentifier = /version\/(\d+(\.\d+)?)/i;
@ -213,7 +214,7 @@ const browsersList = [
{
test: [/blackberry|\bbb\d+/i, /rim\stablet/i],
detect(ua) {
const version = commonVersionIdentifier || getFirstMatch(/blackberry[\d]+\/(\d+(\.\d+)?)/i, ua);
const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/blackberry[\d]+\/(\d+(\.\d+)?)/i, ua);
return {
name: 'BlackBerry',
@ -224,7 +225,7 @@ const browsersList = [
{
test: [/(web|hpw)os/i],
detect(ua) {
const version = commonVersionIdentifier || getFirstMatch(/w(?:eb)?osbrowser\/(\d+(\.\d+)?)/i, ua);
const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/w(?:eb)?osbrowser\/(\d+(\.\d+)?)/i, ua);
return {
name: 'WebOS Browser',
@ -246,7 +247,7 @@ const browsersList = [
{
test: [/tizen/i],
detect(ua) {
const version = getFirstMatch(/(?:tizen\s?)?browser\/(\d+(\.\d+)?)/i, ua) || commonVersionIdentifier;
const version = getFirstMatch(/(?:tizen\s?)?browser\/(\d+(\.\d+)?)/i, ua) || getFirstMatch(commonVersionIdentifier, ua);
return {
name: 'Tizen',
@ -257,7 +258,7 @@ const browsersList = [
{
test: [/qupzilla/i],
detect(ua) {
const version = getFirstMatch(/(?:qupzilla)[\s\/](\d+(?:\.\d+)+)/i, ua) || commonVersionIdentifier;
const version = getFirstMatch(/(?:qupzilla)[\s\/](\d+(?:\.\d+)+)/i, ua) || getFirstMatch(commonVersionIdentifier, ua);
return {
name: 'QupZilla',
@ -268,7 +269,7 @@ const browsersList = [
{
test: [/chromium/i],
detect(ua) {
const version = getFirstMatch(/(?:chromium)[\s\/](\d+(?:\.\d+)?)/i, ua) || commonVersionIdentifier;
const version = getFirstMatch(/(?:chromium)[\s\/](\d+(?:\.\d+)?)/i, ua) || getFirstMatch(commonVersionIdentifier, ua);
return {
name: 'Chromium',
@ -287,31 +288,60 @@ const browsersList = [
}
}
},
/* Android Browser */
{
test(parser) {
const UA = parser.getUA();
return UA.test(/^((?!like android).)*$/i);
const notLikeAndroid = !parser.test(/^((?!like android).)*$/i);
const butAndroid = parser.test(/android/i);
return notLikeAndroid && butAndroid;
},
detect(ua) {
const version = /phantomjs\/(\d+(\.\d+)?)/i;
const version = getFirstMatch(commonVersionIdentifier, ua);
return {
name: 'PhantomJS',
name: 'Android Browser',
version
}
}
},
/* Safari */
{
test: [/phantom/i],
test: [/safari|applewebkit/i],
detect(ua) {
const version = /phantomjs\/(\d+(\.\d+)?)/i;
const version = getFirstMatch(commonVersionIdentifier, ua);
return {
name: 'PhantomJS',
name: 'Safari',
version
}
}
},
/* Googlebot */
{
test: [/googlebot/i],
detect(ua) {
const version = getFirstMatch(/googlebot\/(\d+(\.\d+))/i, ua) || getFirstMatch(commonVersionIdentifier, ua);
return {
name: 'Googlebot',
version
}
}
},
/* Something else */
{
test: [/.*/i],
detect(ua) {
return {
name: getFirstMatch(/^(.*)\/(.*) /, ua),
version: getSecondMatch(/^(.*)\/(.*) /, ua)
};
}
}
];
export default browsersList;

16
src/parser.js
View File

@ -35,12 +35,22 @@ class Parser {
_parseBrowser() {
this.parsedResult.browser = {};
const browser = browsersList.find((browser) => {
return browser.test(this);
const browser = browsersList.find(_browser => {
if (typeof _browser.test === 'function') {
return _browser.test(this);
}
if (_browser.test instanceof Array) {
return _browser.test.some((condition) => {
return this.test(condition);
});
}
throw new Error("Browser's test function is not valid");
});
if (browser) {
this.parsedResult.browser = browser.parse(this.getUA());
this.parsedResult.browser = browser.detect(this.getUA());
}
return this.parsedResult.browser;

5
test/unit/parser.js
View File

@ -15,3 +15,8 @@ test('getUA', t => {
test('test', t => {
t.truthy(parser.test(/Chrome/i));
});
test('_parseBrowser', t => {
const b = parser._parseBrowser();
t.is(b.name, 'Opera');
});