user_agent_parser 2.4.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 11927dac3bd4e88a9a7be095093a664fd96b8111
-  data.tar.gz: 21b998a0a2f0016ad4e75b6e8678e855369dadee
+SHA256:
+  metadata.gz: bd4b7259791194e0dfdd38e5a9fe5f0316f055eb94d21578fa542a8913c6834b
+  data.tar.gz: 1682d5ac3c9ff1e10b896846f215e7c487d83a58ded86ebbed073213156699f8
 SHA512:
-  metadata.gz: 9e374cd5e96daca43ef27002052edb5e1101d35c77a1f18dda370b1c28702709a86a9a2b36d830162b9a068a5259ac2d3d2a1532ae2efaf294d4a955224bcfd6
-  data.tar.gz: 020cef494b4307e0921978e213c7c243cbb70c075f17a6f238e95a40dfd999d38c896abae12d17cf1afd834fea9f3be533d308f08e607127b07be1b82a1ed5b5
+  metadata.gz: f0306cab9fe8e6213f339a061a5683cea62de9a8f06ea5c96e756da014d0cfcffb90d82ff8be66da7c83726fe18ac0161f6eea817e4c211a1ebcb632538bbb38
+  data.tar.gz: be503613c609542a66750d169d0f7a52caa36baa12aeca16739984476edc50a58479d7e537cc3b572c5845d4f13ecbaf5f642953b2ac0b3bf72b532ed110d770

data/bin/user_agent_parser

@@ -8,7 +8,7 @@ require 'user_agent_parser/cli'
 
 options = {}
 
-optparse = OptionParser.new do|opts|
+optparse = OptionParser.new do |opts|
   opts.on('--family', 'Print family only') do
     options[:family] = true
   end

data/lib/user_agent_parser/cli.rb

@@ -20,7 +20,7 @@ module UserAgentParser
         minor
       elsif @options[:os]
         @user_agent.os.to_s
-      elsif format = @options[:format]
+      elsif (format = @options[:format])
         format
           .gsub('%f', @user_agent.family)
           .gsub('%n', @user_agent.name)
@@ -47,8 +47,8 @@ module UserAgentParser
       @version ||= @user_agent.version
     end
 
-    def with_version(&block)
-      block.call(version) if version
+    def with_version
+      yield(version) if version
     end
   end
 end

data/lib/user_agent_parser/device.rb

@@ -25,5 +25,13 @@ module UserAgentParser
     end
 
     alias == eql?
+
+    def to_h
+      {
+        family: family,
+        model: model,
+        brand: brand
+      }
+    end
   end
 end

data/lib/user_agent_parser/operating_system.rb

@@ -13,9 +13,7 @@ module UserAgentParser
 
     def to_s
       string = family
-      unless version.nil?
-        string += " #{version}"
-      end
+      string += " #{version}" unless version.nil?
       string
     end
 
@@ -30,5 +28,12 @@ module UserAgentParser
     end
 
     alias == eql?
+
+    def to_h
+      {
+        version: version.to_h,
+        family: family
+      }
+    end
   end
 end

data/lib/user_agent_parser/parser.rb

@@ -3,8 +3,25 @@
 require 'yaml'
 
 module UserAgentParser
-
   class Parser
+    FAMILY_REPLACEMENT_KEYS = %w[
+      family_replacement
+      v1_replacement
+      v2_replacement
+      v3_replacement
+      v4_replacement
+    ].freeze
+
+    OS_REPLACEMENT_KEYS = %w[
+      os_replacement
+      os_v1_replacement
+      os_v2_replacement
+      os_v3_replacement
+      os_v4_replacement
+    ].freeze
+
+    private_constant :FAMILY_REPLACEMENT_KEYS, :OS_REPLACEMENT_KEYS
+
     attr_reader :patterns_path
 
     def initialize(options = {})
@@ -18,15 +35,15 @@ module UserAgentParser
       parse_ua(user_agent, os, device)
     end
 
-  private
+    private
 
     def load_patterns(path)
       yml = YAML.load_file(path)
 
       # Parse all the regexs
-      yml.each_pair do |type, patterns|
+      yml.each_pair do |_type, patterns|
         patterns.each do |pattern|
-          pattern['regex'] = Regexp.new(pattern['regex'], pattern['regex_flag'] == 'i')
+          pattern[:regex] = Regexp.new(pattern['regex'], pattern['regex_flag'] == 'i')
         end
       end
 
@@ -63,69 +80,36 @@ module UserAgentParser
       end
     end
 
-    def first_pattern_match(patterns, value)
-      patterns.each do |pattern|
-        if match = pattern['regex'].match(value)
-          return [pattern, match]
+    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
+      def first_pattern_match(patterns, value)
+        patterns.each do |pattern|
+          if pattern[:regex].match?(value)
+            return [pattern, pattern[:regex].match(value)]
+          end
         end
+        nil
+      end
+    else
+      def first_pattern_match(patterns, value)
+        patterns.each do |pattern|
+          if (match = pattern[:regex].match(value))
+            return [pattern, match]
+          end
+        end
+        nil
       end
-      nil
     end
 
     def user_agent_from_pattern_match(pattern, match, os = nil, device = nil)
-      family, v1, v2, v3, v4 = match[1], match[2], match[3], match[4], match[5]
-
-      if pattern['family_replacement']
-        family = pattern['family_replacement'].sub('$1', family || '')
-      end
-
-      if pattern['v1_replacement']
-        v1 = pattern['v1_replacement'].sub('$2', v1 || '')
-      end
-
-      if pattern['v2_replacement']
-        v2 = pattern['v2_replacement'].sub('$3', v2 || '')
-      end
-
-      if pattern['v3_replacement']
-        v3 = pattern['v3_replacement'].sub('$4', v3 || '')
-      end
+      family, *versions = from_pattern_match(FAMILY_REPLACEMENT_KEYS, pattern, match)
 
-      if pattern['v4_replacement']
-        v4 = pattern['v4_replacement'].sub('$5', v4 || '')
-      end
-
-      version = version_from_segments(v1, v2, v3, v4)
-
-      UserAgent.new(family, version, os, device)
+      UserAgent.new(family, version_from_segments(*versions), os, device)
     end
 
     def os_from_pattern_match(pattern, match)
-      os, v1, v2, v3, v4 = match[1], match[2], match[3], match[4], match[5]
-
-      if pattern['os_replacement']
-        os = pattern['os_replacement'].sub('$1', os || '')
-      end
-
-      if pattern['os_v1_replacement']
-        v1 = pattern['os_v1_replacement'].sub('$2', v1 || '')
-      end
-
-      if pattern['os_v2_replacement']
-        v2 = pattern['os_v2_replacement'].sub('$3', v2 || '')
-      end
-
-      if pattern['os_v3_replacement']
-        v3 = pattern['os_v3_replacement'].sub('$4', v3 || '')
-      end
-
-      if pattern['os_v4_replacement']
-        v4 = pattern['os_v4_replacement'].sub('$5', v4 || '')
-      end
+      os, *versions = from_pattern_match(OS_REPLACEMENT_KEYS, pattern, match)
 
-      version = version_from_segments(v1, v2, v3, v4)
-
-      OperatingSystem.new(os, version)
+      OperatingSystem.new(os, version_from_segments(*versions))
     end
 
     def device_from_pattern_match(pattern, match)
@@ -135,26 +119,49 @@ module UserAgentParser
 
       if pattern['device_replacement']
         family = pattern['device_replacement']
-        match.each_with_index { |m,i| family = family.sub("$#{i}", m) }
+        match.each_with_index { |m, i| family = family.sub("$#{i}", m) }
       end
-      if pattern["model_replacement"]
-        model = pattern["model_replacement"]
-        match.each_with_index { |m,i| model = model.sub("$#{i}", m) }
+      if pattern['model_replacement']
+        model = pattern['model_replacement']
+        match.each_with_index { |m, i| model = model.sub("$#{i}", m) }
       end
-      if pattern["brand_replacement"]
-        brand = pattern["brand_replacement"]
-        match.each_with_index { |m,i| brand = brand.sub("$#{i}", m) }
+      if pattern['brand_replacement']
+        brand = pattern['brand_replacement']
+        match.each_with_index { |m, i| brand = brand.sub("$#{i}", m) }
         brand.strip!
       end
 
-      model.strip! unless model.nil?
+      model&.strip!
 
       Device.new(family.strip, model, brand)
     end
 
+    # Maps replacement keys to their values
+    def from_pattern_match(keys, pattern, match)
+      keys.each_with_index.map do |key, idx|
+        # Check if there is any replacement specified
+        if pattern[key]
+          interpolate(pattern[key], match)
+        else
+          # No replacement defined, just return correct match group
+          match[idx + 1]
+        end
+      end
+    end
+
+    # Interpolates a string with data from matches if specified
+    def interpolate(replacement, match)
+      group_idx = replacement.index('$')
+      return replacement if group_idx.nil?
+
+      group_nbr = replacement[group_idx + 1]
+      replacement.sub("$#{group_nbr}", match[group_nbr.to_i])
+    end
+
     def version_from_segments(*segments)
-      segments = segments.compact
-      segments.empty? ? nil : Version.new(*segments)
+      return if segments.all?(&:nil?)
+
+      Version.new(*segments)
     end
   end
 end

data/lib/user_agent_parser/user_agent.rb

@@ -34,5 +34,14 @@ module UserAgentParser
     end
 
     alias == eql?
+
+    def to_h
+      {
+        device: device.to_h,
+        family: family,
+        os: os.to_h,
+        version: version.to_h
+      }
+    end
   end
 end

data/lib/user_agent_parser/version.rb

@@ -2,7 +2,6 @@
 
 module UserAgentParser
   class Version
-
     # 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-]*$/
@@ -11,10 +10,12 @@ module UserAgentParser
     alias to_s version
 
     def initialize(*args)
+      # If only one string argument is given, assume a complete version string
+      # and attempt to parse it
       if args.length == 1 && args.first.is_a?(String)
         @version = args.first.to_s.strip
       else
-        @segments = args.map(&:to_s).map(&:strip)
+        @segments = args.compact.map(&:to_s).map(&:strip)
         @version = segments.join('.')
       end
     end
@@ -50,5 +51,15 @@ module UserAgentParser
     def segments
       @segments ||= version.scan(SEGMENTS_REGEX)
     end
+
+    def to_h
+      {
+        version: version,
+        major: major,
+        minor: minor,
+        patch: patch,
+        patch_minor: patch_minor
+      }
+    end
   end
 end

data/vendor/uap-core/regexes.yaml

@@ -29,7 +29,7 @@ user_agent_parsers:
   # Pingdom
   - regex: '(Pingdom.com_bot_version_)(\d+)\.(\d+)'
     family_replacement: 'PingdomBot'
-    # 'Mozilla/5.0 (Unknown; Linux x86_64) AppleWebKit/534.34 (KHTML, like Gecko) PingdomTMS/0.8.5 Safari/534.34'
+  # 'Mozilla/5.0 (Unknown; Linux x86_64) AppleWebKit/534.34 (KHTML, like Gecko) PingdomTMS/0.8.5 Safari/534.34'
   - regex: '(PingdomTMS)/(\d+)\.(\d+)\.(\d+)'
     family_replacement: 'PingdomBot'
 
@@ -37,6 +37,13 @@ user_agent_parsers:
   - regex: '(NewRelicPinger)/(\d+)\.(\d+)'
     family_replacement: 'NewRelicPingerBot'
 
+  # Tableau
+  - regex: '(Tableau)/(\d+)\.(\d+)'
+    family_replacement: 'Tableau'
+
+  # Salesforce
+  - regex: '(Salesforce)(?:.)\/(\d+)\.(\d?)'
+
   #StatusCake
   - regex: '(\(StatusCake\))'
     family_replacement: 'StatusCakeBot'
@@ -53,6 +60,10 @@ user_agent_parsers:
   - regex: 'via ggpht.com GoogleImageProxy'
     family_replacement: 'GmailImageProxy'
 
+  # Yahoo
+  - regex: 'YahooMailProxy; https://help.yahoo.com/kb/yahoo-mail-proxy-SLN28749.html'
+    family_replacement: 'YahooMailProxy'
+
   # Twitter
   - regex: '(Twitterbot)/(\d+)\.(\d+)'
     family_replacement: 'TwitterBot'
@@ -66,15 +77,22 @@ user_agent_parsers:
   - regex: '(MSIE) (\d+)\.(\d+)([a-z]\d?)?;.* MSIECrawler'
     family_replacement: 'MSIECrawler'
 
+  # DAVdroid
+  - regex: '(DAVdroid)/(\d+)\.(\d+)(?:\.(\d+))?'
+
   # Downloader ...
-  - regex: '(Google-HTTP-Java-Client|Apache-HttpClient|http%20client|Python-urllib|HttpMonitor|TLSProber|WinHTTP|JNLP|okhttp)(?:[ /](\d+)(?:\.(\d+)(?:\.(\d+))?)?)?'
+  - regex: '(Google-HTTP-Java-Client|Apache-HttpClient|Go-http-client|scalaj-http|http%20client|Python-urllib|HttpMonitor|TLSProber|WinHTTP|JNLP|okhttp|aihttp|reqwest)(?:[ /](\d+)(?:\.(\d+)(?:\.(\d+))?)?)?'
 
   # Pinterestbot
   - regex: '(Pinterest(?:bot)?)/(\d+)(?:\.(\d+)(?:\.(\d+))?)?[;\s\(]+\+https://www.pinterest.com/bot.html'
     family_replacement: 'Pinterestbot'
 
   # Bots
-  - regex: '(1470\.net crawler|50\.nu|8bo Crawler Bot|Aboundex|Accoona-[A-z]+-Agent|AdsBot-Google(?:-[a-z]+)?|altavista|AppEngine-Google|archive.*?\.org_bot|archiver|Ask Jeeves|[Bb]ai[Dd]u[Ss]pider(?:-[A-Za-z]+)*|bingbot|BingPreview|blitzbot|BlogBridge|Bloglovin|BoardReader(?: [A-Za-z]+)*|boitho.com-dc|BotSeer|\b\w*favicon\w*\b|\bYeti(?:-[a-z]+)?|Catchpoint(?: bot)?|[Cc]harlotte|Checklinks|clumboot|Comodo HTTP\(S\) Crawler|Comodo-Webinspector-Crawler|ConveraCrawler|CRAWL-E|CrawlConvera|Daumoa(?:-feedfetcher)?|Feed Seeker Bot|Feedbin|findlinks|Flamingo_SearchEngine|FollowSite Bot|furlbot|Genieo|gigabot|GomezAgent|gonzo1|(?:[a-zA-Z]+-)?Googlebot(?:-[a-zA-Z]+)?|Google SketchUp|grub-client|gsa-crawler|heritrix|HiddenMarket|holmes|HooWWWer|htdig|ia_archiver|ICC-Crawler|Icarus6j|ichiro(?:/mobile)?|IconSurf|IlTrovatore(?:-Setaccio)?|InfuzApp|Innovazion Crawler|InternetArchive|IP2[a-z]+Bot|jbot\b|KaloogaBot|Kraken|Kurzor|larbin|LEIA|LesnikBot|Linguee Bot|LinkAider|LinkedInBot|Lite Bot|Llaut|lycos|Mail\.RU_Bot|masscan|masidani_bot|Mediapartners-Google|Microsoft .*? Bot|mogimogi|mozDex|MJ12bot|msnbot(?:-media *)?|msrbot|Mtps Feed Aggregation System|netresearch|Netvibes|NewsGator[^/]*|^NING|Nutch[^/]*|Nymesis|ObjectsSearch|Orbiter|OOZBOT|PagePeeker|PagesInventory|PaxleFramework|Peeplo Screenshot Bot|PlantyNet_WebRobot|Pompos|Qwantify|Read%20Later|Reaper|RedCarpet|Retreiver|Riddler|Rival IQ|scooter|Scrapy|Scrubby|searchsight|seekbot|semanticdiscovery|Simpy|SimplePie|SEOstats|SimpleRSS|SiteCon|Slackbot-LinkExpanding|Slack-ImgProxy|Slurp|snappy|Speedy Spider|Squrl Java|Stringer|TheUsefulbot|ThumbShotsBot|Thumbshots\.ru|Tiny Tiny RSS|TwitterBot|WhatsApp|URL2PNG|Vagabondo|VoilaBot|^vortex|Votay bot|^voyager|WASALive.Bot|Web-sniffer|WebThumb|WeSEE:[A-z]+|WhatWeb|WIRE|WordPress|Wotbox|www\.almaden\.ibm\.com|Xenu(?:.s)? Link Sleuth|Xerka [A-z]+Bot|yacy(?:bot)?|Yahoo[a-z]*Seeker|Yahoo! Slurp|Yandex\w+|YodaoBot(?:-[A-z]+)?|YottaaMonitor|Yowedo|^Zao|^Zao-Crawler|ZeBot_www\.ze\.bz|ZooShot|ZyBorg)(?:[ /]v?(\d+)(?:\.(\d+)(?:\.(\d+))?)?)?'
+  - regex: '(1470\.net crawler|50\.nu|8bo Crawler Bot|Aboundex|Accoona-[A-z]+-Agent|AdsBot-Google(?:-[a-z]+)?|altavista|AppEngine-Google|archive.*?\.org_bot|archiver|Ask Jeeves|[Bb]ai[Dd]u[Ss]pider(?:-[A-Za-z]+)*|bingbot|BingPreview|blitzbot|BlogBridge|Bloglovin|BoardReader(?: [A-Za-z]+)*|boitho.com-dc|BotSeer|BUbiNG|\b\w*favicon\w*\b|\bYeti(?:-[a-z]+)?|Catchpoint(?: bot)?|[Cc]harlotte|Checklinks|clumboot|Comodo HTTP\(S\) Crawler|Comodo-Webinspector-Crawler|ConveraCrawler|CRAWL-E|CrawlConvera|Daumoa(?:-feedfetcher)?|Feed Seeker Bot|Feedbin|findlinks|Flamingo_SearchEngine|FollowSite Bot|furlbot|Genieo|gigabot|GomezAgent|gonzo1|(?:[a-zA-Z]+-)?Googlebot(?:-[a-zA-Z]+)?|Google SketchUp|grub-client|gsa-crawler|heritrix|HiddenMarket|holmes|HooWWWer|htdig|ia_archiver|ICC-Crawler|Icarus6j|ichiro(?:/mobile)?|IconSurf|IlTrovatore(?:-Setaccio)?|InfuzApp|Innovazion Crawler|InternetArchive|IP2[a-z]+Bot|jbot\b|KaloogaBot|Kraken|Kurzor|larbin|LEIA|LesnikBot|Linguee Bot|LinkAider|LinkedInBot|Lite Bot|Llaut|lycos|Mail\.RU_Bot|masscan|masidani_bot|Mediapartners-Google|Microsoft .*? Bot|mogimogi|mozDex|MJ12bot|msnbot(?:-media *)?|msrbot|Mtps Feed Aggregation System|netresearch|Netvibes|NewsGator[^/]*|^NING|Nutch[^/]*|Nymesis|ObjectsSearch|Orbiter|OOZBOT|PagePeeker|PagesInventory|PaxleFramework|Peeplo Screenshot Bot|PlantyNet_WebRobot|Pompos|Qwantify|Read%20Later|Reaper|RedCarpet|Retreiver|Riddler|Rival IQ|scooter|Scrapy|Scrubby|searchsight|seekbot|semanticdiscovery|SemrushBot|Simpy|SimplePie|SEOstats|SimpleRSS|SiteCon|Slackbot-LinkExpanding|Slack-ImgProxy|Slurp|snappy|Speedy Spider|Squrl Java|Stringer|TheUsefulbot|ThumbShotsBot|Thumbshots\.ru|Tiny Tiny RSS|TwitterBot|WhatsApp|URL2PNG|Vagabondo|VoilaBot|^vortex|Votay bot|^voyager|WASALive.Bot|Web-sniffer|WebThumb|WeSEE:[A-z]+|WhatWeb|WIRE|WordPress|Wotbox|www\.almaden\.ibm\.com|Xenu(?:.s)? Link Sleuth|Xerka [A-z]+Bot|yacy(?:bot)?|Yahoo[a-z]*Seeker|Yahoo! Slurp|Yandex\w+|YodaoBot(?:-[A-z]+)?|YottaaMonitor|Yowedo|^Zao|^Zao-Crawler|ZeBot_www\.ze\.bz|ZooShot|ZyBorg)(?:[ /]v?(\d+)(?:\.(\d+)(?:\.(\d+))?)?)?'
+
+  # AWS S3 Clients
+  # must come before "Bots General matcher" to catch "boto"/"boto3" before "bot"
+  - regex: '\b(Boto3?|JetS3t|aws-(?:cli|sdk-(?:cpp|go|java|nodejs|ruby2?))|s3fs)/(\d+)\.(\d+)(?:\.(\d+))?'
 
   # Bots General matcher 'name/0.0'
   - regex: '(?:\/[A-Za-z0-9\.]+)? *([A-Za-z0-9 \-_\!\[\]:]*(?:[Aa]rchiver|[Ii]ndexer|[Ss]craper|[Bb]ot|[Ss]pider|[Cc]rawl[a-z]*))/(\d+)(?:\.(\d+)(?:\.(\d+))?)?'
@@ -88,8 +106,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 Chimera/SeaMonkey/Camino
-  - regex: '(Chimera|SeaMonkey|Camino)/(\d+)\.(\d+)\.?([ab]?\d+[a-z]*)?'
+  # must go before Firefox to catch Chimera/SeaMonkey/Camino/Waterfox
+  - regex: '(Chimera|SeaMonkey|Camino|Waterfox)/(\d+)\.(\d+)\.?([ab]?\d+[a-z]*)?'
 
   # Social Networks
   # Facebook
@@ -98,6 +116,18 @@ user_agent_parsers:
   # Pinterest
   - regex: '\[(Pinterest)/[^\]]+\]'
   - regex: '(Pinterest)(?: for Android(?: Tablet)?)?/(\d+)(?:\.(\d+)(?:\.(\d+))?)?'
+  # Instagram app
+  - regex: 'Mozilla.*Mobile.*(Instagram).(\d+)\.(\d+)\.(\d+)'
+  # Flipbaord app
+  - regex: 'Mozilla.*Mobile.*(Flipboard).(\d+)\.(\d+)\.(\d+)'
+  # Flipbaord-briefing app
+  - regex: 'Mozilla.*Mobile.*(Flipboard-Briefing).(\d+)\.(\d+)\.(\d+)'
+  # Onefootball app
+  - regex: 'Mozilla.*Mobile.*(Onefootball)\/Android.(\d+)\.(\d+)\.(\d+)'
+
+  # Basilisk
+  - regex: '(Firefox)/(\d+)\.(\d+) Basilisk/(\d+)'
+    family_replacement: 'Basilisk'
 
   # Pale Moon
   - regex: '(PaleMoon)/(\d+)\.(\d+)\.?(\d+)?'
@@ -263,7 +293,7 @@ user_agent_parsers:
 
   # Seznam.cz browser (based on WebKit)
   - regex: '(SznProhlizec)/(\d+)\.(\d+)(?:\.(\d+))?'
-    family_replacement: 'Seznam.cz'
+    family_replacement: 'Seznam prohlížeč'
 
   # Coc Coc browser, based on Chrome (used in Vietnam)
   - regex: '(coc_coc_browser)/(\d+)\.(\d+)(?:\.(\d+))?'
@@ -283,6 +313,8 @@ user_agent_parsers:
   - regex: '(Crosswalk)/(\d+)\.(\d+)\.(\d+)\.(\d+)'
 
   # Chrome Mobile
+  - regex: 'Version/.+(Chrome)/(\d+)\.(\d+)\.(\d+)\.(\d+)'
+    family_replacement: 'Chrome Mobile WebView'
   - regex: '; wv\).+(Chrome)/(\d+)\.(\d+)\.(\d+)\.(\d+)'
     family_replacement: 'Chrome Mobile WebView'
   - regex: '(CrMo)/(\d+)\.(\d+)\.(\d+)\.(\d+)'
@@ -335,6 +367,17 @@ user_agent_parsers:
   # Podcast catcher Applications using iTunes
   - regex: '(PodCruncher|Downcast)[ /]?(\d+)\.?(\d+)?\.?(\d+)?\.?(\d+)?'
 
+  # Box Notes https://www.box.com/resources/downloads
+  # Must be before Electron
+  - regex: ' (BoxNotes)/(\d+)\.(\d+)\.(\d+)'
+
+  # Whale
+  - regex: '(Whale)/(\d+)\.(\d+)\.(\d+)\.(\d+) Mobile(?:[ /]|$)'
+    family_replacement: 'Whale'
+
+  - regex: '(Whale)/(\d+)\.(\d+)\.(\d+)'
+    family_replacement: 'Whale'
+
   #### END SPECIAL CASES TOP ####
 
   #### MAIN CASES - this catches > 50% of all browsers ####
@@ -350,7 +393,7 @@ user_agent_parsers:
     family_replacement: 'HipChat Desktop Client'
 
   # Browser/major_version.minor_version.beta_version
-  - regex: '\b(MobileIron|FireWeb|Jasmine|ANTGalio|Midori|Fresco|Lobo|PaleMoon|Maxthon|Lynx|OmniWeb|Dillo|Camino|Demeter|Fluid|Fennec|Epiphany|Shiira|Sunrise|Spotify|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|MacOutlook|Electron)/(\d+)\.(\d+)\.(\d+)'
+  - regex: '\b(MobileIron|FireWeb|Jasmine|ANTGalio|Midori|Fresco|Lobo|PaleMoon|Maxthon|Lynx|OmniWeb|Dillo|Camino|Demeter|Fluid|Fennec|Epiphany|Shiira|Sunrise|Spotify|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|MacOutlook|Electron|OktaMobile)/(\d+)\.(\d+)\.(\d+)'
 
   # Outlook 2007
   - regex: 'Microsoft Office Outlook 12\.\d+\.\d+|MSOffice 12'
@@ -415,15 +458,19 @@ user_agent_parsers:
 
   # Headless Chrome
   # https://chromium.googlesource.com/chromium/src/+/lkgr/headless/README.md
-  # Currently only available on Linux
-  - regex: 'HeadlessChrome'
-    family_replacement: 'HeadlessChrome'
+  - regex: '(HeadlessChrome)(?:/(\d+)\.(\d+)\.(\d+))?'
+
+  # Evolution Mail CardDav/CalDav integration
+  - regex: '(Evolution)/(\d+)\.(\d+)\.(\d+\.\d+)'
+
+  # Roundcube Mail CardDav plugin
+  - regex: '(RCM CardDAV plugin)/(\d+)\.(\d+)\.(\d+(?:-dev)?)'
 
   # Browser/major_version.minor_version
   - regex: '(bingbot|Bolt|AdobeAIR|Jasmine|IceCat|Skyfire|Midori|Maxthon|Lynx|Arora|IBrowse|Dillo|Camino|Shiira|Fennec|Phoenix|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|iTunes|MacAppStore|NetNewsWire|Space Bison|Stainless|Orca|Dolfin|BOLT|Minimo|Tizen Browser|Polaris|Abrowser|Planetweb|ICE Browser|mDolphin|qutebrowser|Otter|QupZilla|MailBar|kmail2|YahooMobileMail|ExchangeWebServices|ExchangeServicesClient|Dragon|Outlook-iOS-Android)/(\d+)\.(\d+)(?:\.(\d+))?'
 
   # Chrome/Chromium/major_version.minor_version
-  - regex: '(Chromium|Chrome)/(\d+)\.(\d+)(?:\.(\d+))?'
+  - regex: '(Chromium|Chrome)/(\d+)\.(\d+)(?:\.(\d+))?(?:\.(\d+))?'
 
   ##########
   # IE Mobile needs to happen before Android to catch cases such as:
@@ -463,7 +510,7 @@ user_agent_parsers:
     family_replacement: 'FancyMusic'
   - regex: 'EspnDownloadManager'
     family_replacement: 'ESPN'
-  - regex: '(ESPN) Radio (\d+)\.(\d+)\.?(\d+)? ?[rv:]?(\d+)? '
+  - regex: '(ESPN) Radio (\d+)\.(\d+)\.?(\d+)? ?(?:rv:(\d+))? '
   - regex: '(podracer|jPodder) v ?(\d+)\.(\d+)\.?(\d+)?'
   - regex: '(ZDM)/(\d+)\.(\d+)[; ]?'
   - regex: '(Zune|BeyondPod) (\d+)\.?(\d+)?[\);]'
@@ -521,6 +568,15 @@ user_agent_parsers:
   - regex: '(MSIE) (\d+)\.(\d+).*XBLWP7'
     family_replacement: 'IE Large Screen'
 
+  # Nextcloud desktop sync client
+  - regex: '(Nextcloud)'
+
+  # Generic mirall client
+  - regex: '(mirall)/(\d+)\.(\d+)\.(\d+)'
+
+  # Nextcloud/Owncloud android client
+  - regex: '(ownCloud-android)/(\d+)\.(\d+)\.(\d+)'
+    family_replacement: 'Owncloud'
 
   #### END MAIN CASES ####
 
@@ -552,6 +608,8 @@ user_agent_parsers:
   # @note: iOS / OSX Applications
   - regex: '(iPod|iPhone|iPad).+Version/(\d+)\.(\d+)(?:\.(\d+))?.*[ +]Safari'
     family_replacement: 'Mobile Safari'
+  - regex: '(iPod|iPod touch|iPhone|iPad);.*CPU.*OS[ +](\d+)_(\d+)(?:_(\d+))?.* AppleNews\/\d+\.\d+\.\d+?'
+    family_replacement: 'Mobile Safari UI/WKWebView'
   - regex: '(iPod|iPhone|iPad).+Version/(\d+)\.(\d+)(?:\.(\d+))?'
     family_replacement: 'Mobile Safari UI/WKWebView'
   - regex: '(iPod|iPod touch|iPhone|iPad);.*CPU.*OS[ +](\d+)_(\d+)(?:_(\d+))?.*Mobile.*[ +]Safari'
@@ -563,6 +621,11 @@ user_agent_parsers:
   - regex: '(iPod|iPhone|iPad)'
     family_replacement: 'Mobile Safari UI/WKWebView'
 
+  ##########################
+  # Outlook on iOS >= 2.62.0
+  ##########################
+  - regex: '(Outlook-iOS)/\d+\.\d+\.prod\.iphone \((\d+)\.(\d+)\.(\d+)\)'
+
   - regex: '(AvantGo) (\d+).(\d+)'
 
   - regex: '(OneBrowser)/(\d+).(\d+)'
@@ -653,8 +716,21 @@ user_agent_parsers:
   - regex: '(Phantom)/V(\d+)\.(\d+)'
     family_replacement: 'Phantom Browser'
 
-  - regex: 'Trident(.*)rv.(\d+)\.(\d+)'
+  - regex: '(Trident)/(7|8)\.(0)'
+    family_replacement: 'IE'
+    v1_replacement: '11'
+
+  - regex: '(Trident)/(6)\.(0)'
+    family_replacement: 'IE'
+    v1_replacement: '10'
+
+  - regex: '(Trident)/(5)\.(0)'
     family_replacement: 'IE'
+    v1_replacement: '9'
+
+  - regex: '(Trident)/(4)\.(0)'
+    family_replacement: 'IE'
+    v1_replacement: '8'
 
   # Espial
   - regex: '(Espial)/(\d+)(?:\.(\d+))?(?:\.(\d+))?'
@@ -678,10 +754,16 @@ user_agent_parsers:
     family_replacement: 'Python Requests'
 
   # headless user-agents
-  - regex: '\b(Windows-Update-Agent|Microsoft-CryptoAPI|SophosUpdateManager|SophosAgent|Debian APT-HTTP|Ubuntu APT-HTTP|libcurl-agent|libwww-perl|urlgrabber|curl|Wget|OpenBSD ftp|jupdate)(?:[ /](\d+)(?:\.(\d+)(?:\.(\d+))?)?)?'
+  - regex: '\b(Windows-Update-Agent|Microsoft-CryptoAPI|SophosUpdateManager|SophosAgent|Debian APT-HTTP|Ubuntu APT-HTTP|libcurl-agent|libwww-perl|urlgrabber|curl|PycURL|Wget|aria2|Axel|OpenBSD ftp|lftp|jupdate|insomnia)(?:[ /](\d+)(?:\.(\d+)(?:\.(\d+))?)?)?'
 
   - regex: '(Java)[/ ]{0,1}\d+\.(\d+)\.(\d+)[_-]*([a-zA-Z0-9]+)*'
 
+  # Cloud Storage Clients
+  - regex: '^(Cyberduck)/(\d+)\.(\d+)\.(\d+)(?:\.\d+)?'
+  - regex: '^(S3 Browser) (\d+)-(\d+)-(\d+)(?:\s*http://s3browser\.com)?'
+  # rclone - rsync for cloud storage - https://rclone.org/
+  - regex: '^(rclone)/v(\d+)\.(\d+)'
+
   # Roku Digital-Video-Players https://www.roku.com/
   - regex: '^(Roku)/DVP-(\d+)\.(\d+)'
 
@@ -689,6 +771,8 @@ user_agent_parsers:
   - regex: '(Kurio)\/(\d+)\.(\d+)\.(\d+)'
     family_replacement: 'Kurio App'
 
+  # Box Drive and Box Sync https://www.box.com/resources/downloads
+  - regex: '^(Box(?: Sync)?)/(\d+)\.(\d+)\.(\d+)'
 
 os_parsers:
   ##########
@@ -767,7 +851,7 @@ os_parsers:
   # Android
   # can actually detect rooted android os. do we care?
   ##########
-  - regex: '(Android)[ \-/](\d+)\.(\d+)(?:[.\-]([a-z0-9]+))?'
+  - regex: '(Android)[ \-/](\d+)\.?(\d+)?(?:[.\-]([a-z0-9]+))?'
 
   - regex: '(Android) Donut'
     os_v1_replacement: '1'
@@ -799,6 +883,10 @@ os_parsers:
   - regex: '^(JUC).*; ?U; ?(?:Android)?(\d+)\.(\d+)(?:[\.\-]([a-z0-9]+))?'
     os_replacement: 'Android'
 
+  # Salesforce
+  - regex: '(android)\s(?:mobile\/)(\d+)\.(\d+)\.?(\d+)?'
+    os_replacement: 'Android'
+
   ##########
   # Kindle Android
   ##########
@@ -824,51 +912,75 @@ os_parsers:
     os_replacement: 'Windows Mobile'
 
   - regex: '(Windows (?:NT 5\.2|NT 5\.1))'
-    os_replacement: 'Windows XP'
+    os_replacement: 'Windows'
+    os_v1_replacement: 'XP'
 
   - regex: '(Windows NT 6\.1)'
-    os_replacement: 'Windows 7'
+    os_replacement: 'Windows'
+    os_v1_replacement: '7'
 
   - regex: '(Windows NT 6\.0)'
-    os_replacement: 'Windows Vista'
+    os_replacement: 'Windows'
+    os_v1_replacement: 'Vista'
 
   - regex: '(Win 9x 4\.90)'
-    os_replacement: 'Windows ME'
+    os_replacement: 'Windows'
+    os_v1_replacement: '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'
+    os_replacement: 'Windows'
+    os_v1_replacement: 'RT'
+
   - regex: '(Windows NT 6\.2)'
-    os_replacement: 'Windows 8'
+    os_replacement: 'Windows'
+    os_v1_replacement: '8'
 
   - regex: '(Windows NT 6\.3; ARM;)'
-    os_replacement: 'Windows RT 8.1'
+    os_replacement: 'Windows'
+    os_v1_replacement: 'RT 8.1'
+
   - regex: '(Windows NT 6\.3)'
-    os_replacement: 'Windows 8.1'
+    os_replacement: 'Windows'
+    os_v1_replacement: '8.1'
 
   - regex: '(Windows NT 6\.4)'
-    os_replacement: 'Windows 10'
+    os_replacement: 'Windows'
+    os_v1_replacement: '10'
+
   - regex: '(Windows NT 10\.0)'
-    os_replacement: 'Windows 10'
+    os_replacement: 'Windows'
+    os_v1_replacement: '10'
 
   - regex: '(Windows NT 5\.0)'
-    os_replacement: 'Windows 2000'
+    os_replacement: 'Windows'
+    os_v1_replacement: '2000'
 
   - regex: '(WinNT4.0)'
-    os_replacement: 'Windows NT 4.0'
+    os_replacement: 'Windows'
+    os_v1_replacement: 'NT 4.0'
 
   - regex: '(Windows ?CE)'
-    os_replacement: 'Windows CE'
+    os_replacement: 'Windows'
+    os_v1_replacement: 'CE'
 
   - regex: 'Win ?(95|98|3.1|NT|ME|2000)'
-    os_replacement: 'Windows $1'
+    os_replacement: 'Windows'
+    os_v1_replacement: '$1'
 
   - regex: 'Win16'
-    os_replacement: 'Windows 3.1'
+    os_replacement: 'Windows'
+    os_v1_replacement: '3.1'
 
   - regex: 'Win32'
-    os_replacement: 'Windows 95'
+    os_replacement: 'Windows'
+    os_v1_replacement: '95'
+
+  # Box apps (Drive, Sync, Notes) on Windows https://www.box.com/resources/downloads
+  - regex: '^Box.*Windows/([\d.]+);'
+    os_replacement: 'Windows'
+    os_v1_replacement: '$1'
 
   ##########
   # Tizen OS from Samsung
@@ -883,6 +995,11 @@ os_parsers:
   ##########
   - regex: '((?:Mac[ +]?|; )OS[ +]X)[\s+/](?:(\d+)[_.](\d+)(?:[_.](\d+))?|Mach-O)'
     os_replacement: 'Mac OS X'
+  - regex: '(\w+\s+Mac OS X\s+\w+\s+(\d+).(\d+).(\d+).*)'
+    os_replacement: 'Mac OS X'
+    os_v1_replacement: '$2'
+    os_v2_replacement: '$3'
+    os_v3_replacement: '$4'
   # Leopard
   - regex: ' (Dar)(win)/(9).(\d+).*\((?:i386|x86_64|Power Macintosh)\)'
     os_replacement: 'Mac OS X'
@@ -920,6 +1037,10 @@ os_parsers:
   # ios devices spoof (mac os x), so including intel/ppc prefixes
   - regex: '(?:PPC|Intel) (Mac OS X)'
 
+  # Box Drive and Box Sync on Mac OS X use OSX version numbers, not Darwin
+  - regex: '^Box.*;(Darwin)/(10)\.(1\d)(?:\.(\d+))?'
+    os_replacement: 'Mac OS X'
+
   ##########
   # iOS
   # http://en.wikipedia.org/wiki/IOS_version_history
@@ -979,9 +1100,29 @@ os_parsers:
     os_replacement: 'Mac OS X'
     os_v1_replacement: '10'
     os_v2_replacement: '11'
+  - regex: 'CFNetwork/7.* Darwin/15\.4\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '9'
+    os_v2_replacement: '3'
+    os_v3_replacement: '1'
+  - regex: 'CFNetwork/7.* Darwin/15\.5\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '9'
+    os_v2_replacement: '3'
+    os_v3_replacement: '2'
+  - regex: 'CFNetwork/7.* Darwin/15\.6\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '9'
+    os_v2_replacement: '3'
+    os_v3_replacement: '5'
   - regex: '(CF)(Network)/758\.(\d)'
     os_replacement: 'iOS'
     os_v1_replacement: '9'
+  - regex: 'CFNetwork/808\.3 Darwin/16\.3\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '10'
+    os_v2_replacement: '2'
+    os_v3_replacement: '1'
   - regex: '(CF)(Network)/808\.(\d)'
     os_replacement: 'iOS'
     os_v1_replacement: '10'
@@ -990,6 +1131,10 @@ os_parsers:
   # CFNetwork macOS Apps (must be before CFNetwork iOS Apps
   # @ref: https://en.wikipedia.org/wiki/Darwin_(operating_system)#Release_history
   ##########
+  - regex: 'CFNetwork/.* Darwin/17\.\d+.*\(x86_64\)'
+    os_replacement: 'Mac OS X'
+    os_v1_replacement: '10'
+    os_v2_replacement: '13'
   - regex: 'CFNetwork/.* Darwin/16\.\d+.*\(x86_64\)'
     os_replacement: 'Mac OS X'
     os_v1_replacement: '10'
@@ -1025,14 +1170,76 @@ os_parsers:
     os_replacement: 'iOS'
     os_v1_replacement: '9'
     os_v2_replacement: '0'
+  - regex: 'CFNetwork/8.* Darwin/16\.5\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '10'
+    os_v2_replacement: '3'
+  - regex: 'CFNetwork/8.* Darwin/16\.6\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '10'
+    os_v2_replacement: '3'
+    os_v3_replacement: '2'
+  - regex: 'CFNetwork/8.* Darwin/16\.7\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '10'
+    os_v2_replacement: '3'
+    os_v3_replacement: '3'
   - regex: 'CFNetwork/8.* Darwin/(16)\.\d+'
     os_replacement: 'iOS'
     os_v1_replacement: '10'
+  - regex: 'CFNetwork/8.* Darwin/17\.0\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '11'
+    os_v2_replacement: '0'
+  - regex: 'CFNetwork/8.* Darwin/17\.2\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '11'
+    os_v2_replacement: '1'
+  - regex: 'CFNetwork/8.* Darwin/17\.3\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '11'
+    os_v2_replacement: '2'
+  - regex: 'CFNetwork/8.* Darwin/17\.4\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '11'
+    os_v2_replacement: '2'
+    os_v3_replacement: '6'
+  - regex: 'CFNetwork/8.* Darwin/17\.5\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '11'
+    os_v2_replacement: '3'
+  - regex: 'CFNetwork/9.* Darwin/17\.6\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '11'
+    os_v2_replacement: '4'
+  - regex: 'CFNetwork/9.* Darwin/17\.7\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '11'
+    os_v2_replacement: '4'
+    os_v3_replacement: '1'
+  - regex: 'CFNetwork/8.* Darwin/(17)\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '11'
+  - regex: 'CFNetwork/9.* Darwin/18\.0\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '12'
+    os_v2_replacement: '0'
+  - regex: 'CFNetwork/9.* Darwin/(18)\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '12'
+  - regex: 'CFNetwork/.* Darwin/'
+    os_replacement: 'iOS'
+
   # iOS Apps
   - regex: '\b(iOS[ /]|iOS; |iPhone(?:/| v|[ _]OS[/,]|; | OS : |\d,\d/|\d,\d; )|iPad/)(\d{1,2})[_\.](\d{1,2})(?:[_\.](\d+))?'
     os_replacement: 'iOS'
   - regex: '\((iOS);'
 
+  ##########################
+  # Outlook on iOS >= 2.62.0
+  ##########################
+  - regex: 'Outlook-(iOS)/\d+\.\d+\.prod\.iphone'
+
   ##########
   # Apple TV
   ##########
@@ -1189,6 +1396,13 @@ os_parsers:
   - regex: '(Linux)(?:[ /](\d+)\.(\d+)(?:\.(\d+))?)?'
   - regex: 'SunOS'
     os_replacement: 'Solaris'
+  # Wget/x.x.x (linux-gnu)
+  - regex: '\(linux-gnu\)'
+    os_replacement: 'Linux'
+  - regex: '\(x86_64-redhat-linux-gnu\)'
+    os_replacement: 'Red Hat'
+  - regex: '\((freebsd)(\d+)\.(\d+)\)'
+    os_replacement: 'FreeBSD'
 
   # Roku Digital-Video-Players https://www.roku.com/
   - regex: '^(Roku)/DVP-(\d+)\.(\d+)'
@@ -2098,7 +2312,7 @@ device_parsers:
     device_replacement: '$1'
     brand_replacement: 'Google'
     model_replacement: '$1'
-  - regex: '; *(Pixel \w+) Build'
+  - regex: '; *(Pixel.*) Build'
     device_replacement: '$1'
     brand_replacement: 'Google'
     model_replacement: '$1'
@@ -2374,7 +2588,7 @@ device_parsers:
     device_replacement: '$1 $2'
     brand_replacement: 'iBall'
     model_replacement: '$1 $2'
-  - regex: '; *(IBall)(?:[ _]([^;/]+)|) Build'
+  - regex: '; *(IBall)(?:[ _]([^;/]+))? Build'
     regex_flag: 'i'
     device_replacement: '$1 $2'
     brand_replacement: 'iBall'
@@ -3449,6 +3663,10 @@ device_parsers:
     device_replacement: '$1'
     brand_replacement: 'RCA'
     model_replacement: '$1'
+  - regex: '; RCA (\w+) Build/'
+    device_replacement: 'RCA $1'
+    brand_replacement: 'RCA'
+    model_replacement: '$1'
 
   #########
   # Rockchip
@@ -4088,7 +4306,7 @@ device_parsers:
   # XiaoMi
   # @ref: http://www.xiaomi.com/event/buyphone
   #########
-  - regex: '; *((MI|HM|MI-ONE|Redmi)[ -](NOTE |Note )?[^;/]*) (Build|MIUI)/'
+  - regex: '; *((Mi|MI|HM|MI-ONE|Redmi)[ -](NOTE |Note )?[^;/]*) (Build|MIUI)/'
     device_replacement: 'XiaoMi $1'
     brand_replacement: 'XiaoMi'
     model_replacement: '$1'
@@ -4550,6 +4768,18 @@ device_parsers:
     device_replacement: '$1'
     brand_replacement: 'Apple'
     model_replacement: '$1'
+  - regex: '(Apple Watch)(?:;| Simulator;)'
+    device_replacement: '$1'
+    brand_replacement: 'Apple'
+    model_replacement: '$1'
+  - regex: '(HomePod)(?:;| Simulator;)'
+    device_replacement: '$1'
+    brand_replacement: 'Apple'
+    model_replacement: '$1'
+  - regex: 'iPhone'
+    device_replacement: 'iPhone'
+    brand_replacement: 'Apple'
+    model_replacement: 'iPhone'
   # @note: desktop applications show device info
   - regex: 'CFNetwork/.* Darwin/\d.*\(((?:Mac|iMac|PowerMac|PowerBook)[^\d]*)(\d+)(?:,|%2C)(\d+)'
     device_replacement: '$1$2,$3'
@@ -4567,6 +4797,14 @@ device_parsers:
     brand_replacement: 'Apple'
     model_replacement: 'iOS-Device'
 
+  ##########################
+  # Outlook on iOS >= 2.62.0
+  ##########################
+  - regex: 'Outlook-(iOS)/\d+\.\d+\.prod\.iphone'
+    brand_replacement: 'Apple'
+    device_replacement: 'iPhone'
+    model_replacement: 'iPhone'
+
   ##########
   # Acer
   ##########
@@ -4717,7 +4955,7 @@ device_parsers:
   ##########
   # LGE NetCast TV
   ##########
-  - regex: 'LGE; (?:Media\/)?([^;]*);[^;]*;[^;]*;?\); "?LG NetCast(\.TV|\.Media|)-\d+'
+  - regex: 'LGE; (?:Media\/)?([^;]*);[^;]*;[^;]*;?\); "?LG NetCast(\.TV|\.Media)?-\d+'
     device_replacement: 'NetCast$2'
     brand_replacement: 'LG'
     model_replacement: '$1'
@@ -4988,7 +5226,7 @@ device_parsers:
   ##########
   # Spiders (this is hack...)
   ##########
-  - regex: '(bot|zao|borg|DBot|oegp|silk|Xenu|zeal|^NING|CCBot|crawl|htdig|lycos|slurp|teoma|voila|yahoo|Sogou|CiBra|Nutch|^Java/|^JNLP/|Daumoa|Genieo|ichiro|larbin|pompos|Scrapy|snappy|speedy|spider|msnbot|msrbot|vortex|^vortex|crawler|favicon|indexer|Riddler|scooter|scraper|scrubby|WhatWeb|WinHTTP|bingbot|BingPreview|openbot|gigabot|furlbot|polybot|seekbot|^voyager|archiver|Icarus6j|mogimogi|Netvibes|blitzbot|altavista|charlotte|findlinks|Retreiver|TLSProber|WordPress|SeznamBot|ProoXiBot|wsr\-agent|Squrl Java|EtaoSpider|PaperLiBot|SputnikBot|A6\-Indexer|netresearch|searchsight|baiduspider|YisouSpider|ICC\-Crawler|http%20client|Python-urllib|dataparksearch|converacrawler|Screaming Frog|AppEngine-Google|YahooCacheSystem|fast\-webcrawler|Sogou Pic Spider|semanticdiscovery|Innovazion Crawler|facebookexternalhit|Google.*/\+/web/snippet|Google-HTTP-Java-Client|BlogBridge|IlTrovatore-Setaccio|InternetArchive|GomezAgent|WebThumbnail|heritrix|NewsGator|PagePeeker|Reaper|ZooShot|holmes|NL-Crawler|Pingdom|StatusCake|WhatsApp|masscan|Google Web Preview|Qwantify)'
+  - regex: '(bot|BUbiNG|zao|borg|DBot|oegp|silk|Xenu|zeal|^NING|CCBot|crawl|htdig|lycos|slurp|teoma|voila|yahoo|Sogou|CiBra|Nutch|^Java/|^JNLP/|Daumoa|Daum|Genieo|ichiro|larbin|pompos|Scrapy|snappy|speedy|spider|msnbot|msrbot|vortex|^vortex|crawler|favicon|indexer|Riddler|scooter|scraper|scrubby|WhatWeb|WinHTTP|bingbot|BingPreview|openbot|gigabot|furlbot|polybot|seekbot|^voyager|archiver|Icarus6j|mogimogi|Netvibes|blitzbot|altavista|charlotte|findlinks|Retreiver|TLSProber|WordPress|SeznamBot|ProoXiBot|wsr\-agent|Squrl Java|EtaoSpider|PaperLiBot|SputnikBot|A6\-Indexer|netresearch|searchsight|baiduspider|YisouSpider|ICC\-Crawler|http%20client|Python-urllib|dataparksearch|converacrawler|Screaming Frog|AppEngine-Google|YahooCacheSystem|fast\-webcrawler|Sogou Pic Spider|semanticdiscovery|Innovazion Crawler|facebookexternalhit|Google.*/\+/web/snippet|Google-HTTP-Java-Client|BlogBridge|IlTrovatore-Setaccio|InternetArchive|GomezAgent|WebThumbnail|heritrix|NewsGator|PagePeeker|Reaper|ZooShot|holmes|NL-Crawler|Pingdom|StatusCake|WhatsApp|masscan|Google Web Preview|Qwantify|Yeti)'
     regex_flag: 'i'
     device_replacement: 'Spider'
     brand_replacement: 'Spider'

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: user_agent_parser
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Tim Lucas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.21
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.21
+date: 2018-10-10 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
@@ -54,7 +40,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -62,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: A simple, comprehensive Ruby gem for parsing user agent strings with the