device_detector 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81f8d553f5a16ebe349f683f2a37c34c0cdb59f5
-  data.tar.gz: d12f646a552f2b167d28a8c20fdc71de66108964
+  metadata.gz: 436bad611848de9243a2d405a28991780ebe86cf
+  data.tar.gz: d25b0cadb1959e32e1a2adf362c246d5f77b7050
 SHA512:
-  metadata.gz: 2185e70c4be666e91f66146fe929ce58438b499a8c10c1d4c8595e888cd14cae1c8b87c493237f9518f179ac5c17c5afd55e34713fe0e6385dd2dace85781a4b
-  data.tar.gz: d3c90c155ba23d60f779cb86711eb56b97fd10aa2e0337f9311ddab5ce27a095d5c2daac05efcd12203ee778a4f5db57d6d1f3abaf254dce2f3215750457989b
+  metadata.gz: 6a03c4141c003f03a5cc30a37ecb39fe26bddfbcee014867f96af8f2504f6abaa4bddc766c5236b5d7381b486611b3f5d6eb9bfa195a1756bcfa885e08e3a6bd
+  data.tar.gz: d53a0a43694c932854c149fac2af81be4c8bf5e0b427c0c523c6fc2aef060db183d650619c25f1cb531cd0abea07f986fd5a6169edd8c716c9ae89077c016408

data/.travis.yml

@@ -1,10 +1,18 @@
 language: ruby
+sudo: false
 rvm:
   - 1.9.3
-  - 2.0.0-p598
-  - 2.1.0
-  - 2.2.0
+  - 2.0.0-p648
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
   - ruby-head
   - rbx-2
+before_install:
+  - gem update --system
+  - gem --version
+  - gem update bundler
+  - bundler --version
+cache: bundler
 script:
   bundle exec rake test

data/CHANGELOG.md

@@ -1,22 +1,27 @@
 # Change Log
 
+## [0.9.0]
+- Preparing for the 1.0.0 release. This version (with minor bumps) will be promoted to 1.0.0 once the release has been proven stable
+- Updated regex files from upstream
+- Updated test fixtures from upstream
+
 ## [0.8.2]
-- Added device brand support. Thanks to [dnswus](https://github.com/dnswus).
+- Added device brand support. Thanks to [dnswus](https://github.com/dnswus)
 
 ## [0.8.1]
 - Added Instacast detection rules
 - Updated test fixtures
 
 ## [0.8.0]
-- Added a better and more robust device detection. Thanks to [skaes](https://github.com/skaes).
-- Added test fixture from the piwik project.
+- Added a better and more robust device detection. Thanks to [skaes](https://github.com/skaes)
+- Added test fixture from the piwik project
 
 ## [0.7.0]
-- [Issue #8](https://github.com/podigee/device_detector/issues/8) Fixed Mac OS X full version format. Thanks to [aaronchi](https://github.com/aaronchi) for reporting.
+- [Issue #8](https://github.com/podigee/device_detector/issues/8) Fixed Mac OS X full version format. Thanks to [aaronchi](https://github.com/aaronchi) for reporting
 
 ## [0.6.0]
 
-- [Issue #7](https://github.com/podigee/device_detector/issues/7) Fixed missing name extraction from regexp. Thanks to [janxious](https://github.com/janxious) for reporting.
+- [Issue #7](https://github.com/podigee/device_detector/issues/7) Fixed missing name extraction from regexp. Thanks to [janxious](https://github.com/janxious) for reporting
 - Optimized performance of name and version extraction, by using the built-in memory cache
 - Move specs from RSpec to the more lightweight Minitest
 

data/README.md

@@ -134,19 +134,19 @@ useragent         4.450000   0.000000   4.450000 (  4.452741)
 
 ## Detectable clients, bots and devices
 
-Updated on 2015-03-17
+Updated on 2016-07-16
 
 ### Bots
 
-360Spider, Aboundexbot, Acoon, AddThis.com, aHrefs Bot, Alexa Crawler, Amorank Spider, Analytics SEO Crawler, archive.org bot, Ask Jeeves, Backlink-Ceck.de, BacklinkCrawler, Baidu Spider, BingBot, Blekkobot, BLEXBot Crawler, Bloglovin, Bountii Bot, Browsershots, Butterfly Robot, CareerBot, ccBot crawler, Cliqzbot, CloudFlare Always Online, CommaFeed, Dazoobot, Discobot, DotBot, Easou Spider, EMail Exractor, ExaBot, ExactSeek Crawler, Ezooms, Facebook External Hit, Feedbin, FeedBurner, Feedly, Feedspot, Fever, Genieo Web filter, Goo, Google PageSpeed Insights, Googlebot, Heritrix, HTTPMon, IIS Site Analysis, Kouio, Linkdex Bot, LinkedIn Bot, Mail.Ru Bot, Magpie-Crawler, MagpieRSS, Meanpath Bot, Mixrank Bot, MJ12 Bot, MojeekBot, NalezenCzBot, Netcraft Survey Bot, Netvibes, NewsBlur, NewsGator, NLCrawler, Omgili bot, Openindex Spider, OpenLinkProfiler, OpenWebSpider, PaperLiBot, Picsearch bot, Pingdom Bot, QuerySeekerSpider, Reddit Bot, Rogerbot, Screaming Frog SEO Spider, ScreenerBot, Semrush Bot, Sensika Bot, SEOENGBot, Seznam Bot, ShopWiki, SilverReader, SimplePie, SISTRIX Crawler, Sogou Spider, Soso Spider, Superfeedr Bot, Spinn3r, Sputnik Bot, Survey Bot, TinEye Crawler, Tiny Tiny RSS, TurnitinBot, TweetedTimes Bot, Tweetmeme Bot, Twitterbot, Uptime Robot, URLAppendBot, Visual Site Mapper Crawler, Voila Bot, W3C CSS Validator, W3C I18N Checker, W3C Link Checker, W3C Markup Validation Service, W3C MobileOK Checker, W3C Unified Validator, WeSEE:Search, WebbCrawler, Wotbox, YaCy, Yahoo! Slurp, Yandex Bot, Yeti/Naverbot, Youdao Bot, Yunyun Bot, Zookabot, ZumBot, Yottaa Site Monitor, Lycos, Inktomi Slurp, Speedy, ScoutJet, NetResearchServer, Scooter, Gigabot, Charlotte, Pompos, ichiro, PagePeeker, WebThumbnail, Willow Internet Crawler, EmailWolf, NetLyzer FastProbe, Bot, Nutch-based Bot, Generic Bot
+360Spider, Aboundexbot, Acoon, AddThis.com, ADMantX, aHrefs Bot, Alexa Crawler, Amorank Spider, Analytics SEO Crawler, Applebot, archive.org bot, Ask Jeeves, Backlink-Ceck.de, BacklinkCrawler, Baidu Spider, BazQux Reader, BingBot, Blekkobot, BLEXBot Crawler, Bloglovin, Blogtrottr, Bountii Bot, Browsershots, BUbiNG, Butterfly Robot, CareerBot, ccBot crawler, Charlotte, Cliqzbot, CloudFlare Always Online, CommaFeed, Cốc Cốc Bot, Daum, Dazoobot, Discobot, Domain Re-Animator Bot, DotBot, Easou Spider, EMail Exractor, EmailWolf, ExaBot, ExactSeek Crawler, Ezooms, Facebook External Hit, Feed Wrangler, Feedbin, FeedBurner, Feedly, Feedspot, Fever, Generic Bot, Genieo Web filter, Gigabot, Gluten Free Crawler, Gmail Image Proxy, Goo, Google PageSpeed Insights, Google Partner Monitoring, Googlebot, Heritrix, HTTPMon, HubPages, ICC-Crawler, ichiro, IIS Site Analysis, Inktomi Slurp, Kouio, Larbin web crawler, Linkdex Bot, LinkedIn Bot, LTX71, Lycos, Magpie-Crawler, MagpieRSS, Mail.Ru Bot, Meanpath Bot, Mixrank Bot, MJ12 Bot, MojeekBot, Monitor.Us, NalezenCzBot, Netcraft Survey Bot, NetLyzer FastProbe, NetResearchServer, Netvibes, NewsBlur, NewsGator, NLCrawler, Nutch-based Bot, Omgili bot, Openindex Spider, OpenLinkProfiler, OpenWebSpider, Orange Bot, Outbrain, PagePeeker, PaperLiBot, PHP Server Monitor, Picsearch bot, Pingdom Bot, Pinterest, Pompos, QuerySeekerSpider, Reddit Bot, Rogerbot, ROI Hunter, Scooter, ScoutJet, Scrapy, Screaming Frog SEO Spider, ScreenerBot, Semrush Bot, Sensika Bot, SEOENGBot, Server Density, Seznam Bot, ShopWiki, SilverReader, SimplePie, SISTRIX Crawler, Site24x7 Website Monitoring, Skype URI Preview, Slackbot, Sogou Spider, Soso Spider, Speedy, Spinn3r, Sputnik Bot, Superfeedr Bot, Survey Bot, TelgramBot, TinEye Crawler, Tiny Tiny RSS, TurnitinBot, TweetedTimes Bot, Tweetmeme Bot, Twitterbot, Uptime Robot, URLAppendBot, Visual Site Mapper Crawler, W3C CSS Validator, W3C I18N Checker, W3C Link Checker, W3C Markup Validation Service, W3C MobileOK Checker, W3C Unified Validator, WebbCrawler, WebSitePulse, WebThumbnail, WeSEE:Search, Willow Internet Crawler, Wotbox, YaCy, Yahoo Gemini, Yahoo! Cache System, Yahoo! Link Preview, Yahoo! Slurp, Yandex Bot, Yeti/Naverbot, Yottaa Site Monitor, Youdao Bot, Yourls, Yunyun Bot, Zao, Zookabot, ZumBot
 
 ### Clients
 
-Internet Explorer, Sailfish Browser, Camino, Fennec, MicroB, Avant Browser, Amigo, Bunjalloo, Iceweasel, WebPositive, Pale Moon, CometBird, IceDragon, Flock, Kapiko, Swiftfox, Firefox, ANTGalio, Espial TV Browser, RockMelt, Fireweb Navigator, Netscape, Opera Mobile, Opera Mini, Opera Next, Opera, Rekonq, CoolNovo, Comodo Dragon, ChromePlus, Conkeror, Konqueror, Baidu Browser, Baidu Spark, Yandex Browser, Vivaldi, Midori, Mercury, Maxthon, Puffin, Iron, Epiphany, Liebao, Sogou Explorer, QQ Browser, Chrome Mobile, Chrome Mobile iOS, Chrome Frame, Chromium, Chrome, UC Browser, Tizen Browser, Palm Blazer, Palm Pre, wOSBrowser, Palm WebPro, Jasmine, Lynx, NCSA Mosaic, ABrowse, Amaya, Amiga Voyager, Amiga Aweb, Arora, Beonex, BlackBerry Browser, BrowseX, Charon, Cheshire, Dillo, Dolphin, Elinks, Firebird, Fluid, Galeon, Google Earth, HotJava, IBrowse, iCab, Sleipnir, Lunascape, IE Mobile, Kazehakase, Kindle Browser, K-meleon, Links, Openwave Mobile Browser, OmniWeb, Phoenix, Mobile Silk, MIUI Browser, Nokia Browser, Nokia OSS Browser, Nokia Ovi Browser, NetFront Life, NetFront, NetPositive, Obigo, Off By One, Oregano, Polaris, SEMC-Browser, Shiira, Snowshoe, Sunrise, WeTab Browser, Xiino, Android Browser, Mobile Safari, Safari, Akregator, Apple PubSub, FeedDemon, Feeddler RSS Reader, JetBrains Omea Reader, Liferea, NetNewsWire, NewsBlur Mobile App, NewsBlur, Newsbeuter, Pulp, ReadKit, Reeder, RSS Bandit, RSS Junkie, RSSOwl, Wget, curl, Python Requests, Python urllib, Java, Perl, Banshee, Clementine, iTunes, FlyCast, MediaMonkey, Miro, NexPlayer, Nightingale, QuickTime, Songbird, SubStream, VLC, Winamp, Windows Media Player, XBMC, Stagefright, AndroidDownloadManager, FeedR, WeChat, Sina Weibo, Outlook Express, Microsoft Outlook, Thunderbird, Airmail, Lotus Notes, Barca, Postbox, The Bat!
+360 Browser, 360 Phone Browser, ABrowse, Airmail, Akregator, Amaya, Amiga Aweb, Amiga Voyager, Amigo, Android Browser, AndroidDownloadManager, ANT Fresco, ANTGalio, Apple PubSub, Arora, Atomic Web Browser, Avant Browser, Baidu Browser, Baidu Spark, Banshee, Barca, Beonex, BlackBerry Browser, Boxee, Brave, BrowseX, Bunjalloo, Camino, Charon, Cheshire, Chrome, Chrome Frame, Chrome Mobile, Chrome Mobile iOS, ChromePlus, Chromium, Clementine, Coc Coc, CometBird, Comodo Dragon, Conkeror, CoolNovo, curl, Deepnet Explorer, Dillo, Dolphin, Element Browser, Elinks, Epiphany, Espial TV Browser, Facebook, FeedDemon, Feeddler RSS Reader, FeedR, Fennec, Firebird, Firefox, Fireweb, Fireweb Navigator, Flock, Fluid, FlyCast, Galeon, Google Earth, Google Play Newsstand, Google Plus, Guzzle (PHP HTTP Client), HotJava, IBrowse, iCab, IceDragon, Iceweasel, IE Mobile, Instacast, Internet Explorer, Iron, iTunes, Jasmine, Java, JetBrains Omea Reader, Jig Browser, K-meleon, Kapiko, Kazehakase, Kindle Browser, Kodi, Konqueror, Kylo, LG Browser, Liebao, Liferea, Line, Links, Lotus Notes, LuaKit, Lunascape, Lynx, MailBar, Maxthon, MediaMonkey, Mercury, MicroB, Microsoft Edge, Microsoft Outlook, Midori, Miro, MIUI Browser, Mobile Safari, Mobile Silk, NCSA Mosaic, NetFront, NetFront Life, NetNewsWire, NetPositive, Netscape, Newsbeuter, NewsBlur, NewsBlur Mobile App, NexPlayer, Nightingale, Nokia Browser, Nokia OSS Browser, Nokia Ovi Browser, Obigo, Odyssey Web Browser, Off By One, OmniWeb, ONE Browser, Openwave Mobile Browser, Opera, Opera Mini, Opera Mobile, Opera Next, Oregano, Otter Browser, Outlook Express, Pale Moon, Palm Blazer, Palm Pre, Palm WebPro, Palmscape, Perl, Phoenix, Pinterest, Polaris, Postbox, Puffin, Pulp, Python Requests, Python urllib, QQ Browser, QuickTime, ReadKit, Reeder, Rekonq, RockMelt, RSS Bandit, RSS Junkie, RSSOwl, Safari, Sailfish Browser, Samsung Browser, SEMC-Browser, Seraphic Sraf, Shiira, Sina Weibo, Skyfire, Sleipnir, Snowshoe, Sogou Explorer, Songbird, Stagefright, Stringer, SubStream, Sunrise, SuperBird, Swiftfox, The Bat!, Thunderbird, Tizen Browser, TweakStyle, UC Browser, Vision Mobile Browser, Vivaldi, VLC, WebPositive, WeChat, WeTab Browser, Wget, WhatsApp, Winamp, Windows Media Player, wOSBrowser, XBMC, Xiino, Yandex Browser, YouTube
 
 ### Devices
 
-3Q, Acer, Airness, Alcatel, Amoi, Apple, Archos, Arnova, Asus, Audiovox, Avvio, Axxion, BBK, BangOlufsen, Barnes & Noble, Becker, Beetel, BenQ, BenQ-Siemens, Bird, Blu, Bmobile, Capitel, Cat, Celkon, Cherry Mobile, CnM, Coby Kyros, Compal, ConCorde, Coolpad, Cowon, CreNova, Cricket, Crius Mea, Cube, DMM, Danew, Dbtel, Dell, Denver, Dicam, DoCoMo, Doogee, Dopod, E-Boda, Easypix, Ericsson, Ericy, Evertek, Ezio, Ezze, Fly, Gemini, Gigabyte, Gigaset, Gionee, Google, Gradiente, Grundig, HP, HTC, Haier, Hisense, Huawei, Humax, INQ, Ikea, Infinix, Inkti, Innostream, Intek, Intex, Inverto, Jiayu, Jolla, K-Touch, KDDI, KT-Tech, Karbonn, Kazam, Kindle, Konka, Kyocera, LCT, LG, Lanix, Lava, Lenco, Lenovo, Lexibook, Loewe, Logicom, MEU, Manta Multimedia, MediaTek, Medion, Memup, Metz, MicroMax, Microsoft, Mio, Mitsubishi, Mobistel, Motorola, Mpman, MyPhone, NEC, NGM, Newgen, Nexian, Nikon, Nintendo, Nokia, O2, OPPO, OUYA, Onda, Opsson, Orange, Oysters, PEAQ, Palm, Panasonic, Pantech, Philips, Polaroid, PolyPad, Positivo, Prestigio, Qilive, Qtek, Quechua, RIM, Ramos, Rikomagic, Rover, SFR, Sagem, Samsung, Sanyo, Sega, Selevision, Sendo, Sharp, Siemens, Smart, Smartfren, Softbank, Sony, Spice, Storex, Sumvision, SuperSonic, Symphony, T-Mobile, TCL, TIANYU, TVC, TechniSat, TechnoTrend, Tecno Mobile, Telefunken, Telit, Tesla, Thomson, TiPhone, Tolino, Toplux, Toshiba, Tunisie Telecom, UTStarcom, VK Mobile, Vertu, Vestel, Videocon, Videoweb, ViewSonic, Vitelcom, Voxtel, Web TV, WellcoM, Wiko, Wolder, Wonu, Woxter, Xiaomi, Yuandao, ZTE, Zonda, Zopo, bq, eTouch, i-mate, i-mobile, iBall, iBerry, iKoMo, iTel, phoneOne, teXet
+3Q, Acer, Ainol, Airness, Airties, Alcatel, Allview, Altech UEC, Amazon, Amoi, Apple, Archos, Arnova, ARRIS, Asus, Audiovox, Avvio, Axxion, BangOlufsen, Barnes & Noble, Becker, Beetel, BenQ, BenQ-Siemens, Bird, Blu, Bmobile, Boway, bq, Brondi, Bush, Capitel, Captiva, Carrefour, Casio, Cat, Celkon, Changhong, Cherry Mobile, CnM, Coby Kyros, Compal, ConCorde, Coolpad, Cowon, CreNova, Cricket, Crius Mea, Crosscall, Cube, CUBOT, Danew, Datang, Dbtel, Dell, Denver, Desay, Dicam, DMM, DNS, DoCoMo, Doogee, Doov, Dopod, Dune HD, E-Boda, Easypix, EBEST, ECS, Elephone, Energy Sistem, Ericsson, Ericy, Eton, eTouch, Evertek, Ezio, Ezze, Fairphone, Fly, Foxconn, Fujitsu, Garmin-Asus, Gemini, Gigabyte, Gigaset, Gionee, GOCLEVER, Goly, Google, Gradiente, Grundig, Haier, Hasee, Hi-Level, Hisense, Hosin, HP, HTC, Huawei, Humax, Hyundai, i-Joy, i-mate, i-mobile, iBall, iBerry, Ikea, iKoMo, iNew, Infinix, Inkti, Innostream, INQ, Intek, Intex, Inverto, iOcean, iTel, Jiayu, Jolla, K-Touch, Karbonn, Kazam, KDDI, Kingsun, Komu, Konka, Koobee, KOPO, Koridy, KT-Tech, Kumai, Kyocera, Lanix, Lava, LCT, Le Pan, Lenco, Lenovo, Lexibook, LG, Lingwin, Loewe, Logicom, M.T.T., Majestic, Manta Multimedia, Mecer, Mediacom, MediaTek, Medion, MEEG, Meizu, Memup, Metz, MEU, MicroMax, Microsoft, Mio, Mitsubishi, MLLED, Mobistel, Mofut, Motorola, Mpman, MSI, MyPhone, NEC, Netgear, Newgen, Nexian, NextBook, NGM, Nikon, Nintendo, Noain, Nokia, Nomi, O2, Onda, OnePlus, OPPO, Opsson, Orange, Ouki, OUYA, Overmax, Oysters, Palm, Panasonic, Pantech, PEAQ, Philips, phoneOne, Pioneer, Ployer, Point of View, Polaroid, PolyPad, Pomp, Positivo, Prestigio, ProScan, PULID, Qilive, QMobile, Qtek, Quechua, Ramos, RCA Tablets, Readboy, Rikomagic, RIM, Roku, Rover, Sagem, Samsung, Sanyo, Sega, Selevision, Sencor, Sendo, SFR, Sharp, Siemens, Skyworth, Smart, Smartfren, Softbank, Sony, Spice, Star, Stonex, Storex, Sumvision, SunVan, SuperSonic, Symphony, T-Mobile, TCL, TechniSat, TechnoTrend, Tecno Mobile, Telefunken, Telenor, Telit, Tesco, Tesla, teXet, ThL, Thomson, TIANYU, TiPhone, Tolino, Toplux, Toshiba, Trevi, Tunisie Telecom, Turbo-X, TVC, Uniscope, Unknown, Unowhy, UTStarcom, Vastking, Vertu, Vestel, Videocon, Videoweb, ViewSonic, Vitelcom, Vivo, Vizio, VK Mobile, Vodafone, Voto, Voxtel, Walton, WellcoM, Wexler, Wiko, Wolder, Wonu, Woxter, Xiaomi, Xolo, Yarvik, Ytone, Yuandao, Yusun, Zeemi, Zonda, Zopo, ZTE
 
 ## Maintainers
 

data/Rakefile

@@ -12,12 +12,14 @@ end
 task default: :test
 
 task :detectable_names do
-  bot_names = DeviceDetector::Bot.new.send(:regexes).map { |r| r['name'] }.uniq.sort_by { |n| n.downcase }
+  bot_names = DeviceDetector::Bot.new.send(:regexes).map { |r| r[:name] }.uniq.sort_by { |n| n.downcase }
   bot_names.delete('$1')
-  client_names = DeviceDetector::Client.new.send(:regexes).map { |r| r['name'] }.uniq.sort_by { |n| n.downcase }
+  client_names = DeviceDetector::Client.new.send(:regexes).map { |r| r[:name] }.uniq.sort_by { |n| n.downcase }
   client_names.delete('$1')
-  device_regexes = DeviceDetector::Device.new.send(:load_regexes)
-  device_names = device_regexes.flat_map { |dn| dn.keys }.uniq.sort_by { |n| n.downcase }
+  device = DeviceDetector::Device.new
+  device_paths = device.send(:filepaths)
+  device_regexes = device.send(:load_regexes, device_paths)
+  device_names = device_regexes.flat_map { |dn| dn[1].keys }.uniq.sort_by { |n| n.downcase }
 
   today = Date.today.strftime
 
@@ -39,36 +41,39 @@ task :detectable_names do
   puts
 end
 
-PIWIK_TARBALL_LOCATION = '/tmp/piwik_device_detector.tar.gz'.freeze
+PIWIK_REPO_URL = 'https://github.com/piwik/device-detector.git'.freeze
+PIWIK_CHECKOUT_LOCATION = '/tmp/piwik_device_detector'.freeze
 
-def get_latest_piwik_tarball
-  system "curl -s -L https://api.github.com/repos/piwik/device-detector/tarball/master -o #{PIWIK_TARBALL_LOCATION}"
+def get_latest_piwik_checkout
+  if File.exist?(PIWIK_CHECKOUT_LOCATION)
+    system "cd #{PIWIK_CHECKOUT_LOCATION}; git reset --hard HEAD; git pull origin master"
+  else
+    system "git clone --depth 1 #{PIWIK_REPO_URL} #{PIWIK_CHECKOUT_LOCATION}"
+  end
 end
 
 desc 'update regex database from piwik project'
 task :update_regexes do
   top = File.expand_path('..', __FILE__)
-  get_latest_piwik_tarball
-  system "tar xzvf #{PIWIK_TARBALL_LOCATION} --strip-components 1 --include */regexes/*.yml -C #{top}"
+  get_latest_piwik_checkout
+  system "cp -R #{PIWIK_CHECKOUT_LOCATION}/regexes/* #{top}/regexes"
 end
 
 desc 'update fixtures from piwik project'
 task :update_fixtures do
   top = File.expand_path('..', __FILE__)
-  get_latest_piwik_tarball
+  get_latest_piwik_checkout
 
   fixture_mappings = [
-    # tablet.yml from the detector fixtures is broken: https://github.com/piwik/device-detector/issues/5355
-    #{ local_path: "#{top}/spec/fixtures/detector", archive_path: '*/Tests/fixtures/*.yml', strip_components: 3 },
-    { local_path: "#{top}/spec/fixtures/client", archive_path: '*/Tests/Parser/Client/fixtures/*.yml', strip_components: 5 },
-    { local_path: "#{top}/spec/fixtures/parser", archive_path: '*/Tests/Parser/fixtures/*.yml', strip_components: 4 },
-    { local_path: "#{top}/spec/fixtures/device", archive_path: '*/Tests/Parser/Devices/fixtures/*.yml', strip_components: 5 },
+    {target_path: "#{top}/spec/fixtures/detector", source_path: 'Tests/fixtures/*.yml'},
+    {target_path: "#{top}/spec/fixtures/client", source_path: 'Tests/Parser/Client/fixtures/*.yml'},
+    {target_path: "#{top}/spec/fixtures/parser", source_path: 'Tests/Parser/fixtures/*.yml'},
+    {target_path: "#{top}/spec/fixtures/device", source_path: 'Tests/Parser/Devices/fixtures/*.yml'},
   ]
 
   fixture_mappings.each do |mapping|
-    strip_components = mapping.fetch(:strip_components)
-    archive_path = mapping.fetch(:archive_path)
-    local_path = mapping.fetch(:local_path)
-    system "tar xzvf #{PIWIK_TARBALL_LOCATION} --strip-components #{strip_components} --include #{archive_path} -C #{local_path}"
+    source_path = mapping.fetch(:source_path)
+    target_path = mapping.fetch(:target_path)
+    system "cp -R #{PIWIK_CHECKOUT_LOCATION}/#{source_path} #{target_path}"
   end
 end

data/device_detector.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Precise and fast user agent parser and device detector}
   spec.description   = %q{Precise and fast user agent parser and device detector, backed by the largest and most up-to-date agent and device database}
   spec.homepage      = 'http://podigee.github.io/device_detector'
-  spec.license       = 'LGPLv3'
+  spec.license       = 'LGPL-3.0'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = []

data/lib/device_detector.rb

@@ -47,7 +47,7 @@ class DeviceDetector
   def device_type
     t = device.type
 
-    if t.nil? && android_tablet_fragment?
+    if t.nil? && android_tablet_fragment? || opera_tablet?
       t = 'tablet'
     end
 
@@ -88,8 +88,17 @@ class DeviceDetector
       t = 'tablet'
     end
 
-    # set device type to desktop for all devices running a desktop os that were not detected as an other device type
-    if t.nil? && os.desktop?
+    if opera_tv_store?
+      t = 'tv'
+    end
+
+    if t.nil? && ['Kylo', 'Espial TV Browser'].include?(client.name)
+      t = 'tv'
+    end
+
+    # set device type to desktop for all devices running a desktop os that were
+    # not detected as an other device type
+    if t.nil? && os.desktop? && !puffin_browser?
       t = 'desktop'
     end
 
@@ -165,6 +174,19 @@ class DeviceDetector
     user_agent =~ build_regex('Touch')
   end
 
+  def opera_tv_store?
+    user_agent =~ build_regex('Opera TV Store')
+  end
+
+  def opera_tablet?
+    user_agent =~ build_regex('Opera Tablet')
+  end
+
+  # This is a workaround until we support detecting mobile only browsers
+  def puffin_browser?
+    client.name == 'Puffin'
+  end
+
   def build_regex(src)
     Regexp.new('(?:^|[^A-Z0-9\_\-])(?:' + src + ')', Regexp::IGNORECASE)
   end

data/lib/device_detector/device.rb

@@ -64,7 +64,7 @@ class DeviceDetector
     end
 
     def hbbtv?
-      @regex_hbbtv ||= build_regex('HbbTV/([1-9]{1}(\.[0-9]{1}){1,2})')
+      @regex_hbbtv ||= build_regex('HbbTV/([1-9]{1}(?:\.[0-9]{1}){1,2})')
       user_agent =~ @regex_hbbtv
     end
 

data/lib/device_detector/model_extractor.rb

@@ -3,6 +3,10 @@ class DeviceDetector
 
     def call
       s = super.to_s.gsub('_',' ').strip
+      s = s.gsub(/ TD$/i, '')
+
+      return nil if s == 'Build'
+
       s.empty? ? nil : s
     end
 

data/lib/device_detector/os.rb

@@ -73,6 +73,7 @@ class DeviceDetector
         'LBT' => 'Lubuntu',
         'VLN' => 'VectorLinux',
         'MAC' => 'Mac',
+        'MAE' => 'Maemo',
         'MDR' => 'Mandriva',
         'SMG' => 'MeeGo',
         'MCD' => 'MocorDroid',
@@ -80,6 +81,7 @@ class DeviceDetector
         'MLD' => 'MildWild',
         'MOR' => 'MorphOS',
         'NBS' => 'NetBSD',
+        'MTK' => 'MTK / Nucleus',
         'WII' => 'Nintendo',
         'NDS' => 'Nintendo Mobile',
         'OS2' => 'OS/2',
@@ -89,6 +91,7 @@ class DeviceDetector
         'PS3' => 'PlayStation',
         'RHT' => 'Red Hat',
         'ROS' => 'RISC OS',
+        'REM' => 'Remix OS',
         'RZD' => 'RazoDroiD',
         'SAB' => 'Sabayon',
         'SSE' => 'SUSE',
@@ -101,6 +104,7 @@ class DeviceDetector
         'S40' => 'Symbian OS Series 40',
         'S60' => 'Symbian OS Series 60',
         'SY3' => 'Symbian^3',
+        'TDX' => 'ThreadX',
         'TIZ' => 'Tizen',
         'UBT' => 'Ubuntu',
         'WTV' => 'WebTV',
@@ -120,7 +124,7 @@ class DeviceDetector
     DOWNCASED_OPERATING_SYSTEMS = OPERATING_SYSTEMS.each_with_object({}){|(short,long),h| h[long.downcase] = short}
 
     OS_FAMILIES = {
-        'Android'               => ['AND', 'CYN', 'RZD', 'MLD', 'MCD'],
+        'Android'               => ['AND', 'CYN', 'REM', 'RZD', 'MLD', 'MCD', 'YNS'],
         'AmigaOS'               => ['AMG', 'MOR'],
         'Apple TV'              => ['ATV'],
         'BlackBerry'            => ['BLB', 'QNX'],
@@ -133,10 +137,11 @@ class DeviceDetector
         'IBM'                   => ['OS2'],
         'iOS'                   => ['IOS'],
         'RISC OS'               => ['ROS'],
-        'GNU/Linux'             => ['LIN', 'ARL', 'DEB', 'KNO', 'MIN', 'UBT', 'KBT', 'XBT', 'LBT', 'FED', 'RHT', 'VLN', 'MDR', 'GNT', 'SAB', 'SLW', 'SSE', 'CES', 'BTR', 'YNS', 'SAF'],
+        'GNU/Linux'             => ['LIN', 'ARL', 'DEB', 'KNO', 'MIN', 'UBT', 'KBT', 'XBT', 'LBT', 'FED', 'RHT', 'VLN', 'MDR', 'GNT', 'SAB', 'SLW', 'SSE', 'CES', 'BTR', 'SAF'],
         'Mac'                   => ['MAC'],
         'Mobile Gaming Console' => ['PSP', 'NDS', 'XBX'],
-        'Other Mobile'          => ['WOS', 'POS', 'SBA', 'TIZ', 'SMG'],
+        'Real-time OS'          => ['MTK', 'TDX'],
+        'Other Mobile'          => ['WOS', 'POS', 'SBA', 'TIZ', 'SMG', 'MAE'],
         'Symbian'               => ['SYM', 'SYS', 'SY3', 'S60', 'S40'],
         'Unix'                  => ['SOS', 'AIX', 'HPX', 'BSD', 'NBS', 'OBS', 'DFB', 'SYL', 'IRI', 'T64', 'INF'],
         'WebTV'                 => ['WTV'],

data/lib/device_detector/parser.rb

@@ -71,7 +71,7 @@ class DeviceDetector
     end
 
     def build_regex(src)
-      Regexp.new('(?:^|[^A-Z0-9\_\-])(?:' + src + ')', Regexp::IGNORECASE)
+      Regexp.new('(?:^|[^A-Z0-9\-_]|[^A-Z0-9\-]_|sprd-)(?:' + src + ')', Regexp::IGNORECASE)
     end
 
     def from_cache(key)

data/lib/device_detector/version.rb

@@ -1,3 +1,3 @@
 class DeviceDetector
-  VERSION = '0.8.2'
+  VERSION = '0.9.0'
 end

data/regexes/bots.yml

@@ -29,7 +29,7 @@
     name: 'Acoon GmbH'
     url: 'http://www.acoon.de'
 
-- regex: 'AddThis.com'
+- regex: 'AddThis\.com'
   name: 'AddThis.com'
   category: 'Social Media Agent'
   url: ''
@@ -61,6 +61,14 @@
     name: 'Amorank'
     url: 'http://www.amorank.com'
 
+- regex: 'Applebot'
+  name: 'Applebot'
+  category: 'Crawler'
+  url: 'http://www.apple.com/go/applebot'
+  producer:
+    name: 'Apple Inc'
+    url: 'http://www.apple.com'
+
 - regex: 'Curious George'
   name: 'Analytics SEO Crawler'
   category: 'Crawler'
@@ -69,7 +77,7 @@
     name: 'Analytics SEO'
     url: 'http://www.analyticsseo.com'
 
-- regex: 'archive.org_bot|special_archiver'
+- regex: 'archive\.org_bot|special_archiver'
   name: 'archive.org bot'
   category: 'Crawler'
   url: 'http://www.archive.org/details/archive.org_bot'
@@ -85,7 +93,7 @@
     name: 'Ask Jeeves Inc.'
     url: 'http://www.ask.com'
 
-- regex: 'Backlink-Ceck.de'
+- regex: 'Backlink-Ceck\.de'
   name: 'Backlink-Ceck.de'
   category: 'Crawler'
   url: 'http://www.backlink-check.de/bot.html'
@@ -109,6 +117,14 @@
     name: 'Baidu'
     url: 'http://www.baidu.com'
 
+- regex: 'BazQux'
+  name: 'BazQux Reader'
+  url: 'https://bazqux.com/fetcher'
+  category: 'Feed Fetcher'
+  producer:
+    name: ''
+    url: ''
+
 - regex: 'MSNBot|msrbot|bingbot|BingPreview|msnbot-(UDiscovery|NewsBlogs)|adidxbot'
   name: 'BingBot'
   category: 'Search bot'
@@ -141,6 +157,14 @@
     name: ''
     url: ''
 
+- regex: 'Blogtrottr'
+  name: 'Blogtrottr'
+  url: ''
+  category: 'Feed Fetcher'
+  producer:
+    name: 'Blogtrottr Ltd'
+    url: 'https://blogtrottr.com/'
+
 - regex: 'BountiiBot'
   name: 'Bountii Bot'
   category: 'Search bot'
@@ -157,7 +181,15 @@
     name: 'Browsershots.org'
     url: 'http://browsershots.org'
 
-- regex: '(?<!HTC)[ _]Butterfly'
+- regex: 'BUbiNG'
+  name: 'BUbiNG'
+  category: 'Crawler'
+  url: 'http://law.di.unimi.it/BUbiNG.html'
+  producer:
+    name: ''
+    url: ''
+
+- regex: '(?<!HTC)[ _]Butterfly/'
   name: 'Butterfly Robot'
   category: 'Search bot'
   url: 'http://labs.topsy.com/butterfly'
@@ -197,6 +229,14 @@
     name: 'CloudFlare'
     url: 'http://www.cloudflare.com'
 
+- regex: 'coccoc/'
+  name: 'Cốc Cốc Bot'
+  url: 'http://help.coccoc.com/'
+  category: 'Search bot'
+  producer:
+    name: 'Cốc Cốc'
+    url: 'http://coccoc.com/'
+
 - regex: 'CommaFeed'
   name: 'CommaFeed'
   url: 'http://www.commafeed.com'
@@ -205,6 +245,14 @@
     name: ''
     url: ''
 
+- regex: 'Daum(oa)?[ /][0-9]'
+  name: 'Daum'
+  category: 'Search bot'
+  url: 'http://tab.search.daum.net/aboutWebSearch_en.html'
+  producer:
+    name: 'Daum Communications Corp.'
+    url: 'http://www.kakaocorp.com/main'
+
 - regex: 'Dazoobot'
   name: 'Dazoobot'
   category: 'Search bot'
@@ -221,6 +269,14 @@
     name: 'Discovery Engine'
     url: 'http://discoveryengine.com'
 
+- regex: 'Domain Re-Animator Bot|support@domainreanimator.com'
+  name: 'Domain Re-Animator Bot'
+  category: 'Crawler'
+  url: ''
+  producer:
+    name: 'Domain Re-Animator, LLC'
+    url: 'http://domainreanimator.com'
+
 - regex: 'DotBot'
   name: 'DotBot'
   category: 'Crawler'
@@ -293,6 +349,14 @@
     name: ''
     url: ''
 
+- regex: 'Feed Wrangler'
+  name: 'Feed Wrangler'
+  url: 'https://feedwrangler.net/'
+  category: 'Feed Fetcher'
+  producer:
+    name: 'David Smith & Developing Perspective, LLC'
+    url: 'https://david-smith.org'
+
 - regex: '(Meta)?Feedly(Bot|App)?'
   name: 'Feedly'
   url: 'http://www.feedly.com'
@@ -309,7 +373,7 @@
     name: ''
     url: ''
 
-- regex: 'Fever'
+- regex: 'Fever/[0-9]'
   name: 'Fever'
   url: 'http://feedafever.com/'
   category: 'Feed Fetcher'
@@ -325,6 +389,14 @@
     name: 'Genieo'
     url: 'http://www.genieo.com'
 
+- regex: 'Gluten Free Crawler'
+  name: 'Gluten Free Crawler'
+  category: 'Crawler'
+  url: 'http://glutenfreepleasure.com/'
+  producer:
+    name: ''
+    url: ''
+
 - regex: 'ichiro/mobile goo'
   name: 'Goo'
   category: 'Search bot'
@@ -341,7 +413,23 @@
     name: 'Google Inc.'
     url: 'http://www.google.com'
 
-- regex: 'Googlebot(-Mobile|-Image|-Video|-News)?|Feedfetcher-Google|Google-Test|Google-Site-Verification|Google Web Preview|AdsBot-Google(-Mobile)?|Mediapartners-Google|Google.*/\+/web/snippet|GoogleProducer'
+- regex: 'google_partner_monitoring'
+  name: 'Google Partner Monitoring'
+  category: 'Site Monitor'
+  url: ''
+  producer:
+    name: 'Google Inc.'
+    url: 'http://www.google.com'
+
+- regex: 'via ggpht\.com GoogleImageProxy'
+  name: 'Gmail Image Proxy'
+  category: 'Crawler'
+  url: ''
+  producer:
+    name: 'Google Inc.'
+    url: 'http://www.google.com'
+
+- regex: 'Googlebot(-Mobile|-Image|-Video|-News)?|Feedfetcher-Google|Google-Test|Google-Site-Verification|Google Web Preview|AdsBot-Google(-Mobile)?|Mediapartners-Google|Google.*/\+/web/snippet|GoogleProducer|Google[ -]Publisher[ -]Plugin'
   name: 'Googlebot'
   category: 'Search bot'
   url: 'http://www.google.com/bot.html'
@@ -365,9 +453,17 @@
     name: 'towards GmbH'
     url: 'http://www.towards.ch/'
 
+- regex: 'ICC-Crawler'
+  name: 'ICC-Crawler'
+  category: 'Crawler'
+  url: 'http://www.nict.go.jp/en/univ-com/plan/crawl.html'
+  producer:
+    name: ''
+    url: ''
+
 - regex: 'iisbot'
   name: 'IIS Site Analysis'
-  category: 'crawler'
+  category: 'Crawler'
   url: 'http://www.iis.net/iisbot.html'
   producer:
     name: 'Microsoft Corporation'
@@ -381,7 +477,15 @@
     name: ''
     url: ''
 
-- regex: 'linkdexbot(-mobile)?|linkdex.com'
+- regex: 'larbin'
+  name: 'Larbin web crawler'
+  category: 'Crawler'
+  url: 'http://larbin.sourceforge.net'
+  producer:
+    name: ''
+    url: ''
+
+- regex: 'linkdexbot(-mobile)?|linkdex\.com'
   name: 'Linkdex Bot'
   category: 'Search bot'
   url: 'http://www.linkdex.com/bots'
@@ -397,7 +501,14 @@
     name: 'LinkedIn'
     url: 'http://www.linkedin.com'
 
-- regex: 'Mail.RU(_Bot)?'
+- regex: 'ltx71'
+  name: 'LTX71'
+  url: 'http://ltx71.com/'
+  producer:
+    name: ''
+    url: ''
+
+- regex: 'Mail\.RU(_Bot)?'
   name: 'Mail.Ru Bot'
   category: 'Search bot'
   url: 'http://help.mail.ru/webmaster/indexing/robots/types_robots'
@@ -533,6 +644,14 @@
     name: 'OpenWebSpider Lab'
     url: 'http://lab.openwebspider.org'
 
+- regex: 'OrangeBot|VoilaBot'
+  name: 'Orange Bot'
+  category: 'Search bot'
+  url: 'http://lemoteur.orange.fr'
+  producer:
+    name: 'Orange'
+    url: 'http://www.orange.fr'
+
 - regex: 'PaperLiBot'
   name: 'PaperLiBot'
   category: 'Search bot'
@@ -541,6 +660,14 @@
     name: 'Smallrivers SA'
     url: 'http://www.paper.li'
 
+- regex: 'phpservermon'
+  name: 'PHP Server Monitor'
+  category: 'Site Monitor'
+  url: 'https://github.com/phpservermon/phpservermon'
+  producer:
+    name: 'PHP Server Monitor'
+    url: 'http://www.phpservermonitor.org/'
+
 - regex: 'psbot(-page)?'
   name: 'Picsearch bot'
   category: 'Search bot'
@@ -549,9 +676,9 @@
     name: 'Picsearch'
     url: 'http://www.picsearch.com'
 
-- regex: 'Pingdom.com'
+- regex: 'Pingdom\.com'
   name: 'Pingdom Bot'
-  category: 'Site Monitors'
+  category: 'Site Monitor'
   url: ''
   producer:
     name: 'Pingdom AB'
@@ -581,6 +708,19 @@
     name: 'SEOmoz, Inc.'
     url: 'http://moz.com/'
 
+- regex: 'ROI Hunter'
+  name: 'ROI Hunter'
+  category: 'Crawler'
+  url: ''
+  producer:
+    name: 'Roihunter a.s.'
+    url: 'http://roihunter.com/'
+
+- regex: 'Scrapy'
+  name: 'Scrapy'
+  category: 'Crawler'
+  url: 'http://scrapy.org'
+
 - regex: 'Screaming Frog SEO Spider'
   name: 'Screaming Frog SEO Spider'
   category: 'Crawler'
@@ -621,6 +761,14 @@
     name: 'SEO Engine'
     url: 'http://www.seoengine.com'
 
+- regex: 'SkypeUriPreview'
+  name: 'Skype URI Preview'
+  category: 'Service Agent'
+  url: ''
+  producer:
+    name: 'Skype Communications S.à.r.l.'
+    url: 'https://www.skype.com'
+
 - regex: 'SeznamBot|SklikBot|Seznam screenshot-generator'
   name: 'Seznam Bot'
   category: 'Search bot'
@@ -661,6 +809,14 @@
     name: 'SISTRIX GmbH'
     url: 'http://www.sistrix.de'
 
+- regex: 'Slackbot|Slack-ImgProxy'
+  name: 'Slackbot'
+  category: 'Crawler'
+  url: 'https://api.slack.com/robots'
+  producer:
+    name: 'Slack Technologies'
+    url: 'http://slack.com'
+
 - regex: '(Sogou (web|inst|Pic) spider)|New-Sogou-Spider'
   name: 'Sogou Spider'
   category: 'Search bot'
@@ -709,6 +865,10 @@
     name: 'Domain Tools'
     url: 'http://www.domaintools.com'
 
+- regex: 'TelegramBot'
+  name: 'TelgramBot'
+  url: 'https://telegram.org/blog/bot-revolution'
+
 - regex: 'TinEye-bot'
   name: 'TinEye Crawler'
   category: 'Search bot'
@@ -781,14 +941,6 @@
     name: 'Alentum Software Ltd.'
     url: 'http://www.alentum.com'
 
-- regex: 'VoilaBot'
-  name: 'Voila Bot'
-  category: 'Search bot'
-  url: 'http://www.voila.fr'
-  producer:
-    name: ''
-    url: ''
-
 - regex: 'Jigsaw'
   name: 'W3C CSS Validator'
   category: 'Validator'
@@ -853,6 +1005,14 @@
     name: 'Steve Webb'
     url: 'http://badcheese.com'
 
+- regex: 'websitepulse[+ ]checker'
+  name: 'WebSitePulse'
+  category: 'Site Monitor'
+  url: 'http://badcheese.com/crawler.html'
+  producer:
+    name: 'WebSitePulse'
+    url: 'http://www.websitepulse.com/'
+
 - regex: 'Wotbox'
   name: 'Wotbox'
   category: 'Search bot'
@@ -877,7 +1037,23 @@
     name: 'Yahoo! Inc.'
     url: 'http://www.yahoo.com'
 
-- regex: 'Yandex(Bot|Images|Antivirus|Direct|Blogs|Favicons|ImageResizer|News(links)?|Metrika|.Gazeta Bot)'
+- regex: 'Yahoo Link Preview|Yahoo:LinkExpander:Slingstone'
+  name: 'Yahoo! Link Preview'
+  category: 'Crawler'
+  url: 'https://help.yahoo.com/kb/mail/yahoo-link-preview-SLN23615.html'
+  producer:
+    name: 'Yahoo! Inc.'
+    url: 'http://www.yahoo.com'
+
+- regex: 'YahooCacheSystem'
+  name: 'Yahoo! Cache System'
+  category: 'Crawler'
+  url: ''
+  producer:
+    name: 'Yahoo! Inc.'
+    url: 'http://www.yahoo.com'
+
+- regex: 'Yandex(Bot|Images|Antivirus|Direct|Blogs|Favicons|ImageResizer|News(links)?|Metrika|\.Gazeta Bot)|YaDirectFetcher'
   name: 'Yandex Bot'
   category: 'Search bot'
   url: 'http://www.yandex.com/bots'
@@ -901,6 +1077,11 @@
     name: 'NetEase, Inc.'
     url: 'http://corp.163.com'
 
+- regex: 'YOURLS v[0-9]'
+  name: 'Yourls'
+  category: 'Crawler'
+  url: 'http://yourls.org'
+
 - regex: 'YRSpider|YYSpider'
   name: 'Yunyun Bot'
   category: 'Search bot'
@@ -957,7 +1138,7 @@
     name: 'HubPages'
     url: 'http://hubpages.com/'
 
-- regex: 'Pinterest/\d\.\d.*www.pinterest.com.*'
+- regex: 'Pinterest/\d\.\d.*www\.pinterest\.com.*'
   name: 'Pinterest'
   url: ''
   category: 'Crawler'
@@ -973,7 +1154,7 @@
     name: 'Site24x7'
     url: 'https://www.site24x7.com'
 
-- regex: 'www.monitor.us'
+- regex: 'www\.monitor\.us'
   name: 'Monitor.Us'
   category: 'Site Monitor'
   url: 'http://www.monitor.us'
@@ -981,6 +1162,9 @@
     name: 'Monitor.Us'
     url: 'http://www.monitor.us'
 
+- regex: 'Zao/'
+  name: 'Zao'
+  category: 'Crawler'
 
 - regex: 'lycos'
   name: 'Lycos'
@@ -1027,24 +1211,24 @@
 - regex: 'NetLyzer FastProbe'
   name: 'NetLyzer FastProbe'
 
-- regex: 'AdMantX.*admantx.com'
+- regex: 'AdMantX.*admantx\.com'
   name: 'ADMantX'
 
 - regex: 'Server Density Service Monitoring.*'
   name: 'Server Density'
 
-- regex: '(nuhk|TsolCrawler|Yammybot|Openbot|Gulper Web Bot|grub-client|Download Demon|SearchExpress|Microsoft URL Control|borg|altavista|teoma|blitzbot|oegp|furlbot|http%20client|polybot|htdig|mogimogi|larbin|scrubby|searchsight|seekbot|semanticdiscovery|snappy|vortex|zao|zeal|fast-webcrawler|converacrawler|dataparksearch|findlinks|BrowserMob|HttpMonitor|ThumbShotsBot|URL2PNG|ZooShot|GomezA|Catchpoint bot|Google SketchUp|Read%20Later|Minimo|RackspaceBot)'
-  name: 'Bot'
+- regex: '(A6-Indexer|nuhk|TsolCrawler|Yammybot|Openbot|Gulper Web Bot|grub-client|Download Demon|SearchExpress|Microsoft URL Control|borg|altavista|teoma|blitzbot|oegp|furlbot|http%20client|polybot|htdig|mogimogi|larbin|scrubby|searchsight|seekbot|semanticdiscovery|snappy|vortex(?! Build)|zeal|fast-webcrawler|converacrawler|dataparksearch|findlinks|BrowserMob|HttpMonitor|ThumbShotsBot|URL2PNG|ZooShot|GomezA|Catchpoint bot|Google SketchUp|Read%20Later|Minimo|RackspaceBot)'
+  name: 'Generic Bot'
 
 # Generic detections
 
 - regex: 'Nutch'
   name: 'Nutch-based Bot'
-  category: 'crawler'
+  category: 'Crawler'
   url: 'https://nutch.apache.org'
   producer:
     name: 'The Apache Software Foundation'
     url: 'http://www.apache.org/foundation/'
 
-- regex: '[a-z0-9\-_]*(bot|crawler|archiver|transcoder|spider)'
+- regex: '[a-z0-9\-_]*((?<!cu)bot|crawler|archiver|transcoder|spider)([^a-z]|$)'
   name: 'Generic Bot'