browser 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efec89842173ca944eb69503ca1bc3c90740b94d659b15b84ec7bf807d55bbb6
-  data.tar.gz: b8f3f6cf6ba1f2d75fd4ab9a0a018211af1416099372e90334b649c474e19360
+  metadata.gz: 0e06930aa3adaf7fcb64ba7835316a1e621ca68d48b9e7cb628613737e3f2b3c
+  data.tar.gz: 63af8472b567a45c2cc9bf7fcab64522772313fa701c155d536de81ae5e4bc06
 SHA512:
-  metadata.gz: ca0d06b06a1a737e3fd1da1476a9250ec40d7a870f7b239c429550daf8f035fac11bdd1b084f2300e148f08e8e2ad698e7459224cd07f81aa6008bc5eb6d3664
-  data.tar.gz: b693d37d72f89a54a9e516a4197dbfece42d6775dfdaf0dc71628c177e12bb7877df24f068f52a6454f5c4bd589603ac39f455c05d5250e43ae670aae82fb116
+  metadata.gz: f09b0e90fa5df86138f39f549dab4128ae459066a60eeb22e80ec87edf72b7d228c83115dff7f6e6498c8f98f72660ff2c262341ecd1201eb368c52e5be38134
+  data.tar.gz: ddecdb109e863eac0418faaab17b2dbe581fd1d244ab85d3bdbeb6b416b9c20204ef1c39d400c2ac5340cde9960280fc41367e889eee2ef912b819f394ff206c

data/.rubocop.yml

@@ -1,136 +1,138 @@
+---
+
 AllCops:
   Exclude:
-    - "bin/**/*"
-    - "gemfiles/**/*"
-    - "vendor/**/*"
-    - "Gemfile"
-    - "Rakefile"
+    - bin/**/*
+    - gemfiles/**/*
+    - vendor/**/*
+    - Gemfile
+    - Rakefile
     - "*.gemspec"
-    - "config.ru"
-
-Style/Alias:
-  EnforcedStyle: prefer_alias_method
+    - config.ru
 
-Style/FrozenStringLiteralComment:
-  EnforcedStyle: always
+Layout/DotPosition:
+  EnforcedStyle: leading
 
-Style/ClassCheck:
-  EnforcedStyle: kind_of?
+Layout/RescueEnsureAlignment:
+  Enabled: false
 
-Metrics/LineLength:
-  Max: 80
+Layout/SpaceBeforeBlockBraces:
+  EnforcedStyle: space
 
-Style/BlockDelimiters:
-  Enabled: false
+Layout/SpaceInsideBlockBraces:
+  EnforcedStyle: space
+  SpaceBeforeBlockParameters: false
 
-Style/RegexpLiteral:
+Layout/SpaceInsideHashLiteralBraces:
   Enabled: false
 
 Metrics/AbcSize:
   Enabled: false
 
-Style/PerlBackrefs:
+Metrics/ClassLength:
   Enabled: false
 
-ClassLength:
+Metrics/CyclomaticComplexity:
   Enabled: false
 
-CyclomaticComplexity:
-  Enabled: false
+Metrics/LineLength:
+  Max: 80
 
-Documentation:
+Metrics/MethodLength:
   Enabled: false
 
-Encoding:
+Metrics/ParameterLists:
   Enabled: false
 
-FileName:
+Naming/FileName:
   Enabled: false
 
-IfUnlessModifier:
+Naming/PredicateName:
+  NamePrefixBlacklist:
+    - is_
+
+Naming/UncommunicativeMethodParamName:
   Enabled: false
 
-MethodLength:
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
+
+Style/BlockDelimiters:
   Enabled: false
 
-ModuleFunction:
+Style/ClassCheck:
+  EnforcedStyle: kind_of?
+
+Style/CollectionMethods:
+  PreferredMethods:
+    collect: map
+    collect!: map!
+    inject: reduce
+    detect: find
+    find_all: select
+
+Style/Documentation:
   Enabled: false
 
-OneLineConditional:
+Style/DoubleNegation:
   Enabled: false
 
-ParameterLists:
+Style/Encoding:
   Enabled: false
 
-Proc:
+Style/FrozenStringLiteralComment:
+  EnforcedStyle: always
+
+Style/IfUnlessModifier:
   Enabled: false
 
-SingleLineBlockParams:
+Style/ModuleFunction:
   Enabled: false
 
-VariableInterpolation:
+Style/OneLineConditional:
   Enabled: false
 
-Style/TrailingCommaInArrayLiteral:
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    "%": "[]"
+    "%i": "[]"
+    "%q": "[]"
+    "%Q": "[]"
+    "%r": "[]"
+    "%s": "[]"
+    "%w": "[]"
+    "%W": "[]"
+    "%x": "[]"
+
+Style/PerlBackrefs:
   Enabled: false
 
-Style/TrailingCommaInHashLiteral:
+Style/Proc:
   Enabled: false
 
-WhileUntilModifier:
+Style/RegexpLiteral:
   Enabled: false
 
-Naming/UncommunicativeMethodParamName:
+Style/SafeNavigation:
   Enabled: false
 
-PredicateName:
-  NamePrefixBlacklist:
-    - is_
+Style/SingleLineBlockParams:
+  Enabled: false
 
-StringLiterals:
+Style/StringLiterals:
   EnforcedStyle: double_quotes
   SupportedStyles:
     - single_quotes
     - double_quotes
 
-DotPosition:
-  EnforcedStyle: leading
-
-SpaceBeforeBlockBraces:
-  EnforcedStyle: space
-
-DoubleNegation:
+Style/TrailingCommaInArrayLiteral:
   Enabled: false
 
-SpaceInsideBlockBraces:
-  EnforcedStyle: space
-  SpaceBeforeBlockParameters: false
-
-SpaceInsideHashLiteralBraces:
+Style/TrailingCommaInHashLiteral:
   Enabled: false
 
-PercentLiteralDelimiters:
-  PreferredDelimiters:
-    "%":  "[]"
-    "%i": "[]"
-    "%q": "[]"
-    "%Q": "[]"
-    "%r": "[]"
-    "%s": "[]"
-    "%w": "[]"
-    "%W": "[]"
-    "%x": "[]"
-
-Style/CollectionMethods:
-  PreferredMethods:
-    collect: "map"
-    collect!: "map!"
-    inject: "reduce"
-    detect: "find"
-    find_all: "select"
-
-Style/SafeNavigation:
+Style/VariableInterpolation:
   Enabled: false
 
-Layout/RescueEnsureAlignment:
+Style/WhileUntilModifier:
   Enabled: false

data/.travis.yml

@@ -1,13 +1,14 @@
+---
 language: ruby
 sudo: false
 cache: bundler
 rvm:
   - "2.6.0"
   - "2.5.0"
-  - "2.4.0"
 gemfile:
   - Gemfile
   - gemfiles/rails5.gemfile
+  - gemfiles/rails6.gemfile
 script: bundle exec rake
 notifications:
   email: false

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## Unreleased
+
+- Add more Slack bots.
+- Handle instagram user agents that have a slash instead of a space.
+- Add `Browser::Bot.why?(ua)` to help debugging why a user agent is considered bot.
+- Promote Snapchat to a browser (it was detected as a bot previously).
+- Detect Edge based on Chrome correctly.
+- Improve Yandex detection.
+- Add Sputnik (https://browser.sputnik.ru)
+- Detect Android devices.
+- Add ScoutURLMonitor to the bot list.
+
 ## 2.6.1
 
 - Also include controller extensions to `ActionController::Base`.

data/Gemfile

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 source "http://rubygems.org"
 gemspec

data/README.md

@@ -49,13 +49,16 @@ browser.version         # major version number
 browser.webkit?
 browser.webkit_full_version
 browser.yandex?
-browser.wechat?         # detect the MicroMessenger(WeChat)
-browser.weibo?          # detect Weibo embedded browser (Sina Weibo)
+browser.wechat?
+browser.weibo?
+browser.yandex?
+browser.sputnik?
 
 # Get bot info
 browser.bot.name
 browser.bot.search_engine?
 browser.bot?
+Browser::Bot.why?(ua) # shows which user agent was the offender
 
 # Get device info
 browser.device

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler"
 require "bundler/setup"
 Bundler::GemHelper.install_tasks
@@ -28,4 +30,4 @@ task "test:all" do
   end
 end
 
-task default: [:test, :rubocop]
+task default: %i[test rubocop]

data/bots.yml

@@ -109,7 +109,6 @@ insieve: "Insieve Bot"
 insitesbot: "Insitesbot"
 instapaper: "Instapaper"
 istellabot: "IstellaBot"
-jack: "jack"
 jetslide: "Jetslide"
 jobseeker: "jobseeker.com.au/bot.html"
 jooble: "Jooble"
@@ -146,7 +145,6 @@ mfe_expand: "Mcafee spider"
 mir web crawler: "MIR web crawler"
 mj12bot: "Majestic-12 spider"
 mojeekbot: "Mojeek UK search crawler"
-mrchrome: "MrChrome"
 ms search 6.0 robot: "MS Search 6.0 Robot"
 msnbot-media: "Microsoft media bot"
 msnbot: "Microsoft bot"
@@ -195,6 +193,7 @@ relateiq: "RelateIQ"
 riddler: "Riddler Bot"
 rogerbot: "SeoMoz spider"
 rssmicro: "RSS/Atom Feed Robot (rssmicro.com)"
+scouturlmonitor: "ScoutURLMonitor"
 scrapy: "Scrapy"
 screaming frog seo spider: Screaming Frog SEO Spider
 searchmetricsbot: "SearchmetricsBot"
@@ -212,7 +211,9 @@ sistrix: "SISTRIX"
 sitecheck: "SiteCheck sitecrawl"
 siteuptime: "Site monitoring services"
 slack: "Slackbot-LinkExpanding"
-slackbot: "Slack Bot"
+slackbot: "Slackbot 1.0(+https://api.slack.com/robots)"
+slack-imgproxy: "Slack-ImgProxy 0.19 (+https://api.slack.com/robots)"
+slack-linkexpanding: "Slackbot-LinkExpanding 1.0 (+https://api.slack.com/robots)"
 slurp: "Yahoo spider"
 smtbot: "SimilarTech"
 snapchat: "Snapchat"
@@ -261,11 +262,11 @@ wesee: "WeSEE"
 wget: "wget unix CLI http client"
 whatsapp: "WhatsApp"
 wikido: "WikiDo"
+woorank: "WooRank"
 wordpress: "WordPress spider"
 woriobot: "woriobot"
 wormly: "WormlyBot"
 wotbox: "Wotbox"
-woorank: "WooRank"
 xenu link sleuth: "Xenu Link Sleuth"
 xing-contenttabreceiver: "Xing bot"
 xovibot: "XoviBot"

data/gemfiles/rails5.gemfile

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 gemspec path: ".."
 
-gem "rails", '~> 5.0'
+gem "rails", "~> 5.0"

data/gemfiles/rails6.gemfile

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+gemspec path: ".."
+
+gem "rails", "~> 6.0"

data/lib/browser/base.rb

@@ -52,7 +52,7 @@ module Browser
 
     # Return true if browser is modern (Webkit, Firefox 17+, IE9+, Opera 12+).
     def modern?
-      Browser.modern_rules.any? {|rule| rule === self } # rubocop:disable Metrics/LineLength, Style/CaseEquality
+      Browser.modern_rules.any? {|rule| rule === self } # rubocop:disable Style/CaseEquality
     end
 
     # Detect if browser is Microsoft Internet Explorer.
@@ -84,6 +84,12 @@ module Browser
         detect_version?(full_version, expected_version)
     end
 
+    # Detect if browser is Snapchat.
+    def snapchat?(expected_version = nil)
+      Snapchat.new(ua).match? &&
+        detect_version?(full_version, expected_version)
+    end
+
     # Detect if browser if Facebook.
     def facebook?(expected_version = nil)
       Facebook.new(ua).match? &&
@@ -99,7 +105,7 @@ module Browser
     # Detect if browser is WebKit-based.
     def webkit?(expected_version = nil)
       ua =~ /AppleWebKit/i &&
-        !edge? &&
+        (!edge? || Edge.new(ua).chrome_based?) &&
         detect_version?(webkit_full_version, expected_version)
     end
 
@@ -143,10 +149,16 @@ module Browser
       Opera.new(ua).match? && detect_version?(full_version, expected_version)
     end
 
+    # Detect if browser is Sputnik.
+    def sputnik?(expected_version = nil)
+      Sputnik.new(ua) && detect_version?(full_version, expected_version)
+    end
+
     # Detect if browser is Yandex.
     def yandex?(expected_version = nil)
-      ua =~ /YaBrowser/ && detect_version?(full_version, expected_version)
+      Yandex.new(ua) && detect_version?(full_version, expected_version)
     end
+    alias_method :yandex_browser?, :yandex?
 
     # Detect if browser is UCBrowser.
     def uc_browser?(expected_version = nil)

data/lib/browser/bot.rb

@@ -24,6 +24,11 @@ module Browser
                           .load_file(Browser.root.join("search_engines.yml"))
     end
 
+    def self.why?(ua)
+      downcased_ua = ua.downcase
+      bots.find {|key, _| downcased_ua.include?(key) }
+    end
+
     attr_reader :ua
 
     def initialize(ua)

data/lib/browser/browser.rb

@@ -27,6 +27,9 @@ require "browser/electron"
 require "browser/facebook"
 require "browser/otter"
 require "browser/instagram"
+require "browser/yandex"
+require "browser/sputnik"
+require "browser/snapchat"
 
 require "browser/bot"
 require "browser/middleware"
@@ -57,10 +60,13 @@ module Browser
       Otter,
       Facebook,             # must be placed before Chrome and Safari
       Instagram,            # must be placed before Chrome and Safari
+      Snapchat,             # must be placed before Chrome and Safari
       Weibo,                # must be placed before Chrome and Safari
       QQ,                   # must be placed before Chrome and Safari
       Alipay,               # must be placed before Chrome and Safari
       Electron,             # must be placed before Chrome and Safari
+      Yandex,               # must be placed before Chrome and Safari
+      Sputnik,              # must be placed before Chrome and Safari
       Chrome,
       Safari,
       MicroMessenger,

data/lib/browser/chrome.rb

@@ -20,7 +20,10 @@ module Browser
     end
 
     def match?
-      ua =~ /Chrome|CriOS/ && !opera? && !edge?
+      ua =~ /Chrome|CriOS/ &&
+        ua !~ /PhantomJS|FxiOS|YaBrowser|SputnikBrowser/ &&
+        !opera? &&
+        !edge?
     end
   end
 end

data/lib/browser/device.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "browser/device/base"
+require "browser/device/android"
 require "browser/device/unknown"
 require "browser/device/ipad"
 require "browser/device/ipod_touch"
@@ -45,6 +46,7 @@ module Browser
         Ipad,
         Iphone,
         IpodTouch,
+        Android,
         Unknown
       ]
     end

data/lib/browser/device/android.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Browser
+  class Device
+    class Android < Base
+      def id
+        :unknown
+      end
+
+      def name
+        ua[/\(Linux.*?; Android.*?; ([-_a-z0-9 ]+) Build[^)]+\)/i, 1] ||
+          "Unknown"
+      end
+
+      def match?
+        ua =~ /Android/
+      end
+    end
+  end
+end

data/lib/browser/device/tv.rb

@@ -12,7 +12,7 @@ module Browser
       end
 
       def match?
-        ua =~ /(tv|Android.*?ADT-1|Nexus Player)/i
+        ua =~ /(\btv|Android.*?ADT-1|Nexus Player)/i
       end
     end
   end

data/lib/browser/edge.rb

@@ -11,11 +11,15 @@ module Browser
     end
 
     def full_version
-      ua[%r[Edge/([\d.]+)], 1] || super
+      ua[%r[(?:Edge|Edg)/([\d.]+)], 1] || super
     end
 
     def match?
-      ua =~ %r[(Edge/[\d.]+|Trident/8)]
+      ua =~ %r[((?:Edge|Edg)/[\d.]+|Trident/8)]
+    end
+
+    def chrome_based?
+      match? && ua =~ /\bEdg\b/
     end
   end
 end

data/lib/browser/instagram.rb

@@ -11,7 +11,7 @@ module Browser
     end
 
     def full_version
-      ua[%r[Instagram ([\d.]+)], 1]
+      ua[%r[Instagram[ /]([\d.]+)], 1]
     end
 
     def match?

data/lib/browser/platform/ios.rb

@@ -4,10 +4,22 @@ module Browser
   class Platform
     class IOS < Base
       MATCHER = /(iPhone|iPad|iPod)/.freeze
-      VERSION_MATCHER = /OS ([\d.]+)/.freeze
+      VERSION_MATCHER = /OS ((?<major>\d)_(?<minor>\d)_?(?<patch>\d)?)/.freeze
 
       def version
-        ua[VERSION_MATCHER, 1] || "0"
+        matches = VERSION_MATCHER.match(ua)
+
+        return "0" unless matches
+
+        versions = [matches[:major]]
+
+        if matches[:patch]
+          versions.push(matches[:minor], matches[:patch])
+        else
+          versions.push(matches[:minor]) unless matches[:minor] == "0"
+        end
+
+        versions.join(".")
       end
 
       def name

data/lib/browser/rails.rb

@@ -10,14 +10,13 @@ module Browser
 
     initializer "browser" do
       ActiveSupport.on_load(:action_controller) do
-        ::ActionController::Base.send :include, Browser::ActionController
+        ::ActionController::Base.include(Browser::ActionController)
 
         if defined?(::ActionController::Metal)
-          ::ActionController::Metal.send :include, Browser::ActionController
+          ::ActionController::Metal.include(Browser::ActionController)
         end
 
-        Browser::Middleware::Context.send(
-          :include,
+        Browser::Middleware::Context.include(
           Browser::Middleware::Context::Additions
         )
       end

data/lib/browser/safari.rb

@@ -18,7 +18,7 @@ module Browser
     end
 
     def match?
-      ua =~ /Safari/ && ua !~ /Chrome|CriOS|PhantomJS|FxiOS/
+      ua =~ /Safari/ && ua !~ /Chrome|CriOS|PhantomJS|FxiOS|YaBrowser/
     end
   end
 end

data/lib/browser/snapchat.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Browser
+  class Snapchat < Base
+    def id
+      :snapchat
+    end
+
+    def name
+      "Snapchat"
+    end
+
+    def full_version
+      ua[%r[Snapchat/([\d.]+)], 1]
+    end
+
+    def match?
+      ua =~ /Snapchat/
+    end
+  end
+end

data/lib/browser/sputnik.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Browser
+  class Sputnik < Base
+    def id
+      :sputnik
+    end
+
+    def name
+      "Sputnik"
+    end
+
+    def full_version
+      # Each regex on its own line to enforce precedence.
+      ua[%r[SputnikBrowser/([\d.]+)], 1] ||
+        ua[%r[Chrome/([\d.]+)], 1] ||
+        "0.0"
+    end
+
+    def match?
+      ua =~ /SputnikBrowser/
+    end
+  end
+end

data/lib/browser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Browser
-  VERSION = "2.6.1"
+  VERSION = "2.7.0"
 end

data/lib/browser/yandex.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Browser
+  class Yandex < Base
+    def id
+      :yandex
+    end
+
+    def name
+      "Yandex"
+    end
+
+    def full_version
+      ua[%r[YaBrowser/([\d.]+)], 1] || "0.0"
+    end
+
+    def match?
+      ua =~ /YaBrowser/
+    end
+  end
+end

data/test/sample_app.rb

@@ -24,6 +24,11 @@ class SampleApp < Rails::Application
   config.eager_load = true
   config.active_support.deprecation = :log
 
+  # Introduced by Rails 6.
+  if config.respond_to?(:hosts)
+    config.hosts << "example.org"
+  end
+
   routes.append do
     default_headers = {"Content-Type" => "text/html"}
 

data/test/ua.yml

@@ -1,3 +1,4 @@
+---
 ADOBE_AIR: "Mozilla/5.0 (Macintosh; U; Intel Mac OS X; de) AppleWebKit/533.19.4 (KHTML, like Gecko) AdobeAIR/13.0"
 ALIPAY_ANDROID: "Mozilla/5.0 (Linux; U; Android 4.2.1; zh-cn; HUAWEI G610-T00 Build/HuaweiG610-T00) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 AlipayDefined(nt:WIFI,ws:360|640|1.5) AliApp(AP/9.0.1.073001) AlipayClient/9.0.1.073001 GCanvas/1.4.2.15"
 ALIPAY_IOS: "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53 AliApp(AP/2.3.4) AlipayClient/2.3.4"
@@ -55,12 +56,15 @@ IE9_CHROME_FRAME: "Mozilla/5.0 (Windows NT 6.1; WOW64; chromeframe/26.0.1410.43)
 IE9_COMPAT: "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; Trident/5.0)"
 IE_WITHOUT_TRIDENT: Mozilla/4.0 (compatible; MSIE8.0; Windows NT 6.0) .NET CLR 2.0.50727)
 INSTAGRAM: "Mozilla/5.0 (iPhone; CPU iPhone OS 11_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E216 Instagram 41.0.0.14.90 (iPhone9,3; iOS 11_3; pl_PL; pl-PL; scale=2.00; gamut=wide; 750x1334)"
+INSTAGRAM_OTHER: "Instagram/182257141 CFNetwork/1107.1 Darwin/19.0.0"
 IOS3: "Mozilla/5.0 (iPad; U; CPU iPhone OS 3_0 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B314 Safari/531.21.10"
 IOS4: "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7"
 IOS5: "Mozilla/5.0 (iPhone; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3"
 IOS6: "Mozilla/5.0 (iPhone; CPU iPhone OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5376e Safari/8536.25"
 IOS7: "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53"
 IOS8: "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12A365 Safari/600.1.4"
+IOS8_1_2: 'Mozilla/5.0 (iPhone; CPU iPhone OS 8_1_2 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12B440 Safari/600.1.4'
+IOS8_3: 'Mozilla/5.0 (iPhone; CPU iPhone OS 8_3 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12F70 Safari/600.1.4'
 IOS9: "Mozilla/5.0 (iPad; CPU OS 9_0 like Mac OS X) AppleWebKit/601.1.17 (KHTML, like Gecko) Version/8.0 Mobile/13A175 Safari/600.1.4"
 IOS_WEBVIEW: Mozilla/5.0 (iPhone; CPU iPhone OS 8_4 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Mobile/12H141
 IPAD: "Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B367 Safari/531.21.10"
@@ -75,6 +79,7 @@ MICRO_MESSENGER: "Mozilla/5.0 (iPhone; CPU iPhone OS 9_3_1 like Mac OS X) AppleW
 MIDP: MIDP-2.0
 MOBILE_CHROME: "Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_1_1 like Mac OS X; en) AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 Safari/7534.48.3"
 MS_EDGE: "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Safari/537.36 Edge/12.0"
+MS_EDGE_CHROME: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.29 Safari/537.36 Edg/79.0.309.18"
 MS_EDGE_COMPAT: "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.2; WOW64; Trident/8.0; .NET4.0C; .NET4.0E; Tablet PC 2.0; Microsoft Outlook 15.0.4433; ms-office; MSOffice 15)"
 MS_EDGE_MOBILE: "Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; DEVICE INFO) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Mobile Safari/537.36 Edge/12.0"
 NEXUS7: "Mozilla/5.0 (Linux; Android 4.3; Nexus 7 Build/JWR66Y) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.72 Safari/537.36"
@@ -114,6 +119,8 @@ SAFARI_IPHONE_WEBAPP_MODE: "Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_2 like Mac O
 SAMSUNG: "Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; SAMSUNG-SGH-I497 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30"
 SAMSUNG_CHROME: "Mozilla/5.0 (Linux; Android 4.4.2; en-gb; SAMSUNG GT-I9195/I9195XXUCNEA Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/1.5 Chrome/28.0.1500.94 Mobile Safari/537.36"
 SMART_TV: "Mozilla/5.0 (SmartHub; SMART-TV; U; Linux/SmartTV) AppleWebKit/531.2+ (KHTML, like Gecko) WebBrowser/1.0 SmartTV Safari/531.2+"
+SNAPCHAT: Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Snapchat/10.69.5.72 (iPhone10,3; iOS 13.2.2; gzip)
+SPUTNIK: "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.140 SputnikBrowser/4.1.2801.0 Safari/537.36"
 SURFACE: "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; ARM; Trident/6.0; Touch)"
 SYMBIAN: "Nokia5250/10.0.011 (SymbianOS/9.4; U; Series60/5.0 Mozilla/5.0; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/525 (KHTML, like Gecko) Safari/525 3gpp-gba"
 TABLOID: "Mozilla/5.0 (Linux; U; Android 3.0; en-us; Xoom Build/HRI39) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13"
@@ -137,4 +144,5 @@ WINDOWS_XP_64: "Mozilla/4.0 (Compatible; MSIE 8.0; Windows NT 5.2; Trident/6.0)"
 XBOX360: "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0; Xbox), or Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0; Xbox)"
 XBOXONE: "Mozilla/5.0 (Compatible; MSIE 10.0; Windows NT 6.2; Trident /6.0; Xbox; Xbox One)"
 XOOM: "Mozilla/5.0 (Linux; U; Android 3.0; en-us; Xoom Build/HRI39) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13"
-YANDEX_BROWSER: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2272.118 YaBrowser/15.4.2272.3909 (beta) Yowser/2.0 Safari/537.36"
+YANDEX_BROWSER_DESKTOP: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 YaBrowser/19.6.0.1583 Yowser/2.5 Safari/537.36"
+YANDEX_BROWSER_IOS: "Mozilla/5.0 (iPhone; CPU iPhone OS 12_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 YaBrowser/19.6.1.157.10 Mobile/15E148 Safari/605.1"

data/test/ua_bots.yml

@@ -1,3 +1,4 @@
+---
 ADLXBOT: "Mozilla/5.0 (compatible; adidxbot/2.0; +http://www.bing.com/bingbot.htm)"
 ADS_TXT_CRAWLER: "AdsTxtCrawler/1.0"
 ANDERSPINK: "Mozilla/5.0 (compatible; AndersPinkBot/1.0; +http://anderspink.com/bot.html)"
@@ -49,7 +50,6 @@ MAPPYDATA: "Mozilla/5.0 (compatible; Mappy/1.0; +http://mappydata.net/bot/)"
 MASTODONBOT: "http.rb/3.0.0 (Mastodon/2.2.0; +https://mstdn.io/)"
 MAUIBOT: "MauiBot (crawler.feedback+wc@gmail.com)"
 MEGAINDEX_RU: "Mozilla/5.0 (compatible; MegaIndex.ru/2.0; +https://www.megaindex.ru/?tab=linkAnalyze)"
-MRCHROME: "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.107 Amigo/45.0.2454.107 MRCHROME SOC Safari/537.36"
 MSNBOT: "msnbot/2.0b (+http://search.msn.com/msnbot.htm)"
 MSNBOT_MEDIA: "msnbot-media/1.1 (+http://search.msn.com/msnbot.htm)"
 NETCRAFT2: Netcraft SSL Server Survey - contact info@netcraft.com
@@ -62,6 +62,7 @@ PROXIMIC: "Mozilla/5.0 (compatible; proximic; +http://www.proximic.com/info/spid
 PUINCRAWLER: "Pu_iN Crawler (+http://semanticjuice.com/)"
 QUERYSEEKER: "QuerySeekerSpider ( http://queryseeker.com/bot.html )"
 QUICKCRAWLER: "Quick-Crawler (+https://www.scrapinghub.com/)"
+SCOUT_URL_MONITOR: ScoutURLMonitor/6.2.2
 SCRAPY: "Scrapy/0.18.4 (+http://scrapy.org)"
 SEMANTICBOT: "Mozilla/5.0 (compatible; Semanticbot/1.0; +http://sempi.tech/bot.html)"
 SEO_AUDIT: "Mozilla/5.0 (compatible; seo-audit-check-bot/1.0)"
@@ -69,7 +70,6 @@ SEODIVER: "Mozilla/5.0 (compatible; SEOdiver/1.0; +http://www.seodiver.com/bot)"
 SEOKICKS: "Mozilla/5.0 (compatible; SEOkicks-Robot; +http://www.seokicks.de/robot.html)"
 SISTRIX: "Mozilla/5.0 (compatible; SISTRIX Crawler; http://crawler.sistrix.net/)"
 SITECHECK: 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.0) SiteCheck-sitecrawl by Siteimprove.com'
-SNAPCHAT: "Mozilla/5.0 (iPhone; CPU iPhone OS 11_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Snapchat/10.37.1.1 (iPhone9,4; iOS 11.4; gzip)"
 SOCIALRANKIO: SocialRankIOBot; http://socialrank.io/about
 SQUIDER: "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36 Squider/0.01"
 STRIPE: "Stripe/1.0 (+https://stripe.com/docs/webhooks)"

data/test/unit/bots_test.rb

@@ -114,4 +114,11 @@ class BotsTest < Minitest::Test
     assert browser.bot?
     assert_equal "LinkedIn", browser.bot.name
   end
+
+  test "tells why user agent is considered a bot" do
+    id, name = Browser::Bot.why?(Browser.bot_user_agents["LINKEDIN"])
+
+    assert_equal "linkedinbot", id
+    assert_equal "LinkedIn", name
+  end
 end

data/test/unit/chrome_test.rb

@@ -45,22 +45,6 @@ class ChromeTest < Minitest::Test
     assert browser.platform.chrome_os?
   end
 
-  test "detects yandex browser" do
-    browser = Browser.new(Browser["YANDEX_BROWSER"])
-
-    assert browser.yandex?
-    assert browser.chrome?
-    refute browser.safari?
-    assert browser.webkit?
-    assert_equal "41.0.2272.118", browser.full_version
-    assert_equal "41", browser.version
-  end
-
-  test "detects yandex version by range" do
-    browser = Browser.new(Browser["YANDEX_BROWSER"])
-    assert browser.yandex?(%w[>=41 <42])
-  end
-
   test "detects chrome frame" do
     browser = Browser.new(Browser["IE9_CHROME_FRAME"])
 

data/test/unit/device_test.rb

@@ -238,4 +238,24 @@ class DeviceTest < Minitest::Test
       refute device.mobile?
     end
   end
+
+  {
+    "ANDROID_CUPCAKE" => "T-Mobile G1",
+    "ANDROID_DONUT" => "SonyEricssonX10i",
+    "ANDROID_ECLAIR_21" => "Nexus One",
+    "ANDROID_FROYO" => "HTC_DesireHD_A9191",
+    "ANDROID_GINGERBREAD" => "Sensation_4G",
+    "ANDROID_HONEYCOMB_30" => "Xoom",
+    "ANDROID_ICECREAM" => "sdk",
+    "ANDROID_JELLYBEAN_41" => "Nexus S",
+    "ANDROID_JELLYBEAN_42" => "Nexus 10",
+    "ANDROID_JELLYBEAN_43" => "Nexus 7",
+    "CUSTOM_APP" => "HTC Ruby",
+    "NOOK" => "NOOK BNTV250A"
+  }.each do |key, name|
+    test "detect device name of #{key} as #{name}" do
+      device = Browser::Device.new(Browser[key])
+      assert_equal name, device.name
+    end
+  end
 end

data/test/unit/edge_test.rb

@@ -53,6 +53,22 @@ class EdgeTest < ActionController::TestCase
     refute browser.safari?
   end
 
+  test "detects Microsoft Edge based on Chrome" do
+    browser = Browser.new(Browser["MS_EDGE_CHROME"])
+
+    assert_equal :edge, browser.id
+    assert_equal "Microsoft Edge", browser.name
+    assert_equal "79.0.309.18", browser.full_version
+    assert_equal "79", browser.version
+    assert browser.platform.mac?
+    refute browser.platform.windows?
+    assert browser.edge?
+    assert browser.modern?
+    assert browser.webkit?
+    refute browser.chrome?
+    refute browser.safari?
+  end
+
   test "detects version by range" do
     browser = Browser.new(Browser["MS_EDGE"])
     assert browser.edge?(%w[>=12 <13])

data/test/unit/instagram_test.rb

@@ -13,6 +13,16 @@ class InstagramTest < Minitest::Test
     assert_equal "41", browser.version
   end
 
+  test "detects alternate instagram user agent" do
+    browser = Browser.new(Browser["INSTAGRAM_OTHER"])
+
+    assert_equal "Instagram", browser.name
+    assert browser.instagram?
+    assert :instagram, browser.id
+    assert_equal "182257141", browser.full_version
+    assert_equal "182257141", browser.version
+  end
+
   test "detects version by range" do
     browser = Browser.new(Browser["INSTAGRAM"])
     assert browser.instagram?(%w[>=41])

data/test/unit/platform_test.rb

@@ -62,6 +62,27 @@ class PlatformTest < Minitest::Test
     assert_equal "9", platform.version
   end
 
+  test "detect specific minor iOS (iPhone)" do
+    platform = Browser::Platform.new(Browser["IOS8_3"])
+
+    assert_equal "iOS (iPhone)", platform.name
+    assert_equal :ios, platform.id
+    assert platform.ios?
+    assert platform.ios?(8.3)
+    assert_equal "8.3", platform.version
+  end
+
+  test "detect specific patch iOS (iPhone)" do
+    platform = Browser::Platform.new(Browser["IOS8_1_2"])
+
+    assert_equal "iOS (iPhone)", platform.name
+    assert_equal :ios, platform.id
+    assert platform.ios?
+    assert platform.ios?("8.1.2")
+    assert platform.ios?("<8.2")
+    assert_equal "8.1.2", platform.version
+  end
+
   test "detect ios (iPod Touch)" do
     platform = Browser::Platform.new(Browser["IPOD"])
 

data/test/unit/snapchat_test.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class SnapchatTest < Minitest::Test
+  test "detects snapchat" do
+    browser = Browser.new(Browser["SNAPCHAT"])
+
+    assert_equal "Snapchat", browser.name
+    assert browser.snapchat?
+    assert :snapchat, browser.id
+    assert_equal "10.69.5.72", browser.full_version
+    assert_equal "10", browser.version
+  end
+
+  test "detects version by range" do
+    browser = Browser.new(Browser["SNAPCHAT"])
+    assert browser.snapchat?(%w[>=10])
+  end
+end

data/test/unit/sputnik_test.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class SputnikTest < Minitest::Test
+  test "detects sputnik" do
+    browser = Browser.new(Browser["SPUTNIK"])
+
+    assert_equal "Sputnik", browser.name
+    assert browser.sputnik?
+    refute browser.chrome?
+    refute browser.safari?
+    assert_equal "4.1.2801.0", browser.full_version
+    assert_equal "4", browser.version
+  end
+
+  test "detects version by range" do
+    browser = Browser.new(Browser["SPUTNIK"])
+    assert browser.sputnik?(%w[>=4 <5])
+  end
+end

data/test/unit/yandex_test.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class YandexTest < Minitest::Test
+  test "detects Yandex on iOS device" do
+    browser = Browser.new(Browser["YANDEX_BROWSER_IOS"])
+    assert browser.yandex?
+    assert browser.yandex_browser?
+    refute browser.safari?
+    refute browser.chrome?
+    assert browser.webkit?
+    assert_equal "Yandex", browser.name
+    assert_equal :yandex, browser.id
+  end
+
+  test "detects Yandex on non-iOS devices" do
+    browser = Browser.new(Browser["YANDEX_BROWSER_DESKTOP"])
+    assert browser.yandex?
+    assert browser.yandex_browser?
+    refute browser.safari?
+    refute browser.chrome?
+    assert_equal "Yandex", browser.name
+    assert_equal :yandex, browser.id
+  end
+
+  test "detects correct version" do
+    browser = Browser.new(Browser["YANDEX_BROWSER_DESKTOP"])
+    assert_equal "19.6.0.1583", browser.full_version
+    assert_equal "19", browser.version
+  end
+
+  test "detects version by range" do
+    browser = Browser.new(Browser["YANDEX_BROWSER_DESKTOP"])
+    assert browser.yandex?(%w[>=18 <20])
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browser
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2019-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -171,6 +171,7 @@ files:
 - browser.gemspec
 - config.ru
 - gemfiles/rails5.gemfile
+- gemfiles/rails6.gemfile
 - languages.yml
 - lib/browser.rb
 - lib/browser/accept_language.rb
@@ -184,6 +185,7 @@ files:
 - lib/browser/chrome.rb
 - lib/browser/detect_version.rb
 - lib/browser/device.rb
+- lib/browser/device/android.rb
 - lib/browser/device/base.rb
 - lib/browser/device/blackberry_playbook.rb
 - lib/browser/device/ipad.rb
@@ -250,10 +252,13 @@ files:
 - lib/browser/qq.rb
 - lib/browser/rails.rb
 - lib/browser/safari.rb
+- lib/browser/snapchat.rb
+- lib/browser/sputnik.rb
 - lib/browser/testing.rb
 - lib/browser/uc_browser.rb
 - lib/browser/version.rb
 - lib/browser/weibo.rb
+- lib/browser/yandex.rb
 - search_engines.yml
 - test/browser_test.rb
 - test/middleware_test.rb
@@ -293,10 +298,13 @@ files:
 - test/unit/proxy_test.rb
 - test/unit/qq_test.rb
 - test/unit/safari_test.rb
+- test/unit/snapchat_test.rb
+- test/unit/sputnik_test.rb
 - test/unit/uc_browser_test.rb
 - test/unit/weibo_test.rb
 - test/unit/windows_phone_test.rb
 - test/unit/windows_test.rb
+- test/unit/yandex_test.rb
 homepage: http://github.com/fnando/browser
 licenses:
 - MIT
@@ -359,7 +367,10 @@ test_files:
 - test/unit/proxy_test.rb
 - test/unit/qq_test.rb
 - test/unit/safari_test.rb
+- test/unit/snapchat_test.rb
+- test/unit/sputnik_test.rb
 - test/unit/uc_browser_test.rb
 - test/unit/weibo_test.rb
 - test/unit/windows_phone_test.rb
 - test/unit/windows_test.rb
+- test/unit/yandex_test.rb