Add Browser::Base#chromium_based?. (fnando#527)

Close fnando#523.

FUNDING.yml → .github/FUNDING.yml

@@ -1,3 +1,4 @@
 # These are supported funding model platforms
-
+---
 github: [fnando]
+custom: ["https://paypal.me/nandovieira/🍕"]

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Unreleased
+
+- Add `Browser::Base#chromium_based?`.
+- Change how browser detection works to avoid re-instantiating classes.
+
 ## 5.3.1
 
 - Remove Stripe webhooks from bot list.

README.md

@@ -22,6 +22,7 @@ browser = Browser.new("Some User Agent", accept_language: "en-us")
 # General info
 browser.bot?
 browser.chrome?
+browser.chromium_based?
 browser.core_media?
 browser.duck_duck_go?
 browser.edge?                # Newest MS browser

lib/browser/base.rb

@@ -59,13 +59,13 @@ def device
 
     # Detect if browser is Microsoft Internet Explorer.
     def ie?(expected_version = nil)
-      InternetExplorer.new(ua).match? &&
+      instance_of?(InternetExplorer) &&
         detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is Microsoft Edge.
     def edge?(expected_version = nil)
-      Edge.new(ua).match? && detect_version?(full_version, expected_version)
+      instance_of?(Edge) && detect_version?(full_version, expected_version)
     end
 
     def compatibility_view?
@@ -82,32 +82,32 @@ def msie_version
 
     # Detect if browser is Instagram.
     def instagram?(expected_version = nil)
-      Instagram.new(ua).match? &&
+      instance_of?(Instagram) &&
         detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is Snapchat.
     def snapchat?(expected_version = nil)
-      Snapchat.new(ua).match? &&
+      instance_of?(Snapchat) &&
         detect_version?(full_version, expected_version)
     end
 
     # Detect if browser if Facebook.
     def facebook?(expected_version = nil)
-      Facebook.new(ua).match? &&
+      instance_of?(Facebook) &&
         detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is Otter.
     def otter?(expected_version = nil)
-      Otter.new(ua).match? &&
+      instance_of?(Otter) &&
         detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is WebKit-based.
     def webkit?(expected_version = nil)
       ua.match?(/AppleWebKit/i) &&
-        (!edge? || Edge.new(ua).chrome_based?) &&
+        (!edge? || chromium_based?) &&
         detect_version?(webkit_full_version, expected_version)
     end
 
@@ -124,13 +124,13 @@ def core_media?(expected_version = nil)
 
     # Detect if browser is PhantomJS
     def phantom_js?(expected_version = nil)
-      PhantomJS.new(ua).match? &&
+      instance_of?(PhantomJS) &&
         detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is Safari.
     def safari?(expected_version = nil)
-      Safari.new(ua).match? && detect_version?(full_version, expected_version)
+      instance_of?(Safari) && detect_version?(full_version, expected_version)
     end
 
     def safari_webapp_mode?
@@ -139,55 +139,55 @@ def safari_webapp_mode?
 
     # Detect if browser is Firefox.
     def firefox?(expected_version = nil)
-      Firefox.new(ua).match? && detect_version?(full_version, expected_version)
+      instance_of?(Firefox) && detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is Chrome.
     def chrome?(expected_version = nil)
-      Chrome.new(ua).match? && detect_version?(full_version, expected_version)
+      instance_of?(Chrome) && detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is Opera.
     def opera?(expected_version = nil)
-      Opera.new(ua).match? && detect_version?(full_version, expected_version)
+      instance_of?(Opera) && detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is Sputnik.
     def sputnik?(expected_version = nil)
-      Sputnik.new(ua).match? && detect_version?(full_version, expected_version)
+      instance_of?(Sputnik) && detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is Yandex.
     def yandex?(expected_version = nil)
-      Yandex.new(ua).match? && detect_version?(full_version, expected_version)
+      instance_of?(Yandex) && detect_version?(full_version, expected_version)
     end
     alias yandex_browser? yandex?
 
     # Detect if browser is UCBrowser.
     def uc_browser?(expected_version = nil)
-      UCBrowser.new(ua).match? &&
+      instance_of?(UCBrowser) &&
         detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is Nokia S40 Ovi Browser.
     def nokia?(expected_version = nil)
-      Nokia.new(ua).match? && detect_version?(full_version, expected_version)
+      instance_of?(Nokia) && detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is MicroMessenger.
     def micro_messenger?(expected_version = nil)
-      MicroMessenger.new(ua).match? &&
+      instance_of?(MicroMessenger) &&
         detect_version?(full_version, expected_version)
     end
 
     alias wechat? micro_messenger?
 
     def weibo?(expected_version = nil)
-      Weibo.new(ua).match? && detect_version?(full_version, expected_version)
+      instance_of?(Weibo) && detect_version?(full_version, expected_version)
     end
 
     def alipay?(expected_version = nil)
-      Alipay.new(ua).match? && detect_version?(full_version, expected_version)
+      instance_of?(Alipay) && detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is Opera Mini.
@@ -210,29 +210,29 @@ def samsung_browser?(expected_version = nil)
 
     # Detect if browser is Huawei.
     def huawei_browser?(expected_version = nil)
-      HuaweiBrowser.new(ua).match? &&
+      instance_of?(HuaweiBrowser) &&
         detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is Xiaomi Miui.
     def miui_browser?(expected_version = nil)
-      MiuiBrowser.new(ua).match? &&
+      instance_of?(MiuiBrowser) &&
         detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is Maxthon.
     def maxthon?(expected_version = nil)
-      Maxthon.new(ua).match? && detect_version?(full_version, expected_version)
+      instance_of?(Maxthon) && detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is QQ.
     def qq?(expected_version = nil)
-      QQ.new(ua).match? && detect_version?(full_version, expected_version)
+      instance_of?(QQ) && detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is Sougou.
     def sougou_browser?(expected_version = nil)
-      SougouBrowser.new(ua).match? &&
+      instance_of?(SougouBrowser) &&
         detect_version?(full_version, expected_version)
     end
 
@@ -241,6 +241,11 @@ def google_search_app?(expected_version = nil)
       ua.include?("GSA") && detect_version?(full_version, expected_version)
     end
 
+    # Detect if browser is Chromium-based.
+    def chromium_based?
+      false
+    end
+
     def webkit_full_version
       ua[%r{AppleWebKit/([\d.]+)}, 1] || "0.0"
     end
@@ -260,7 +265,7 @@ def proxy?
 
     # Detect if the browser is Electron.
     def electron?(expected_version = nil)
-      Electron.new(ua).match? && detect_version?(full_version, expected_version)
+      instance_of?(Electron) && detect_version?(full_version, expected_version)
     end
 
     private def validate_size(subject, input)

lib/browser/browser.rb

@@ -101,8 +101,9 @@ def self.matchers
   end
 
   def self.new(user_agent, **kwargs)
-    matchers
-      .map {|klass| klass.new(user_agent || EMPTY_STRING, **kwargs) }
-      .find(&:match?)
+    matchers.each do |matcher_class|
+      matcher = matcher_class.new(user_agent || EMPTY_STRING, **kwargs)
+      return matcher if matcher.match?
+    end
   end
 end

lib/browser/chrome.rb

@@ -19,6 +19,10 @@ def full_version
         "0.0"
     end
 
+    def chromium_based?
+      true
+    end
+
     def match?
       ua.match?(/Chrome|CriOS/) &&
         !ua.match?(/PhantomJS|FxiOS|ArchiveBot/) &&

lib/browser/edge.rb

@@ -18,7 +18,7 @@ def match?
       ua.match?(%r{((?:Edge|Edg|EdgiOS|EdgA)/[\d.]+|Trident/8)})
     end
 
-    def chrome_based?
+    def chromium_based?
       match? && ua.match?(/\bEdg\b/)
     end
   end

test/browser_test.rb

@@ -8,7 +8,7 @@ class BrowserTest < Minitest::Test
     assert_equal "Safari", browser.ua
   end
 
-  test "don't fail with nil user agent" do
+  test "does not fail with nil user agent" do
     browser = Browser.new(nil)
     refute browser.known?
   end
@@ -25,7 +25,7 @@ class BrowserTest < Minitest::Test
     Safari
     UCBrowser
   ].each do |ua|
-    test "don't fail when have no version info (#{ua})" do
+    test "does not fail when have no version info (#{ua})" do
       browser = Browser.new(ua)
       assert_equal "0", browser.version
       assert_equal "0.0", browser.full_version

test/test_helper.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 require "simplecov"
-SimpleCov.start
+SimpleCov.start do
+  add_filter %r{/test/}
+end
 
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 require "bundler/setup"

test/unit/android_app_test.rb

@@ -5,15 +5,15 @@
 class AndroidAppTest < Minitest::Test
   let(:browser) { Browser.new(Browser["ANDROID_WEBVIEW"]) }
 
-  test "detect as android" do
+  test "detects as android" do
     assert browser.platform.android?
   end
 
-  test "detect as webview" do
+  test "detects as webview" do
     assert browser.platform.android_webview?
   end
 
-  test "non-webviews do not detect as webview" do
+  test "does not detect non-webviews as webview" do
     %w[
       ANDROID_CUPCAKE
       ANDROID_DONUT