browser 1.1.0 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75600634f8811452d7529a87b2ec72a2db30bc06
-  data.tar.gz: ce2d4b9e533326ec90643ab3d5dc72bb3b9ad07c
+  metadata.gz: f578d8090bda26ced6964ce2894e545b7a10e5a6
+  data.tar.gz: e8b3f2a1f6b5f0052af82f531284a6f9bfa25042
 SHA512:
-  metadata.gz: ea36b6d309a509c4958fe71c5a2f4f737a6f492cfcfa8cc7ddd5a646bdb319c2866f7dac0cce50ce498e4ff92408c4220d03424e190edfff35ce2b1d10917e51
-  data.tar.gz: 7a76ff7c859256f547cdb19733fa59d71ad8a49d9cfa615f0906d4845a9b996bbe44156399aa3747b5ddbc159581c99155f5778982aaaf5b33b1b4b8807278fe
+  metadata.gz: 5ac0365b335f80c2e460c80990523b928ee88e413ad47f9b52f47d5778e3ef12fe001b0f6f357d45c574ae6bb5503b248062273aa7b261da14638ee1dbff032e
+  data.tar.gz: 0269de18d4aeffa748e7752279579b505e2d1025a70c149421496caa227196e7b97fb8b1629cacbe597667a3aaa4ecc8ddc42127b21476f227727b37d82d53ce

data/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_BIN: bin

data/.hound.yml

@@ -1,3 +1,21 @@
+Style/ClassCheck:
+  EnforcedStyle: kind_of?
+
+Metrics/LineLength:
+  Max: 80
+
+Style/BlockDelimiters:
+  Enabled: false
+
+Style/RegexpLiteral:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Style/PerlBackrefs:
+  Enabled: false
+
 ClassLength:
   Enabled: false
 
@@ -68,12 +86,6 @@ DoubleNegation:
 SpaceInsideBlockBraces:
   SpaceBeforeBlockParameters: false
 
-LineLength:
-  Max: 130
-
-RegexpLiteral:
-  MaxSlashes: 0
-
 SpaceInsideHashLiteralBraces:
   Enabled: false
 
@@ -88,3 +100,11 @@ PercentLiteralDelimiters:
     '%w': '[]'
     '%W': '[]'
     '%x': '[]'
+
+Style/CollectionMethods:
+  PreferredMethods:
+    collect: 'map'
+    collect!: 'map!'
+    inject: 'reduce'
+    detect: 'find'
+    find_all: 'select'

data/.rubocop.yml

@@ -1,3 +1,21 @@
+Style/ClassCheck:
+  EnforcedStyle: kind_of?
+
+Metrics/LineLength:
+  Max: 80
+
+Style/BlockDelimiters:
+  Enabled: false
+
+Style/RegexpLiteral:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Style/PerlBackrefs:
+  Enabled: false
+
 ClassLength:
   Enabled: false
 
@@ -68,12 +86,6 @@ DoubleNegation:
 SpaceInsideBlockBraces:
   SpaceBeforeBlockParameters: false
 
-LineLength:
-  Max: 130
-
-RegexpLiteral:
-  MaxSlashes: 0
-
 SpaceInsideHashLiteralBraces:
   Enabled: false
 
@@ -88,3 +100,11 @@ PercentLiteralDelimiters:
     '%w': '[]'
     '%W': '[]'
     '%x': '[]'
+
+Style/CollectionMethods:
+  PreferredMethods:
+    collect: 'map'
+    collect!: 'map!'
+    inject: 'reduce'
+    detect: 'find'
+    find_all: 'select'

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+# Changelog
+
+## v2.0.0 [unreleased]
+
+- `Browser#platform` now returns instance of `Browser::Platform`, instead of a `String`. It contains information about the platform (software).
+- `Browser#device` was added. It returns information about the device (hardware).
+- `Browser#accept_language` now returns a list of `Browser::AcceptLanguage` objects.
+- `Browser#bot` now returns a `Browser::Bot` instance.
+- Safari running as web app mode is not recognized as Safari anymore.
+- [List of all commits since last release](https://github.com/fnando/browser/compare/v1.1.0...v2.0.0)

data/README.md

@@ -15,50 +15,108 @@ gem install browser
 ## Usage
 
 ```ruby
-require "rubygems"
 require "browser"
 
-browser = Browser.new(:ua => "some string", :accept_language => "en-us")
-browser.name            # readable browser name
-browser.version         # major version number
-browser.full_version
-browser.safari?
-browser.ios?
-browser.app?      # request performed by ios' app webview 
-browser.opera?
+browser = Browser.new("Some User Agent", accept_language: "en-us")
+
+# General info
+browser.bot?
 browser.chrome?
-browser.chrome_os?
-browser.mobile?
-browser.tablet?
-browser.console?
+browser.core_media?
+browser.edge?           # Newest MS browser
 browser.firefox?
+browser.full_version
 browser.ie?
-browser.ie?(6)          # detect specific IE version
-browser.edge?           # Newest MS browser
-browser.modern?         # Webkit, Firefox 17+, IE 9+ and Opera 12+
-browser.platform        # return :mac, :windows, :linux or :other
-browser.ios?            # detect iOS
-browser.ios?(9)         # detect specific iOS version
-browser.mac?
-browser.windows?
-browser.windows_x64?
-browser.linux?
-browser.blackberry?
-browser.blackberry?(10) # detect specific BlackBerry version
-browser.bot?
-browser.search_engine?
+browser.ie?(6)               # detect specific IE version
+browser.ie?([">8", "<10"])   # detect specific IE (IE9).
+browser.known?               # has the browser been successfully detected?
+browser.meta                 # an array with several attributes
+browser.modern?              # Webkit, Firefox 17+, IE 9+ and Opera 12+
+browser.name                 # readable browser name
+browser.nokia?
+browser.opera?
+browser.opera_mini?
 browser.phantom_js?
 browser.quicktime?
-browser.core_media?
-browser.silk?
-browser.android?
-browser.android?(4.2)   # detect Android Jelly Bean 4.2
-browser.known?          # has the browser been successfully detected?
-browser.meta            # an array with several attributes
+browser.safari?
+browser.safari_webapp_mode?
 browser.to_s            # the meta info joined by space
-```
+browser.uc_browser?
+browser.version         # major version number
+browser.webkit?
+browser.webkit_full_version
+browser.yandex?
+
+# Get bot info
+browser.bot.name
+browser.bot.search_engine?
+browser.bot?
 
-See the [tests](https://github.com/fnando/browser/blob/master/test/browser_test.rb) and [implementation](https://github.com/fnando/browser/blob/master/lib/browser.rb) for more examples.
+# Get device info
+browser.device
+browser.device.id
+browser.device.name
+browser.device.blackberry_playbook?
+browser.device.console?
+browser.device.ios?
+browser.device.ipad?
+browser.device.iphone?
+browser.device.ipod_touch?
+browser.device.kindle?
+browser.device.kindle_fire?
+browser.device.mobile?
+browser.device.nintendo?
+browser.device.playstation?
+browser.device.ps3?
+browser.device.ps4?
+browser.device.psp?
+browser.device.silk?
+browser.device.surface?
+browser.device.tablet?
+browser.device.tv?
+browser.device.vita?
+browser.device.wii?
+browser.device.wiiu?
+browser.device.xbox?
+browser.device.xbox_360?
+browser.device.xbox_one?
+
+# Get platform info
+browser.platform
+browser.platform.id
+browser.platform.name
+browser.platform.version  # e.g. 9 (for iOS9)
+browser.platform.adobe_air?
+browser.platform.android?
+browser.platform.android?(4.2)   # detect Android Jelly Bean 4.2
+browser.platform.blackberry?
+browser.platform.blackberry?(10) # detect specific BlackBerry version
+browser.platform.chrome_os?
+browser.platform.firefox_os?
+browser.platform.ios?     # detect iOS
+browser.platform.ios?(9)  # detect specific iOS version
+browser.platform.ios_app?
+browser.platform.ios_webview?
+browser.platform.ios_webview? # request performed by ios' app webview 
+browser.platform.linux?
+browser.platform.mac?
+browser.platform.other?
+browser.platform.windows10?
+browser.platform.windows7?
+browser.platform.windows8?
+browser.platform.windows8_1?
+browser.platform.windows?
+browser.platform.windows_mobile?
+browser.platform.windows_phone?
+browser.platform.windows_rt?
+browser.platform.windows_touchscreen_desktop?
+browser.platform.windows_vista?
+browser.platform.windows_wow64?
+browser.platform.windows_x64?
+browser.platform.windows_x64?
+browser.platform.windows_x64_inclusive?
+browser.platform.windows_xp?
+```
 
 ### What defines a modern browser?
 
@@ -95,6 +153,36 @@ This adds a helper method called `browser`, that inspects your current user agen
 <% end %>
 ```
 
+### Accept Language
+
+Parses the accept-language header from an HTTP request and produces an array of language objects sorted by quality.
+
+```ruby
+browser = Browser.new("Some User Agent", accept_language: "en-us")
+
+browser.accept_language.class
+#=> Array
+
+language = browser.accept_language.first
+
+language.code
+#=> "en"
+
+language.region
+#=> "US"
+
+language.full
+#=> "en-US"
+
+language.quality
+#=> 1.0
+
+language.name
+#=> "English/United States"
+```
+
+Result is always sorted in quality order from highest -> lowest. as per the HTTP spec, omitting the quality value implies 1.0.
+
 ### Internet Explorer
 
 Internet Explorer has a compatibility view mode that allows newer versions (IE8+) to run as an older version. Browser will always return the navigator version, ignoring the compatibility view version, when defined. If you need to get the engine's version, you have to use `Browser#msie_version` and `Browser#msie_full_version`.
@@ -123,12 +211,30 @@ browser.modern?
 
 This behavior changed in `v1.0.0`; previously there wasn't a way of getting the real browser version.
 
+### Safari
+
+iOS webviews and web apps aren't detect as Safari anymore, so be aware of that if that's your case. You can use a combination of platform and webkit detection to do whatever you want.
+
+```ruby
+# iPad's Safari running as web app mode.
+browser = Browser.new("Mozilla/5.0 (iPad; U; CPU OS 3_2_1 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Mobile/7B405")
+
+browser.safari?
+#=> false
+
+browser.webkit?
+#=> true
+
+browser.platform.ios?
+#=> true
+```
+
 ### Bots
 
-Browser used to detect empty user agents as bots, but this behaviour has changed. If you want to bring this detection back, you can activate it through the following call:
+Browser used to detect empty user agents as bots, but this behavior has changed. If you want to bring this detection back, you can activate it through the following call:
 
 ```ruby
-Browser::Bots.detect_empty_ua!
+Browser::Bot.detect_empty_ua!
 ```
 
 ### Middleware
@@ -153,22 +259,52 @@ Notice that you can have multiple conditionals.
 
 ```ruby
 Rails.configuration.middleware.use Browser::Middleware do
-  next if browser.search_engine?
+  next if browser.bot.search_engine?
   redirect_to upgrade_path(browser: "oldie") if browser.ie? && !browser.modern?
   redirect_to upgrade_path(browser: "oldfx") if browser.firefox? && !browser.modern?
 end
 ```
 
-If you need acccess to the `Rack::Request` object (e.g. to exclude a path), you can do so with `request`.
+If you need access to the `Rack::Request` object (e.g. to exclude a path), you can do so with `request`.
+
 ```ruby
 Rails.configuration.middleware.use Browser::Middleware do
-  redirect_to upgrade_path unless browser.modern? || request.env['PATH_INFO'] == '/exclude_me'
+  redirect_to upgrade_path unless browser.modern? || request.env["PATH_INFO"] == "/exclude_me"
 end
 ```
 
+## Development
+
+If you want to contribute to this project, just follow the tips below.
+
+To configure your environment, you must have Ruby and bundler installed. Then run `bundle install` to install all dependencies.
+
+To run tests, execute `./bin/rake`.
+
+### Adding new features
+
+Before using your time to code a new feature, open a ticket asking if it makes sense and if it's on this project's scope.
+
+#### Adding a new bot
+
+1. Add the user agent to `test/ua_bots.yml`.
+2. Add the readable name to `bots.yml`. The key must be something that matches the user agent, in lowercased text.
+3. Run tests.
+
+#### Adding a new search engine
+
+1. Add the user agent to `test/ua_search_engines.yml`.
+2. Add the same user agent to `test/ua_bots.yml`.
+3. Add the readable name to `search_engines.yml`. The key must be something that matches the user agent, in lowercased text.
+4. Run tests.
+
+#### Wrong browser detection
+
+Follow the instructions of [CONTRIBUTING.md](https://github.com/fnando/browser/blob/master/CONTRIBUTING.md).
+
 ## Maintainer
 
-* Nando Vieira - http://nandovieira.com.br
+* Nando Vieira - http://nandovieira.com
 
 ## Contributors
 

data/Rakefile

@@ -22,4 +22,4 @@ task "spec:all" do
   end
 end
 
-task :default => "spec"
+task default: "spec"

data/bin/rake

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bot_exceptions.yml

@@ -0,0 +1 @@
+- ruby build

data/bots.yml

@@ -1,230 +1,226 @@
-200PleaseBot: "200PleaseBot (200please.com/bot)"
-360Spider: "360Spider"
-abot: "CrawlDaddy, abot (code.google.com/p/abot)"
-AddThis: "AddThis"
-ADmantX: "ADmantX Platform Semantic Analyzer"
-AdsBot-Google: "Google Adwords"
-AdvBot: "AdvBot (advbot.net/bot.htmlm, advbot.org/bot.html)"
-AhrefsBot: "Ahrefs backlinks research tool"
+200pleasebot: "200PleaseBot"
+360spider: "360Spider"
+abot: "CrawlDaddy, abot"
+addthis: "AddThis"
+admantx: "ADmantX Platform Semantic Analyzer"
+adsbot-google: "Google Adwords"
+advbot: "AdvBot"
+ahrefsbot: "Ahrefs backlinks research tool"
 alexa: "Alexa Crawler"
-Apache-HttpClient: "Java http library"
-ApacheBench: "ApacheBench (ab)"
-AppEngine-Google: "Google App Engine"
-Applebot: "Apple Bot"
+apache-httpclient: "Java http library"
+apachebench: "ApacheBench (ab)"
+appengine-google: "Google App Engine"
+applebot: "Apple Bot"
 archive.org_bot: "Internet Archive (archive.org)"
-Ask Jeeves: "Ask Jeeves"
-AsyncHttpClient: "Java http and WebSocket client library"
+ask jeeves: "Ask Jeeves"
+asynchttpclient: "Java http and WebSocket client library"
 awe.sm: "Awe.sm URL expander"
-Baidu: "baidu"
-Baiduspider: "Chinese search engine"
-BDCbot: "Big Data Corp (ecommerce.bigdatacorp.com.br/faq.aspx)"
+baidu: "Baidu"
+bdcbot: "Big Data Corp"
 bingbot: "Microsoft bing bot"
 bitlybot: "bit.ly bot"
-Blekkobot: "Blekkobot (blekko.com/about/blekkobot)"
-BLEXBot: "webmeup-crawler.com"
+blekkobot: "Blekkobot"
+blexbot: "BLEXBot (webmeup)"
 bot@linkfluence.net: "Linkfluence bot"
-BufferBot: "BufferBot"
-BuiBui-CheckBot: "email: buibui[at]dadapro[dot]com"
-Butterfly: "Topsy Labs"
+bufferbot: "BufferBot"
+buibui-checkbot: "buibui"
+butterfly: "Topsy Labs"
 buzztalk: "buzztalk"
-CatchBot: "CatchBot (catchbot.com)"
+catchbot: "CatchBot (catchbot.com)"
 check_http: "Nagios monitor"
-Cliqzbot: "Cliqzbot (cliqz.com/company/cliqzbot)"
-CMRadar/0.1: "CMRadar/0.1"
-ColdFusion: "ColdFusion http library"
-Comodo-Webinspector-Crawler: "Comodo (comodorobot.com)"
-Crowsnest: "Crowsnest"
+cliqzbot: "Cliqzbot"
+cmradar/0.1: "CMRadar/0.1"
+coldfusion: "ColdFusion http library"
+comodo-webinspector-crawler: "Comodo"
+crowsnest: "Crowsnest"
 curabot: "cura.yt"
 curl: "curl unix CLI http client"
-DAP/NetHTTP: "DAP/NetHTTP"
+dap/nethttp: "DAP/NetHTTP"
 datagnionbot: "datagnion.com/bot.html"
-Daumoa: "Korean portal and search engine indexing bot"
+daumoa: "Korean portal and search engine indexing bot"
 developers.google.com/+/web/snippet/: "Google Plus"
-diffbot: "Diffbot (diffbot.com)"
-DigitalPersona Fingerprint Software: "HP Fingerprint scanner"
-Domain Re-Animator Bot: "Domain Re-Animator Bot (http://domainreanimator.com) - support@domainreanimator.com"
-domainsbot: "DomainsBot (domainsbot.com)"
-DomainTunoCrawler: "DomainTuno (domaintuno.com/robot)"
-DotBot: "Dot Bot"
-DuckDuckBot: "Duck Duck Go"
-DuckDuckGo: "Duck Duck Go"
-Embedly: "Embedly"
-EOAAgent: "EOAAgent"
-EventMachine HttpClient: "Ruby http library"
-EveryoneSocialBot: "EveryoneSocial (everyonesocial.com)"
-EvriNid: "Evri bot"
-Exabot: "Exalead's bot"
-ExaleadCloudView: "ExaleadCloudView"
+diffbot: "Diffbot"
+digitalpersona fingerprint software: "HP Fingerprint scanner"
+domain re-animator bot: "Domain Re-Animator Bot"
+domainsbot: "DomainsBot"
+domaintunocrawler: "DomainTuno"
+dotbot: "Dot Bot"
+duckduck: "Duck Duck Go"
+embedly: "Embedly"
+eoaagent: "EOAAgent"
+eventmachine httpclient: "Ruby http library"
+everyonesocialbot: "EveryoneSocial"
+evrinid: "Evri bot"
+exabot: "Exalead's bot"
+exaleadcloudview: "ExaleadCloudView"
 facebookexternalhit: "Facebook Bot"
-Facebot: "Facebook Bot"
-FeedBurner: "RSS bot"
-Feedfetcher-Google: "Google Feedfetcher"
-Findxbot: "Findxbot (http://www.findxbot.com)"
-FlipboardProxy: "FlipboardProxy"
-FriendFeedBot: "FriendFeed (friendfeed.com/about/bot)"
-Genieo: "Genieo Web filter bot"
+facebot: "Facebook Bot"
+feedburner: "RSS bot"
+feedfetcher-google: "Google Feedfetcher"
+findxbot: "Findxbot"
+flipboardproxy: "FlipboardProxy"
+friendfeedbot: "FriendFeed"
+genieo: "Genieo Web filter bot"
 getprismatic.com: "getprismatic.com"
-Gigabot: "Gigabot spider"
-Gimme60bot: "Gimme60 (gimme60.com)"
+gigabot: "Gigabot spider"
 gimme60bot: "Gimme60 (gimme60.com)"
-GimmeUSAbot: "Gimme60 (gimme60.com)"
-Go http package: "Go http library"
-Google Page Speed Insights: "Google Page Speed Insights"
-Google Web Preview: "Google Instant Previews crawler"
-Googlebot: "Google spider"
-GrapeshotCrawler: "Mozilla/5.0 (compatible; GrapeshotCrawler/2.0; +http://www.grapeshot.co.uk/crawler.php)"
-Gravitybot: "Gravitybot (gravity.com)"
-Hatena::Bookmark: "Hatena::Bookmark"
+gimmeusabot: "Gimme60 (gimme60.com)"
+go http package: "Go http library"
+google page speed insights: "Google Page Speed Insights"
+google Web Preview: "Google Instant Previews crawler"
+googlebot: "Google Bot"
+grapeshotcrawler: "GrapeshotCrawler"
+gravitybot: "Gravity Bot"
+hatena::bookmark: "Hatena::Bookmark"
 heritrix: "heritrix"
-HTMLParser: "HTMLParser"
-HTTP_Request2: "HTTP_Request2"
-HTTPClient: "HTTPClient"
+htmlparser: "HTMLParser"
+http_request2: "HTTP_Request2"
+httpclient: "HTTPClient"
 https://developers.google.com/+/web/snippet: "Google+ Snippet Fetcher"
-HubSpot: "HubSpot"
+hubspot: "HubSpot"
 ia_archiver: "Internet Archive (WayBackMachine)"
-iCoreService: "iCoreService"
+icoreservice: "iCoreService"
 idmarch: "idmarch.org/bot.html"
-InAGist: "URL resolver"
-Insieve: "Insieve Bot"
-Insitesbot: "Insitesbot"
-Instapaper: "Instapaper"
-IstellaBot: "IstellaBot"
+inagist: "URL resolver"
+insieve: "Insieve Bot"
+insitesbot: "Insitesbot"
+instapaper: "Instapaper"
+istellabot: "IstellaBot"
 jack: "jack"
-Jakarta Commons: "Jakarta Commons HttpClient"
-Java: "Generic Java http library"
-Jetslide: "Jetslide"
-JS-Kit: "URL resolver"
-Kemvibot: "Kemvi (kemvi.com)"
-Kimengi: "Kimengi/nineconnections.com bot"
+jakarta commons: "Jakarta Commons HttpClient"
+java: "Generic Java http library"
+jetslide: "Jetslide"
+js-kit: "URL resolver"
+kemvibot: "Kemvi"
+kimengi: "Kimengi Bot"
 knows.is: "knows.is"
-Kojitsubot: "Kojitsubot"
-KomodiaBot: "KomodiaBot"
+kojitsubot: "Kojitsubot"
+komodiabot: "KomodiaBot"
 kraken: "kraken"
-Laconica: "Laconica"
-libwww-perl: "Perl client-server library loved by script kids"
-Lijit Crawler: "Lijit (lijit.com/robot/crawler)"
+laconica: "Laconica"
+libwww-perl: "Perl client-server library"
+lijit crawler: "Lijit"
 linkdexbot: "Linkdex Bot"
-LinkedInBot: "LinkedIn"
-LinksCrawler: "LinksCrawler"
-Linode: "Linode Longview"
-Lipperhey: "Lipperhey"
-Livelapbot: "Livelapbot"
-LoadTimeBot: "Load Time Bot"
-LongURL: "URL expander service"
-Lumibot: "Lumibot"
-lwp-trivial: "Another Perl library loved by script kids"
+linkedinbot: "LinkedIn"
+linkscrawler: "LinksCrawler"
+linode: "Linode Longview"
+lipperhey: "Lipperhey"
+livelapbot: "Livelapbot"
+loadtimebot: "Load Time Bot"
+longurl: "URL expander service"
+lumibot: "Lumibot"
+lwp-trivial: "Another Perl library"
 magpie-crawler: "magpie-crawler"
-Mail.RU_Bot: "Mail.ru Bot"
-meanpathbot: "meanpath (meanpath.com)"
-Mediapartners-Google: "Google Adsense bot"
-MegaIndex.ru: "Mozilla/5.0 (compatible; MegaIndex.ru/2.0; +https://www.megaindex.ru/?tab=linkAnalyze)"
-memoryBot: "mignify.com/bot.html"
+mail.ru_bot: "Mail.ru Bot"
+meanpathbot: "meanpath"
+mediapartners-google: "Google Adsense bot"
+megaindex.ru: "MegaIndex"
 memorybot: "mignify.com/bot.html"
-MetaURI: "MetaURI"
-MFE_expand: "Mcafee spider"
-MIR web crawler: "MIR web crawler (mirproject15@gmail.com)"
-MJ12bot: "Majestic-12 spider"
-MojeekBot: "Mojeek UK search crawler"
-MS Search 6.0 Robot: "MS Search 6.0 Robot"
+metauri: "MetaURI"
+mfe_expand: "Mcafee spider"
+mir web crawler: "MIR web crawler"
+mj12bot: "Majestic-12 spider"
+mojeekbot: "Mojeek UK search crawler"
+ms search 6.0 robot: "MS Search 6.0 Robot"
 msnbot: "Microsoft bot"
-NerdyBot: "NerdyBot"
-netState: "netEstate NE Crawler"
-Netvibes: "Personalized dashboard bot"
-NetzCheckBot: "bot@netzcheck.com"
-NewRelicPinger: "NewRelic monitor"
+nerdybot: "NerdyBot"
+netstate: "netEstate NE Crawler"
+netvibes: "Personalized dashboard bot"
+netzcheckbot: "netzcheck"
+newrelicpinger: "NewRelic monitor"
 newsme: "newsme"
 niki-bot: "niki-bot"
-NING: "NING - Yet Another Twitter Swarmer"
-Nutch: "Apache search spider"
-OpenHoseBot: "OpenHoseBot (http://www.openhose.org/bot.html)"
-OrangeBot: "OrangeBot (support.orangebot@orange.com)"
-PagesInventory: "pagesinventory.com"
-Panopta: "Monitoring service"
-PaperLiBot: "PaperLi is another content curation service"
+ning: "NING - Yet Another Twitter Swarmer"
+nutch: "Apache search spider"
+openhosebot: "OpenHoseBot"
+orangebot: "OrangeBot"
+pagesinventory: "pagesinventory.com"
+panopta: "Monitoring service"
+paperlibot: "PaperLi"
 peerindex: "peerindex"
-PercolateCrawler: "PercolateCrawler"
-PerfectMarketKWTbot: "PerfectMarket (perfectmarket.com)"
-PhantomJS: "PhantomJS"
-Pingdom: "Pingdom monitoring"
-Pinterest: "Pinterest"
-Plukkie: "botje.com/plukkie.htm"
-psbot-page: "picsearch.com/bot.html"
+percolatecrawler: "PercolateCrawler"
+perfectmarketkwtbot: "PerfectMarket"
+phantomjs: "PhantomJS"
+pingdom: "Pingdom monitoring"
+pinterest: "Pinterest"
+plukkie: "botje.com/plukkie.htm"
+psbot-page: "Picsearch"
 publiclibraryarchive.org: "publiclibraryarchive.org"
-PycURL: "Python http library"
-Python-httplib2: "Python-httplib2"
+pycurl: "Python http library"
+python-httplib2: "Python-httplib2"
 python-requests: "Python http library"
-Python-urllib: "Python http library"
-QuerySeeker: "QuerySeekerSpider ( http://queryseeker.com/bot.html )"
-QuickLook: "QuickLook"
-Re-Animator: "Domain Re-Animator Bot (http://domainreanimator.com)"
-Readability: "Readability"
-RebelMouse: "RebelMouse"
+python-urllib: "Python http library"
+queryseeker: "QuerySeekerSpider"
+quicklook: "QuickLook"
+re-animator: "Domain Re-Animator Bot"
+readability: "Readability"
+rebelmouse: "RebelMouse"
 redditbot: "Reddit Bot"
-RelateIQ: "RelateIQ"
-Riddler: "Riddler Bot"
+relateiq: "RelateIQ"
+riddler: "Riddler Bot"
 rogerbot: "SeoMoz spider"
-RSSMicro: "RSS/Atom Feed Robot (rssmicro.com)"
-Ruby: "Ruby"
-Scrapy: "Scrapy"
-Screaming Frog SEO Spider: Screaming Frog SEO Spider
-SearchmetricsBot: "SearchmetricsBot"
-SemrushBot: "SEO analysis bot"
-SEOkicks-Robot: "SEOKicks (seokicks.de/robot.html)"
-SeznamBot: "SeznamBot"
-ShopWiki: "ShopWiki"
-ShortLinkTranslate: "Link shortener"
-ShowyouBot: "Showyou iOS app spider"
-Siege: "Joe Dog Siege"
-SISTRIX: "Mozilla/5.0 (compatible; SISTRIX Crawler; http://crawler.sistrix.net/)"
-SiteUptime: "Site monitoring services"
-Slack: "Slackbot-LinkExpanding"
-Slackbot: "api.slack.com/robots"
-Slurp: "Yahoo spider"
-SMTBot: "SimilarTech (http://www.similartech.com/smtbot)"
-Sogou: "Chinese search engine"
-spbot: "OpenLinkProfiler (http://openlinkprofiler.org/bot)"
+rssmicro: "RSS/Atom Feed Robot (rssmicro.com)"
+ruby: "Ruby"
+scrapy: "Scrapy"
+screaming frog seo spider: Screaming Frog SEO Spider
+searchmetricsbot: "SearchmetricsBot"
+semrushbot: "SEO analysis bot"
+seokicks: "SEOKicks"
+seznambot: "SeznamBot"
+shopwiki: "ShopWiki"
+shortlinktranslate: "Link shortener"
+showyoubot: "Showyou iOS app spider"
+siege: "Joe Dog Siege"
+sistrix: "SISTRIX"
+siteuptime: "Site monitoring services"
+slack: "Slackbot-LinkExpanding"
+slackbot: "Slack Bot"
+slurp: "Yahoo spider"
+smtbot: "SimilarTech"
+sogou: "Chinese search engine"
+spbot: "OpenLinkProfiler"
 spider: "generic web spider"
-Spinn3r: "Spinn3r aggregator"
-SputnikBot: "SputnikBot (http://corp.sputnik.ru/webmaster)"
-StatusCake: "StatusCake"
-StructuredDataTestingTool: 'Google-StructuredDataTestingTool'
-Test Certificate Info: "C http library?"
-TinEye: "TinEye-bot/0.51 (see http://www.tineye.com/crawler.html)"
-trendictionbot: "trendiction search"
-TurnitinBot: "TurnitinBot"
+spinn3r: "Spinn3r aggregator"
+sputnikbot: "SputnikBot"
+statuscake: "StatusCake"
+structureddatatestingtool: 'Google-StructuredDataTestingTool'
+test certificate info: "C http library?"
+tineye: "TinEye Bot"
+trendictionbot: "Trendiction Search"
+turnitinbot: "TurnitinBot"
 tweetedtimes: "The Tweeted Times"
-TweetmemeBot: "TweetMeMe Crawler"
-Twikle: "Social web search bot"
-TwitJobSearch: "TwitJobSearch"
-Twitmunin: "Twitmunin"
-Twitterbot: "Twitter URL expander"
-Twurly: "Twurly"
-Typhoeus: "Typhoeus"
-uMBot: "uberMetrics"
-UnwindFetch: "Gnip"
-UptimeRobot: "Uptime Robot"
-Vagabondo: "Vagabondo"
-VB Project: "Visual Basic"
-Vigil: "Vigil (vigil-app.com/bot.html)"
-vkShare: "VKontake Sharer"
-VoilaBot: "VoilaBot"
-VRCrawler: "ventureradar.com/crawler"
-WASALive-Bot: "blog.wasalive.com/wasalive-bots"
-WBSearchBot: "Ware Bay Best Buys (http://www.warebay.com/bot.html)"
-Webscout: "Webscout"
-WeSEE: "WeSEE (www.wesee.com/bot)"
-Wget: "wget unix CLI http client"
+tweetmemebot: "TweetMeMe Crawler"
+twikle: "Social web search bot"
+twitjobsearch: "TwitJobSearch"
+twitmunin: "Twitmunin"
+twitterbot: "Twitter URL expander"
+twurly: "Twurly"
+typhoeus: "Typhoeus"
+umbot: "uberMetrics"
+unwindfetch: "Gnip"
+uptimerobot: "Uptime Robot"
+vagabondo: "Vagabondo"
+vb project: "Visual Basic"
+vigil: "Vigil"
+vkshare: "VKontake Sharer"
+voilabot: "VoilaBot"
+vrcrawler: "Venture Radar"
+wasalive-bot: "Wasalive Bots"
+wbsearchbot: "Ware Bay Best Buys"
+webscout: "Webscout"
+wesee: "WeSEE"
 wget: "wget unix CLI http client"
-WordPress: "WordPress spider"
-Wormly: "WormlyBot"
-Wotbox: "Wotbox (http://www.wotbox.com/bot)"
-Xenu Link Sleuth: "Xenu Link Sleuth"
-XoviBot: "XoviBot"
-yacybot: "YaCy (yacy.net)"
-Yandex: "Yandex, Yandex Direct, Yandex Metrika, Yandex News (yandex.com)"
-Yeti: "Naver Corp (help.naver.com/robots)"
-YOURLS: "YOURLS"
+wordpress: "WordPress spider"
+wormly: "WormlyBot"
+wotbox: "Wotbox"
+xenu link sleuth: "Xenu Link Sleuth"
+xovibot: "XoviBot"
+yacybot: "YaCy"
+yandex: "Yandex"
+yeti: "Naver Corp"
+yourls: "YOURLS"
 zelist.ro: "feed parser"
-ZIBB: "ZIBB spider"
+zibb: "ZIBB spider"
 zitebot: "Zite"
-ZyBorg: "Zyborg? Hmmm...."
+zyborg: "Zyborg"
+mrchrome: "MrChrome"