user_agent_parser 0.1.2 → 2.1.0

data/lib/user_agent_parser/version.rb

@@ -1,32 +1,47 @@
 module UserAgentParser
-  
   class Version
 
-    attr_accessor :version
+    # Private: Regex used to split version string into major, minor, patch,
+    # and patch_minor.
+    SEGMENTS_REGEX = /\d+\-\d+|\d+[a-zA-Z]+$|\d+|[A-Za-z][0-9A-Za-z-]*$/
+
+    attr_reader :version
     alias :to_s :version
 
     def initialize(version)
-      self.version = version.to_s.strip
+      @version = version.to_s.strip
     end
 
-    def segments
-      version.scan(/\d+\-\d+|\d+[a-zA-Z]+$|\d+|[A-Za-z][0-9A-Za-z-]*$/).map do |s|
-        /^\d+$/ =~ s ? s.to_i : s
-      end
+    def major
+      segments[0]
+    end
+
+    def minor
+      segments[1]
+    end
+
+    def patch
+      segments[2]
     end
 
-    def [](segment)
-      segments[segment]
+    def patch_minor
+      segments[3]
     end
-  
+
     def inspect
       "#<#{self.class} #{to_s}>"
     end
-    
-    def ==(other)
-      version == other.version
+
+    def eql?(other)
+      self.class.eql?(other.class) &&
+        version == other.version
     end
 
-  end
+    alias_method :==, :eql?
 
-end
+    # Private
+    def segments
+      @segments ||= version.scan(SEGMENTS_REGEX)
+    end
+  end
+end

data/vendor/ua-parser/regexes.yaml

@@ -1,28 +1,29 @@
-### THIS FILE WAS COPIED ON JAN 26 2012.
-### ORIGINAL IS AT: http://code.google.com/p/ua-parser/source/browse/trunk/resources/user_agent_parser.yaml
-### Please review the CHANGELOG to see how this file differs from the original
 user_agent_parsers:
   #### SPECIAL CASES TOP ####
 
-  # must go before Opera
-  - regex: '^(Opera)/(\d+)\.(\d+) \(Nintendo Wii'
-    family_replacement: 'Wii'
-
   # must go before Firefox to catch SeaMonkey/Camino
   - regex: '(SeaMonkey|Camino)/(\d+)\.(\d+)\.?([ab]?\d+[a-z]*)'
 
   # Firefox
+  - regex: '(Pale[Mm]oon)/(\d+)\.(\d+)\.?(\d+)?'
+    family_replacement: 'Pale Moon (Firefox Variant)'
   - regex: '(Fennec)/(\d+)\.(\d+)\.?([ab]?\d+[a-z]*)'
     family_replacement: 'Firefox Mobile'
   - regex: '(Fennec)/(\d+)\.(\d+)(pre)'
-    family_replacment: 'Firefox Mobile'
+    family_replacement: 'Firefox Mobile'
   - regex: '(Fennec)/(\d+)\.(\d+)'
     family_replacement: 'Firefox Mobile'
+  - regex: 'Mobile.*(Firefox)/(\d+)\.(\d+)'
+    family_replacement: 'Firefox Mobile'
   - regex: '(Namoroka|Shiretoko|Minefield)/(\d+)\.(\d+)\.(\d+(?:pre)?)'
     family_replacement: 'Firefox ($1)'
-  - regex: '(Firefox)/(\d+)\.(\d+)([ab]\d+[a-z]*)'
+  - regex: '(Firefox)/(\d+)\.(\d+)(a\d+[a-z]*)'
+    family_replacement: 'Firefox Alpha'
+  - regex: '(Firefox)/(\d+)\.(\d+)(b\d+[a-z]*)'
     family_replacement: 'Firefox Beta'
-  - regex: '(Firefox)-(?:\d+\.\d+)?/(\d+)\.(\d+)([ab]\d+[a-z]*)'
+  - regex: '(Firefox)-(?:\d+\.\d+)?/(\d+)\.(\d+)(a\d+[a-z]*)'
+    family_replacement: 'Firefox Alpha'
+  - regex: '(Firefox)-(?:\d+\.\d+)?/(\d+)\.(\d+)(b\d+[a-z]*)'
     family_replacement: 'Firefox Beta'
   - regex: '(Namoroka|Shiretoko|Minefield)/(\d+)\.(\d+)([ab]\d+[a-z]*)?'
     family_replacement: 'Firefox ($1)'
@@ -60,17 +61,21 @@ user_agent_parsers:
   - regex: '(Opera Mini)/att/(\d+)\.(\d+)'
   - regex: '(Opera)/9.80.*Version/(\d+)\.(\d+)(?:\.(\d+))?'
 
+  # Opera 14 for Android uses a WebKit render engine.
+  - regex: '(?:Mobile Safari).*(OPR)/(\d+)\.(\d+)\.(\d+)'
+    family_replacement: 'Opera Mobile'
+
   # Palm WebOS looks a lot like Safari.
-  - regex: '(webOSBrowser)/(\d+)\.(\d+)'
-  - regex: '(webOS)/(\d+)\.(\d+)'
-    family_replacement: 'webOSBrowser'
-  - regex: '(wOSBrowser).+TouchPad/(\d+)\.(\d+)'
-    family_replacement: 'webOS TouchPad'
+  - regex: '(hpw|web)OS/(\d+)\.(\d+)(?:\.(\d+))?'
+    family_replacement: 'webOS Browser'
 
   # LuaKit has no version info.
   # http://luakit.org/projects/luakit/
   - regex: '(luakit)'
     family_replacement: 'LuaKit'
+    
+  # Snowshoe
+  - regex: '(Snowshoe)/(\d+)\.(\d+).(\d+)'
 
   # Lightning (for Thunderbird)
   # http://www.mozilla.org/projects/calendar/lightning/
@@ -83,6 +88,8 @@ user_agent_parsers:
     family_replacement: 'Swiftfox'
 
   # Rekonq
+  - regex: '(rekonq)/(\d+)\.(\d+) Safari'
+    family_replacement: 'Rekonq'
   - regex: 'rekonq'
     family_replacement: 'Rekonq'
 
@@ -100,42 +107,94 @@ user_agent_parsers:
   - regex: '(Comodo_Dragon)/(\d+)\.(\d+)\.(\d+)'
     family_replacement: 'Comodo Dragon'
 
-  # YottaaMonitor bot
-  - regex: '(YottaaMonitor)'
-
-  # must go before NetFront below
-  - regex: '(Kindle)/(\d+)\.(\d+)'
+  # Bots
+  - regex: '(YottaaMonitor|BrowserMob|HttpMonitor|YandexBot|Slurp|BingPreview|PagePeeker|ThumbShotsBot|WebThumb|URL2PNG|ZooShot|GomezA|Catchpoint bot|Willow Internet Crawler|Google SketchUp|Read%20Later)'
 
   - regex: '(Symphony) (\d+).(\d+)'
 
-  - regex: 'Minimo'
+  - regex: '(Minimo)'
 
   # Chrome Mobile
   - regex: '(CrMo)/(\d+)\.(\d+)\.(\d+)\.(\d+)'
     family_replacement: 'Chrome Mobile'
+  - regex: '(CriOS)/(\d+)\.(\d+)\.(\d+)\.(\d+)'
+    family_replacement: 'Chrome Mobile iOS'
+  - regex: '(Chrome)/(\d+)\.(\d+)\.(\d+)\.(\d+) Mobile'
+    family_replacement: 'Chrome Mobile'
 
   # Chrome Frame must come before MSIE.
   - regex: '(chromeframe)/(\d+)\.(\d+)\.(\d+)'
     family_replacement: 'Chrome Frame'
 
   # UC Browser
-  - regex: '(UC Browser)(\d+)\.(\d+)\.(\d+)'
+  - regex: '(UCBrowser)[ /](\d+)\.(\d+)\.(\d+)'
+    family_replacement: 'UC Browser'
+  - regex: '(UC Browser)[ /](\d+)\.(\d+)\.(\d+)'
+  - regex: '(UC Browser|UCBrowser|UCWEB)(\d+)\.(\d+)\.(\d+)'
+    family_replacement: 'UC Browser'
+
+  # Tizen Browser (second case included in browser/major.minor regex)
+  - regex: '(SLP Browser)/(\d+)\.(\d+)'
+    family_replacement: 'Tizen Browser'
+
+  # Epiphany browser (identifies as Chromium)
+  - regex: '(Epiphany)/(\d+)\.(\d+).(\d+)'
+
+  # Sogou Explorer 2.X
+  - regex: '(SE 2\.X) MetaSr (\d+)\.(\d+)'
+    family_replacement: 'Sogou Explorer'
+
+  # Baidu Browsers (desktop spoofs chrome & IE, explorer is mobile)
+  - regex: '(baidubrowser)[/\s](\d+)'
+    family_replacement: 'Baidu Browser'
+  - regex: '(FlyFlow)/(\d+)\.(\d+)'
+    family_replacement: 'Baidu Explorer'
+
+  # Pingdom
+  - regex: '(Pingdom.com_bot_version_)(\d+)\.(\d+)'
+    family_replacement: 'PingdomBot'
+
+  # Facebook
+  - regex: '(facebookexternalhit)/(\d+)\.(\d+)'
+    family_replacement: 'FacebookBot'
+
+  # Twitterbot
+  - regex: '(Twitterbot)/(\d+)\.(\d+)'
+    family_replacement: 'TwitterBot'
+
+  # Rackspace Monitoring
+  - regex: '(Rackspace Monitoring)/(\d+)\.(\d+)'
+    family_replacement: 'RackspaceBot'
+
+  # PyAMF
+  - regex: '(PyAMF)/(\d+)\.(\d+)\.(\d+)'
+
+  # Yandex Browser
+  - regex: '(YaBrowser)/(\d+)\.(\d+)\.(\d+)'
+    family_replacement: 'Yandex Browser'
+
+  # Mail.ru Amigo/Internet Browser (Chromium-based)
+  - regex: '(Chrome)/(\d+)\.(\d+)\.(\d+).* MRCHROME'
+    family_replacement: 'Mail.ru Chromium Browser'
 
   #### END SPECIAL CASES TOP ####
 
   #### MAIN CASES - this catches > 50% of all browsers ####
 
   # Browser/major_version.minor_version.beta_version
-  - regex: '(AdobeAIR|Chromium|FireWeb|Jasmine|ANTGalio|Midori|Fresco|Lobo|PaleMoon|Maxthon|Lynx|OmniWeb|Dillo|Camino|Demeter|Fluid|Fennec|Shiira|Sunrise|Chrome|Flock|Netscape|Lunascape|Epiphany|WebPilot|NetFront|Netfront|Konqueror|SeaMonkey|Kazehakase|Vienna|Iceape|Iceweasel|IceWeasel|Iron|K-Meleon|Sleipnir|Galeon|GranParadiso|Opera Mini|iCab|NetNewsWire|ThunderBrowse|Iron|Iris|UP\.Browser|Bunjaloo)/(\d+)\.(\d+)\.(\d+)'
+  - regex: '(AdobeAIR|Chromium|FireWeb|Jasmine|ANTGalio|Midori|Fresco|Lobo|PaleMoon|Maxthon|Lynx|OmniWeb|Dillo|Camino|Demeter|Fluid|Fennec|Shiira|Sunrise|Chrome|Flock|Netscape|Lunascape|WebPilot|Vodafone|NetFront|Netfront|Konqueror|SeaMonkey|Kazehakase|Vienna|Iceape|Iceweasel|IceWeasel|Iron|K-Meleon|Sleipnir|Galeon|GranParadiso|Opera Mini|iCab|NetNewsWire|ThunderBrowse|Iris|UP\.Browser|Bunjalloo|Google Earth|Raven for Mac|Openwave)/(\d+)\.(\d+)\.(\d+)'
 
   # Browser/major_version.minor_version
-  - regex: '(Bolt|Jasmine|IceCat|Skyfire|Midori|Maxthon|Lynx|Arora|IBrowse|Dillo|Camino|Shiira|Fennec|Phoenix|Chrome|Flock|Netscape|Lunascape|Epiphany|WebPilot|Opera Mini|Opera|NetFront|Netfront|Konqueror|Googlebot|SeaMonkey|Kazehakase|Vienna|Iceape|Iceweasel|IceWeasel|Iron|K-Meleon|Sleipnir|Galeon|GranParadiso|iCab|NetNewsWire|Iron|Space Bison|Stainless|Orca|Dolfin|BOLT|Minimo)/(\d+)\.(\d+)'
+  - regex: '(Bolt|Jasmine|IceCat|Skyfire|Midori|Maxthon|Lynx|Arora|IBrowse|Dillo|Camino|Shiira|Fennec|Phoenix|Chrome|Flock|Netscape|Lunascape|Epiphany|WebPilot|Opera Mini|Opera|Vodafone|NetFront|Netfront|Konqueror|Googlebot|SeaMonkey|Kazehakase|Vienna|Iceape|Iceweasel|IceWeasel|Iron|K-Meleon|Sleipnir|Galeon|GranParadiso|iCab|NetNewsWire|Space Bison|Stainless|Orca|Dolfin|BOLT|Minimo|Tizen Browser|Polaris|Abrowser|Planetweb|ICE Browser)/(\d+)\.(\d+)'
 
   # Browser major_version.minor_version.beta_version (space instead of slash)
   - regex: '(iRider|Crazy Browser|SkipStone|iCab|Lunascape|Sleipnir|Maemo Browser) (\d+)\.(\d+)\.(\d+)'
   # Browser major_version.minor_version (space instead of slash)
-  - regex: '(iCab|Lunascape|Opera|Android|Jasmine|Polaris|BREW) (\d+)\.(\d+)\.?(\d+)?'
-
+  - regex: '(iCab|Lunascape|Opera|Android|Jasmine|Polaris) (\d+)\.(\d+)\.?(\d+)?'
+  
+  # Kindle WebKit
+  - regex: '(Kindle)/(\d+)\.(\d+)'
+  
   # weird android UAs
   - regex: '(Android) Donut'
     v1_replacement: '1'
@@ -174,18 +233,33 @@ user_agent_parsers:
   - regex: '(Obigo)InternetBrowser'
   - regex: '(Obigo)\-Browser'
   - regex: '(Obigo|OBIGO)[^\d]*(\d+)(?:.(\d+))?'
+    family_replacement: 'Obigo'
 
   - regex: '(MAXTHON|Maxthon) (\d+)\.(\d+)'
     family_replacement: 'Maxthon'
   - regex: '(Maxthon|MyIE2|Uzbl|Shiira)'
     v1_replacement: '0'
 
-  - regex: '(PLAYSTATION) (\d+)'
-    family_replacement: 'PlayStation'
-  - regex: '(PlayStation Portable)[^\d]+(\d+).(\d+)'
+  - regex: 'PLAYSTATION 3.+WebKit'
+    family_replacement: 'NetFront NX'
+  - regex: 'PLAYSTATION 3'
+    family_replacement: 'NetFront'
+  - regex: '(PlayStation Portable)'
+    family_replacement: 'NetFront'
+  - regex: '(PlayStation Vita)'
+    family_replacement: 'NetFront NX'
+  
+  - regex: 'AppleWebKit.+ (NX)/(\d+)\.(\d+)\.(\d+)'
+    family_replacement: 'NetFront NX'
+  - regex: '(Nintendo 3DS)'
+    family_replacement: 'NetFront NX'
 
   - regex: '(BrowseX) \((\d+)\.(\d+)\.(\d+)'
 
+  - regex: '(NCSA_Mosaic)/(\d+)\.(\d+)'
+    family_replacement: 'NCSA Mosaic'
+
+  # Polaris/d.d is above
   - regex: '(POLARIS)/(\d+)\.(\d+)'
     family_replacement: 'Polaris'
   - regex: '(Embider)/(\d+)\.(\d+)'
@@ -194,56 +268,71 @@ user_agent_parsers:
   - regex: '(BonEcho)/(\d+)\.(\d+)\.(\d+)'
     family_replacement: 'Bon Echo'
 
+  - regex: 'M?QQBrowser'
+    family_replacement: 'QQ Browser'
+
   - regex: '(iPod).+Version/(\d+)\.(\d+)\.(\d+)'
     family_replacement: 'Mobile Safari'
   - regex: '(iPod).*Version/(\d+)\.(\d+)'
     family_replacement: 'Mobile Safari'
-  - regex: '(iPod)'
-    family_replacement: 'Mobile Safari'
   - regex: '(iPhone).*Version/(\d+)\.(\d+)\.(\d+)'
     family_replacement: 'Mobile Safari'
   - regex: '(iPhone).*Version/(\d+)\.(\d+)'
     family_replacement: 'Mobile Safari'
-  - regex: '(iPhone)'
-    family_replacement: 'Mobile Safari'
   - regex: '(iPad).*Version/(\d+)\.(\d+)\.(\d+)'
     family_replacement: 'Mobile Safari'
   - regex: '(iPad).*Version/(\d+)\.(\d+)'
     family_replacement: 'Mobile Safari'
-  - regex: '(iPad)'
+  - regex: '(iPod|iPhone|iPad);.*CPU.*OS (\d+)(?:_\d+)?_(\d+).*Mobile'
+    family_replacement: 'Mobile Safari'
+  - regex: '(iPod|iPhone|iPad)'
     family_replacement: 'Mobile Safari'
 
   - regex: '(AvantGo) (\d+).(\d+)'
+  
+  - regex: '(OneBrowser)/(\d+).(\d+)'
+    family_replacement: 'ONE Browser'
 
   - regex: '(Avant)'
     v1_replacement: '1'
 
+  # This is the Tesla Model S (see similar entry in device parsers)
+  - regex: '(QtCarBrowser)'
+    v1_replacement: '1'
+
+  - regex: '(iBrowser/Mini)(\d+).(\d+)'
+    family_replacement: 'iBrowser Mini'
   # nokia browsers
   # based on: http://www.developer.nokia.com/Community/Wiki/User-Agent_headers_for_Nokia_devices
   - regex: '^(Nokia)'
     family_replacement: 'Nokia Services (WAP) Browser'
   - regex: '(NokiaBrowser)/(\d+)\.(\d+).(\d+)\.(\d+)'
+    family_replacement: 'Nokia Browser'
   - regex: '(NokiaBrowser)/(\d+)\.(\d+).(\d+)'
+    family_replacement: 'Nokia Browser'
   - regex: '(NokiaBrowser)/(\d+)\.(\d+)'
+    family_replacement: 'Nokia Browser'
   - regex: '(BrowserNG)/(\d+)\.(\d+).(\d+)'
-    family_replacement: 'NokiaBrowser'
+    family_replacement: 'Nokia Browser'
   - regex: '(Series60)/5\.0'
-    family_replacement: 'NokiaBrowser'
+    family_replacement: 'Nokia Browser'
     v1_replacement: '7'
     v2_replacement: '0'
   - regex: '(Series60)/(\d+)\.(\d+)'
     family_replacement: 'Nokia OSS Browser'
   - regex: '(S40OviBrowser)/(\d+)\.(\d+)\.(\d+)\.(\d+)'
-    family_replacement: 'Nokia Series 40 Ovi Browser'
+    family_replacement: 'Ovi Browser'
   - regex: '(Nokia)[EN]?(\d+)'
 
   # BlackBerry devices
+  - regex: '(BB10);'
+    family_replacement: 'BlackBerry WebKit'
   - regex: '(PlayBook).+RIM Tablet OS (\d+)\.(\d+)\.(\d+)'
-    family_replacement: 'Blackberry WebKit'
+    family_replacement: 'BlackBerry WebKit'
   - regex: '(Black[bB]erry).+Version/(\d+)\.(\d+)\.(\d+)'
-    family_replacement: 'Blackberry WebKit'
+    family_replacement: 'BlackBerry WebKit'
   - regex: '(Black[bB]erry)\s?(\d+)'
-    family_replacement: 'Blackberry'
+    family_replacement: 'BlackBerry'
 
   - regex: '(OmniWeb)/v(\d+)\.(\d+)'
 
@@ -262,6 +351,14 @@ user_agent_parsers:
 
   # Amazon Silk, should go before Safari
   - regex: '(Silk)/(\d+)\.(\d+)(?:\.([0-9\-]+))?'
+    family_replacement: 'Amazon Silk'
+
+  # Phantomjs, should go before Safari
+  - regex: '(PhantomJS)/(\d+)\.(\d+)\.(\d+)'
+
+  # WebKit Nightly
+  - regex: '(AppleWebKit)/(\d+)\.?(\d+)?\+ .* Safari'
+    family_replacement: 'WebKit Nightly'
 
   # Safari
   - regex: '(Version)/(\d+)\.(\d+)(?:\.(\d+))?.*Safari/'
@@ -278,11 +375,50 @@ user_agent_parsers:
 
   - regex: '(Teleca)'
     family_replacement: 'Teleca Browser'
+    
+  - regex: '(Phantom)/V(\d+)\.(\d+)'
+    family_replacement: 'Phantom Browser'
 
-  - regex: '(MSIE) (\d+)\.(\d+)'
+  - regex: '([MS]?IE) (\d+)\.(\d+)'
     family_replacement: 'IE'
 
+  - regex: '(python-requests)/(\d+)\.(\d+)'
+    family_replacement: 'Python Requests'
+
 os_parsers:
+
+  ##########
+  # Android
+  # can actually detect rooted android os. do we care?
+  ##########
+  - regex: '(Android) (\d+)\.(\d+)(?:[.\-]([a-z0-9]+))?'
+  - regex: '(Android)\-(\d+)\.(\d+)(?:[.\-]([a-z0-9]+))?'
+
+  - regex: '(Android) Donut'
+    os_v1_replacement: '1'
+    os_v2_replacement: '2'
+
+  - regex: '(Android) Eclair'
+    os_v1_replacement: '2'
+    os_v2_replacement: '1'
+
+  - regex: '(Android) Froyo'
+    os_v1_replacement: '2'
+    os_v2_replacement: '2'
+
+  - regex: '(Android) Gingerbread'
+    os_v1_replacement: '2'
+    os_v2_replacement: '3'
+
+  - regex: '(Android) Honeycomb'
+    os_v1_replacement: '3'
+
+  ##########
+  # Kindle Android
+  ##########
+  - regex: '(Silk-Accelerated=[a-z]{4,5})'
+    os_replacement: 'Android'
+
   ##########
   # Windows
   # http://en.wikipedia.org/wiki/Windows_NT#Releases
@@ -291,15 +427,14 @@ os_parsers:
   # lots of ua strings have Windows NT 4.1 !?!?!?!? !?!? !? !????!?! !!! ??? !?!?! ?
   # (very) roughly ordered in terms of frequency of occurence of regex (win xp currently most frequent, etc)
   ##########
-  - regex: '(Windows Phone 6\.5)'
-
+  
   - regex: '(Windows (?:NT 5\.2|NT 5\.1))'
     os_replacement: 'Windows XP'
 
   # ie mobile des ktop mode
   # spoofs nt 6.1. must come before windows 7
   - regex: '(XBLWP7)'
-    os_replacement: 'Windows Phone OS'
+    os_replacement: 'Windows Phone'
 
   - regex: '(Windows NT 6\.1)'
     os_replacement: 'Windows 7'
@@ -307,7 +442,10 @@ os_parsers:
   - regex: '(Windows NT 6\.0)'
     os_replacement: 'Windows Vista'
 
-  - regex: '(Windows 98|Windows XP|Windows ME|Windows 95|Windows CE|Windows 7|Windows NT 4\.0|Windows Vista|Windows 2000)'
+  - regex: '(Windows 98|Windows XP|Windows ME|Windows 95|Windows CE|Windows 7|Windows NT 4\.0|Windows Vista|Windows 2000|Windows 3.1)'
+
+  - regex: '(Windows NT 6\.2; ARM;)'
+    os_replacement: 'Windows RT'
 
   # is this a spoof or is nt 6.2 out and about in some capacity?
   - regex: '(Windows NT 6\.2)'
@@ -316,8 +454,8 @@ os_parsers:
   - regex: '(Windows NT 5\.0)'
     os_replacement: 'Windows 2000'
 
-  - regex: '(Windows Phone OS) (\d+)\.(\d+)'
-
+  - regex: '(Windows Phone) (\d+)\.(\d+)'
+  - regex: '(Windows Phone) OS (\d+)\.(\d+)'
   - regex: '(Windows ?Mobile)'
     os_replacement: 'Windows Mobile'
 
@@ -328,36 +466,20 @@ os_parsers:
     os_replacement: 'Windows 98'
 
   ##########
-  # Android
-  # can actually detect rooted android os. do we care?
+  # Tizen OS from Samsung
+  # spoofs Android so pushing it above
   ##########
-  - regex: '(Android) (\d+)\.(\d+)(?:[.\-]([a-z0-9]+))?'
-  - regex: '(Android)\-(\d+)\.(\d+)(?:[.\-]([a-z0-9]+))?'
-
-  - regex: '(Android) Donut'
-    os_v1_replacement: '1'
-    os_v2_replacement: '2'
-
-  - regex: '(Android) Eclair'
-    os_v1_replacement: '2'
-    os_v2_replacement: '1'
-
-  - regex: '(Android) Froyo'
-    os_v1_replacement: '2'
-    os_v2_replacement: '2'
-
-  - regex: '(Android) Gingerbread'
-    os_v1_replacement: '2'
-    os_v2_replacement: '3'
-
-  - regex: '(Android) Honeycomb'
-    os_v1_replacement: '3'
+  - regex: '(Tizen)/(\d+)\.(\d+)'
 
   ##########
   # Mac OS
   # http://en.wikipedia.org/wiki/Mac_OS_X#Versions
   ##########
   - regex: '(Mac OS X) (\d+)[_.](\d+)(?:[_.](\d+))?'
+  
+  # IE on Mac doesn't specify version number
+  - regex: 'Mac_PowerPC'
+    os_replacement: 'Mac OS'
 
   # builds before tiger don't seem to specify version?
 
@@ -379,6 +501,11 @@ os_parsers:
   - regex: '(iPhone|iPad|iPod).*Mac OS X.*Version/(\d+)\.(\d+)'
     os_replacement: 'iOS'
 
+  - regex: '(AppleTV)/(\d+)\.(\d+)'
+    os_replacement: 'ATV OS X'
+    os_v1_replacement: '$1'
+    os_v2_replacement: '$2'
+
   ##########
   # Chrome OS
   # if version 0.0.0, probably this stuff:
@@ -412,10 +539,14 @@ os_parsers:
   - regex: '(MeeGo)'
   - regex: 'Symbian [Oo][Ss]'
     os_replacement: 'Symbian OS'
+  - regex: 'Series40;'
+    os_replacement: 'Nokia Series 40'
 
   ##########
   # BlackBerry devices
   ##########
+  - regex: '(BB10);.+Version/(\d+)\.(\d+)\.(\d+)'
+    os_replacement: 'BlackBerry OS'
   - regex: '(Black[Bb]erry)[0-9a-z]+/(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?'
     os_replacement: 'BlackBerry OS'
   - regex: '(Black[Bb]erry).+Version/(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?'
@@ -425,13 +556,40 @@ os_parsers:
   - regex: '(Play[Bb]ook)'
     os_replacement: 'BlackBerry Tablet OS'
   - regex: '(Black[Bb]erry)'
-    os_replacement: 'Blackberry OS'
+    os_replacement: 'BlackBerry OS'
+
+  ##########
+  # Firefox OS
+  ##########
+  - regex: '\(Mobile;.+Firefox/\d+\.\d+'
+    os_replacement: 'Firefox OS'
+
+  ##########
+  # BREW
+  # yes, Brew is lower-cased for Brew MP
+  ##########
+  - regex: '(BREW)[ /](\d+)\.(\d+)\.(\d+)'
+  - regex: '(BREW);'
+  - regex: '(Brew MP|BMP)[ /](\d+)\.(\d+)\.(\d+)'
+    os_replacement: 'Brew MP'
+  - regex: 'BMP;'
+    os_replacement: 'Brew MP'
+
+  ##########
+  # Google TV
+  ##########
+  - regex: '(GoogleTV) (\d+)\.(\d+)\.(\d+)'
+  # Old style
+  - regex: '(GoogleTV)\/\d+'
 
+  - regex: '(WebTV)/(\d+).(\d+)'
+  
   ##########
   # Misc mobile
   ##########
-  - regex: '(webOS|hpwOS)/(\d+)\.(\d+)(?:\.(\d+))?'
+  - regex: '(hpw|web)OS/(\d+)\.(\d+)(?:\.(\d+))?'
     os_replacement: 'webOS'
+  - regex: '(VRE);'
 
   ##########
   # Generic patterns
@@ -448,7 +606,10 @@ os_parsers:
 
   # just os
   - regex: '(Windows|OpenBSD|FreeBSD|NetBSD|Ubuntu|Kubuntu|Android|Arch Linux|CentOS|WeTab|Slackware)'
+  - regex: '(Linux)/(\d+)\.(\d+)'
   - regex: '(Linux|BSD)'
+  - regex: 'SunOS'
+    os_replacement: 'Solaris'
 
 device_parsers:
   ##########
@@ -478,30 +639,64 @@ device_parsers:
   - regex: 'Sprint APA(9292)'
     device_replacement: 'HTC $1 (Sprint)'
   - regex: 'HTC ([A-Za-z0-9]+ [A-Z])'
-    device_replacement: HTC $1
-  - regex: 'HTC-([A-Za-z0-9]+)'
-    device_replacement: 'HTC $1'
-  - regex: 'HTC_([A-Za-z0-9]+)'
     device_replacement: 'HTC $1'
-  - regex: 'HTC ([A-Za-z0-9]+)'
+  - regex: 'HTC[-_/\s]([A-Za-z0-9]+)'
     device_replacement: 'HTC $1'
-  - regex: '(ADR[A-z0-9]+)'
+  - regex: '(ADR[A-Za-z0-9]+)'
     device_replacement: 'HTC $1'
   - regex: '(HTC)'
 
+  # Tesla Model S
+  - regex: '(QtCarBrowser)'
+    device_replacement: 'Tesla Model S'
+
+  # Samsung
+  - regex: '(SamsungSGHi560)'
+    device_replacement: 'Samsung SGHi560'
+
   #########
   # Ericsson - must come before nokia since they also use symbian
   #########
-  - regex: 'SonyEricsson([A-z0-9]+)/'
+  - regex: 'SonyEricsson([A-Za-z0-9]+)/'
     device_replacement: 'Ericsson $1'
 
+  ##########
+  # PlayStation
+  # The Vita spoofs the Kindle
+  ##########
+  - regex: 'PLAYSTATION 3'
+    device_replacement: 'PlayStation 3'
+  - regex: '(PlayStation Portable)'
+  - regex: '(PlayStation Vita)'
+
+  ##########
+  # incomplete!
+  # Kindle
+  # http://amazonsilk.wordpress.com/useful-bits/silk-user-agent/
+  ##########
+  - regex: '(KFOT Build)'
+    device_replacement: 'Kindle Fire'
+  - regex: '(KFTT Build)'
+    device_replacement: 'Kindle Fire HD'
+  - regex: '(KFJWI Build)'
+    device_replacement: 'Kindle Fire HD 8.9" WiFi'
+  - regex: '(KFJWA Build)'
+    device_replacement: 'Kindle Fire HD 8.9" 4G'
+  - regex: '(Kindle Fire)'
+  - regex: '(Kindle)'
+  - regex: '(Silk)/(\d+)\.(\d+)(?:\.([0-9\-]+))?'
+    device_replacement: 'Kindle Fire'
+      
   #########
   # Android General Device Matching (far from perfect)
   #########
-  - regex: 'Android[\- ][\d]+\.[\d]+\; [A-z]{2}\-[A-z]{2}\; WOWMobile (.+) Build'
-  - regex: 'Android[\- ][\d]+\.[\d]+\.[\d]+; [A-z]{2}\-[A-z]{2}\; (.+) Build'
-  - regex: 'Android[\- ][\d]+\.[\d]+\-update1\; [A-z]{2}\-[A-z]{2}\; (.+) Build'
-  - regex: 'Android[\- ][\d]+\.[\d]+\; [A-z]{2}\-[A-z]{2}\; (.+) Build'
+  - regex: 'Android[\- ][\d]+\.[\d]+; [A-Za-z]{2}\-[A-Za-z]{2}; WOWMobile (.+) Build'
+  - regex: 'Android[\- ][\d]+\.[\d]+\-update1; [A-Za-z]{2}\-[A-Za-z]{2}; (.+) Build'
+  - regex: 'Android[\- ][\d]+\.[\d]+\.[\d]+; [A-Za-z]{2}\-[A-Za-z]{2}; (.+) Build'
+  - regex: 'Android[\- ][\d]+\.[\d]+\.[\d]+;[A-Za-z]{2}\-[A-Za-z]{2};(.+) Build'
+  - regex: 'Android[\- ][\d]+\.[\d]+; [A-Za-z]{2}\-[A-Za-z]{2}; (.+) Build'
+  - regex: 'Android[\- ][\d]+\.[\d]+\.[\d]+; (.+) Build'
+  - regex: 'Android[\- ][\d]+\.[\d]+; (.+) Build'
 
   ##########
   # NOKIA
@@ -509,6 +704,8 @@ device_parsers:
   ##########
   - regex: 'NokiaN([0-9]+)'
     device_replacement: 'Nokia N$1'
+  - regex: 'NOKIA([A-Za-z0-9\v-]+)'
+    device_replacement: 'Nokia $1'
   - regex: 'Nokia([A-Za-z0-9\v-]+)'
     device_replacement: 'Nokia $1'
   - regex: 'NOKIA ([A-Za-z0-9\-]+)'
@@ -521,14 +718,19 @@ device_parsers:
     device_replacement: 'Nokia'
 
   ##########
-  # Blackberry
+  # BlackBerry
   # http://www.useragentstring.com/pages/BlackBerry/
   ##########
+  - regex: 'BB10; ([A-Za-z0-9\- ]+)\)'
+    device_replacement: 'BlackBerry $1'
   - regex: '(PlayBook).+RIM Tablet OS'
-    device_replacement: 'Blackberry Playbook'
-  - regex: '(Black[Bb]erry [0-9]+);'
+    device_replacement: 'BlackBerry Playbook'
+  - regex: 'Black[Bb]erry ([0-9]+);'
+    device_replacement: 'BlackBerry $1'
   - regex: 'Black[Bb]erry([0-9]+)'
     device_replacement: 'BlackBerry $1'
+  - regex: 'Black[Bb]erry;'
+    device_replacement: 'BlackBerry'
 
   ##########
   # PALM / HP
@@ -538,26 +740,35 @@ device_parsers:
     device_replacement: 'Palm Pre'
   - regex: '(Pixi)/(\d+)\.(\d+)'
     device_replacement: 'Palm Pixi'
-  - regex: '(Touchpad)/(\d+)\.(\d+)'
-    device_replacement: 'HP Touchpad'
-  - regex: 'HPiPAQ([A-z0-9]+)/(\d+).(\d+)'
+  - regex: '(Touch[Pp]ad)/(\d+)\.(\d+)'
+    device_replacement: 'HP TouchPad'
+  - regex: 'HPiPAQ([A-Za-z0-9]+)/(\d+).(\d+)'
     device_replacement: 'HP iPAQ $1'
-  - regex: 'Palm([A-z0-9]+)'
+  - regex: 'Palm([A-Za-z0-9]+)'
     device_replacement: 'Palm $1'
-  - regex: 'Treo([A-z0-9]+)'
+  - regex: 'Treo([A-Za-z0-9]+)'
     device_replacement: 'Palm Treo $1'
   - regex: 'webOS.*(P160UNA)/(\d+).(\d+)'
     device_replacement: 'HP Veer'
 
   ##########
-  # incomplete!
-  # Kindle
+  # AppleTV
+  # No built in browser that I can tell
+  # Stack Overflow indicated iTunes-AppleTV/4.1 as a known UA for app available and I'm seeing it in live traffic
   ##########
-  - regex: '(Kindle Fire)'
-  - regex: '(Kindle)'
-  - regex: '(Silk)/(\d+)\.(\d+)(?:\.([0-9\-]+))?'
-    device_replacement: 'Kindle Fire'
+  - regex: '(AppleTV)'
+    device_replacement: 'AppleTV'
 
+  ##########
+  # Catch the google mobile crawler before checking for iPhones.
+  ##########
+
+  - regex: 'AdsBot-Google-Mobile'
+    device_replacement: 'Spider'
+   
+  - regex: 'Googlebot-Mobile/(\d+).(\d+)'
+    device_replacement: 'Spider'
+    
   ##########
   # complete but probably catches spoofs
   # iSTUFF
@@ -573,101 +784,113 @@ device_parsers:
   ##########
   # Acer
   ##########
-  - regex: 'acer_([A-z0-9]+)_'
+  - regex: 'acer_([A-Za-z0-9]+)_'
     device_replacement: 'Acer $1'
-  - regex: 'acer_([A-z0-9]+)_'
+  - regex: 'acer_([A-Za-z0-9]+)_'
     device_replacement: 'Acer $1'
 
+  ##########   
+  # Alcatel
+  ##########
+  - regex: 'ALCATEL-([A-Za-z0-9]+)'
+    device_replacement: 'Alcatel $1'
+  - regex: 'Alcatel-([A-Za-z0-9]+)'
+    device_replacement: 'Alcatel $1'
+
   ##########
   # Amoi
   ##########
-  - regex: 'Amoi\-([A-z0-9]+)'
+  - regex: 'Amoi\-([A-Za-z0-9]+)'
     device_replacement: 'Amoi $1'
-  - regex: 'AMOI\-([A-z0-9]+)'
+  - regex: 'AMOI\-([A-Za-z0-9]+)'
     device_replacement: 'Amoi $1'
 
   ##########
   # Amoi
   ##########
-  - regex: 'Asus\-([A-z0-9]+)'
+  - regex: 'Asus\-([A-Za-z0-9]+)'
     device_replacement: 'Asus $1'
-  - regex: 'ASUS\-([A-z0-9]+)'
+  - regex: 'ASUS\-([A-Za-z0-9]+)'
     device_replacement: 'Asus $1'
 
   ##########
   # Bird
   ##########
-  - regex: 'BIRD\-([A-z0-9]+)'
+  - regex: 'BIRD\-([A-Za-z0-9]+)'
     device_replacement: 'Bird $1'
-  - regex: 'BIRD\.([A-z0-9]+)'
+  - regex: 'BIRD\.([A-Za-z0-9]+)'
     device_replacement: 'Bird $1'
-  - regex: 'BIRD ([A-z0-9]+)'
+  - regex: 'BIRD ([A-Za-z0-9]+)'
     device_replacement: 'Bird $1'
 
   ##########
   # Dell
   ##########
-  - regex: 'Dell ([A-z0-9]+)'
+  - regex: 'Dell ([A-Za-z0-9]+)'
     device_replacement: 'Dell $1'
 
   ##########
   # DoCoMo
   ##########
-  - regex: 'DoCoMo/2\.0 ([A-z0-9]+)'
+  - regex: 'DoCoMo/2\.0 ([A-Za-z0-9]+)'
     device_replacement: 'DoCoMo $1'
-  - regex: '([A-z0-9]+)\_W\;FOMA'
+  - regex: '([A-Za-z0-9]+)_W\;FOMA'
     device_replacement: 'DoCoMo $1'
-  - regex: '([A-z0-9]+)\;FOMA'
+  - regex: '([A-Za-z0-9]+)\;FOMA'
     device_replacement: 'DoCoMo $1'
 
   ##########
-  # Huawei Vodafone
+  # Huawei
   ##########
-  - regex: 'vodafone([A-z0-9]+)'
+  - regex: 'Huawei([A-Za-z0-9]+)'
+    device_replacement: 'Huawei $1'
+  - regex: 'HUAWEI-([A-Za-z0-9]+)'
+    device_replacement: 'Huawei $1'
+  - regex: 'vodafone([A-Za-z0-9]+)'
     device_replacement: 'Huawei Vodafone $1'
 
   ##########
   # i-mate
   ##########
-  - regex: 'i\-mate ([A-z0-9]+)'
+  - regex: 'i\-mate ([A-Za-z0-9]+)'
     device_replacement: 'i-mate $1'
 
   ##########
   # kyocera
   ##########
-  - regex: 'Kyocera\-([A-z0-9]+)'
+  - regex: 'Kyocera\-([A-Za-z0-9]+)'
     device_replacement: 'Kyocera $1'
-  - regex: 'KWC\-([A-z0-9]+)'
+  - regex: 'KWC\-([A-Za-z0-9]+)'
     device_replacement: 'Kyocera $1'
 
   ##########
   # lenovo
   ##########
-  - regex: 'Lenovo\-([A-z0-9]+)'
+  - regex: 'Lenovo\-([A-Za-z0-9]+)'
     device_replacement: 'Lenovo $1'
-  - regex: 'Lenovo\_([A-z0-9]+)'
+  - regex: 'Lenovo_([A-Za-z0-9]+)'
     device_replacement: 'Lenovo $1'
 
   ##########
   # lg
   ##########
-  - regex: 'LG/([A-z0-9]+)'
+  - regex: 'LG/([A-Za-z0-9]+)'
     device_replacement: 'LG $1'
-  - regex: 'LG-LG([A-z0-9]+)'
+  - regex: 'LG-LG([A-Za-z0-9]+)'
     device_replacement: 'LG $1'
-  - regex: 'LGE-LG([A-z0-9]+)'
+  - regex: 'LGE-LG([A-Za-z0-9]+)'
     device_replacement: 'LG $1'
-  - regex: 'LGE VX([A-z0-9]+)'
+  - regex: 'LGE VX([A-Za-z0-9]+)'
     device_replacement: 'LG $1'
-  - regex: 'LG ([A-z0-9]+)'
+  - regex: 'LG ([A-Za-z0-9]+)'
     device_replacement: 'LG $1'
-  - regex: 'LGE LG\-AX([A-z0-9]+)'
+  - regex: 'LGE LG\-AX([A-Za-z0-9]+)'
     device_replacement: 'LG $1'
-  - regex: 'LG\-([A-z0-9]+)'
+  - regex: 'LG\-([A-Za-z0-9]+)'
     device_replacement: 'LG $1'
-  - regex: 'LGE\-([A-z0-9]+)'
+  - regex: 'LGE\-([A-Za-z0-9]+)'
     device_replacement: 'LG $1'
-  - regex: 'LG([A-z0-9]+)'
+  - regex: 'LG([A-Za-z0-9]+)'
     device_replacement: 'LG $1'
 
   ##########
@@ -681,36 +904,61 @@ device_parsers:
   ##########
   # motorola
   ##########
-  - regex: '(Motorola)\-([A-z0-9]+)'
-  - regex: 'MOTO\-([A-z0-9]+)'
+  - regex: '(Motorola)\-([A-Za-z0-9]+)'
+  - regex: 'MOTO\-([A-Za-z0-9]+)'
     device_replacement: 'Motorola $1'
-  - regex: 'MOT\-([A-z0-9]+)'
+  - regex: 'MOT\-([A-Za-z0-9]+)'
     device_replacement: 'Motorola $1'
+    
+  ##########
+  # nintendo
+  ##########
+  - regex: '(Nintendo WiiU)'
+    device_replacement: 'Nintendo Wii U'
+  - regex: 'Nintendo (DS|3DS|DSi|Wii);'
+    device_replacement: 'Nintendo $1'
 
+  ##########
+  # pantech
+  ##########
+  - regex: 'Pantech([A-Za-z0-9]+)'
+    device_replacement: 'Pantech $1'
+ 
   ##########
   # philips
   ##########
-  - regex: 'Philips([A-z0-9]+)'
+  - regex: 'Philips([A-Za-z0-9]+)'
     device_replacement: 'Philips $1'
-  - regex: 'Philips ([A-z0-9]+)'
+  - regex: 'Philips ([A-Za-z0-9]+)'
     device_replacement: 'Philips $1'
 
   ##########
   # Samsung
   ##########
-  - regex: 'SAMSUNG-([A-z0-9\-]+)'
+  - regex: 'SAMSUNG-([A-Za-z0-9\-]+)'
     device_replacement: 'Samsung $1'
-  - regex: 'SAMSUNG\; ([A-z0-9\-]+)'
+  - regex: 'SAMSUNG\; ([A-Za-z0-9\-]+)'
     device_replacement: 'Samsung $1'
 
+  ##########
+  # Sega
+  ##########
+  - regex: 'Dreamcast'
+    device_replacement: 'Sega Dreamcast'
+
   ##########
   # Softbank
   ##########
-  - regex: 'Softbank/1\.0/([A-z0-9]+)'
+  - regex: 'Softbank/1\.0/([A-Za-z0-9]+)'
     device_replacement: 'Softbank $1'
-  - regex: 'Softbank/2\.0/([A-z0-9]+)'
+  - regex: 'Softbank/2\.0/([A-Za-z0-9]+)'
     device_replacement: 'Softbank $1'
 
+  ##########
+  # WebTV
+  ##########
+  - regex: '(WebTV)/(\d+).(\d+)'
+
   ##########
   # Generic Smart Phone
   ##########
@@ -720,17 +968,18 @@ device_parsers:
   ##########
   # Generic Feature Phone
   ##########
-  - regex: '^(1207|3gso|4thp|501i|502i|503i|504i|505i|506i|6310|6590|770s|802s|a wa|acer|acs\-|airn|alav|asus|attw|au\-m|aur |aus |abac|acoo|aiko|alco|alca|amoi|anex|anny|anyw|aptu|arch|argo|bell|bird|bw\-n|bw\-u|beck|benq|bilb|blac|c55/|cdm\-|chtm|capi|comp|cond|craw|dall|dbte|dc\-s|dica|ds\-d|ds12|dait|devi|dmob|doco|dopo|el49|erk0|esl8|ez40|ez60|ez70|ezos|ezze|elai|emul|eric|ezwa|fake|fly\-|fly\_|g\-mo|g1 u|g560|gf\-5|grun|gene|go.w|good|grad|hcit|hd\-m|hd\-p|hd\-t|hei\-|hp i|hpip|hs\-c|htc |htc\-|htca|htcg)'
+  - regex: '^(1207|3gso|4thp|501i|502i|503i|504i|505i|506i|6310|6590|770s|802s|a wa|acer|acs\-|airn|alav|asus|attw|au\-m|aur |aus |abac|acoo|aiko|alco|alca|amoi|anex|anny|anyw|aptu|arch|argo|bell|bird|bw\-n|bw\-u|beck|benq|bilb|blac|c55/|cdm\-|chtm|capi|comp|cond|craw|dall|dbte|dc\-s|dica|ds\-d|ds12|dait|devi|dmob|doco|dopo|el49|erk0|esl8|ez40|ez60|ez70|ezos|ezze|elai|emul|eric|ezwa|fake|fly\-|fly_|g\-mo|g1 u|g560|gf\-5|grun|gene|go.w|good|grad|hcit|hd\-m|hd\-p|hd\-t|hei\-|hp i|hpip|hs\-c|htc |htc\-|htca|htcg)'
     device_replacement: 'Generic Feature Phone'
-  - regex: '^(htcp|htcs|htct|htc\_|haie|hita|huaw|hutc|i\-20|i\-go|i\-ma|i230|iac|iac\-|iac/|ig01|im1k|inno|iris|jata|java|kddi|kgt|kgt/|kpt |kwc\-|klon|lexi|lg g|lg\-a|lg\-b|lg\-c|lg\-d|lg\-f|lg\-g|lg\-k|lg\-l|lg\-m|lg\-o|lg\-p|lg\-s|lg\-t|lg\-u|lg\-w|lg/k|lg/l|lg/u|lg50|lg54|lge\-|lge/|lynx|leno|m1\-w|m3ga|m50/|maui|mc01|mc21|mcca|medi|meri|mio8|mioa|mo01|mo02|mode|modo|mot |mot\-|mt50|mtp1|mtv |mate|maxo|merc|mits|mobi|motv|mozz|n100|n101|n102|n202|n203|n300|n302|n500|n502|n505|n700|n701|n710|nec\-|nem\-|newg|neon)'
+  - regex: '^(htcp|htcs|htct|htc_|haie|hita|huaw|hutc|i\-20|i\-go|i\-ma|i230|iac|iac\-|iac/|ig01|im1k|inno|iris|jata|java|kddi|kgt|kgt/|kpt |kwc\-|klon|lexi|lg g|lg\-a|lg\-b|lg\-c|lg\-d|lg\-f|lg\-g|lg\-k|lg\-l|lg\-m|lg\-o|lg\-p|lg\-s|lg\-t|lg\-u|lg\-w|lg/k|lg/l|lg/u|lg50|lg54|lge\-|lge/|lynx|leno|m1\-w|m3ga|m50/|maui|mc01|mc21|mcca|medi|meri|mio8|mioa|mo01|mo02|mode|modo|mot |mot\-|mt50|mtp1|mtv |mate|maxo|merc|mits|mobi|motv|mozz|n100|n101|n102|n202|n203|n300|n302|n500|n502|n505|n700|n701|n710|nec\-|nem\-|newg|neon)'
     device_replacement: 'Generic Feature Phone'
   - regex: '^(netf|noki|nzph|o2 x|o2\-x|opwv|owg1|opti|oran|ot\-s|p800|pand|pg\-1|pg\-2|pg\-3|pg\-6|pg\-8|pg\-c|pg13|phil|pn\-2|pt\-g|palm|pana|pire|pock|pose|psio|qa\-a|qc\-2|qc\-3|qc\-5|qc\-7|qc07|qc12|qc21|qc32|qc60|qci\-|qwap|qtek|r380|r600|raks|rim9|rove|s55/|sage|sams|sc01|sch\-|scp\-|sdk/|se47|sec\-|sec0|sec1|semc|sgh\-|shar|sie\-|sk\-0|sl45|slid|smb3|smt5|sp01|sph\-|spv |spv\-|sy01|samm|sany|sava|scoo|send|siem|smar|smit|soft|sony|t\-mo|t218|t250|t600|t610|t618|tcl\-|tdg\-|telm|tim\-|ts70|tsm\-|tsm3|tsm5|tx\-9|tagt)'
     device_replacement: 'Generic Feature Phone'
-  - regex: '^(talk|teli|topl|tosh|up.b|upg1|utst|v400|v750|veri|vk\-v|vk40|vk50|vk52|vk53|vm40|vx98|virg|vite|voda|vulc|w3c |w3c\-|wapj|wapp|wapu|wapm|wig |wapi|wapr|wapv|wapy|wapa|waps|wapt|winc|winw|wonu|x700|xda2|xdag|yas\-|your|zte\-|zeto|aste|audi|avan|blaz|brew|brvw|bumb|ccwa|cell|cldc|cmd\-|dang|eml2|fetc|hipt|http|ibro|idea|ikom|ipaq|jbro|jemu|jigs|keji|kyoc|kyok|libw|m\-cr|midp|mmef|moto|mwbp|mywa|newt|nok6|o2im|pant|pdxg|play|pluc|port|prox|rozo|sama|seri|smal|symb|treo|upsi|vx52|vx53|vx60|vx61|vx70|vx80|vx81|vx83|vx85|wap\-|webc|whit|wmlb|xda\-|xda\_)'
+  - regex: '^(talk|teli|topl|tosh|up.b|upg1|utst|v400|v750|veri|vk\-v|vk40|vk50|vk52|vk53|vm40|vx98|virg|vite|voda|vulc|w3c |w3c\-|wapj|wapp|wapu|wapm|wig |wapi|wapr|wapv|wapy|wapa|waps|wapt|winc|winw|wonu|x700|xda2|xdag|yas\-|your|zte\-|zeto|aste|audi|avan|blaz|brew|brvw|bumb|ccwa|cell|cldc|cmd\-|dang|eml2|fetc|hipt|http|ibro|idea|ikom|ipaq|jbro|jemu|jigs|keji|kyoc|kyok|libw|m\-cr|midp|mmef|moto|mwbp|mywa|newt|nok6|o2im|pant|pdxg|play|pluc|port|prox|rozo|sama|seri|smal|symb|treo|upsi|vx52|vx53|vx60|vx61|vx70|vx80|vx81|vx83|vx85|wap\-|webc|whit|wmlb|xda\-|xda_)'
     device_replacement: 'Generic Feature Phone'
 
   ##########
   # Spiders (this is hack...)
   ##########
-  - regex: '(bot|borg|google(^tv)|yahoo|slurp|msnbot|msrbot|openbot|archiver|netresearch|lycos|scooter|altavista|teoma|gigabot|baiduspider|blitzbot|oegp|charlotte|furlbot|http%20client|polybot|htdig|ichiro|mogimogi|larbin|pompos|scrubby|searchsight|seekbot|semanticdiscovery|silk|snappy|speedy|spider|voila|vortex|voyager|zao|zeal|fast\-webcrawler|converacrawler|dataparksearch|findlinks)'
+  - regex: '(bot|borg|google(^tv)|yahoo|slurp|msnbot|msrbot|openbot|archiver|netresearch|lycos|scooter|altavista|teoma|gigabot|baiduspider|blitzbot|oegp|charlotte|furlbot|http%20client|polybot|htdig|ichiro|mogimogi|larbin|pompos|scrubby|searchsight|seekbot|semanticdiscovery|silk|snappy|speedy|spider|voila|vortex|voyager|zao|zeal|fast\-webcrawler|converacrawler|dataparksearch|findlinks|crawler)'
     device_replacement: 'Spider'
+