Move regexMapper & maps outside UAParser class

package.json

@@ -1,43 +1,51 @@
 {
-  "title"       : "UA-Parser.js",
-  "name"        : "ua-parser-js",
-  "version"     : "0.3.0",
-  "author"      : {
-      "name"      : "Faisal Salman",
-      "email"     : "fyzlman@gmail.com",
-      "url"       : "http://faisalman.com"
-  },
-  "description" : "Lightweight JavaScript-based user-agent parser",
-  "keywords"    : [
-    "user-agent",
+  "title": "UA-Parser.JS",
+  "name": "ua-parser-js",
+  "version": "0.3.4",
+  "author": "Faisal Salman <fyzlman@gmail.com> (http://faisalman.com)",
+  "description": "Lightweight JavaScript-based user-agent string parser",
+  "keywords": [
+    "user agent",
     "parser",
     "browser",
     "engine",
     "os",
     "device"
   ],
-  "homepage"    : "http://faisalman.github.com/ua-parser-js",
+  "homepage": "http://github.com/faisalman/ua-parser-js",
   "contributors": [
-    {
-      "name"    : "Faisal Salman",
-      "email"   : "fyzlman@gmail.com"
-    }
+    "Faisal Salman <fyzlman@gmail.com>"
   ],
-  "main"        : "ua-parser.js",
+  "main": "ua-parser",
   "repositories": [
     {
-      "type"    : "git",
-      "url"     : "https://github.com/faisalman/ua-parser-js.git"
+      "type": "git",
+      "url": "https://github.com/faisalman/ua-parser-js.git"
     }
   ],
-  "licenses"    : [
+  "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": "GPLv2",
+      "url": "http://www.gnu.org/licenses/gpl-2.0.html"
     },
     {
-      "type"    : "MIT",
-      "url"     : "http://www.opensource.org/licenses/mit-license.php" 
+      "type": "MIT",
+      "url": "http://www.opensource.org/licenses/mit-license.php"
     }
-  ]
+  ],
+  "engines": {
+    "node": "*"
+  },
+  "directories": {
+    "lib": "."
+  },
+  "files": [
+    ""
+  ],
+  "repository": "git://github.com/faisalman/ua-parser-js.git"
 }

readme.md

@@ -1,36 +1,36 @@
-# UA-Parser.js
+# UA-Parser.JS
 
-JavaScript-based user-agent parser
+Lightweight JavaScript-based User-Agent string parser
 
 * Author    : Faisalman <<fyzlman@gmail.com>>
 * Home      : http://faisalman.github.com/ua-parser-js
-* Source	: https://github.com/faisalman/ua-parser-js
-* License	: GPLv2 & MIT
+* Source    : https://github.com/faisalman/ua-parser-js
+* License   : GPLv2 & MIT
 
 ## Features
 
-Get detailed type and version of web browser, layout engine, operating system, and device.
+Extract detailed type of web browser, layout engine, operating system, and device purely from user-agent string.
 
 ## Methods
 
-* `getBrowser([uastring])`
-* `getDevice([uastring])`
-* `getEngine([uastring])`
-* `getOS([uastring])`
+* `getBrowser()`
+* `getDevice()`
+* `getEngine()`
+* `getOS()`
+* `getResult()`
+* `getUA()`
 * `setUA(uastring)`
 
-## Properties
-
-* `result`
-
 ## Example
 
 ```html
 <script type="text/javascript" src="ua-parser.js"></script>
 <script type="text/javascript">
     
-    // by default it takes ua string from current browser's window.navigator
-    console.log(UAParser.result);
+	var parser = new UAParser();
+	
+    // by default it takes ua string from current browser's window.navigator.userAgent
+    console.log(parser.getResult());
     /*
         /// this will print an object structured like this:
         {
@@ -39,10 +39,6 @@ Get detailed type and version of web browser, layout engine, operating system, a
                 version: "",
                 major: ""
             },
-            device: {
-                name: "",
-                version: ""
-            },
             engine: {
                 name: "",
                 version: ""
@@ -60,42 +56,42 @@ Get detailed type and version of web browser, layout engine, operating system, a
 
     // let's test a custom user-agent string as an example
     var uastr = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.2 (KHTML, like Gecko) Ubuntu/11.10 Chromium/15.0.874.106 Chrome/15.0.874.106 Safari/535.2";
-    UAParser.setUA(uastr);
+    parser.setUA(uastr);
     
-    console.log(UAParser.result.browser);  // {name: "Chromium", major: "15", version: "15.0.874.106"}
-    console.log(UAParser.result.engine);   // {name: "AppleWebKit", version: "535.2"}
-    console.log(UAParser.result.os);       // {name: "Ubuntu", version: "11.10"}
+    console.log(parser.getResult().browser);    // {name: "Chromium", major: "15", version: "15.0.874.106"}
+    console.log(parser.getResult().engine);     // {name: "AppleWebKit", version: "535.2"}
+    console.log(parser.getResult().os);         // {name: "Ubuntu", version: "11.10"}
     
     // let's take another test please
-    UAParser.setUA("Mozilla/5.0 (compatible; Konqueror/4.1; OpenBSD) KHTML/4.1.4 (like Gecko)").getOS().name; // prints "OpenBSD"
+    console.log(parser.setUA("Mozilla/5.0 (compatible; Konqueror/4.1; OpenBSD) KHTML/4.1.4 (like Gecko)").getOS().name); // "OpenBSD"
 </script>
 ```
 
 ## Using node.js
 
 ```js
-var parser = require('ua-parser');
-
+var UAParser = require('ua-parser');
+var parser = new UAParser();
 var ua1 = 'Mozilla/5.0 (PlayBook; U; RIM Tablet OS 1.0.0; en-US) AppleWebKit/534.11 (KHTML, like Gecko) Version/7.1.0.7 Safari/534.11';
 var ua2 = 'Midori/0.2 (X11; Linux; U; cs-cz) WebKit/531.2+';
 
-parser.setUA(ua1).getDevice().name; // prints "PlayBook"
-parser.getOS()                      // prints {name: "RIM Tablet OS", version: "1.0.0"}
-parser.getOS(ua2)                   // prints {name: "Linux", version: undefined}
-parser.getOS()                      // prints {name: "RIM Tablet OS", version: "1.0.0"}
-parser.getEngine().name;            // prints "AppleWebKit"
+console.log(parser.setUA(ua1).getDevice().name);    // "PlayBook"
+console.log(parser.getOS())                         // {name: "RIM Tablet OS", version: "1.0.0"}
+console.log(parser.getOS(ua2))                      // {name: "Linux", version: undefined}
+console.log(parser.getOS())                         // {name: "RIM Tablet OS", version: "1.0.0"}
+console.log(parser.getEngine().name);               // "AppleWebKit"
 ```
 
 ## License
 
 Copyright © 2012 Faisalman <<fyzlman@gmail.com>>
 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+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:
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+The above copyright notice and this permission notice shall be included in all 
+copies or substantial portions of the Software.

ua-parser.js

@@ -1,86 +1,96 @@
-// UA-Parser.js v0.3.0
-// Lightweight JavaScript-based user-agent parser
+// UA-Parser.JS v0.3.4
+// Lightweight JavaScript-based User-Agent string parser
 // https://github.com/faisalman/ua-parser-js
 //
 // Copyright © 2012 Faisalman
-// Licensed under GPLv2 & MIT
+// Dual licensed under GPLv2 & MIT
 
-(function () {
-    function UAParser (uastring) {
+(function (undefined) {
 
-        var ua = uastring || typeof window !== 'undefined' ? window.navigator.userAgent : "";
-
-        // regexp mapper
-        var regxMap = function (ua) {
-            var result;
-            var i, j, k, l;
-            for (i = 1; i < arguments.length; i += 2) {
-                var regex = arguments[i];
-                var props = arguments[i + 1];
-                var isMatchFound = false;
-                for (j = 0; j < regex.length; j++) {
-                    var match = regex[j].exec(ua);
-                    //console.log(match);
-                    if (!!match) {
-                        result = {};
-                        l = 1;
-                        for (k = 0; k < props.length; k++) {
-                            if (typeof props[k] === 'object' && props[k].length === 2) {
-                                result[props[k][0]] = props[k][1];
-                                l -= 1;
-                            } else if (typeof props[k] === 'object' && props[k].length === 3) {
-                                result[props[k][0]] = (!!match[k + l]) ? match[k + l].replace(props[k][1], props[k][2]) : undefined;
-                            } else {
-                                result[props[k]] = (!!match[k + l]) ? match[k + l] : undefined;
-                            }
-                        }
-                        isMatchFound = true;
-                        break;
-                    }
-                }
-                if (!isMatchFound) {
-                    result = {};
-                    for (k in props) {
-                        if (props.hasOwnProperty(k)) {
-                            if (typeof props[k] == 'object') {
-                                result[props[k][0]] = undefined;
-                            } else {
-                                result[props[k]] = undefined;
-                            }
-                        }
-                    }
+    var regexMapper = function (ua, args) {
+        
+        var result = {}, i, j, k, l, m;
+        
+        // loop through all regexes maps
+        for (i = 1; i < arguments.length; i += 2) {
+        
+            var regex = arguments[i],       // even sequence (1,3,5,..)
+                props = arguments[i + 1];   // odd sequence (2,4,6,..)
+            
+            // build object barebones
+            for (k = 0; k < props.length; k++) {
+                if (typeof props[k] == 'object') {
+                    result[props[k][0]] = undefined;
                 } else {
-                    return result;
+                    result[props[k]] = undefined;
                 }
             }
-            return result;
-        };
-
-        var mapper = {
-            os : {        
-                win: function (str, match) {
-                    switch (match.toLowerCase()) {
-                        case 'nt 5.0':
-                            return '2000';
-                        case 'nt 5.1':
-                        case 'nt 5.2':
-                            return 'XP';
-                        case 'nt 6.0':
-                            return 'Vista';
-                        case 'nt 6.1':
-                            return '7';
-                        case 'nt 6.2':
-                            return '8';
-                        default:
-                            return match;
-                    };
+            
+            // try matching uastring with regexes
+            for (j = 0; j < regex.length; j++) {
+                l = regex[j].exec(ua);
+                if (!!l) {
+                    for (k = 0; k < props.length; k++) {
+                        m = l[k + 1];
+                        if (typeof props[k] === 'object' && props[k].length === 2) {
+                            result[props[k][0]] = props[k][1];
+                        } else if (typeof props[k] === 'object' && props[k].length === 3) {
+                            result[props[k][0]] = m ? m.replace(props[k][1], props[k][2]) : undefined;
+                        } else {
+                            result[props[k]] = m ? m : undefined;
+                        }
+                    }
+                    break;
                 }
             }
-        };
+            
+            if(!!l) break; // break the loop immediately if match found
+        }
+        return result;
+    };
 
-        this.getBrowser = function (uastring) {
+    var maps = {
+    
+        check : function(str, map){
+            for (var i in map){
+                if (map.hasOwnProperty(i)) {
+                    if (typeof map[i] === 'object' && map[i].length > 0) {
+                        for (var j = 0; j < map[i].length; j++) {
+                            if (str.toLowerCase().indexOf(map[i][j]) !== -1) {
+                                return i;
+                            }
+                        }
+                    } else if (str.toLowerCase().indexOf(map[i]) !== -1) {
+                        return i;
+                    }
+                }
+            }
+            return str;
+        },
+        
+        os : {
+            win : function (match, str1) {
+                return maps.check(str1, {
+                    'ME'        : '4.90',
+                    'NT 3.11'   : 'nt3.51',
+                    'NT 4.0'    : 'nt4.0',
+                    '2000'      : 'nt 5.0',
+                    'XP'        : ['nt 5.1', 'nt 5.2'],
+                    'Vista'     : 'nt 6.0',
+                    '7'         : 'nt 6.1',
+                    '8'         : 'nt 6.2'
+                });
+            }
+        }
+    };
 
-            return regxMap(uastring || ua, [
+    var UAParser = function UAParser (uastring) {
+
+        var ua = uastring || (typeof window !== 'undefined' ? window.navigator.userAgent : "");
+
+        this.getBrowser = function () {
+
+            return regexMapper(ua, [
 
                 // Mixed
                 /(kindle)\/((\d+)?[\w\.]+)/i,                                       // Kindle
@@ -89,23 +99,26 @@
                 // Presto based
                 /(opera\smini)\/((\d+)?[\w\.-]+)/i,                                 // Opera Mini
                 /(opera\smobi)\/((\d+)?[\w\.-]+)/i,                                 // Opera Mobile
-                /(opera).*\/((\d+)?[\w\.]+)/i,                                      // Opera
-
+                /(opera).+version\/((\d+)?[\w\.]+)/i,                               // Opera
+                /(opera)[\/\s]+((\d+)?[\w\.]+)/i,
+                
                 // Trident based
                 /(avant\sbrowser|iemobile|slimbrowser)[\/\s]?((\d+)?[\w\.]*)/i,     // Avant/IEMobile/SlimBrowser
                 /ms(ie)\s((\d+)?[\w\.]+)/i,                                         // Internet Explorer
 
                 // Webkit/KHTML based
-                /(chromium|flock|rockmelt|midori|epiphany)\/((\d+)?[\w\.]+)/i,      // Chromium/Flock/RockMelt/Midori/Epiphany
-                /(chrome|omniweb|arora|dolfin)\/((\d+)?[\w\.]+)/i,                  // Chrome/OmniWeb/Arora/Dolphin
+                /(chromium|flock|rockmelt|midori|epiphany|silk)\/((\d+)?[\w\.]+)/i, // Chromium/Flock/RockMelt/Midori/Epiphany
+                /(chrome|omniweb|arora|dolfin|[tizenaok]{5}\s?browser)\/((\d+)?[\w\.]+)/i,
+                                                                                    // Chrome/OmniWeb/Arora/Dolphin/Tizen/Nokia
                 ], ['name', 'version', 'major'], [
-                /(?:android.+crmo|crios)\/((\d+)?[\w\.]+)/i,                        // Chrome for Android/iOS
+                /(?:android.+(crmo|crios))\/((\d+)?[\w\.]+)/i,                      // Chrome for Android/iOS
                 ], [['name', 'Chrome'], 'version', 'major'], [
                 /(mobile\ssafari|safari|konqueror)\/((\d+)?[\w\.]+)/i,              // Safari/Konqueror
                 /(applewebkit|khtml)\/((\d+)?[\w\.]+)/i,
 
                 // Gecko based
-                /(iceweasel|camino|fennec|maemo|minimo)[\/\s]?((\d+)?[\w\.\+]+)/i,  // Iceweasel/Camino/Fennec/Maemo/Minimo
+                /(iceweasel|camino|fennec|maemo\sbrowser|minimo)[\/\s]?((\d+)?[\w\.\+]+)/i,  
+                                                                                    // Iceweasel/Camino/Fennec/Maemo/Minimo
                 /(firefox|seamonkey|netscape|navigator|k-meleon|icecat|iceape)\/((\d+)?[\w\.]+)/i,
                                                                                     // Firefox/SeaMonkey/Netscape/K-Meleon/IceCat/IceApe
                 /(mozilla)\/([\w\.]+).+rv\:.+gecko\/\d+/i,                          // Mozilla
@@ -115,9 +128,9 @@
                 ], ['name', 'version', 'major']);  
         };
 
-        this.getEngine = function (uastring) {
+        this.getEngine = function () {
 
-            return regxMap(uastring || ua, [
+            return regexMapper(ua, [
 
                 /(presto)\/([\w\.]+)/i,                                             // Presto
                 /([aple]*webkit|trident)\/([\w\.]+)/i,                              // Webkit/Trident
@@ -128,18 +141,21 @@
                 ], ['version', 'name']);
         };
 
-        this.getOS = function (uastring) { 
+        this.getOS = function () { 
 
-            return regxMap(uastring || ua, [
+            return regexMapper(ua, [
 
                 // Windows based
-                /(windows\sphone\sos|windows)\s+([\w\.\s]+)*/i,                     // Windows
-                ], ['name', ['version', /(nt\s[\d\.]+)/gi, mapper.os.win]], [
-
+                /(windows\sphone\sos|windows)\s?([nt\d\.\s]+\d)/i                   // Windows
+                ], ['name', ['version', /(.+)/gi, maps.os.win]], [
+                /(win(?=3|9|n)|win\s9x\s)([nt\d\.]+)/i
+                ], [['name', 'Windows'], ['version', /(.+)/gi, maps.os.win]], [
+                
                 // Mobile/Embedded OS
                 /(blackberry).+version\/([\w\.]+)/i,                                // Blackberry
-                /(android|symbianos|symbos|webos|palm\os|qnx|bada|rim\stablet\sos)[\/\s-]?([\w\.]+)*/i,
-                                                                                    // Android/Symbian/WebOS/Palm/QNX/Bada/RIM
+                /(tizen)\/([\w\.]+)/i,                                              // Tizen
+                /(android|symbianos|symbos|webos|palm\os|qnx|bada|rim\stablet\sos|meego)[\/\s-]?([\w\.]+)*/i,
+                                                                                    // Android/Symbian/WebOS/Palm/QNX/Bada/RIM/MeeGo
                 /(nintendo|playstation)\s([wids3portable]+)/i,                      // Nintendo/Playstation
 
                 // GNU/Linux based
@@ -150,11 +166,11 @@
                 /(gnu|linux)\s?([\w\.]+)*/i                                         // Other GNU/Linux
                 ], ['name', 'version'], [
 
-                /cros\s([\w\.\s]+)/i                                                // Chromium OS
+                /(cros)\s([\w\.\s]+\d)/i                                            // Chromium OS
                 ], [['name', 'Chromium OS'], 'version'],[
 
                 // Solaris
-                /sunos\s?([\w\.\s]+)*/i                                             // Solaris
+                /(sunos)\s?([\w\.\s]+\d)*/i                                         // Solaris
                 ], [['name', 'Solaris'], 'version'], [
 
                 // BSD based
@@ -164,23 +180,24 @@
                 /(ip[honead]+).*os\s*([\w]+)*\slike\smac/i                          // iOS
                 ], [['name', /.+/g, 'iOS'], ['version', /_/g, '.']], [
 
-                /(mac\sos)\sx\s([\w\s\.]+)/i,                                       // Mac OS
+                /(mac\sos\sx)\s([\w\s\.]+\w)/i,                                     // Mac OS
                 ], ['name', ['version', /_/g, '.']], [
 
                 // Other
-                /(macintosh|unix|minix|beos)[\/\s]?()*/i
+                /(haiku)\s(\w+)/i,                                                  // Haiku
+                /(macintosh|unix|minix|beos)[\/\s]?()*/i                            // UNIX/Minix/BeOS
                 ], ['name', 'version']);
         };
 
-        this.getDevice = function (uastring) { 
+        this.getDevice = function () { 
 
-            return regxMap(uastring || ua, [
+            return regexMapper(ua, [
 
                 /\((ip[honead]+|playbook);/i,                                       // iPod/iPhone/iPad/PlayBook
                 /(blackberry)[\s-]?(\w+)/i,                                         // BlackBerry
-                /(blackberry|benq|nokia|palm(?=\-)|sonyericsson|acer|asus|dell|nexus|zte)[\s_-]?([\w-]+)*/i,  
-                                                                                    // BenQ/Nokia/Palm/Sony-Ericsson/Acer/Asus/Dell/Nexus/ZTE
-                /(hp)\s([\w\s]+)/i,                                                 // HP iPAQ
+                /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|nexus|zte)[\s_-]?([\w-]+)*/i,  
+                                                                                    // BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Nexus/ZTE
+                /(hp)\s([\w\s]+\w)/i,                                               // HP iPAQ
                 /(hp).+(touchpad)/i,                                                // HP TouchPad
                 /(kindle)\/([\w\.]+)/i,                                             // Kindle
                 /(lg)[e;\s-]+(\w+)*/i,                                              // LG
@@ -191,45 +208,54 @@
                 /(zte)-([\w]+)*/i
                 ], ['name', ['version', /_/g, ' ']], [
                             
-                /\s(milestone|mz601|droid[2x]?|xoom)[globa\s]*\sbuild\//i,          // Motorola
-                /mot[\s-]?(\w+)*/i
+                /\s((milestone|mz601|droid[2x]?|xoom))[globa\s]*\sbuild\//i,        // Motorola
+                /(mot)[\s-]?(\w+)*/i
                 ], [['name', 'Motorola'], 'version'], [
                 
-                /(s[cgp]h-\w+|gt-\w+|galaxy\snexus)/i,                              // Samsung
-                /sam[sung]*[\s-]*(\w+-?[\w-]*)*/i,
-                /sec-(sgh\w+)/i
+                /((s[cgp]h-\w+|gt-\w+|galaxy\snexus))/i,                            // Samsung
+                /(sam[sung]*)[\s-]*(\w+-?[\w-]*)*/i,
+                /sec-((sgh\w+))/i
                 ], [['name', 'Samsung'], 'version'], [
                 
-                /(transfo[prime\s]{4,10}\s\w+|(?:android).*eeepc)/i                 // Asus
+                /((transfo[prime\s]{4,10}\s\w+|(?:android.*)eeepc))/i               // Asus
                 ], [['name', 'Asus'], 'version'], [
 
-                /sie-(\w+)*/i                                                       // Siemens
-                ], [['name', 'Siemens'], 'version']);
+                /(sie)-(\w+)*/i                                                     // Siemens
+                ], [['name', 'Siemens'], 'version'], [
+                
+                /(maemo|nokia).*(n900|lumia\s\d+)/i,                                // Nokia
+                /(nokia)[\s_-]?([\w-]+)*/i
+                ], [['name', 'Nokia'], 'version']);
+        };
+        
+        this.getUA = function() {
+            return ua;
         };
 
-        this.setUA = function (uastring) {
-            ua = uastring || ua;
-            this.result = {
+        this.getResult = function() {
+            return {
                 browser : this.getBrowser(),
                 engine  : this.getEngine(),
                 os      : this.getOS(),
                 device  : this.getDevice()
             };
+        };
+
+        this.setUA = function (uastring) {
+            ua = uastring;
             return this;
         };
 
         this.setUA(ua);
     };
-    
-    var parser = new UAParser();
-    
+        
     // check whether script is running inside node.js export as module
     if (typeof exports !== 'undefined' && this.toString() !== '[object DOMWindow]') {
         if (typeof module !== 'undefined' && module.exports) {
-            exports = module.exports = parser;
+            exports = module.exports = UAParser;
         }
-        exports.UAParser = parser;
+        exports.UAParser = UAParser;
     } else {
-        this['UAParser'] = parser;
+        this['UAParser'] = UAParser;
     }
 })();