user_agent_parser 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e20682e690e1e3552bc54b1ef9849ab8febc3ec
-  data.tar.gz: 8f7578787fc31f82e35909d34c86b1b00594b0b6
+  metadata.gz: 3e6c42fb7a24030be52fa5c096b8af27e362bb02
+  data.tar.gz: 60cfeb6d90444739f7f81f0e035704e23b5597df
 SHA512:
-  metadata.gz: 488d4f2b60187907f65ad244786c6babfef042fa16d5a70292a29aac70fda3cbbf7dead070d2c30123b9a81c46c3385e4347994692342d3b127fb5baba01d6dd
-  data.tar.gz: a8213bbf5f3b4fb36665d36b7c401c6ec40acfcacc0b52340bcb36a402b038ea5c658837d449c2cd04ad04142334f080bd2479ae4ae5c7b4fd67f54e49c46b0b
+  metadata.gz: 9fe9aa53552e5fb33d04bdc412a4cfb684ef5e04cb75f0d3747a8036ae804891072f1114dba9729d243d7bb138e610f954ee108dc4d1dda025ac1155bf4e2445
+  data.tar.gz: 06ba11a996ca450f7db3a5fc5175c76d703e3cd2496013c0d09bc34a1f63cf8a145ee2a1fa1ee48b37152074ab6c12b98c0e4f62c9e305af59432f69d7fd10b3

data/Readme.md

@@ -2,9 +2,13 @@
 
 UserAgentParser is a simple, comprehensive Ruby gem for parsing user agent strings. It uses [BrowserScope](http://www.browserscope.org/)'s [parsing patterns](https://github.com/tobie/ua-parser).
 
-## Requirements
+## Supported Rubies
 
-* Ruby >= 1.8.7
+* Ruby 2.1
+* Ruby 2.0
+* Ruby 1.9.3
+* Ruby 1.9.2
+* JRuby
 
 ## Installation
 
@@ -21,7 +25,7 @@ user_agent = UserAgentParser.parse 'Mozilla/5.0 (compatible; MSIE 9.0; Windows N
 => #<UserAgentParser::UserAgent IE 9.0 (Windows Vista)>
 user_agent.to_s
 => "IE 9.0"
-user_agent.name
+user_agent.family
 => "IE"
 user_agent.version.to_s
 => "9.0"
@@ -74,6 +78,17 @@ or when instantiating a `UserAgentParser::Parser`:
 UserAgentParser::Parser.new(patterns_path: '/some/path/to/regexes.yaml').parse(ua_string)
 ```
 
+## Binary: user_agent_parser
+
+There is a binary called `user_agent_parser` that will read from
+standard input, parse each line and print the result, for example:
+
+```ruby
+$ cat SOME-FILE.json | user_agent_parser --format '%n %M' | distribution
+```
+
+See `user_agent_parser -h` for more information.
+
 ## Contributing
 
 1. Fork
@@ -94,6 +109,7 @@ All accepted pull requests will earn you commit and release rights.
         * Some new feature
         * Some new bug fix
 3. `rake release`
+4. Create a [new Github release](https://github.com/toolmantim/user_agent_parser/releases/new)
 
 ## License
 

data/bin/user_agent_parser

@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+
+require 'user_agent_parser'
+require 'user_agent_parser/cli'
+
+options = {}
+
+optparse = OptionParser.new do|opts|
+  opts.on('--family', 'Print family only') do
+    options[:family] = true
+  end
+
+  opts.on('--name', 'Print name (alias for family) only') do
+    options[:family] = true
+  end
+
+  opts.on('--version', 'Print version only') do
+    options[:version] = true
+  end
+
+  opts.on('--major', 'Print major version only') do
+    options[:major] = true
+  end
+
+  opts.on('--minor', 'Print minor version only') do
+    options[:minor] = true
+  end
+
+  opts.on('--os', 'Print operating system only') do
+    options[:os] = true
+  end
+
+  opts.on('--format format',
+          'Print output in specified format. The available formatters are:',
+          ' - %f: family',
+          ' - %n: name (alias for family)',
+          ' - %v: version',
+          ' - %M: major version',
+          ' - %m: minor version',
+          ' - %o: operating system'
+         ) do |format|
+    options[:format] = format
+  end
+
+  opts.on('-h', '--help', 'Display this screen') do
+    puts opts
+    exit
+  end
+end
+
+optparse.parse!
+
+parser = UserAgentParser::Parser.new
+
+ARGF.each do |line|
+  puts UserAgentParser::Cli.new(parser.parse(line), options).run!
+end

data/lib/user_agent_parser/cli.rb

@@ -0,0 +1,58 @@
+module UserAgentParser
+  class Cli
+    def initialize(user_agent, options = {})
+      @user_agent = user_agent
+      @options = options
+    end
+
+    def run!
+      if @options[:family]
+        @user_agent.family
+      elsif @options[:name]
+        @user_agent.name
+      elsif @options[:version]
+        with_version do |version|
+          version.to_s
+        end
+      elsif @options[:major]
+        major
+      elsif @options[:minor]
+        minor
+      elsif @options[:os]
+        @user_agent.os.to_s
+      elsif format = @options[:format]
+        format.
+          gsub('%f', @user_agent.family).
+          gsub('%n', @user_agent.name).
+          gsub('%v', version.to_s).
+          gsub('%M', major.to_s).
+          gsub('%m', minor.to_s).
+          gsub('%o', @user_agent.os.to_s)
+      else
+        @user_agent.to_s
+      end
+    end
+
+    private
+
+    def major
+      with_version do |version|
+        version.major
+      end
+    end
+
+    def minor
+      with_version do |version|
+        version.minor
+      end
+    end
+
+    def version
+      @version ||= @user_agent.version
+    end
+
+    def with_version(&block)
+      block.call(version) if version
+    end
+  end
+end

data/lib/user_agent_parser/device.rb

@@ -1,13 +1,15 @@
 module UserAgentParser
   class Device
-    attr_reader :name
+    attr_reader :family
 
-    def initialize(name = nil)
-      @name = name || 'Other'
+    alias_method :name, :family
+
+    def initialize(family = nil)
+      @family = family || 'Other'
     end
 
     def to_s
-      name
+      family
     end
 
     def inspect
@@ -15,7 +17,7 @@ module UserAgentParser
     end
 
     def eql?(other)
-      self.class.eql?(other.class) && name == other.name
+      self.class.eql?(other.class) && family == other.family
     end
 
     alias_method :==, :eql?

data/lib/user_agent_parser/operating_system.rb

@@ -1,14 +1,16 @@
 module UserAgentParser
   class OperatingSystem
-    attr_reader :name, :version
+    attr_reader :family, :version
 
-    def initialize(name = 'Other', version = nil)
-      @name = name
+    alias_method :name, :family
+
+    def initialize(family = 'Other', version = nil)
+      @family = family
       @version = version
     end
 
     def to_s
-      string = name
+      string = family
       unless version.nil?
         string += " #{version}"
       end
@@ -21,7 +23,7 @@ module UserAgentParser
 
     def eql?(other)
       self.class.eql?(other.class) &&
-        name == other.name &&
+        family == other.family &&
         version == other.version
     end
 

data/lib/user_agent_parser/parser.rb

@@ -1,7 +1,7 @@
 require 'yaml'
 
 module UserAgentParser
-  
+
   class Parser
     attr_reader :patterns_path
 
@@ -71,10 +71,10 @@ module UserAgentParser
     end
 
     def user_agent_from_pattern_match(pattern, match, os = nil, device = nil)
-      name, v1, v2, v3, v4 = match[1], match[2], match[3], match[4], match[5]
+      family, v1, v2, v3, v4 = match[1], match[2], match[3], match[4], match[5]
 
       if pattern["family_replacement"]
-        name = pattern["family_replacement"].sub('$1', name || '')
+        family = pattern["family_replacement"].sub('$1', family || '')
       end
 
       if pattern["v1_replacement"]
@@ -95,7 +95,7 @@ module UserAgentParser
 
       version = version_from_segments(v1, v2, v3, v4)
 
-      UserAgent.new(name, version, os, device)
+      UserAgent.new(family, version, os, device)
     end
 
     def os_from_pattern_match(pattern, match)
@@ -137,8 +137,8 @@ module UserAgentParser
     end
 
     def version_from_segments(*segments)
-      version_string = segments.compact.join(".")
-      version_string.empty? ? nil : Version.new(version_string)
+      segments = segments.compact
+      segments.empty? ? nil : Version.new(*segments)
     end
   end
 end

data/lib/user_agent_parser/user_agent.rb

@@ -1,19 +1,18 @@
 module UserAgentParser
   class UserAgent
-    attr_reader :name, :version, :os, :device
+    attr_reader :family, :version, :os, :device
 
-    # For backwards compatibility with older versions of this gem.
-    alias_method :family, :name
+    alias_method :name, :family
 
-    def initialize(name = nil, version = nil, os = nil, device = nil)
-      @name = name || 'Other'
+    def initialize(family = nil, version = nil, os = nil, device = nil)
+      @family = family || 'Other'
       @version = version
       @os = os
       @device = device
     end
 
     def to_s
-      string = name
+      string = family
       string += " #{version}" if version
       string
     end
@@ -27,7 +26,7 @@ module UserAgentParser
 
     def eql?(other)
       self.class.eql?(other.class) &&
-      name == other.name &&
+      family == other.family &&
         version == other.version &&
         os == other.os
     end

data/lib/user_agent_parser/version.rb

@@ -1,15 +1,20 @@
 module UserAgentParser
   class Version
 
-    # Private: Regex used to split version string into major, minor, patch,
-    # and patch_minor.
+    # Private: Regex used to split string 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)
-      @version = version.to_s.strip
+    def initialize(*args)
+      if args.length == 1 && args.first.is_a?(String)
+        @version = args.first.to_s.strip
+      else
+        @segments = args.map(&:to_s).map(&:strip)
+        @version = segments.join(".")
+      end
     end
 
     def major

data/vendor/ua-parser/regexes.yaml

@@ -6,8 +6,8 @@ user_agent_parsers:
   # See os_parsers if you want to target a specific TV
   - regex: '(HbbTV)/(\d+)\.(\d+)\.(\d+) \('
 
-  # must go before Firefox to catch SeaMonkey/Camino
-  - regex: '(SeaMonkey|Camino)/(\d+)\.(\d+)\.?([ab]?\d+[a-z]*)'
+  # must go before Firefox to catch Chimera/SeaMonkey/Camino
+  - regex: '(Chimera|SeaMonkey|Camino)/(\d+)\.(\d+)\.?([ab]?\d+[a-z]*)?'
 
   # Firefox
   - regex: '(Pale[Mm]oon)/(\d+)\.(\d+)\.?(\d+)?'
@@ -49,7 +49,7 @@ user_agent_parsers:
   - regex: '(Navigator)/(\d+)\.(\d+)([ab]\d+)'
     family_replacement: 'Netscape'
 
-  - regex: '(Netscape6)/(\d+)\.(\d+)\.(\d+)'
+  - regex: '(Netscape6)/(\d+)\.(\d+)\.?([ab]?\d+)?'
     family_replacement: 'Netscape'
 
   - regex: '(MyIBrow)/(\d+)\.(\d+)'
@@ -60,10 +60,13 @@ user_agent_parsers:
   - regex: '(Opera Tablet).*Version/(\d+)\.(\d+)(?:\.(\d+))?'
   - regex: '(Opera)/.+Opera Mobi.+Version/(\d+)\.(\d+)'
     family_replacement: 'Opera Mobile'
+  - regex: '(Opera)/(\d+)\.(\d+).+Opera Mobi'
+    family_replacement: 'Opera Mobile'
+  - regex: 'Opera Mobi.+(Opera)(?:/|\s+)(\d+)\.(\d+)'
+    family_replacement: 'Opera Mobile'
   - regex: 'Opera Mobi'
     family_replacement: 'Opera Mobile'
-  - regex: '(Opera Mini)/(\d+)\.(\d+)'
-  - regex: '(Opera Mini)/att/(\d+)\.(\d+)'
+  - regex: '(Opera Mini)(?:/att)?/(\d+)\.(\d+)'
   - regex: '(Opera)/9.80.*Version/(\d+)\.(\d+)(?:\.(\d+))?'
 
   # Opera 14 for Android uses a WebKit render engine.
@@ -82,13 +85,13 @@ user_agent_parsers:
   # 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/
-  - regex: '(Lightning)/(\d+)\.(\d+)([ab]?\d+[a-z]*)'
+  - regex: '(Lightning)/(\d+)\.(\d+)\.?((?:[ab]?\d+[a-z]*)|(?:\d*))'
 
   # Swiftfox
   - regex: '(Firefox)/(\d+)\.(\d+)\.(\d+(?:pre)?) \(Swiftfox\)'
@@ -123,6 +126,28 @@ user_agent_parsers:
 
   - regex: '(Minimo)'
 
+  - 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'
+
+  # Amazon Silk, should go before Safari and Chrome Mobile
+  - regex: '(Silk)/(\d+)\.(\d+)(?:\.([0-9\-]+))?'
+    family_replacement: 'Amazon Silk'
+
+
+  # @ref: http://www.puffinbrowser.com
+  - regex: '(Puffin)/(\d+)\.(\d+)(?:\.(\d+))?'
+
   # Chrome Mobile
   - regex: '(CrMo)/(\d+)\.(\d+)\.(\d+)\.(\d+)'
     family_replacement: 'Chrome Mobile'
@@ -156,6 +181,14 @@ user_agent_parsers:
   - regex: '(FlyFlow)/(\d+)\.(\d+)'
     family_replacement: 'Baidu Explorer'
 
+  # QQ Browsers
+  - regex: '(MQQBrowser/Mini)(?:(\d+)(?:\.(\d+)(?:\.(\d+))?)?)?'
+    family_replacement: 'QQ Browser Mini'
+  - regex: '(MQQBrowser)(?:/(\d+)(?:\.(\d+)(?:\.(\d+))?)?)?'
+    family_replacement: 'QQ Browser Mobile'
+  - regex: '(QQBrowser)(?:/(\d+)(?:\.(\d+)\.(\d+)(?:\.(\d+))?)?)?'
+    family_replacement: 'QQ Browser'
+
   # Pingdom
   - regex: '(Pingdom.com_bot_version_)(\d+)\.(\d+)'
     family_replacement: 'PingdomBot'
@@ -164,10 +197,18 @@ user_agent_parsers:
   - regex: '(facebookexternalhit)/(\d+)\.(\d+)'
     family_replacement: 'FacebookBot'
 
+  # LinkedIn
+  - regex: '(LinkedInBot)/(\d+)\.(\d+)'
+    family_replacement: 'LinkedInBot'
+
   # Twitterbot
   - regex: '(Twitterbot)/(\d+)\.(\d+)'
     family_replacement: 'TwitterBot'
 
+  # Google Plus
+  - regex: 'Google.*/\+/web/snippet'
+    family_replacement: 'GooglePlusBot'
+
   # Rackspace Monitoring
   - regex: '(Rackspace Monitoring)/(\d+)\.(\d+)'
     family_replacement: 'RackspaceBot'
@@ -191,25 +232,63 @@ user_agent_parsers:
   #### MAIN CASES - this catches > 50% of all browsers ####
 
   # Browser/major_version.minor_version.beta_version
-  - regex: '(AdobeAIR|FireWeb|Jasmine|ANTGalio|Midori|Fresco|Lobo|PaleMoon|Maxthon|Lynx|OmniWeb|Dillo|Camino|Demeter|Fluid|Fennec|Epiphany|Shiira|Sunrise|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+)'
+  - regex: '(AdobeAIR|FireWeb|Jasmine|ANTGalio|Midori|Fresco|Lobo|PaleMoon|Maxthon|Lynx|OmniWeb|Dillo|Camino|Demeter|Fluid|Fennec|Epiphany|Shiira|Sunrise|Flock|Netscape|Lunascape|WebPilot|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+)'
+
+  # Outlook 2007
+  - regex: 'MSOffice 12'
+    family_replacement: 'Outlook'
+    v1_replacement: '2007'
+
+  # Outlook 2010
+  - regex: 'MSOffice 14'
+    family_replacement: 'Outlook'
+    v1_replacement: '2010'
+
+  # Outlook 2013
+  - regex: 'Microsoft Outlook 15\.\d+\.\d+'
+    family_replacement: 'Outlook'
+    v1_replacement: '2013'
+
+  # Apple Air Mail
+  - regex: '(Airmail) (\d+)\.(\d+)(?:\.(\d+))?'
+
+  # Thunderbird
+  - regex: '(Thunderbird)/(\d+)\.(\d+)\.(\d+(?:pre)?)'
+    family_replacement: 'Thunderbird'
 
   # Chrome/Chromium/major_version.minor_version.beta_version
   - regex: '(Chromium|Chrome)/(\d+)\.(\d+)\.(\d+)'
 
+  # Dolphin Browser 
+  # @ref: http://www.dolphin.com
+  - regex: '\b(Dolphin)(?: |HDCN/|/INT\-)(\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|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+)'
+  - regex: '(bingbot|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|Space Bison|Stainless|Orca|Dolfin|BOLT|Minimo|Tizen Browser|Polaris|Abrowser|Planetweb|ICE Browser|mDolphin)/(\d+)\.(\d+)\.?(\d+)?'
 
   # Chrome/Chromium/major_version.minor_version
   - regex: '(Chromium|Chrome)/(\d+)\.(\d+)'
 
+  ##########
+  # IE Mobile needs to happen before Android to catch cases such as:
+  # Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 920)...
+  # Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 920; ANZ821)...
+  # Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 920; Orange)...
+  # Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 920; Vodafone)...
+  ##########
+  
+  # IE Mobile
+  - regex: '(IEMobile)[ /](\d+)\.(\d+)'
+    family_replacement: 'IE Mobile'
+  
   # 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) (\d+)\.(\d+)\.?(\d+)?'
-  
+
   # Kindle WebKit
   - regex: '(Kindle)/(\d+)\.(\d+)'
-  
+
   # weird android UAs
   - regex: '(Android) Donut'
     v1_replacement: '1'
@@ -230,18 +309,11 @@ user_agent_parsers:
   - regex: '(Android) Honeycomb'
     v1_replacement: '3'
 
-  # IE Mobile
-  - regex: '(IEMobile)[ /](\d+)\.(\d+)'
-    family_replacement: 'IE Mobile'
   # desktop mode
   # http://www.anandtech.com/show/3982/windows-phone-7-review
   - regex: '(MSIE) (\d+)\.(\d+).*XBLWP7'
     family_replacement: 'IE Large Screen'
 
-  # AFTER THE EDGE CASES ABOVE!
-  - regex: '(Firefox)/(\d+)\.(\d+)\.(\d+)'
-  - regex: '(Firefox)/(\d+)\.(\d+)(pre|[ab]\d+[a-z]*)?'
-
   #### END MAIN CASES ####
 
   #### SPECIAL CASES ####
@@ -255,20 +327,6 @@ user_agent_parsers:
   - regex: '(Maxthon|MyIE2|Uzbl|Shiira)'
     v1_replacement: '0'
 
-  - 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+)'
@@ -280,11 +338,12 @@ user_agent_parsers:
   - regex: '(Embider)/(\d+)\.(\d+)'
     family_replacement: 'Polaris'
 
-  - regex: '(BonEcho)/(\d+)\.(\d+)\.(\d+)'
+  - regex: '(BonEcho)/(\d+)\.(\d+)\.?([ab]?\d+)?'
     family_replacement: 'Bon Echo'
 
-  - regex: 'M?QQBrowser'
-    family_replacement: 'QQ Browser'
+  # @note: iOS / OSX Applications
+  - regex: '(CFNetwork)(?:/(\d+)\.(\d+)\.?(\d+)?)?'
+    family_replacement: 'CFNetwork'
 
   - regex: '(iPod).+Version/(\d+)\.(\d+)\.(\d+)'
     family_replacement: 'Mobile Safari'
@@ -298,7 +357,7 @@ user_agent_parsers:
     family_replacement: 'Mobile Safari'
   - regex: '(iPad).*Version/(\d+)\.(\d+)'
     family_replacement: 'Mobile Safari'
-  - regex: '(iPod|iPhone|iPad);.*CPU.*OS (\d+)(?:_\d+)?_(\d+).*Mobile'
+  - regex: '(iPod|iPhone|iPad);.*CPU.*OS (\d+)_(\d+)(?:_(\d+))?.*Mobile'
     family_replacement: 'Mobile Safari'
   - regex: '(iPod|iPhone|iPad)'
     family_replacement: 'Mobile Safari'
@@ -315,8 +374,10 @@ user_agent_parsers:
   - regex: '(QtCarBrowser)'
     v1_replacement: '1'
 
-  - regex: '(iBrowser/Mini)(\d+).(\d+)'
+  - regex: '^(iBrowser/Mini)(\d+).(\d+)'
     family_replacement: 'iBrowser Mini'
+  - regex: '^(iBrowser|iRAPP)/(\d+).(\d+)'
+
   # nokia browsers
   # based on: http://www.developer.nokia.com/Community/Wiki/User-Agent_headers_for_Nokia_devices
   - regex: '^(Nokia)'
@@ -367,10 +428,6 @@ user_agent_parsers:
   #- regex: '\(iPad;.+(Version)/(\d+)\.(\d+)(?:\.(\d+))?.*Safari/'
   #  family_replacement: 'iPad'
 
-  # 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+)'
 
@@ -397,10 +454,25 @@ user_agent_parsers:
   - regex: '(Phantom)/V(\d+)\.(\d+)'
     family_replacement: 'Phantom Browser'
 
-  - regex: '([MS]?IE) (\d+)\.(\d+)'
+  - regex: 'Trident(.*)rv.(\d+)\.(\d+)'
     family_replacement: 'IE'
 
-  - regex: 'Trident(.*)rv.(\d+)\.(\d+)'
+  # Espial
+  - regex: '(Espial)/(\d+)(?:\.(\d+))?(?:\.(\d+))?'  
+
+ # Apple Mail
+
+  # apple mail - not directly detectable, have it after Safari stuff
+  - regex: '(AppleWebKit)/(\d+)\.(\d+)\.(\d+)'
+    family_replacement: 'AppleMail'
+
+  # AFTER THE EDGE CASES ABOVE!
+  # AFTER IE11
+  # BEFORE all other IE
+  - regex: '(Firefox)/(\d+)\.(\d+)\.(\d+)'
+  - regex: '(Firefox)/(\d+)\.(\d+)(pre|[ab]\d+[a-z]*)?'
+
+  - regex: '([MS]?IE) (\d+)\.(\d+)'
     family_replacement: 'IE'
 
   - regex: '(python-requests)/(\d+)\.(\d+)'
@@ -465,13 +537,22 @@ os_parsers:
   # generic HbbTV, hoping to catch manufacturer name (always after 2nd comma) and the first string that looks like a 2011-2019 year
   - regex: 'HbbTV/\d+\.\d+\.\d+ \(.*; ?([a-zA-Z]+) ?;.*(201[1-9]).*\)'
 
+  ##########
+  # @note: Windows Phone needs to come before Windows NT 6.1 *and* before Android to catch cases such as:
+  # Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 920)...
+  # Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 920; ANZ821)...
+  # Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 920; Orange)...
+  # Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 920; Vodafone)...
+  ##########
+
+  - regex: '(Windows Phone) (?:OS[ /])?(\d+)\.(\d+)'
+
   ##########
   # 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)[ \-/](\d+)\.(\d+)(?:[.\-]([a-z0-9]+))?'
+ 
   - regex: '(Android) Donut'
     os_v1_replacement: '1'
     os_v2_replacement: '2'
@@ -491,6 +572,17 @@ os_parsers:
   - regex: '(Android) Honeycomb'
     os_v1_replacement: '3'
 
+  # UCWEB
+  - regex: '^UCWEB.*; (Adr) (\d+)\.(\d+)(?:[.\-]([a-z0-9]+))?;'
+    os_replacement: 'Android'
+  - regex: '^UCWEB.*; (iPad OS|iPh OS) (\d+)_(\d+)(?:_(\d+))?;'
+    os_replacement: 'iOS'
+  - regex: '^UCWEB.*; (wds) (\d+)\.(\d+)(?:\.(\d+))?;'
+    os_replacement: 'Windows Phone'
+  # JUC
+  - regex: '^(JUC).*; ?U; ?(?:Android)?(\d+)\.(\d+)(?:[\.\-]([a-z0-9]+))?'
+    os_replacement: 'Android'
+
   ##########
   # Kindle Android
   ##########
@@ -506,14 +598,18 @@ os_parsers:
   # (very) roughly ordered in terms of frequency of occurence of regex (win xp currently most frequent, etc)
   ##########
 
-  - regex: '(Windows (?:NT 5\.2|NT 5\.1))'
-    os_replacement: 'Windows XP'
-
-  # ie mobile des ktop mode
+  # ie mobile desktop mode
   # spoofs nt 6.1. must come before windows 7
   - regex: '(XBLWP7)'
     os_replacement: 'Windows Phone'
 
+  # @note: This needs to come before Windows NT 6.1
+  - regex: '(Windows ?Mobile)'
+    os_replacement: 'Windows Mobile'
+
+  - regex: '(Windows (?:NT 5\.2|NT 5\.1))'
+    os_replacement: 'Windows XP'
+
   - regex: '(Windows NT 6\.1)'
     os_replacement: 'Windows 7'
 
@@ -521,30 +617,37 @@ os_parsers:
     os_replacement: 'Windows Vista'
 
   - regex: '(Win 9x 4\.90)'
-    os_replacement: 'Windows Me'
+    os_replacement: 'Windows ME'
 
   - 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)'
     os_replacement: 'Windows 8'
 
+  - regex: '(Windows NT 6\.3; ARM;)'
+    os_replacement: 'Windows RT 8.1'
+  - regex: '(Windows NT 6\.3)'
+    os_replacement: 'Windows 8.1'
+
   - regex: '(Windows NT 5\.0)'
     os_replacement: 'Windows 2000'
 
-  - regex: '(Windows Phone) (\d+)\.(\d+)'
-  - regex: '(Windows Phone) OS (\d+)\.(\d+)'
-  - regex: '(Windows ?Mobile)'
-    os_replacement: 'Windows Mobile'
-
   - regex: '(WinNT4.0)'
     os_replacement: 'Windows NT 4.0'
 
-  - regex: '(Win98)'
-    os_replacement: 'Windows 98'
+  - regex: '(Windows ?CE)'
+    os_replacement: 'Windows CE'
+
+  - regex: 'Win ?(95|98|3.1|NT|ME|2000)'
+    os_replacement: 'Windows $1'
+
+  - regex: 'Win16'
+    os_replacement: 'Windows 3.1'
+
+  - regex: 'Win32'
+    os_replacement: 'Windows 95'
 
   ##########
   # Tizen OS from Samsung
@@ -554,10 +657,36 @@ os_parsers:
 
   ##########
   # Mac OS
-  # http://en.wikipedia.org/wiki/Mac_OS_X#Versions
+  # @ref: http://en.wikipedia.org/wiki/Mac_OS_X#Versions
+  # @ref: http://www.puredarwin.org/curious/versions
   ##########
   - regex: '(Mac OS X) (\d+)[_.](\d+)(?:[_.](\d+))?'
-  
+  # Leopard
+  - regex: ' (Dar)(win)/(9).(\d+).*\((?:i386|x86_64|Power Macintosh)\)'
+    os_replacement: 'Mac OS X'
+    os_v1_replacement: '10'
+    os_v2_replacement: '5'
+  # Snow Leopard
+  - regex: ' (Dar)(win)/(10).(\d+).*\((?:i386|x86_64)\)'
+    os_replacement: 'Mac OS X'
+    os_v1_replacement: '10'
+    os_v2_replacement: '6'
+  # Lion
+  - regex: ' (Dar)(win)/(11).(\d+).*\((?:i386|x86_64)\)'
+    os_replacement: 'Mac OS X'
+    os_v1_replacement: '10'
+    os_v2_replacement: '7'
+  # Mountain Lion
+  - regex: ' (Dar)(win)/(12).(\d+).*\((?:i386|x86_64)\)'
+    os_replacement: 'Mac OS X'
+    os_v1_replacement: '10'
+    os_v2_replacement: '8'
+  # Mavericks
+  - regex: ' (Dar)(win)/(13).(\d+).*\((?:i386|x86_64)\)'
+    os_replacement: 'Mac OS X'
+    os_v1_replacement: '10'
+    os_v2_replacement: '9'
+
   # IE on Mac doesn't specify version number
   - regex: 'Mac_PowerPC'
     os_replacement: 'Mac OS'
@@ -571,7 +700,7 @@ os_parsers:
   # iOS
   # http://en.wikipedia.org/wiki/IOS_version_history
   ##########
-  - regex: '(CPU OS|iPhone OS) (\d+)_(\d+)(?:_(\d+))?'
+  - regex: '(CPU OS|iPhone OS|CPU iPhone) +(\d+)[_\.](\d+)(?:[_\.](\d+))?'
     os_replacement: 'iOS'
 
   # remaining cases are mostly only opera uas, so catch opera as to not catch iphone spoofs
@@ -585,6 +714,63 @@ os_parsers:
   - regex: '(AppleTV)/(\d+)\.(\d+)'
     os_replacement: 'ATV OS X'
 
+  # CFNetwork/Darwin - The specific CFNetwork or Darwin version determines
+  # whether the os maps to Mac OS, or iOS, or just Darwin.
+  # See: http://user-agents.me/cfnetwork-version-list
+  - regex: '(CFNetwork)/(5)48\.0\.3.* Darwin/11\.0\.0'
+    os_replacement: 'iOS'
+  - regex: '(CFNetwork)/(5)48\.(0)\.4.* Darwin/(1)1\.0\.0'
+    os_replacement: 'iOS'
+  - regex: '(CFNetwork)/(5)48\.(1)\.4'
+    os_replacement: 'iOS'
+  - regex: '(CFNetwork)/(4)85\.1(3)\.9'
+    os_replacement: 'iOS'
+  - regex: '(CFNetwork)/(6)09\.(1)\.4'
+    os_replacement: 'iOS'
+  - regex: '(CFNetwork)/(6)(0)9'
+    os_replacement: 'iOS'
+  - regex: '(CFNetwork)/6(7)2\.(1)\.13'
+    os_replacement: 'iOS'
+  - regex: '(CFNetwork)/6(7)2\.(1)\.(1)4'
+    os_replacement: 'iOS'
+  - regex: '(CF)(Network)/6(7)(2)\.1\.15'
+    os_replacement: 'iOS'
+    os_v1_replacement: '7'
+    os_v2_replacement: '1'
+  - regex: '(CFNetwork)/6(7)2\.(0)\.(?:2|8)'
+    os_replacement: 'iOS'
+  - regex: '(CFNetwork)/709\.1'
+    os_replacement: 'iOS'
+    os_v1_replacement: '8'
+    os_v2_replacement: '0.b5'
+  
+  ##########
+  # CFNetwork iOS Apps
+  # @ref: https://en.wikipedia.org/wiki/Darwin_(operating_system)#Release_history
+  ##########
+  - regex: 'CFNetwork/.* Darwin/(9)\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '1'
+  - regex: 'CFNetwork/.* Darwin/(10)\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '4'
+  - regex: 'CFNetwork/.* Darwin/(11)\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '5'
+  - regex: 'CFNetwork/.* Darwin/(13)\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '6'
+  - regex: 'CFNetwork/6.* Darwin/(14)\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '7'
+  - regex: 'CFNetwork/7.* Darwin/(14)\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '8'
+    os_v2_replacement: '0'
+  # iOS Apps
+  - regex: '\b(iOS[ /]|iPhone(?:/| v|[ _]OS[/,]|; | OS : |\d,\d/|\d,\d; )|iPad/)(\d{1,2})[_\.](\d{1,2})(?:[_\.](\d+))?'
+    os_replacement: 'iOS'
+
   ##########
   # Chrome OS
   # if version 0.0.0, probably this stuff:
@@ -606,7 +792,7 @@ os_parsers:
   # Symbian + Symbian OS
   # http://en.wikipedia.org/wiki/History_of_Symbian
   ##########
-  - regex: '(Symbian[Oo][Ss])/(\d+)\.(\d+)'
+  - regex: '(Symbian[Oo][Ss])[/ ](\d+)\.(\d+)'
     os_replacement: 'Symbian OS'
   - regex: '(Symbian/3).+NokiaBrowser/7\.3'
     os_replacement: 'Symbian^3 Anna'
@@ -614,13 +800,15 @@ os_parsers:
     os_replacement: 'Symbian^3 Belle'
   - regex: '(Symbian/3)'
     os_replacement: 'Symbian^3'
-  - regex: '(Series 60|SymbOS|S60)'
+  - regex: '\b(Series 60|SymbOS|S60Version|S60V\d|S60\b)'
     os_replacement: 'Symbian OS'
   - regex: '(MeeGo)'
   - regex: 'Symbian [Oo][Ss]'
     os_replacement: 'Symbian OS'
   - regex: 'Series40;'
     os_replacement: 'Nokia Series 40'
+  - regex: 'Series30Plus;'
+    os_replacement: 'Nokia Series 30 Plus'
 
   ##########
   # BlackBerry devices
@@ -641,7 +829,7 @@ os_parsers:
   ##########
   # Firefox OS
   ##########
-  - regex: '\(Mobile;.+Firefox/\d+\.\d+'
+  - regex: '\((?:Mobile|Tablet);.+Firefox/\d+\.\d+'
     os_replacement: 'Firefox OS'
 
   ##########
@@ -658,12 +846,10 @@ os_parsers:
   ##########
   # Google TV
   ##########
-  - regex: '(GoogleTV) (\d+)\.(\d+)\.(\d+)'
-  # Old style
-  - regex: '(GoogleTV)/[\da-z]+'
+  - regex: '(GoogleTV)(?: (\d+)\.(\d+)(?:\.(\d+))?|/[\da-z]+)'
 
   - regex: '(WebTV)/(\d+).(\d+)'
-  
+
   ##########
   # Misc mobile
   ##########
@@ -675,20 +861,20 @@ os_parsers:
   # Generic patterns
   # since the majority of os cases are very specific, these go last
   ##########
-  # first.second.third.fourth bits
-  - regex: '(Fedora|Red Hat|PCLinuxOS)/(\d+)\.(\d+)\.(\d+)\.(\d+)'
+  - regex: '(Fedora|Red Hat|PCLinuxOS|Puppy|Ubuntu|Kindle|Bada|Lubuntu|BackTrack|Slackware|(?:Free|Open|Net|\b)BSD)[/ ](\d+)\.(\d+)(?:\.(\d+)(?:\.(\d+))?)?'
 
-  # first.second.third bits
-  - regex: '(Red Hat|Puppy|PCLinuxOS)/(\d+)\.(\d+)\.(\d+)'
+  # Gentoo Linux + Kernel Version
+  - regex: '(Linux)[ /](\d+)\.(\d+)(?:\.(\d+))?.*gentoo'
+    os_replacement: 'Gentoo'
 
-  # first.second bits
-  - regex: '(Ubuntu|Kindle|Bada|Lubuntu|BackTrack|Red Hat|Slackware)/(\d+)\.(\d+)'
+  # Opera Mini Bada
+  - regex: '\((Bada);'
 
   # just os
-  - regex: '(Windows|OpenBSD|FreeBSD|NetBSD|Android|WeTab)'
-  - regex: '(Ubuntu|Kubuntu|Arch Linux|CentOS|Slackware|Gentoo|openSUSE|SUSE|Red Hat|Fedora|PCLinuxOS|Gentoo|Mageia)'
-  - regex: '(Linux)/(\d+)\.(\d+)'
-  - regex: '(Linux|BSD)'
+  - regex: '(Windows|Android|WeTab|Maemo)'
+  - regex: '(Ubuntu|Kubuntu|Arch Linux|CentOS|Slackware|Gentoo|openSUSE|SUSE|Red Hat|Fedora|PCLinuxOS|Gentoo|Mageia|(?:Free|Open|Net|\b)BSD)'
+  # Linux + Kernel Version
+  - regex: '(Linux)(?:[ /](\d+)\.(\d+)(?:\.(\d+))?)?'
   - regex: 'SunOS'
     os_replacement: 'Solaris'
 
@@ -734,7 +920,29 @@ device_parsers:
   # Samsung
   - regex: '(SamsungSGHi560)'
     device_replacement: 'Samsung SGHi560'
+   
+  - regex: '(SCH-[A-Za-z0-9_-]+)'
+    device_replacement: 'Samsung $1'
+    
+  - regex: '(SGH-[A-Za-z0-9_-]+)'
+    device_replacement: 'Samsung $1'  
+  
+  - regex: '(GT-[A-Za-z0-9_-]+)'
+    device_replacement: 'Samsung $1'    
+
+  - regex: '(SM-[A-Za-z0-9_-]+)'
+    device_replacement: 'Samsung $1'  
+
+  - regex: '(SPH-[A-Za-z0-9_-]+)'
+    device_replacement: 'Samsung $1'  
 
+  - regex: 'SAMSUNG-([A-Za-z0-9_-]+)'
+    device_replacement: 'Samsung $1'  
+
+  - regex: 'SAMSUNG ([A-Za-z0-9_-]+)'
+    device_replacement: 'Samsung $1'  
+    
+    
   #########
   # Ericsson - must come before nokia since they also use symbian
   #########
@@ -747,8 +955,8 @@ device_parsers:
   ##########
   - regex: 'PLAYSTATION 3'
     device_replacement: 'PlayStation 3'
-  - regex: '(PlayStation Portable)'
-  - regex: '(PlayStation Vita)'
+  - regex: '(PlayStation (:?Portable|Vita))'
+  - regex: '(PlayStation (:?\d+))'  
 
   ##########
   # incomplete!
@@ -763,21 +971,22 @@ device_parsers:
     device_replacement: 'Kindle Fire HD 8.9" WiFi'
   - regex: '(KFJWA Build)'
     device_replacement: 'Kindle Fire HD 8.9" 4G'
+  - regex: '(KFSOWI Build)'
+    device_replacement: 'Kindle Fire HD 7" WiFi'
+  - regex: '(KFTHWI Build)'
+    device_replacement: 'Kindle Fire HDX 7" WiFi'
+  - regex: '(KFTHWA Build)'
+    device_replacement: 'Kindle Fire HDX 7" 4G'
+  - regex: '(KFAPWI Build)'
+    device_replacement: 'Kindle Fire HDX 8.9" WiFi'
+  - regex: '(KFAPWA Build)'
+    device_replacement: 'Kindle Fire HDX 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-Za-z]{2}\-[A-Za-z]{0,2}; WOWMobile (.+) Build'
-  - regex: 'Android[\- ][\d]+\.[\d]+\-update1; [A-Za-z]{2}\-[A-Za-z]{0,2}; (.+) Build'
-  - regex: 'Android[\- ][\d]+\.[\d]+\.[\d]+; [A-Za-z]{2}\-[A-Za-z]{0,2}; (.+) Build'
-  - regex: 'Android[\- ][\d]+\.[\d]+\.[\d]+;[A-Za-z]{2}\-[A-Za-z]{0,2};(.+) Build'
-  - regex: 'Android[\- ][\d]+\.[\d]+; [A-Za-z]{2}\-[A-Za-z]{0,2}; (.+) Build'
-  - regex: 'Android[\- ][\d]+\.[\d]+\.[\d]+; (.+) Build'
-  - regex: 'Android[\- ][\d]+\.[\d]+; (.+) Build'
+ 
 
   ##########
   # NOKIA
@@ -849,7 +1058,16 @@ device_parsers:
    
   - regex: 'Googlebot-Mobile/(\d+).(\d+)'
     device_replacement: 'Spider'
+
+  - regex: 'Googlebot/\d+.\d+'
+    device_replacement: 'Spider'
+
+  - regex: 'NING/(\d+).(\d+)'
+    device_replacement: 'Spider'
     
+  - regex: 'MsnBot-Media /(\d+).(\d+)'
+    device_replacement: 'Spider'
+
   ##########
   # complete but probably catches spoofs
   # iSTUFF
@@ -878,7 +1096,14 @@ device_parsers:
     device_replacement: 'Alcatel $1'
   - regex: 'Alcatel-([A-Za-z0-9]+)'
     device_replacement: 'Alcatel $1'
-
+  - regex: 'ALCATEL_ONE_TOUCH_([A-Za-z0-9]+)'
+    device_replacement: 'Alcatel ONE TOUCH $1'
+  - regex: 'ALCATEL (ONE TOUCH [A-Za-z0-9]+)'
+    device_replacement: 'Alcatel $1'
+  - regex: 'ALCATEL (one touch [A-Za-z0-9]+)'
+    device_replacement: 'Alcatel $1'
+  - regex: 'ALCATEL ([A-Za-z0-9]+)'
+    device_replacement: 'Alcatel $1'
   ##########
   # Amoi
   ##########
@@ -997,6 +1222,14 @@ device_parsers:
     device_replacement: 'Motorola $1'
   - regex: 'MOT\-([A-Za-z0-9]+)'
     device_replacement: 'Motorola $1'
+  - regex: ' (DROID RAZR [A-Za-z0-9 ]+) '
+    device_replacement: 'Motorola $1'
+  - regex: ' (DROID[2 ][A-Za-z0-9 ]+) '
+    device_replacement: 'Motorola $1'
+  - regex: ' (Droid2| )'
+    device_replacement: 'Motorola $1'
+  - regex: ' (DROID2| )'
+    device_replacement: 'Motorola $1'
     
   ##########
   # nintendo
@@ -1027,6 +1260,16 @@ device_parsers:
     device_replacement: 'Samsung $1'
   - regex: 'SAMSUNG\; ([A-Za-z0-9\-]+)'
     device_replacement: 'Samsung $1'
+ 
+  ##########
+  # ZTE
+  ##########
+  - regex: 'ZTE-([A-Za-z0-9\-]+)'
+    device_replacement: 'ZTE $1'
+  - regex: 'ZTE ([A-Za-z0-9\-]+)'
+    device_replacement: 'ZTE $1'
+  - regex: 'ZTE_([A-Za-z0-9\-]+)'
+    device_replacement: 'ZTE $1'
 
   ##########
   # Sega
@@ -1042,11 +1285,30 @@ device_parsers:
   - regex: 'Softbank/2\.0/([A-Za-z0-9]+)'
     device_replacement: 'Softbank $1'
 
+  ##########
+  # SONY   #
+  ##########
+  - regex: 'Sony([^ ]+) '
+    device_replacement: 'Sony $1'
+    
   ##########
   # WebTV
   ##########
   - regex: '(WebTV)/(\d+).(\d+)'
 
+  #########
+  # Android General Device Matching (far from perfect)
+  #########
+  - regex: 'Android[\- ][\d]+\.[\d]+\.[\d]+; [^;]+; ([A-Za-z0-9 _-]+) '
+  - regex: 'Android[\- ][\d]+\.[\d]+; [^;]+; ([A-Za-z0-9 _-]+) '
+  - regex: 'Android[\- ][\d]+\.[\d]+; [^;]+; WOWMobile ([A-Za-z0-9 _-]+) '
+  - regex: 'Android[\- ][\d]+\.[\d]+\-update1; [^;]+; ([A-Za-z0-9 _-]+) '
+  - regex: 'Android[\- ][\d]+\.[\d]+\.[\d]+;[^;]+;([A-Za-z0-9 _-]+) '
+  - regex: 'Android[\- ][\d]+\.[\d]+\.[\d]+; ([A-Za-z0-9 _-]+) '
+  - regex: 'Android[\- ][\d]+\.[\d]+; ([A-Za-z0-9 _-]+) '
+  - regex: 'Android[\- ][\d]+\.[\d]+\.[\d]+; [^;]+; ([A-Za-z0-9\.\/_-]+) '
+  - regex: 'Android[\- ][\d]+\.[\d]+; [^;]+; ([A-Za-z0-9\.\/_-]+) '
+  
   ##########
   # Generic Smart Phone
   ##########
@@ -1068,6 +1330,6 @@ device_parsers:
   ##########
   # 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|crawler)'
+  - regex: '(bingbot|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|Netvibes|Sogou Pic Spider|ICC\-Crawler|Innovazion Crawler|Daumoa|EtaoSpider|A6\-Indexer|YisouSpider|Riddler|DBot|wsr\-agent|Xenu|SeznamBot|PaperLiBot|SputnikBot|CCBot|ProoXiBot|Scrapy|Genieo|Screaming Frog|YahooCacheSystem|CiBra|Nutch)'
     device_replacement: 'Spider'
 

metadata

@@ -1,25 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: user_agent_parser
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Tim Lucas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2014-11-08 00:00:00.000000000 Z
 dependencies: []
 description: A simple, comprehensive Ruby gem for parsing user agent strings with
   the help of BrowserScope's UA database
 email: t@toolmantim.com
-executables: []
+executables:
+- user_agent_parser
 extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - Readme.md
+- bin/user_agent_parser
 - lib/user_agent_parser.rb
+- lib/user_agent_parser/cli.rb
 - lib/user_agent_parser/device.rb
 - lib/user_agent_parser/operating_system.rb
 - lib/user_agent_parser/parser.rb
@@ -46,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A simple, comprehensive Ruby gem for parsing user agent strings with the