user_agent_parser 1.0.2 → 2.0.0

data/Readme.md

@@ -4,9 +4,7 @@ UserAgentParser is a simple, comprehensive Ruby gem for parsing user agent strin
 
 ## Requirements
 
-* Ruby >= 1.9.2
-
-Note: Ruby 1.8.7 is not supported due to the requirement for the newer psych YAML parser. If you can get it working on 1.8.7 please send a pull request.
+* Ruby >= 1.8.7
 
 ## Installation
 
@@ -19,49 +17,48 @@ $ gem install user_agent_parser
 ```ruby
 require 'user_agent_parser'
 => true
-ua = UserAgentParser.parse 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.0;)'
+user_agent = UserAgentParser.parse 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.0;)'
 => #<UserAgentParser::UserAgent IE 9.0 (Windows Vista)>
-ua.to_s
+user_agent.to_s
 => "IE 9.0"
-ua.family
+user_agent.name
 => "IE"
-ua.version.to_s
+user_agent.version.to_s
 => "9.0"
-ua.version.major
-=> 9
-ua.version.minor
-=> 0
-os = ua.os
+user_agent.version.major
+=> "9"
+user_agent.version.minor
+=> "0"
+operating_system = user_agent.os
 => #<UserAgentParser::OperatingSystem Windows Vista>
-os.to_s
+operating_system.to_s
 => "Windows Vista"
+
+# The parser database will be loaded and parsed on every call to
+# UserAgentParser.parse. To avoid this, instantiate your own Parser instance.
+parser = UserAgentParser::Parser.new
+parser.parse 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.0;)'
+=> #<UserAgentParser::UserAgent IE 9.0 (Windows Vista)>
+parser.parse 'Opera/9.80 (Windows NT 5.1; U; ru) Presto/2.5.24 Version/10.53'
+=> #<UserAgentParser::UserAgent Opera 10.53 (Windows XP)>
 ```
 
 ## The pattern database
 
 The [ua-parser database](https://github.com/tobie/ua-parser/blob/master/regexes.yaml) is included via a [git submodule](http://help.github.com/submodules/). To update the database the submodule needs to be updated and the gem re-released (pull requests for this are very welcome!).
 
-You can also specify the path to your own, updated and/or customised `regexes.yaml` file:
+You can also specify the path to your own, updated and/or customised `regexes.yaml` file as a second argument to `UserAgentParser.parse`:
 
 ```ruby
-UserAgentParser.patterns_path = '/some/path/to/regexes.yaml'
+UserAgentParser.parse(ua_string, patterns_path: '/some/path/to/regexes.yaml')
 ```
 
-## Comprehensive you say?
-
-```bash
-$ rake test
-...
-    
-Finished tests in 144.220280s, 89.0027 tests/s, 234.9739 assertions/s.
+or when instantiating a `UserAgentParser::Parser`:
 
-12836 tests, 33888 assertions, 0 failures, 0 errors, 0 skips
+```ruby
+UserAgentParser::Parser.new(patterns_path: '/some/path/to/regexes.yaml').parse(ua_string)
 ```
 
-## Limitations
-
-There's no support for providing overrides from Javascript user agent detection like there is with original BrowserScope library. The Javascript overrides were only necessary for detecting IE 9 Platform Preview and older versions of [Chrome Frame](https://developers.google.com/chrome/chrome-frame/).
-
 ## Contributing
 
 1. Fork
@@ -73,4 +70,4 @@ All accepted pull requests will earn you commit and release rights.
 
 ## License
 
-MIT
+MIT

data/lib/user_agent_parser.rb

@@ -2,24 +2,13 @@ require 'user_agent_parser/parser'
 require 'user_agent_parser/user_agent'
 require 'user_agent_parser/version'
 require 'user_agent_parser/operating_system'
+require 'user_agent_parser/device'
 
 module UserAgentParser
-
-  # Path to the ua-parser regexes pattern database
-  def self.patterns_path
-    @patterns_path
-  end
-  
-  # Sets the path to the ua-parser regexes pattern database
-  def self.patterns_path=(path)
-    @patterns_path = path
-  end
-  
-  self.patterns_path = File.join(File.dirname(__FILE__), "../vendor/ua-parser/regexes.yaml")
+  DefaultPatternsPath = File.join(File.dirname(__FILE__), "../vendor/ua-parser/regexes.yaml")
 
   # Parse the given +user_agent_string+, returning a +UserAgent+
-  def self.parse user_agent_string
-    Parser.new.parse user_agent_string
+  def self.parse(user_agent_string, options={})
+    Parser.new(options).parse(user_agent_string)
   end
-
 end

data/lib/user_agent_parser/device.rb

@@ -0,0 +1,23 @@
+module UserAgentParser
+  class Device
+    attr_reader :name
+
+    def initialize(name = nil)
+      @name = name || 'Other'
+    end
+
+    def to_s
+      name
+    end
+
+    def inspect
+      "#<#{self.class} #{to_s}>"
+    end
+
+    def eql?(other)
+      self.class.eql?(other.class) && name == other.name
+    end
+
+    alias_method :==, :eql?
+  end
+end

data/lib/user_agent_parser/operating_system.rb

@@ -1,28 +1,30 @@
 module UserAgentParser
-
   class OperatingSystem
-  
-    attr_accessor :name, :version
-  
-    def initialize(name="Other", version=nil)
-      self.name = name
-      self.version = version
+    attr_reader :name, :version
+
+    def initialize(name = 'Other', version = nil)
+      @name = name
+      @version = version
     end
-  
+
     def to_s
-      s = name
-      s += " #{version}" if version
-      s
+      string = name
+      unless version.nil?
+        string += " #{version}"
+      end
+      string
     end
-  
+
     def inspect
       "#<#{self.class} #{to_s}>"
     end
-  
-    def ==(other)
-      name == other.name && version == other.version
+
+    def eql?(other)
+      self.class.eql?(other.class) &&
+        name == other.name &&
+        version == other.version
     end
-  
-  end
 
-end
+    alias_method :==, :eql?
+  end
+end

data/lib/user_agent_parser/parser.rb

@@ -1,41 +1,49 @@
 require 'yaml'
 
 module UserAgentParser
-
+  
   class Parser
+    attr_reader :patterns_path
 
-    def parse user_agent
-      ua = parse_ua(user_agent)
-      ua.os = parse_os(user_agent)
-      ua
+    def initialize(options={})
+      @patterns_path = options[:patterns_path] || UserAgentParser::DefaultPatternsPath
+      @ua_patterns, @os_patterns, @device_patterns = load_patterns(patterns_path)
     end
-  
-  private
 
-    def all_patterns
-      @all_patterns ||= YAML.load_file(UserAgentParser.patterns_path)
+    def parse(user_agent)
+      os = parse_os(user_agent)
+      device = parse_device(user_agent)
+      parse_ua(user_agent, os, device)
     end
 
-    def patterns type
-      @patterns ||= {}
-      @patterns[type] ||= begin
-        all_patterns[type].each do |p|
-          p["regex"] = Regexp.new(p["regex"])
+  private
+
+    def load_patterns(path)
+      yml = YAML.load_file(path)
+
+      # Parse all the regexs
+      yml.each_pair do |type, patterns|
+        patterns.each do |pattern|
+          pattern["regex"] = Regexp.new(pattern["regex"])
         end
       end
+
+      [ yml["user_agent_parsers"], yml["os_parsers"], yml["device_parsers"] ]
     end
-  
-    def parse_ua user_agent
-      pattern, match = first_pattern_match(patterns("user_agent_parsers"), user_agent)
+
+    def parse_ua(user_agent, os = nil, device = nil)
+      pattern, match = first_pattern_match(@ua_patterns, user_agent)
+
       if match
-        user_agent_from_pattern_match(pattern, match)
+        user_agent_from_pattern_match(pattern, match, os, device)
       else
-        UserAgent.new
+        UserAgent.new(nil, nil, os, device)
       end
     end
-  
-    def parse_os user_agent
-      pattern, match = first_pattern_match(patterns("os_parsers"), user_agent)
+
+    def parse_os(user_agent)
+      pattern, match = first_pattern_match(@os_patterns, user_agent)
+
       if match
         os_from_pattern_match(pattern, match)
       else
@@ -43,45 +51,90 @@ module UserAgentParser
       end
     end
 
-    def first_pattern_match patterns, value
-      for p in patterns
-        if m = p["regex"].match(value)
-          return [p, m]
+    def parse_device(user_agent)
+      pattern, match = first_pattern_match(@device_patterns, user_agent)
+
+      if match
+        device_from_pattern_match(pattern, match)
+      else
+        Device.new
+      end
+    end
+
+    def first_pattern_match(patterns, value)
+      patterns.each do |pattern|
+        if match = pattern["regex"].match(value)
+          return [pattern, match]
         end
       end
       nil
     end
 
-    def user_agent_from_pattern_match pattern, match
-      family, v1, v2, v3 = match[1], match[2], match[3], match[4]
+    def user_agent_from_pattern_match(pattern, match, os = nil, device = nil)
+      name, v1, v2, v3 = match[1], match[2], match[3], match[4]
+
       if pattern["family_replacement"]
-        family = pattern["family_replacement"].sub('$1', family || '')
+        name = pattern["family_replacement"].sub('$1', name || '')
+      end
+
+      if pattern["v1_replacement"]
+        v1 = pattern["v1_replacement"].sub('$1', v1 || '')
+      end
+
+      if pattern["v2_replacement"]
+        v2 = pattern["v2_replacement"].sub('$1', v2 || '')
+      end
+
+      if pattern["v3_replacement"]
+        v3 = pattern["v3_replacement"].sub('$1', v3 || '')
       end
-      v1 = pattern["v1_replacement"].sub('$1', v1 || '') if pattern["v1_replacement"]
-      v2 = pattern["v2_replacement"].sub('$1', v2 || '') if pattern["v2_replacement"]
-      v3 = pattern["v3_replacement"].sub('$1', v3 || '') if pattern["v3_replacement"] 
-      ua = UserAgent.new(family)
-      ua.version = version_from_segments(v1, v2, v3)
-      ua
+
+      version = version_from_segments(v1, v2, v3)
+
+      UserAgent.new(name, version, os, device)
     end
-  
-    def os_from_pattern_match pattern, match
+
+    def os_from_pattern_match(pattern, match)
       os, v1, v2, v3, v4 = match[1], match[2], match[3], match[4], match[5]
-      os = pattern["os_replacement"].sub('$1', os || '') if pattern["os_replacement"]
-      v1 = pattern["v1_replacement"].sub('$1', v1 || '') if pattern["v1_replacement"]
-      v2 = pattern["v2_replacement"].sub('$1', v2 || '') if pattern["v2_replacement"]
-      v3 = pattern["v3_replacement"].sub('$1', v3 || '') if pattern["v3_replacement"]
-      v4 = pattern["v3_replacement"].sub('$1', v3 || '') if pattern["v4_replacement"]
-      os = OperatingSystem.new(os)
-      os.version = version_from_segments(v1, v2, v3, v4)
-      os
+
+      if pattern["os_replacement"]
+        os = pattern["os_replacement"].sub('$1', os || '')
+      end
+
+      if pattern["os_v1_replacement"]
+        v1 = pattern["os_v1_replacement"].sub('$1', v1 || '')
+      end
+
+      if pattern["os_v2_replacement"]
+        v2 = pattern["os_v2_replacement"].sub('$1', v2 || '')
+      end
+
+      if pattern["os_v3_replacement"]
+        v3 = pattern["os_v3_replacement"].sub('$1', v3 || '')
+      end
+
+      if pattern["os_v4_replacement"]
+        v4 = pattern["os_v4_replacement"].sub('$1', v4 || '')
+      end
+
+      version = version_from_segments(v1, v2, v3, v4)
+
+      OperatingSystem.new(os, version)
     end
-  
+
+    def device_from_pattern_match(pattern, match)
+      device = match[1]
+
+      if pattern["device_replacement"]
+        device = pattern["device_replacement"].sub('$1', device || '')
+      end
+
+      Device.new(device)
+    end
+
     def version_from_segments(*segments)
       version_string = segments.compact.join(".")
       version_string.empty? ? nil : Version.new(version_string)
     end
-  
   end
-
 end

data/lib/user_agent_parser/user_agent.rb

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

data/lib/user_agent_parser/version.rb

@@ -1,37 +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 major; self[0] end
-    def minor; self[1] end
-    def patch; self[2] end
-    def patch_minor; self[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,10 +1,6 @@
 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]*)'
 
@@ -66,16 +62,16 @@ user_agent_parsers:
   - regex: '(Opera)/9.80.*Version/(\d+)\.(\d+)(?:\.(\d+))?'
 
   # 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/
@@ -110,9 +106,6 @@ user_agent_parsers:
   # Bots
   - regex: '(YottaaMonitor|BrowserMob|HttpMonitor|YandexBot|Slurp|BingPreview|PagePeeker|ThumbShotsBot|WebThumb|URL2PNG|ZooShot|GomezA|Catchpoint bot|Willow Internet Crawler|Google SketchUp|Read%20Later)'
 
-  # must go before NetFront below
-  - regex: '(Kindle)/(\d+)\.(\d+)'
-
   - regex: '(Symphony) (\d+).(\d+)'
 
   - regex: '(Minimo)'
@@ -130,7 +123,11 @@ user_agent_parsers:
     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+)'
@@ -142,8 +139,10 @@ user_agent_parsers:
   # Sogou Explorer 2.X
   - regex: '(SE 2\.X) MetaSr (\d+)\.(\d+)'
     family_replacement: 'Sogou Explorer'
-    
-  # Baidu Browser
+
+  # 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'
 
@@ -159,24 +158,39 @@ user_agent_parsers:
   - 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|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|Bunjaloo|Google Earth|Raven for Mac)/(\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|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)/(\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'
@@ -215,18 +229,32 @@ 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'
@@ -236,6 +264,9 @@ 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+)'
@@ -254,36 +285,50 @@ user_agent_parsers:
     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+)'
 
@@ -302,6 +347,7 @@ user_agent_parsers:
 
   # Amazon Silk, should go before Safari
   - regex: '(Silk)/(\d+)\.(\d+)(?:\.([0-9\-]+))?'
+    family_replacement: 'Amazon Silk'
 
   # WebKit Nightly
   - regex: '(AppleWebKit)/(\d+)\.?(\d+)?\+ .* Safari'
@@ -322,11 +368,15 @@ user_agent_parsers:
 
   - regex: '(Teleca)'
     family_replacement: 'Teleca Browser'
+    
+  - regex: '(Phantom)/V(\d+)\.(\d+)'
+    family_replacement: 'Phantom Browser'
 
   - regex: '(MSIE) (\d+)\.(\d+)'
     family_replacement: 'IE'
 
-  - regex: '(Nintendo 3DS).* Version/(\d+)\.(\d+)(?:\.(\w+))'
+  - regex: '(python-requests)/(\d+)\.(\d+)'
+    family_replacement: 'Python Requests'
 
 os_parsers:
 
@@ -356,6 +406,12 @@ os_parsers:
   - 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
@@ -364,15 +420,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'
@@ -380,7 +435,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)'
@@ -389,8 +447,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'
 
@@ -406,13 +464,15 @@ os_parsers:
   ##########
   - 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?
 
@@ -472,10 +532,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+))?'
@@ -485,7 +549,24 @@ 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
@@ -494,11 +575,14 @@ os_parsers:
   # 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
@@ -512,11 +596,13 @@ os_parsers:
 
   # first.second bits
   - regex: '(Ubuntu|Kindle|Bada|Lubuntu|BackTrack|Red Hat|Slackware)/(\d+)\.(\d+)'
-  - regex: '(PlayStation Vita) (\d+)\.(\d+)'
 
   # 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:
   ##########
@@ -547,16 +633,16 @@ device_parsers:
     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-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'
@@ -567,14 +653,43 @@ device_parsers:
   - 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-Za-z]{2}\-[A-Za-z]{2}\; WOWMobile (.+) Build'
-  - regex: 'Android[\- ][\d]+\.[\d]+\.[\d]+; [A-Za-z]{2}\-[A-Za-z]{2}\; (.+) Build'
-  - regex: 'Android[\- ][\d]+\.[\d]+\-update1\; [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]+; [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
@@ -582,6 +697,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\-]+)'
@@ -594,14 +711,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
@@ -611,8 +733,8 @@ device_parsers:
     device_replacement: 'Palm Pre'
   - regex: '(Pixi)/(\d+)\.(\d+)'
     device_replacement: 'Palm Pixi'
-  - regex: '(Touchpad)/(\d+)\.(\d+)'
-    device_replacement: 'HP Touchpad'
+  - 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-Za-z0-9]+)'
@@ -622,21 +744,6 @@ device_parsers:
   - regex: 'webOS.*(P160UNA)/(\d+).(\d+)'
     device_replacement: 'HP Veer'
 
-  ##########
-  # PlayStation
-  ##########
-  - regex: '(PlayStation Portable)'
-  - regex: '(PlayStation Vita)'
-  
-  ##########
-  # incomplete!
-  # Kindle
-  ##########
-  - regex: '(Kindle Fire)'
-  - regex: '(Kindle)'
-  - regex: '(Silk)/(\d+)\.(\d+)(?:\.([0-9\-]+))?'
-    device_replacement: 'Kindle Fire'
-
   ##########
   # AppleTV
   # No built in browser that I can tell
@@ -665,6 +772,14 @@ device_parsers:
   - 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
   ##########
@@ -702,14 +817,18 @@ device_parsers:
   ##########
   - regex: 'DoCoMo/2\.0 ([A-Za-z0-9]+)'
     device_replacement: 'DoCoMo $1'
-  - regex: '([A-Za-z0-9]+)\_W\;FOMA'
+  - regex: '([A-Za-z0-9]+)_W\;FOMA'
     device_replacement: 'DoCoMo $1'
   - regex: '([A-Za-z0-9]+)\;FOMA'
     device_replacement: 'DoCoMo $1'
 
   ##########
-  # Huawei Vodafone
+  # Huawei
   ##########
+  - 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'
 
@@ -732,7 +851,7 @@ device_parsers:
   ##########
   - regex: 'Lenovo\-([A-Za-z0-9]+)'
     device_replacement: 'Lenovo $1'
-  - regex: 'Lenovo\_([A-Za-z0-9]+)'
+  - regex: 'Lenovo_([A-Za-z0-9]+)'
     device_replacement: 'Lenovo $1'
 
   ##########
@@ -773,7 +892,21 @@ device_parsers:
     device_replacement: 'Motorola $1'
   - 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
   ##########
@@ -790,6 +923,12 @@ device_parsers:
   - regex: 'SAMSUNG\; ([A-Za-z0-9\-]+)'
     device_replacement: 'Samsung $1'
 
+  ##########
+  # Sega
+  ##########
+  - regex: 'Dreamcast'
+    device_replacement: 'Sega Dreamcast'
+
   ##########
   # Softbank
   ##########
@@ -799,10 +938,9 @@ device_parsers:
     device_replacement: 'Softbank $1'
 
   ##########
-  # Sony
+  # WebTV
   ##########
-  - regex: '(PlayStation3 PPC)'
-    device_replacement: 'Playstation 3'
+  - regex: '(WebTV)/(\d+).(\d+)'
 
   ##########
   # Generic Smart Phone
@@ -813,13 +951,13 @@ 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'
 
   ##########
@@ -828,43 +966,3 @@ device_parsers:
   - 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)'
     device_replacement: 'Spider'
 
-
-mobile_user_agent_families:
-  - 'Firefox Mobile'
-  - 'Opera Mobile'
-  - 'Opera Mini'
-  - 'Mobile Safari'
-  - 'webOS'
-  - 'IE Mobile'
-  - 'Playstation Portable'
-  - 'Nokia'
-  - 'Blackberry'
-  - 'Palm'
-  - 'Silk'
-  - 'Android'
-  - 'Maemo'
-  - 'Obigo'
-  - 'Netfront'
-  - 'AvantGo'
-  - 'Teleca'
-  - 'SEMC-Browser'
-  - 'Bolt'
-  - 'Iris'
-  - 'UP.Browser'
-  - 'Symphony'
-  - 'Minimo'
-  - 'Bunjaloo'
-  - 'Jasmine'
-  - 'Dolfin'
-  - 'Polaris'
-  - 'BREW'
-  - 'Chrome Mobile'
-  - 'UC Browser'
-  - 'Tizen Browser'
-
-# Some select mobile OSs report a desktop browser.
-# make sure we note they're mobile
-mobile_os_families:
-  - 'Windows Phone 6.5'
-  - 'Windows CE'
-  - 'Symbian OS'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: user_agent_parser
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-10 00:00:00.000000000 Z
+date: 2013-02-18 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
@@ -21,6 +21,7 @@ files:
 - MIT-LICENSE
 - Readme.md
 - lib/user_agent_parser.rb
+- lib/user_agent_parser/device.rb
 - lib/user_agent_parser/operating_system.rb
 - lib/user_agent_parser/parser.rb
 - lib/user_agent_parser/user_agent.rb
@@ -38,7 +39,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: