Fix #328 New release 0.7.19

Detect Essential Phone (PH-1)

.gitignore

@@ -1,12 +1,18 @@
 node_modules/
 npm-debug.log
-<<<<<<< HEAD
+
 ### vim ###
 .*.s[a-w][a-z]
 *.un~
 Session.vim
 .netrwhist
 *~
+.versions
+
+### editors ###
+.vscode
+.idea
+*.sublime-*
 
 ### OSX ###
 .DS_Store
@@ -14,13 +20,9 @@ Session.vim
 .LSOverride
 Icon
 
-
 # Thumbnails
 ._*
 
 # Files that might appear on external disk
 .Spotlight-V100
 .Trashes
-=======
-.idea
->>>>>>> baf4bb99b4ef92c71419931e8fd334e34c051e52

.npmrc

@@ -0,0 +1 @@
+package-lock=false

.travis.yml

@@ -1,6 +1,13 @@
 language: node_js
 node_js:
-  - 0.8
-  - 0.6
+    - stable
+    - lts/*
+
 notifications:
   email: false
+
+cache:
+    directories:
+        - node_modules
+
+sudo: false

bower.json

@@ -1,26 +1,17 @@
 {
-    "name": "ua-parser-js",
-    "version": "0.6.3-ktb",
-    "authors": [
-        "Faisal Salman <fyzlman@gmail.com>"
-    ],
-    "private": false,
-    "main": "src/ua-parser.js",
-    "ignore": [
-        "build",
-        "node_modules",
-        "bower_components",
-        "test",
-        "tests"
-    ],
-    "contributors": [
-        "Faisal Salman <fyzlman@gmail.com>",
-        "Christopher De Cairos <chris.decairos@gmail.com>",
-        "John Tantalo <john.tantalo@gmail.com>",
-        "Jon Buckley <jon@jbuckley.ca>",
-        "Lee Treveil <leetreveil@gmail.com>"
-    ],
-    "dependencies": {
-
-    }
+  "name": "ua-parser-js",
+  "version": "0.7.19",
+  "authors": [
+    "Faisal Salman <fyzlman@gmail.com>"
+  ],
+  "private": false,
+  "main": "src/ua-parser.js",
+  "ignore": [
+    "build",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {}
 }

build/build.sh

@@ -1,37 +0,0 @@
-#!/bin/bash
-
-# dependencies
-JSHINT_DIR="node_modules/jshint/bin/jshint"
-MOCHA_DIR="node_modules/mocha/bin/mocha"
-UGLIFY_DIR="node_modules/uglify-js/bin/uglifyjs"
-
-# check module directory & install if not found
-function check_module {
-    if ! type $2 &> /dev/null
-    then        
-        echo "$2 is not found"
-        if ! type "npm" &> /dev/null
-        then
-            echo "npm is not installed"
-            echo "Exiting"
-            exit 1
-        else
-            echo "Installing $1..."
-            npm install $1
-        fi
-    fi
-}
-
-check_module "jshint" $JSHINT_DIR
-check_module "mocha" $MOCHA_DIR
-check_module "uglify-js" $UGLIFY_DIR
-
-echo "Verifiying code..."
-$JSHINT_DIR src/ua-parser.js
-
-echo "Running test..."
-$MOCHA_DIR -R nyan test/test.js
-
-echo "Minifying script..."
-$UGLIFY_DIR src/ua-parser.js > src/ua-parser.min.js
-echo "OK"

component.json

@@ -1,14 +0,0 @@
-{
-  "name": "ua-parser-js",
-  "version": "0.6.16",
-  "description": "Lightweight JavaScript-based user-agent string parser",
-  "keywords": ["user-agent", "parser", "browser", "engine", "os", "device", "cpu"],
-  "scripts": ["src/ua-parser.js"],
-  "main": "src/ua-parser.js",
-  "license": "MIT",
-  "development": {
-    "jshint/jshint": "*",
-    "visionmedia/mocha": "*",
-    "mishoo/uglifyjs2": "*"
-  }
-}

dist/ua-parser.html

@@ -0,0 +1 @@
+<script src="./ua-parser.min.js"></script>

license.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2012-2018 Faisal Salman <<f@faisalman.com>>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package.js

@@ -0,0 +1,12 @@
+Package.describe({
+  name: 'faisalman:ua-parser-js',
+  version: '0.7.19',
+  summary: 'Lightweight JavaScript-based user-agent string parser',
+  git: 'https://github.com/faisalman/ua-parser-js.git',
+  documentation: 'readme.md'
+});
+
+Package.onUse(function (api) {
+  api.addFiles("src/ua-parser.js");
+  api.export("UAParser");
+});

package.json

@@ -1,8 +1,8 @@
 {
   "title": "UAParser.js",
   "name": "ua-parser-js",
-  "version": "0.6.16",
-  "author": "Faisal Salman <fyzlman@gmail.com> (http://faisalman.com)",
+  "version": "0.7.19",
+  "author": "Faisal Salman <f@faisalman.com> (http://faisalman.com)",
   "description": "Lightweight JavaScript-based user-agent string parser",
   "keywords": [
     "user-agent",
@@ -11,44 +11,130 @@
     "engine",
     "os",
     "device",
-    "cpu"
+    "cpu",
+    "jquery-plugin",
+    "ecosystem:jquery"
   ],
   "homepage": "http://github.com/faisalman/ua-parser-js",
   "contributors": [
-    "Faisal Salman <fyzlman@gmail.com>",
+    "Aamir Poonawalla <aamir@urx.com>",
+    "Admas <mollases@users.noreply.github.com>",
+    "algenon <m@antonz.ru>",
+    "Alvin Portillo <portilloalvin@gmail.com>",
+    "Andrea Vaghi <andrea.vaghi@jobrapido.com>",
+    "Anton Zhiyanov <m@antonz.ru>",
+    "Arturo Mejia <amejia@blim.com>",
+    "Arun Rama Reddy <arunramareddy@gmail.com>",
+    "Austin Pray <austin@austinpray.com>",
+    "Benjamin Bertrand <bertrand.design@gmail.com>",
+    "Benjamin Urban <benjamin.urban@sueddeutsche.de>",
+    "boneyao <admin@boneyao.com>",
+    "Carl C Von Lewin <carlchristianlewin@gmail.com>",
+    "CESAR RAMOS <c@imagenproactiva.com>",
     "Christopher De Cairos <chris.decairos@gmail.com>",
+    "Dario Vladovic <d.vladimyr@gmail.com>",
+    "Davit Barbakadze <jayarjo@gmail.com>",
+    "ddivernois <david-emmanuel.divernois@amadeus.com>",
+    "Demis Palma <demis.palma@gmail.com>",
+    "dhoko <aurelien@protonmail.com>",
+    "dianhe <dianhe@webank.com>",
+    "Dmitry Tyschenko <dtyschenko@gmail.com>",
+    "Douglas Li <doug@knotch.it>",
+    "Dumitru Uzun <contact@duzun.me>",
+    "Eric Schrenker <eric.schrenker@gmail.com>",
+    "Erik Hesselink <hesselink@gmail.com>",
+    "Fabian Becker <halfdan@xnorfz.de>",
+    "Faisal Salman <fyzlman@gmail.com>",
+    "Frédéric Camblor <fcamblor@gmail.com>",
+    "Germán M. Bravo <german.mb@gmail.com>",
+    "Grigory Dmitrenko <grigory@snsk.ru>",
+    "Hendrik Helwich <h.helwich@iplabs.de>",
+    "Hermann Ebert <ebbmo@HE.local>",
+    "jackpoll <jackpoll123456@gmail.com>",
+    "Jake Mc <startswithaj@users.noreply.github.com>",
     "John Tantalo <john.tantalo@gmail.com>",
+    "John Yanarella <jmy@codecatalyst.com>",
     "Jon Buckley <jon@jbuckley.ca>",
-    "Lee Treveil <leetreveil@gmail.com>"
+    "Kendall Buchanan <kendall@kendagriff.com>",
+    "Lee Treveil <leetreveil@gmail.com>",
+    "leonardo <leofiore@libero.it>",
+    "Levente Balogh <balogh.levente.hu@gmail.com>",
+    "Liam Quinn <lquinn@blackberry.com>",
+    "Lithin <lithin@webklipper.com>",
+    "Loris Guignard <loris.guignard@gmail.com>",
+    "Lukas Drgon <lukas.drgon@gmail.com>",
+    "Lukas Eipert <leipert@users.noreply.github.com>",
+    "Malash <i@malash.me>",
+    "Martynas <martynas@firmfirm.co>",
+    "Matt Brophy <matt@brophy.org>",
+    "Max Maurer <maxemanuel.maurer@gmail.com>",
+    "Maximilian Haupt <mail@maximilianhaupt.com>",
+    "Michael Hess <mhess@connectify.me>",
+    "naoh <naoh.cs03g@nctu.edu.tw>",
+    "Nik Rolls <nik@rolls.cc>",
+    "Nikhil Motiani <nikhil.m@247-inc.com>",
+    "niris <nirisix@gmail.com>",
+    "Nobuo Okada <nookada@yahoo-corp.jp>",
+    "otakuSiD <otakusid@gmail.com>",
+    "Peter Dave Hello <PeterDaveHello@users.noreply.github.com>",
+    "philippsimon <github@philippsimon.de>",
+    "Pieter Hendrickx <pieter.hendrickx@belfius.be>",
+    "Piper Chester <piperchester@gmail.com>",
+    "Robert Tod <robert@qubit.com>",
+    "Ron Korland <ron@testim.io>",
+    "Ross Noble <rosshnoble@gmail.com>",
+    "Sandro Sonntag <sandro.sonntag@adorsys.de>",
+    "sgautrea <shanegautreau@gmail.com>",
+    "Shane Gautreau <sgautrea@opentext.com>",
+    "Shane Thacker <shane@steadymade.com>",
+    "shchotse <topal@mail.ua>",
+    "Simon Eisenmann <simon@longsleep.org>",
+    "Simon Lang <me@simonlang.org>",
+    "Stiekel <histkc@gmail.com>",
+    "Sylvain Gizard <sylvain.gizard@gmail.com>",
+    "szchenghuang <szchenghuang@gmail.com>",
+    "Vadim Kurachevsky <vadim@hmvs.org>",
+    "Yun Young-jin <yupmin@yupmin-office-macmini.local>"
   ],
   "main": "src/ua-parser.js",
   "scripts": {
-    "test": "./build/build.sh"
+    "build": "uglifyjs src/ua-parser.js -o dist/ua-parser.min.js --comments '/UAParser\\.js/' && uglifyjs src/ua-parser.js -o dist/ua-parser.pack.js --comments '/UAParser\\.js/' --compress --mangle",
+    "test": "jshint src/ua-parser.js && mocha -R nyan test/test.js",
+    "verup": "node ./node_modules/verup",
+    "version": "node ./node_modules/verup 0"
+  },
+  "verup": {
+    "files": [
+      "bower.json",
+      "package.js",
+      "src/ua-parser.js"
+    ],
+    "regs": [
+      "^((?:\\$|(\\s*\\*\\s*@)|(\\s*(?:var|,)?\\s+))(?:LIBVERSION|version)[\\s\\:='\"]+)([0-9]+(?:\\.[0-9]+){2,2})",
+      "^(\\s?\\*.*v)([0-9]+(?:\\.[0-9]+){2,2})"
+    ]
   },
   "devDependencies": {
     "jshint": "~1.1.0",
-    "mocha": "~1.7.1",
-    "uglify-js": "~1.3.4"
+    "mocha": "~1.8.0",
+    "requirejs": "^2.3.2",
+    "uglify-js": "~2.7.5",
+    "verup": "^1.3.x"
   },
-  "repository" : {
+  "repository": {
     "type": "git",
     "url": "https://github.com/faisalman/ua-parser-js.git"
   },
-  "licenses": [
-    {
-      "type": "GPLv2",
-      "url": "http://www.gnu.org/licenses/gpl-2.0.html"
-    },
-    {
-      "type": "MIT",
-      "url": "http://www.opensource.org/licenses/mit-license.php"
-    }
-  ],
+  "license": "(GPL-2.0 OR MIT)",
   "engines": {
     "node": "*"
   },
   "directories": {
-    "lib": "src",
+    "dist": "dist",
+    "src": "src",
     "test": "test"
-  }
+  },
+  "bugs": "https://github.com/faisalman/ua-parser-js/issues",
+  "demo": "https://faisalman.github.io/ua-parser-js",
+  "download": "https://raw.github.com/faisalman/ua-parser-js/master/dist/ua-parser.min.js"
 }

readme.md

@@ -1,49 +1,61 @@
 # UAParser.js
 
-Lightweight JavaScript-based User-Agent string parser. Supports browser & node.js environment. Also available as Component package, Bower package, jQuery.ua, & AMD module
+<img align="right" src="https://raw.githubusercontent.com/faisalman/ua-parser-js/gh-pages/images/logo.png"> A JavaScript-based User-Agent string parser. Can be used either in browser (client-side) or in node.js (server-side) environment. Also available as jQuery/Zepto plugin, Bower/Meteor package, & RequireJS/AMD module. This library aims to identify detailed type of web browser, layout engine, operating system, cpu architecture, and device type/model, entirely from user-agent string with a relatively small footprint (~17KB when minified / ~6KB gzipped). Written in vanilla JavaScript, which means it doesn't require any other library and can be used independently. However, it's not recommended to use this library as browser detection since the result may not be more accurate than using feature detection.
 
-[![Build Status](https://travis-ci.org/faisalman/ua-parser-js.png?branch=master)](https://travis-ci.org/faisalman/ua-parser-js)
+[![Build Status](https://travis-ci.org/faisalman/ua-parser-js.svg?branch=master)](https://travis-ci.org/faisalman/ua-parser-js)
+[![NPM downloads](https://img.shields.io/npm/dw/ua-parser-js.svg)](https://www.npmjs.com/package/ua-parser-js)
+[![NPM](https://img.shields.io/npm/v/ua-parser-js.svg)](https://www.npmjs.com/package/ua-parser-js)
+[![Bower](https://img.shields.io/bower/v/ua-parser-js.svg)](https://bower.io/)
+[![CDNJS](https://img.shields.io/cdnjs/v/UAParser.js.svg)](https://cdnjs.com/libraries/UAParser.js)
 
-* Author    : Faisalman <<fyzlman@gmail.com>>
-* Demo      : http://faisalman.github.com/ua-parser-js
+* Author    : Faisal Salman <<f@faisalman.com>>
+* Demo      : http://faisalman.github.io/ua-parser-js
 * Source    : https://github.com/faisalman/ua-parser-js
 
-## Features
+# Constructor
 
-Extract detailed type of web browser, layout engine, operating system, cpu architecture, and device purely from user-agent string with relatively lightweight footprint (~7KB minified / ~3KB gzipped). Written in vanilla js, which means it doesn't depends on any other library.
+* `new UAParser([uastring][,extensions])`
+    * returns new instance
 
-![It's over 9000](https://pbs.twimg.com/media/A9LpEG6CIAA5VrT.jpg)
+* `UAParser([uastring][,extensions])`
+    * returns result object `{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, os: {} }`
 
-## Methods
+# Methods
 
 * `getBrowser()`
-    * returns `{ name: '', major: '', version: '' }`
+    * returns `{ name: '', version: '' }`
 
-```
+```sh
 # Possible 'browser.name':
-Amaya, Arora, Avant, Baidu, Blazer, Bolt, Camino, Chimera, Chrome, Chromium, 
-Comodo Dragon, Conkeror, Dillo, Dolphin, Doris, Epiphany, Fennec, Firebird, 
-Firefox, Flock, GoBrowser, iCab, ICE Browser, IceApe, IceCat, IceDragon, 
-Iceweasel, IE [Mobile], Iron, Jasmine, K-Meleon, Konqueror, Kindle, Links, 
-Lunascape, Lynx, Maemo, Maxthon, Midori, Minimo, [Mobile] Safari, Mosaic, Mozilla, 
-Netfront, Netscape, NetSurf, Nokia, OmniWeb, Opera [Mini/Mobi/Tablet], Phoenix, 
-Polaris, QQBrowser, RockMelt, Silk, Skyfire, SeaMonkey, SlimBrowser, Swiftfox, 
-Tizen, UCBrowser, w3m, Yandex
+2345Explorer, Amaya, Android Browser, Arora, Avant, BIDUBrowser, Baidu,
+Basilisk, Blazer, Bolt, Bowser, Camino, Chimera, Chrome Headless,
+Chrome WebView, Chrome, Chromium, Comodo Dragon, Dillo, Dolphin, Doris, Edge,
+Epiphany, Facebook, Fennec, Firebird, Firefox, Flock, GSA, GoBrowser,
+ICE Browser, IE, IEMobile, IceApe, IceCat, IceDragon, Iceape, Iceweasel,
+Iridium, Iron, Jasmine, K-Meleon, Kindle, Konqueror, LBBROWSER Line, Links,
+Lunascape, Lynx, MIUI Browser, Maemo Browser, Maemo, Maxthon, MetaSr Midori,
+Minimo, Mobile Safari, Mosaic, Mozilla, NetFront, NetSurf, Netfront, Netscape,
+NokiaBrowser, Oculus Browser, OmniWeb, Opera Coast, Opera Mini, Opera Mobi,
+Opera Tablet, Opera, PaleMoon, PhantomJS, Phoenix, Polaris, Puffin, QQ,
+QQBrowser, QQBrowserLite, Quark, RockMelt, Safari, Samsung Browser, SeaMonkey,
+Silk, Skyfire, Sleipnir, Slim, SlimBrowser, Swiftfox, Tizen Browser, UCBrowser,
+Vivaldi, Waterfox, WeChat, Yandex, baidu, iCab, w3m, ...
 
-# 'browser.version' & 'browser.major' determined dynamically
+# 'browser.version' determined dynamically
 ```
 
 * `getDevice()`
     * returns `{ model: '', type: '', vendor: '' }` 
 
-```
+```sh
 # Possible 'device.type':
-console, mobile, tablet
+console, mobile, tablet, smarttv, wearable, embedded
 
 # Possible 'device.vendor':
-Acer, Alcatel, Apple, Asus, BenQ, BlackBerry, Dell, GeeksPhone, HP, HTC, Huawei, 
-Lenovo, LG, Meizu, Motorola, Nexian, Nintendo, Nokia, Palm, Panasonic, 
-RIM, Samsung, Siemens, Sony-Ericsson, Sprint, ZTE
+Acer, Alcatel, Amazon, Apple, Archos, Asus, BenQ, BlackBerry, Dell, Essential,
+GeeksPhone, Google, HP, HTC, Huawei, Jolla, Lenovo, LG, Meizu, Microsoft, Motorola,
+Nexian, Nintendo, Nokia, Nvidia, OnePlus, Ouya, Palm, Panasonic, Pebble, Polytron,
+RIM, Samsung, Sharp, Siemens, Sony[Ericsson], Sprint, Xbox, Xiaomi, ZTE, ...
 
 # 'device.model' determined dynamically
 ```
@@ -51,10 +63,10 @@ RIM, Samsung, Siemens, Sony-Ericsson, Sprint, ZTE
 * `getEngine()`
     * returns `{ name: '', version: '' }`
 
-```
+```sh
 # Possible 'engine.name'
-Amaya, Gecko, iCab, KHTML, Links, Lynx, NetFront, NetSurf, Presto, Tasman, 
-Trident, w3m, WebKit
+Amaya, EdgeHTML, Gecko, iCab, KHTML, Links, Lynx, NetFront, NetSurf, Presto, 
+Tasman, Trident, w3m, WebKit
 
 # 'engine.version' determined dynamically
 ```
@@ -62,14 +74,14 @@ Trident, w3m, WebKit
 * `getOS()`
     * returns `{ name: '', version: '' }`
 
-```
+```sh
 # Possible 'os.name'
-AIX, Amiga OS, Android, Arch, Bada, BeOS, BlackBerry, CentOS, Chromium OS, 
-Fedora, Firefox OS, FreeBSD, Debian, DragonFly, Gentoo, GNU, Haiku, Hurd, iOS, 
-Joli, Linux, Mac OS, Mandriva, MeeGo, Minix, Mint, Morph OS, NetBSD, Nintendo, 
-OpenBSD, OS/2, Palm, PCLinuxOS, Plan9, Playstation, QNX, RedHat, RIM Tablet OS, 
-RISC OS, Slackware, Solaris, SUSE, Symbian, Tizen, Ubuntu, UNIX, WebOS, 
-Windows [Phone/Mobile], Zenwalk
+AIX, Amiga OS, Android, Arch, Bada, BeOS, BlackBerry, CentOS, Chromium OS, Contiki,
+Fedora, Firefox OS, FreeBSD, Debian, DragonFly, Fuchsia, Gentoo, GNU, Haiku, Hurd, iOS, 
+Joli, Linpus, Linux, Mac OS, Mageia, Mandriva, MeeGo, Minix, Mint, Morph OS, NetBSD, 
+Nintendo, OpenBSD, OpenVMS, OS/2, Palm, PC-BSD, PCLinuxOS, Plan9, Playstation, QNX, RedHat, 
+RIM Tablet OS, RISC OS, Sailfish, Series40, Slackware, Solaris, SUSE, Symbian, Tizen, 
+Ubuntu, Unix, VectorLinux, WebOS, Windows [Phone/Mobile], Zenwalk, ...
 
 # 'os.version' determined dynamically
 ```
@@ -77,19 +89,23 @@ Windows [Phone/Mobile], Zenwalk
 * `getCPU()`
     * returns `{ architecture: '' }`
 
-```
+```sh
 # Possible 'cpu.architecture'
-68k, amd64, arm, ia32, ia64, irix, irix64, mips, mips64, pa-risc, ppc, sparc, sparc64
+68k, amd64, arm[64], avr, ia[32/64], irix[64], mips[64], pa-risc, ppc, sparc[64]
 ```
 
 * `getResult()`
     * returns `{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, os: {} }`
+
 * `getUA()`
     * returns UA string of current instance
-* `setUA(uastring)`
-    * set & parse UA string
 
-## Example
+* `setUA(uastring)`
+    * set UA string to parse
+    * returns current instance
+
+
+# Example
 
 ```html
 <!doctype html>
@@ -108,8 +124,7 @@ Windows [Phone/Mobile], Zenwalk
             ua: "",
             browser: {
                 name: "",
-                version: "",
-                major: ""
+                version: ""
             },
             engine: {
                 name: "",
@@ -138,7 +153,7 @@ Windows [Phone/Mobile], Zenwalk
     // this will also produce the same result (without instantiation):
     // var result = UAParser(uastring);
 
-    console.log(result.browser);        // {name: "Chromium", major: "15", version: "15.0.874.106"}
+    console.log(result.browser);        // {name: "Chromium", version: "15.0.874.106"}
     console.log(result.device);         // {model: undefined, type: undefined, vendor: undefined}
     console.log(result.os);             // {name: "Ubuntu", version: "11.10"}
     console.log(result.os.version);     // "11.10"
@@ -163,49 +178,84 @@ Windows [Phone/Mobile], Zenwalk
 </html>
 ```
 
-### Using node.js
+## Using node.js
 
 ```sh
 $ npm install ua-parser-js
 ```
 
 ```js
-var UAParser = require('ua-parser-js');
-var parser = new UAParser();
-var ua = request.headers['user-agent'];     // user-agent header from an HTTP request
-console.log(parser.setUA(ua).getResult());
+var http = require('http');
+var parser = require('ua-parser-js');
+
+http.createServer(function (req, res) {
+    // get user-agent header
+    var ua = parser(req.headers['user-agent']);
+    // write the result as response
+    res.end(JSON.stringify(ua, null, '  '));
+})
+.listen(1337, '127.0.0.1');
+
+console.log('Server running at http://127.0.0.1:1337/');
 ```
 
-### Using requirejs
+## Using requirejs
 
 ```js
-require(['ua-parser'], function(UAParser) {
+requirejs.config({
+    baseUrl : 'js/lib', // path to your script directory
+    paths   : {
+        'ua-parser-js' : 'ua-parser.min'
+    }
+});
+
+requirejs(['ua-parser-js'], function(UAParser) {
     var parser = new UAParser();
     console.log(parser.getResult());
 });
 ```
 
-### Using component
+## Using CDN
 
-```sh
-$ component install faisalman/ua-parser-js
+```html
+<script src="https://cdn.jsdelivr.net/npm/ua-parser-js@0/dist/ua-parser.min.js"></script>
 ```
 
-```js
-var UAParser = require('ua-parser-js');
-var parser = new UAParser();
-console.log(parser.getResult());
-```
-
-### Using bower
+## Using bower
 
 ```sh
 $ bower install ua-parser-js
 ```
 
-### Using jQuery.ua
+## Using meteor
 
-Although written in vanilla js (which means it doesn't depends on jQuery), this library will automatically detect if jQuery is present and create `$.ua` object based on browser's user-agent (although in case you need, `window.UAParser` constructor is still present). To get/set user-agent you can use: `$.ua.get()` / `$.ua.set(uastring)`. 
+```sh
+$ meteor add faisalman:ua-parser-js
+```
+
+## Using TypeScript
+
+```sh
+$ npm install --save @types/ua-parser-js
+# Download TS type definition from DefinitelyTyped repository:
+# https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/ua-parser-js
+```
+
+## Using CLI
+
+```sh
+$ node ua-parser.min.js "Mozilla/4.0 (compatible; MSIE 4.01; Windows 98)"
+# multiple args
+$ node ua-parser.min.js "Opera/1.2" "Opera/3.4"
+# piped args
+$ echo "Opera/1.2" | node ua-parser.min.js
+# log file
+$ cat ua.log | node ua-parser.min.js
+```
+
+## Using jQuery/Zepto ($.ua)
+
+Although written in vanilla js (which means it doesn't depends on jQuery), this library will automatically detect if jQuery/Zepto is present and create `$.ua` object based on browser's user-agent (although in case you need, `window.UAParser` constructor is still present). To get/set user-agent you can use: `$.ua.get()` / `$.ua.set(uastring)`. 
 
 ```js
 // In browser with default user-agent: 'Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Sprint APA7373KT Build/GRJ22) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0':
@@ -224,29 +274,60 @@ console.log($.ua.browser.name);     // "Safari"
 console.log($.ua.engine.name);      // "Webkit"
 console.log($.ua.device);           // {vendor: "Motorola", model: "Xoom", type: "tablet"}
 console.log(parseInt($.ua.browser.version.split('.')[0], 10));  // 4
+
+// Add class to <body> tag
+// <body class="ua-browser-safari ua-devicetype-tablet">
+$('body').addClass('ua-browser-' + $.ua.browser.name + ' ua-devicetype-' + $.ua.device.type);
 ```
 
-## Development
+## Extending regex patterns
 
-Install dependencies
+* `UAParser([uastring,] extensions)`
+
+Pass your own regexes to extend the limited matching rules.
+
+```js
+// Example:
+var myOwnRegex = [[/(myownbrowser)\/([\w\.]+)/i], [UAParser.BROWSER.NAME, UAParser.BROWSER.VERSION]];
+var myParser = new UAParser({ browser: myOwnRegex });
+var uaString = 'Mozilla/5.0 MyOwnBrowser/1.3';
+console.log(myParser.setUA(uaString).getBrowser());   // {name: "MyOwnBrowser", version: "1.3"}
+```
+
+
+# Development
+
+## Contribute
+
+* Fork and clone this repository
+* Make some changes as required
+* Write a unit test to showcase your feature
+* Run the test suites to make sure the changes you made didn't break anything `$ npm run test`
+* Commit and push to your own repository
+* Submit a pull request to this repository under `develop` branch
+* Profit? $$$
+
+## Build
+
+Build a minified & packed script
 
 ```sh
-$ npm install jshint
-$ npm install mocha
-$ npm install uglify-js
+$ npm run build
 ```
 
-Verify, test, & minify script
 
-```sh
-$ ./build/build.sh
-```
+# Donate
 
-## License
+Do you use & like UAParser.js but you don’t find a way to show some love? If yes, please consider donating to support this project. Otherwise, no worries, regardless of whether there is support or not, I will keep maintaining this project. Still, if you buy me a cup of coffee I would be more than happy though :)
 
-Dual licensed under GPLv2 & MIT
+[![Support via PayPal](https://cdn.rawgit.com/twolfson/paypal-github-button/1.0.0/dist/button.svg)](https://www.paypal.me/faisalman/)
 
-Copyright © 2012-2013 Faisalman <<fyzlman@gmail.com>>
+
+# License
+
+Dual licensed under GPLv2 or MIT
+
+Copyright © 2012-2018 Faisal Salman <<f@faisalman.com>>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of 
 this software and associated documentation files (the "Software"), to deal in 
@@ -257,3 +338,11 @@ subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all 
 copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

test/cpu-test.json

@@ -47,6 +47,14 @@
             "architecture"  : "arm"
         }
     },
+    {
+        "desc"    : "ARMv7",
+        "ua"      : "Mozilla/5.0 (X11; CrOS armv7l 9765.85.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.123 Safari/537.36",
+        "expect"  :
+        {
+            "architecture"  : "arm"
+        }
+    },
     {
         "desc"    : "Pocket PC",
         "ua"      : "Opera/9.7 (Windows Mobile; PPC; Opera Mobi/35166; U; en) Presto/2.2.1",
@@ -102,21 +110,5 @@
         {
             "architecture"  : "amd64"
         }
-    },
-    {
-        "desc"    : "KTB iPad",
-        "ua"      :  "APP-BE Test/1.0 (iPad; Apple; CPU iPhone OS 7_0_2 like Mac OS X)",
-        "expect"  :
-        {
-            "architecture"  : "undefined"
-        }
-    },
-    {
-        "desc"    : "KTB-Nexus 5",
-        "ua"      : "APP-My App/1.0 (Linux; Android 4.2.1; Nexus 5 Build/JOP40D)",
-        "expect"  :
-        {
-            "architecture"  : "undefined"
-        }
     }
 ]

test/engine-test.json

@@ -1,4 +1,13 @@
 [
+    {
+        "desc"    : "EdgeHTML",
+        "ua"      : "Mozilla/5.0 (Windows NT 6.4; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.143 Safari/537.36 Edge/12.0",
+        "expect"  :
+        {
+            "name"    : "EdgeHTML",
+            "version" : "12.0"
+        }
+    },
     {
         "desc"    : "Gecko",
         "ua"      : "Mozilla/5.0 (X11; Linux x86_64; rv:2.0b9pre) Gecko/20110111 Firefox/4.0b9pre",
@@ -61,24 +70,5 @@
             "name"    : "WebKit",
             "version" : "533.19.4"
         }
-    },
-    {
-        "desc"    : "KTA Mobile App",
-        "ua"      : "APP-BE Test/1.0 (iPad; Apple; CPU iPhone OS 7_0_2 like Mac OS X)",
-        "expect"  :
-        {
-            "name"    : "Mobile-App",
-            "version" : "1.0"
-        }
-    },
-    {
-        "desc"    : "KTB-Nexus 5",
-        "ua"      : "APP-My App/1.0 (Linux; Android 4.2.1; Nexus 5 Build/JOP40D)",
-        "expect"  :
-        {
-            "name"    : "Mobile-App",
-            "version" : "1.0"
-        }
     }
-
 ]

test/mediaplayer-test.json

@@ -0,0 +1,582 @@
+[
+    {
+        "desc"    : "Coremedia",
+        "ua"      : "Apple Mac OS X v10.6.4 CoreMedia v1.0.0.10F2108",
+        "expect"  : 
+        {
+            "name"    : "CoreMedia",
+            "version" : "1.0.0.10F2108",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "AppleCoreMedia",
+        "ua"      : "AppleCoreMedia/1.0.0.10A403 (iPad; U; CPU OS 6_0 like Mac OS X; it_it)",
+        "expect"  : 
+        {
+            "name"    : "AppleCoreMedia",
+            "version" : "1.0.0.10A403",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "AppleTv",
+        "ua"      : "AppleTV/3.0.2 (Macintosh; Intel Mac OS X 10.4.7) AppleWebKit/528.18",
+        "expect"  : 
+        {
+            "name"    : "WebKit",
+            "version" : "528.18",
+            "major"   : "528"
+        }
+    },
+    {
+        "desc"    : "Aqualung",
+        "ua"      : "Aqualung/R-1114",
+        "expect"  : 
+        {
+            "name"    : "Aqualung",
+            "version" : "R-1114",
+            "major"   : "undefined"
+        }
+    },
+    {
+        "desc"    : "Ares",
+        "ua"      : "Ares 2.2.4.3048",
+        "expect"  : 
+        {
+            "name"    : "Ares",
+            "version" : "2.2.4.3048",
+            "major"   : "2"
+        }
+    },
+    {
+        "desc"    : "Audacious",
+        "ua"      : "Audacious/3.2.2 neon/0.29.3",
+        "expect"  : 
+        {
+            "name"    : "Audacious",
+            "version" : "3.2.2",
+            "major"   : "3"
+        }
+    },
+    {
+        "desc"    : "AudiMusicStream",
+        "ua"      : "AudiMusicStream/3020.130826151911",
+        "expect"  : 
+        {
+            "name"    : "AudiMusicStream",
+            "version" : "3020.130826151911",
+            "major"   : "3020"
+        }
+    },
+    {
+        "desc"    : "BASS",
+        "ua"      : "BASS/2.4",
+        "expect"  : 
+        {
+            "name"    : "BASS",
+            "version" : "2.4",
+            "major"   : "2"
+        }
+    },
+    {
+        "desc"    : "BSPlayer",
+        "ua"      : "BSPlayer/2",
+        "expect"  : 
+        {
+            "name"    : "BSPlayer",
+            "version" : "2",
+            "major"   : "2"
+        }
+    },
+    {
+        "desc"    : "Core",
+        "ua"      : "CORE/6.506.4.1",
+        "expect"  : 
+        {
+            "name"    : "CORE",
+            "version" : "6.506.4.1",
+            "major"   : "6"
+        }
+    },
+    {
+        "desc"    : "Clementine",
+        "ua"      : "Clementine 1.1",
+        "expect"  : 
+        {
+            "name"    : "Clementine",
+            "version" : "1.1",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "Dalvik",
+        "ua"      : "Dalvik/1.2.0 (Linux; U; Android 2.2.1; GT-S5830L Build/FROYO)",
+        "expect"  : 
+        {
+            "name"    : "Dalvik",
+            "version" : "1.2.0",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "NexPlayer",
+        "ua"      : "E97510d/ Player/NexPlayer 4.0",
+        "expect"  : 
+        {
+            "name"    : "NexPlayer",
+            "version" : "4.0",
+            "major"   : "4"
+        }
+    },
+    {
+        "desc"    : "FLRP",
+        "ua"      : "FLRP/2.5 CFNetwork/609.1.4 Darwin/13.0.0",
+        "expect"  : 
+        {
+            "name"    : "Flip Player",
+            "version" : "2.5",
+            "major"   : "2"
+        }
+    },
+    {
+        "desc"    : "FStream",
+        "ua"      : "FStream",
+        "expect"  : 
+        {
+            "name"    : "FStream",
+            "version" : "undefined",
+            "major"   : "undefined"
+        }
+    },
+    {
+        "desc"    : "GStreamer",
+        "ua"      : "GStreamer souphttpsrc (compatible; LG NetCast.TV-2012) libsoup/2.34.2",
+        "expect"  : 
+        {
+            "name"    : "GStreamer",
+            "version" : "2.34.2",
+            "major"   : "2"
+        }
+    },
+    {
+        "desc"    : "GnomeMplayer",
+        "ua"      : "GnomeMplayer/1.0.2",
+        "expect"  : 
+        {
+            "name"    : "GnomeMplayer",
+            "version" : "1.0.2",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "HTC Streaming Player",
+        "ua"      : "HTC Streaming Player htc_asia_wwe / 1.0 / endeavoru / 4.1.1",
+        "expect"  : 
+        {
+            "name"    : "HTC Streaming Player",
+            "version" : "1.0",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "HTC One S",
+        "ua"      : "HTC_One_S/3.16.111.10",
+        "expect"  : 
+        {
+            "name"    : "HTC One S",
+            "version" : "3.16.111.10",
+            "major"   : "3"
+        }
+    },
+    {
+        "desc"    : "Java",
+        "ua"      : "Java/1.4.1_04",
+        "expect"  : 
+        {
+            "name"    : "Java",
+            "version" : "1.4.1_04",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "LG Player",
+        "ua"      : "LG Player 1.0; Android",
+        "expect"  : 
+        {
+            "name"    : "LG Player",
+            "version" : "1.0",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "NexPlayer",
+        "ua"      : "LG-P700/V10k-DEC-12-2012 Player/NexPlayer 4.0 for Android",
+        "expect"  : 
+        {
+            "name"    : "NexPlayer",
+            "version" : "4.0",
+            "major"   : "4"
+        }
+    },
+    {
+        "desc"    : "LG Player",
+        "ua"      : "LGE400/V10b Player/LG Player 1.0",
+        "expect"  : 
+        {
+            "name"    : "LG Player",
+            "version" : "1.0",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "Lavf",
+        "ua"      : "Lavf52.111.0",
+        "expect"  : 
+        {
+            "name"    : "Lavf",
+            "version" : "52.111.0",
+            "major"   : "52"
+        }
+    },
+    {
+        "desc"    : "Lyssna",
+        "ua"      : "Lyssna/46 CFNetwork/609.1.4 Darwin/13.0.0",
+        "expect"  : 
+        {
+            "name"    : "Lyssna",
+            "version" : "46",
+            "major"   : "46"
+        }
+    },
+    {
+        "desc"    : "MPlayer",
+        "ua"      : "MPlayer 1.1-4.2.1",
+        "expect"  : 
+        {
+            "name"    : "MPlayer",
+            "version" : "1.1-4.2.1",
+            "major"   : ""
+        }
+    },
+    {
+        "desc"    : "MPlayer SVN",
+        "ua"      : "MPlayer SVN-r33713-4.6.1",
+        "expect"  : 
+        {
+            "name"    : "MPlayer",
+            "version" : "r33713-4.6.1",
+            "major"   : "undefined"
+        }
+    },
+    {
+        "desc"    : "MPlayer ubuntu",
+        "ua"      : "MPlayer svn r34540 (Ubuntu), built with gcc-4.6",
+        "expect"  : 
+        {
+            "name"    : "MPlayer",
+            "version" : "r34540",
+            "major"   : "undefined"
+        }
+    },
+    {
+        "desc"    : "MoC",
+        "ua"      : "Music On Console/2.5.0-beta1",
+        "expect"  : 
+        {
+            "name"    : "Music On Console",
+            "version" : "2.5.0-beta1",
+            "major"   : "2"
+        }
+    },
+    {
+        "desc"    : "MPD",
+        "ua"      : "Music Player Daemon 0.17.4",
+        "expect"  : 
+        {
+            "name"    : "Music Player Daemon",
+            "version" : "0.17.4",
+            "major"   : "0"
+        }
+    },
+    {
+        "desc"    : "NSPlayer",
+        "ua"      : "NSPlayer/11.0.5358.4827 WMFSDK/11.0",
+        "expect"  : 
+        {
+            "name"    : "NSPlayer",
+            "version" : "11.0.5358.4827",
+            "major"   : "11"
+        }
+    },
+    {
+        "desc"    : "Nero Home",
+        "ua"      : "Nero Home/1.5.3.0 (compatible; Nero AG; Nero Home 1.5.3.0)",
+        "expect"  : 
+        {
+            "name"    : "Nero Home",
+            "version" : "1.5.3.0",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "NexPlayer",
+        "ua"      : "NexPlayer 4.0 for Android( stagefright alternative )",
+        "expect"  : 
+        {
+            "name"    : "NexPlayer",
+            "version" : "4.0",
+            "major"   : "4"
+        }
+    },
+    {
+        "desc"    : "Nokia3xx",
+        "ua"      : "Nokia303/14.87 CLDC-1.1",
+        "expect"  : 
+        {
+            "name"    : "Nokia303",
+            "version" : "14.87",
+            "major"   : "14"
+        }
+    },
+    {
+        "desc"    : "MPlayer SVN Sherpya",
+        "ua"      : "MPlayer Sherpya-SVN-r33124-4.2.5",
+        "expect"  : 
+        {
+            "name"    : "MPlayer",
+            "version" : "r33124-4.2.5",
+            "major"   : "undefined"
+        }
+    },
+    {
+        "desc"    : "Philips Songbird",
+        "ua"      : "NotMoz/5.0 (Windows; U; Windows NT 5.1; it; rv:1.9.2.3) Gecko/20101207 Philips-Songbird/5.4.1980 Songbird/1.9.4 (20110302030555)",
+        "expect"  : 
+        {
+            "name"    : "Songbird",
+            "version" : "1.9.4",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "Ossproxy",
+        "ua"      : "OSSProxy 1.3.336.320 (Build 336.320 Win32 en-us)(Aug 16 2013 17:38:43)",
+        "expect"  : 
+        {
+            "name"    : "OSSProxy",
+            "version" : "1.3.336.320",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "Winamp3",
+        "ua"      : "Nullsoft Winamp3 version 3.0 (compatible)",
+        "expect"  : 
+        {
+            "name"    : "Winamp",
+            "version" : "3.0",
+            "major"   : "3"
+        }
+    },
+    {
+        "desc"    : "PSP",
+        "ua"      : "PSP-InternetRadioPlayer/1.00",
+        "expect"  : 
+        {
+            "name"    : "PSP-InternetRadioPlayer",
+            "version" : "1.00",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "urllib",
+        "ua"      : "Python-urllib/2.7",
+        "expect"  : 
+        {
+            "name"    : "Python-urllib",
+            "version" : "2.7",
+            "major"   : "2"
+        }
+    },
+    {
+        "desc"    : "QuickTime",
+        "ua"      : "QuickTime/7.5.6 (qtver=7.5.6;cpu=IA32;os=Mac 10.5.8)",
+        "expect"  : 
+        {
+            "name"    : "QuickTime",
+            "version" : "7.5.6",
+            "major"   : "7"
+        }
+    },
+    {
+        "desc"    : "RMA",
+        "ua"      : "RMA/1.0 (compatible; RealMedia)",
+        "expect"  : 
+        {
+            "name"    : "RMA",
+            "version" : "1.0",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "RadioApp",
+        "ua"      : "RadioApp/1.0 CFNetwork/609.1.4 Darwin/11.4.2",
+        "expect"  : 
+        {
+            "name"    : "RadioApp",
+            "version" : "1.0",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "RadioClientApplication",
+        "ua"      : "RadioClientApplication/20 CFNetwork/609.1.4 Darwin/13.0.0",
+        "expect"  : 
+        {
+            "name"    : "RadioClientApplication",
+            "version" : "20",
+            "major"   : "undefined"
+        }
+    },
+    {
+        "desc"    : "stagefright",
+        "ua"      : "Samsung GT-I9070 stagefright/1.1 (Linux;Android 2.3.6)",
+        "expect"  : 
+        {
+            "name"    : "stagefright",
+            "version" : "1.1",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "Soundtap",
+        "ua"      : "Soundtap/1.2.4 CFNetwork/672.0.2 Darwin/14.0.0",
+        "expect"  : 
+        {
+            "name"    : "Soundtap",
+            "version" : "1.2.4",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "Streamium",
+        "ua"      : "Streamium/1.0",
+        "expect"  : 
+        {
+            "name"    : "Streamium",
+            "version" : "1.0",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "Totem",
+        "ua"      : "Totem/3.0.1",
+        "expect"  : 
+        {
+            "name"    : "Totem",
+            "version" : "3.0.1",
+            "major"   : "3"
+        }
+    },
+    {
+        "desc"    : "VLC",
+        "ua"      : "VLC media player - version 0.8.6c Janus - (c) 1996-2007 the VideoLAN team",
+        "expect"  : 
+        {
+            "name"    : "VLC",
+            "version" : "0.8.6c",
+            "major"   : "0"
+        }
+    },
+    {
+        "desc"    : "VLC",
+        "ua"      : "VLC/2.0.0 LibVLC/2.0.0",
+        "expect"  : 
+        {
+            "name"    : "VLC",
+            "version" : "2.0.0",
+            "major"   : "2"
+        }
+    },
+    {
+        "desc"    : "Videos",
+        "ua"      : "Videos/3.8.2",
+        "expect"  : 
+        {
+            "name"    : "Video",
+            "version" : "3.8.2",
+            "major"   : "3"
+        }
+    },
+    {
+        "desc"    : "Wget",
+        "ua"      : "Wget/1.12 (darwin10.7.0)",
+        "expect"  : 
+        {
+            "name"    : "Wget",
+            "version" : "1.12",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "Winamp",
+        "ua"      : "Winamp 2.81",
+        "expect"  : 
+        {
+            "name"    : "Winamp",
+            "version" : "2.81",
+            "major"   : "2"
+        }
+    },
+    {
+        "desc"    : "Winamp",
+        "ua"      : "WinampMPEG/2.00",
+        "expect"  : 
+        {
+            "name"    : "Winamp",
+            "version" : "2.00",
+            "major"   : "2"
+        }
+    },
+    {
+        "desc"    : "Windows Media Player",
+        "ua"      : "Windows-Media-Player/10.00.00.4019",
+        "expect"  : 
+        {
+            "name"    : "Windows Media Player",
+            "version" : "10.00.00.4019",
+            "major"   : "10"
+        }
+    },
+    {
+        "desc"    : "XBMC",
+        "ua"      : "XBMC/12.0 Git:20130127-fb595f2 (Windows NT 6.1;WOW64;Win64;x64; http://www.xbmc.org)",
+        "expect"  : 
+        {
+            "name"    : "XBMC",
+            "version" : "12.0",
+            "major"   : "12"
+        }
+    },
+    {
+        "desc"    : "rad.io",
+        "ua"      : "rad.io 1.18.1 rv:593 (iPhone 4S; iPhone OS 7.0.4; it_IT)",
+        "expect"  : 
+        {
+            "name"    : "rad.io",
+            "version" : "1.18.1",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "BE-Test",
+        "ua"      : "APP-BE Test/1.0 (iPad; Apple; CPU iPhone OS 7_0_2 like Mac OS X)",
+        "expect"  :
+        {
+            "name"    : "BE Test",
+            "version" : "1.0",
+            "major"   : "1"
+        }
+    }
+]

test/os-test.json

@@ -71,6 +71,15 @@
             "version" : "8"
         }
     },
+    {
+        "desc"    : "Windows 10",
+        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Safari/537.36 Edge/12.0",
+        "expect"  :
+        {
+            "name"    : "Windows",
+            "version" : "10"
+        }
+    },
     {
         "desc"    : "Windows RT",
         "ua"      : "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; ARM; Trident/6.0)",
@@ -98,6 +107,15 @@
             "version" : "6.1"
         }
     },
+    {
+        "desc"    : "Windows Phone",
+        "ua"      : "Opera/9.80 (Windows Phone; Opera Mini/7.6.8/35.7518; U; ru) Presto/2.8.119 Version/11.10",
+        "expect"  :
+        {
+            "name"    : "Windows Phone",
+            "version" : "undefined"
+        }
+    },
     {
         "desc"    : "Windows Phone OS",
         "ua"      : "Mozilla/4.0 (compatible; MSIE 7.0; Windows Phone OS 7.0; Trident/3.1; IEMobile/7.0; DELL; Venue Pro)",
@@ -136,11 +154,11 @@
     },
     {
         "desc"    : "Tizen",
-        "ua"      : "",
+        "ua"      : "Mozilla/5.0 (Linux; Tizen 2.3; SAMSUNG SM-Z130H) AppleWebKit/537.3 (KHTML, like Gecko) Version/2.3 Mobile Safari/537.3",
         "expect"  :
         {
-            "name"    : "",
-            "version" : ""
+            "name"    : "Tizen",
+            "version" : "2.3"
         }
     },
     {
@@ -242,6 +260,15 @@
             "version" : ""
         }
     },
+    {
+        "desc"    : "PlayStation 4",
+        "ua"      : "Mozilla/5.0 (PlayStation 4 3.00) AppleWebKit/537.73 (KHTML, like Gecko)",
+        "expect"  :
+        {
+            "name"    : "PlayStation",
+            "version" : "4"
+        }
+    },
     {
         "desc"    : "Mint",
         "ua"      : "",
@@ -262,11 +289,20 @@
     },
     {
         "desc"    : "Ubuntu",
-        "ua"      : "",
+        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.22+ (KHTML, like Gecko) Chromium/17.0.963.56 Chrome/17.0.963.56 Safari/535.22+ Ubuntu/12.04 (3.4.1-0ubuntu1) Epiphany/3.4.1",
         "expect"  :
         {
-            "name"    : "",
-            "version" : ""
+            "name"    : "Ubuntu",
+            "version" : "12.04"
+        }
+    },
+    {
+        "desc"    : "Ubuntu",
+        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/31.0.1650.63 Chrome/31.0.1650.63 Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "Ubuntu",
+            "version" : "undefined"
         }
     },
     {
@@ -397,11 +433,20 @@
     },
     {
         "desc"    : "Chromium OS",
-        "ua"      : "",
+        "ua"      : "Mozilla/5.0 (X11; CrOS x86_64 10575.58.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.99 Safari/537.36",
         "expect"  :
         {
-            "name"    : "",
-            "version" : ""
+            "name"    : "Chromium OS",
+            "version" : "10575.58.0"
+        }
+    },
+    {
+        "desc"    : "Fuchsia",
+        "ua"      : "Mozilla/5.0 (X11; Fuchsia x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3557.0 Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "Fuchsia",
+            "version" : "undefined"
         }
     },
     {
@@ -449,6 +494,15 @@
             "version" : ""
         }
     },
+    {
+        "desc"    : "iOS in App",
+        "ua"      : "AppName/version CFNetwork/version Darwin/version",
+        "expect"  :
+        {
+            "name"    : "iOS",
+            "version" : "undefined"
+        }
+    },
     {
         "desc"    : "iOS with Chrome",
         "ua"      : "Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_1_1 like Mac OS X; en) AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 Safari/7534.48.3",
@@ -472,17 +526,17 @@
         "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.95 Safari/537.36",
         "expect"  :
         {
-            "name"    : "Mac OS X",
+            "name"    : "Mac OS",
             "version" : "10.6.8"
         }
     },
     {
         "desc"    : "Haiku",
-        "ua"      : "",
+        "ua"      : "Mozilla/5.0 (Macintosh; Intel Haiku R1 x86) AppleWebKit/602.1.1 (KHTML, like Gecko) WebPositive/1.2 Version/8.0 Safari/602.1.1",
         "expect"  :
         {
-            "name"    : "",
-            "version" : ""
+            "name"    : "Haiku",
+            "version" : "R1"
         }
     },
     {

test/test.js

@@ -1,4 +1,5 @@
 var assert      = require('assert');
+var requirejs   = require('requirejs');
 var UAParser    = require('./../src/ua-parser');
 var browsers    = require('./browser-test.json');
 var cpus        = require('./cpu-test.json');
@@ -48,9 +49,9 @@ for (var i in methods) {
         for (var j in methods[i]['list']) {
             if (!!methods[i]['list'][j].ua) {
                 describe('[' + methods[i]['list'][j].desc + ']', function () {
-                    describe('"' + methods[i]['list'][j].ua + '"', function () {                
+                    describe('"' + methods[i]['list'][j].ua + '"', function () {
                         var expect = methods[i]['list'][j].expect;
-                        var result = parser.setUA(methods[i]['list'][j].ua).getResult()[methods[i]['label']];  
+                        var result = parser.setUA(methods[i]['list'][j].ua).getResult()[methods[i]['label']];
 
                         methods[i]['properties'].forEach(function(m) {
                             it('should return ' + methods[i]['label'] + ' ' + m + ': ' + expect[m], function () {
@@ -63,3 +64,50 @@ for (var i in methods) {
         }
     });
 }
+
+describe('Returns', function () {
+    it('getResult() should returns JSON', function(done) {
+        assert.deepEqual(new UAParser('').getResult(), 
+            {
+                ua : '',
+                browser: { name: undefined, version: undefined, major: undefined },
+                cpu: { architecture: undefined },
+                device: { vendor: undefined, model: undefined, type: undefined },
+                engine: { name: undefined, version: undefined},
+                os: { name: undefined, version: undefined }
+        });
+        done();
+    });
+});
+
+describe('Extending Regex', function () {
+    var uaString = 'Mozilla/5.0 MyOwnBrowser/1.3';
+    var myOwnBrowser = [[/(myownbrowser)\/((\d+)?[\w\.]+)/i], [UAParser.BROWSER.NAME, UAParser.BROWSER.VERSION, UAParser.BROWSER.MAJOR]];
+
+    var parser1 = new UAParser(uaString, {browser: myOwnBrowser});
+    assert.equal(parser1.getBrowser().name, 'MyOwnBrowser');
+    assert.equal(parser1.getBrowser().version, '1.3');
+    assert.equal(parser1.getBrowser().major, '1');
+
+    var parser2 = new UAParser({browser: myOwnBrowser});
+    assert.equal(parser2.getBrowser().name, undefined);
+    parser2.setUA(uaString);
+    assert.equal(parser2.getBrowser().name, 'MyOwnBrowser');
+    assert.equal(parser1.getBrowser().version, '1.3');
+});
+
+describe('Using Require.js', function () {
+    it('should loaded automatically', function(done) {
+        requirejs.config({
+            baseUrl : 'dist',
+            paths   : {
+                'ua-parser-js' : 'ua-parser.min'
+            }
+        });
+        requirejs(['ua-parser-js'], function(ua) {
+            var parser = new ua('Dillo/1.0');
+            assert.deepEqual(parser.getBrowser().name, 'Dillo');
+            done();
+        });
+    });
+});

ua-parser-js.jquery.json

@@ -1,32 +0,0 @@
-{
-    "title": "UAParser.js",
-    "name": "ua-parser-js",
-    "version": "0.6.16",
-    "description": "Lightweight JavaScript-based user-agent string parser",
-    "keywords": [
-        "user-agent",
-        "parser",
-        "browser",
-        "engine",
-        "os",
-        "device",
-        "cpu"
-    ],
-    "homepage": "https://faisalman.github.com/ua-parser-js",
-    "author": {
-        "name": "Faisal Salman",
-        "email": "fyzlman@gmail.com"
-    },
-    "dependencies": {
-        "jquery": ">=1.5"
-    },
-    "licenses": [
-        {
-            "type": "MIT",
-            "url": "http://www.opensource.org/licenses/mit-license.php"
-        }
-    ],
-    "bugs": "https://github.com/faisalman/ua-parser-js/issues",
-    "docs": "https://github.com/faisalman/ua-parser-js",
-    "download": "https://raw.github.com/faisalman/ua-parser-js/master/src/ua-parser.min.js"
-}