user_agent_parser 2.1.5 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80f68759d3f70ad50acdc09e5d68214172cac287
-  data.tar.gz: 3d55b8c54039e2931b0d36dca2ba82333cec730b
+  metadata.gz: 3e6c42fb7a24030be52fa5c096b8af27e362bb02
+  data.tar.gz: 60cfeb6d90444739f7f81f0e035704e23b5597df
 SHA512:
-  metadata.gz: fb24b29ea2f06c2a48e3593e26e00ed5d7805b8c485081742b902a260500bbd5b18b015a5faa8851d6b184c005735700bc5ba46d6a7394d4f0d29ed2a87aa5ae
-  data.tar.gz: e5fbf51ff61e036548f607d33050ff2862a31f1066c9fe8cdfe995db32fe77971e2543f06a71a610699260f0e1d566b09a4d9953ea7cff2be161cdd0913b7c65
+  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"

data/bin/user_agent_parser

@@ -8,8 +8,12 @@ require 'user_agent_parser/cli'
 options = {}
 
 optparse = OptionParser.new do|opts|
-  opts.on('--name', 'Print name only') do
-    options[:name] = true
+  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
@@ -30,7 +34,8 @@ optparse = OptionParser.new do|opts|
 
   opts.on('--format format',
           'Print output in specified format. The available formatters are:',
-          ' - %n: name',
+          ' - %f: family',
+          ' - %n: name (alias for family)',
           ' - %v: version',
           ' - %M: major version',
           ' - %m: minor version',

data/lib/user_agent_parser/cli.rb

@@ -6,7 +6,9 @@ module UserAgentParser
     end
 
     def run!
-      if @options[:name]
+      if @options[:family]
+        @user_agent.family
+      elsif @options[:name]
         @user_agent.name
       elsif @options[:version]
         with_version do |version|
@@ -19,7 +21,9 @@ module UserAgentParser
       elsif @options[:os]
         @user_agent.os.to_s
       elsif format = @options[:format]
-        format.gsub('%n', @user_agent.name).
+        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).

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+)'
@@ -62,7 +62,7 @@ user_agent_parsers:
     family_replacement: 'Opera Mobile'
   - regex: '(Opera)/(\d+)\.(\d+).+Opera Mobi'
     family_replacement: 'Opera Mobile'
-  - regex: 'Opera Mobi.+(Opera)/(\d+)\.(\d+)'
+  - regex: 'Opera Mobi.+(Opera)(?:/|\s+)(\d+)\.(\d+)'
     family_replacement: 'Opera Mobile'
   - regex: 'Opera Mobi'
     family_replacement: 'Opera Mobile'
@@ -126,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'
@@ -247,6 +269,18 @@ user_agent_parsers:
   # 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)
@@ -275,9 +309,6 @@ 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'
@@ -296,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+)'
@@ -321,7 +338,7 @@ 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'
 
   # @note: iOS / OSX Applications
@@ -340,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'
@@ -411,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+)'
 
@@ -444,6 +457,9 @@ user_agent_parsers:
   - regex: 'Trident(.*)rv.(\d+)\.(\d+)'
     family_replacement: 'IE'
 
+  # Espial
+  - regex: '(Espial)/(\d+)(?:\.(\d+))?(?:\.(\d+))?'  
+
  # Apple Mail
 
   # apple mail - not directly detectable, have it after Safari stuff
@@ -521,12 +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) Donut'
     os_v1_replacement: '1'
     os_v2_replacement: '2'
@@ -577,8 +603,7 @@ os_parsers:
   - regex: '(XBLWP7)'
     os_replacement: 'Windows Phone'
 
-  # @note: These need to come before Windows NT 6.1
-  - regex: '(Windows Phone) (?:OS[ /])?(\d+)\.(\d+)'
+  # @note: This needs to come before Windows NT 6.1
   - regex: '(Windows ?Mobile)'
     os_replacement: 'Windows Mobile'
 
@@ -689,6 +714,36 @@ 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
@@ -705,9 +760,13 @@ os_parsers:
   - regex: 'CFNetwork/.* Darwin/(13)\.\d+'
     os_replacement: 'iOS'
     os_v1_replacement: '6'
-  - regex: 'CFNetwork/.* Darwin/(14)\.\d+'
+  - 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'
@@ -861,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
   #########
@@ -874,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!
@@ -905,16 +986,7 @@ device_parsers:
   - 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
@@ -990,6 +1062,12 @@ device_parsers:
   - 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
@@ -1018,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
   ##########
@@ -1137,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
@@ -1167,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
@@ -1182,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
   ##########
@@ -1208,6 +1330,6 @@ device_parsers:
   ##########
   # Spiders (this is hack...)
   ##########
-  - 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)'
+  - 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: user_agent_parser
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.2.0
 platform: ruby
 authors:
 - Tim Lucas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 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