browser 2.7.1 → 5.3.1

data/lib/browser/platform/windows.rb

@@ -4,7 +4,7 @@ module Browser
   class Platform
     class Windows < Base
       def version
-        ua[/Windows NT\s*([0-9_\.]+)?/, 1] || "0"
+        ua[/Windows NT\s*([0-9_.]+)?/, 1] || "0"
       end
 
       def name
@@ -16,7 +16,7 @@ module Browser
       end
 
       def match?
-        ua =~ /Windows/
+        ua.include?("Windows")
       end
     end
   end

data/lib/browser/platform/windows_mobile.rb

@@ -16,7 +16,7 @@ module Browser
       end
 
       def match?
-        ua =~ /Windows CE/
+        ua.include?("Windows CE")
       end
     end
   end

data/lib/browser/platform/windows_phone.rb

@@ -16,7 +16,7 @@ module Browser
       end
 
       def match?
-        ua =~ /Windows Phone/
+        ua.include?("Windows Phone")
       end
     end
   end

data/lib/browser/platform.rb

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
 
-require "browser/platform/base"
-require "browser/platform/ios"
-require "browser/platform/linux"
-require "browser/platform/windows"
-require "browser/platform/mac"
-require "browser/platform/windows_phone"
-require "browser/platform/windows_mobile"
-require "browser/platform/firefox_os"
-require "browser/platform/blackberry"
-require "browser/platform/android"
-require "browser/platform/other"
-require "browser/platform/chrome_os"
-require "browser/platform/adobe_air"
+require_relative "platform/base"
+require_relative "platform/ios"
+require_relative "platform/linux"
+require_relative "platform/windows"
+require_relative "platform/mac"
+require_relative "platform/windows_phone"
+require_relative "platform/windows_mobile"
+require_relative "platform/firefox_os"
+require_relative "platform/blackberry"
+require_relative "platform/android"
+require_relative "platform/unknown"
+require_relative "platform/chrome_os"
+require_relative "platform/adobe_air"
+require_relative "platform/kai_os"
 
 module Browser
   class Platform
@@ -32,10 +33,11 @@ module Browser
         BlackBerry,
         IOS,
         Mac,
+        KaiOS,
         FirefoxOS,
         Windows,
         Linux,
-        Other
+        Unknown
       ]
     end
 
@@ -45,7 +47,7 @@ module Browser
 
     def subject
       @subject ||= self.class.matchers
-                       .map {|matcher| matcher.new(ua) }
+                       .map {|matcher| matcher.new(ua, self) }
                        .find(&:match?)
     end
 
@@ -61,8 +63,8 @@ module Browser
       id == :android && detect_version?(version, expected_version)
     end
 
-    def other?
-      id == :other
+    def unknown?
+      id == :unknown_platform
     end
 
     def linux?
@@ -81,6 +83,10 @@ module Browser
       id == :firefox_os
     end
 
+    def kai_os?
+      id == :kai_os
+    end
+
     def ios?(expected_version = nil)
       id == :ios && detect_version?(version, expected_version)
     end
@@ -130,46 +136,46 @@ module Browser
     # Detect if in an Android app webview (Lollipop and newer)
     # https://developer.chrome.com/multidevice/user-agent#webview_user_agent
     def android_app?
-      android? && ua =~ /\bwv\b/
+      android? && ua.match?(/\bwv\b/)
     end
     alias_method :android_webview?, :android_app?
 
     # http://msdn.microsoft.com/fr-FR/library/ms537503.aspx#PltToken
     def windows_xp?
-      windows? && ua =~ /Windows NT 5\.[12]/
+      windows? && ua.match?(/Windows NT 5\.[12]/)
     end
 
     def windows_vista?
-      windows? && ua =~ /Windows NT 6\.0/
+      windows? && ua.include?("Windows NT 6.0")
     end
 
     def windows7?
-      windows? && ua =~ /Windows NT 6\.1/
+      windows? && ua.include?("Windows NT 6.1")
     end
 
     def windows8?
-      windows? && ua =~ /Windows NT 6\.[2-3]/
+      windows? && ua.match?(/Windows NT 6\.[2-3]/)
     end
 
     def windows8_1?
-      windows? && ua =~ /Windows NT 6\.3/
+      windows? && ua.include?("Windows NT 6.3")
     end
 
     def windows10?
-      windows? && ua =~ /Windows NT 10/
+      windows? && ua.include?("Windows NT 10")
     end
 
     def windows_rt?
-      windows8? && ua =~ /ARM/
+      windows8? && ua.include?("ARM")
     end
 
     # Detect if current platform is Windows in 64-bit architecture.
     def windows_x64?
-      windows? && ua =~ /(Win64|x64|Windows NT 5\.2)/
+      windows? && ua.match?(/(Win64|x64|Windows NT 5\.2)/)
     end
 
     def windows_wow64?
-      windows? && ua =~ /WOW64/i
+      windows? && ua.match?(/WOW64/i)
     end
 
     def windows_x64_inclusive?
@@ -177,7 +183,10 @@ module Browser
     end
 
     def windows_touchscreen_desktop?
-      windows? && ua =~ /Touch/
+      windows? && ua.include?("Touch")
     end
+
+    private :subject
+    private :ua
   end
 end

data/lib/browser/qq.rb

@@ -19,7 +19,7 @@ module Browser
     end
 
     def match?
-      ua =~ /QQ/i
+      ua.match?(%r{QQ/|QQBrowser}i)
     end
   end
 end

data/lib/browser/rails.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require "rails/railtie"
-require "browser/action_controller"
-require "browser/middleware/context/additions"
+require_relative "action_controller"
+require_relative "middleware/context/additions"
 
 module Browser
   class Railtie < Rails::Railtie
@@ -12,7 +12,7 @@ module Browser
       ActiveSupport.on_load(:action_controller) do
         ::ActionController::Base.include(Browser::ActionController)
 
-        ::ActionController::Metal.include(Browser::ActionController) if defined?(::ActionController::Metal) # rubocop:disable Metrics/LineLength
+        ::ActionController::Metal.include(Browser::ActionController) if defined?(::ActionController::Metal) # rubocop:disable Layout/LineLength
 
         Browser::Middleware::Context.include(
           Browser::Middleware::Context::Additions

data/lib/browser/safari.rb

@@ -18,7 +18,22 @@ module Browser
     end
 
     def match?
-      ua =~ /Safari/ && ua !~ /Chrome|CriOS|PhantomJS|FxiOS|YaBrowser/
+      ua.include?("Safari") &&
+        !ua.match?(/PhantomJS|FxiOS/) &&
+        !edge? &&
+        !chrome? &&
+        !opera? &&
+        !samsung_browser? &&
+        !huawei_browser? &&
+        !miui_browser? &&
+        !duck_duck_go? &&
+        !yandex? &&
+        !sputnik? &&
+        !maxthon? &&
+        !qq? &&
+        !alipay? &&
+        !sougou_browser? &&
+        !google_search_app?
     end
   end
 end

data/lib/browser/samsung_browser.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Browser
+  class SamsungBrowser < Chrome
+    def id
+      :samsung_browser
+    end
+
+    def name
+      "Samsung Browser"
+    end
+
+    def full_version
+      ua[%r{SamsungBrowser/([\d.]+)}, 1] || super
+    end
+
+    def match?
+      ua.include?("SamsungBrowser")
+    end
+  end
+end

data/lib/browser/snapchat.rb

@@ -15,7 +15,7 @@ module Browser
     end
 
     def match?
-      ua =~ /Snapchat/
+      ua.include?("Snapchat")
     end
   end
 end

data/lib/browser/sougou_browser.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Browser
+  class SougouBrowser < Base
+    def id
+      :sougou_browser
+    end
+
+    def name
+      "Sougou Browser"
+    end
+
+    # We can't get the real version on desktop device from the ua string
+    def full_version
+      ua[%r{(?:SogouMobileBrowser)/([\d.]+)}, 1] || "0.0"
+    end
+
+    # SogouMobileBrowser for mobile device
+    # SE for desktop device
+    def match?
+      ua.match?(/SogouMobileBrowser/i) || ua.match?(/\bSE\b/)
+    end
+  end
+end

data/lib/browser/sputnik.rb

@@ -11,14 +11,11 @@ module Browser
     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"
+      ua[%r{SputnikBrowser/([\d.]+)}, 1] || "0.0"
     end
 
     def match?
-      ua =~ /SputnikBrowser/
+      ua.include?("SputnikBrowser")
     end
   end
 end

data/lib/browser/uc_browser.rb

@@ -15,7 +15,7 @@ module Browser
     end
 
     def match?
-      ua =~ /UCBrowser/
+      ua.include?("UCBrowser")
     end
   end
 end

data/lib/browser/{generic.rb → unknown.rb}

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
 module Browser
-  class Generic < Base
+  class Unknown < Base
     NAMES = {
       "QuickTime" => "QuickTime",
       "CoreMedia" => "Apple CoreMedia"
     }.freeze
 
     def id
-      :generic
+      :unknown_browser
     end
 
     def name
-      infer_name || "Generic Browser"
+      infer_name || "Unknown Browser"
     end
 
     def full_version

data/lib/browser/version.rb

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

data/lib/browser/weibo.rb

@@ -15,7 +15,7 @@ module Browser
     end
 
     def match?
-      ua =~ /__weibo__/i
+      ua.match?(/__weibo__/i)
     end
   end
 end

data/lib/browser/yandex.rb

@@ -15,7 +15,7 @@ module Browser
     end
 
     def match?
-      ua =~ /YaBrowser/
+      ua.include?("YaBrowser")
     end
   end
 end

data/lib/browser.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-require "browser/browser"
-require "browser/rails" if defined?(::Rails)
+require_relative "browser/browser"
+require_relative "browser/rails" if defined?(::Rails)

data/samsung.yml

@@ -0,0 +1,138 @@
+# Source: https://en.wikipedia.org/wiki/Samsung_Galaxy
+SM-G900H: Galaxy S5 Exynos
+SM-A320FL: Galaxy A3
+SM-G780F: Galaxy S20 Fan Edition
+SM-G781B: Galaxy S20 Fan Edition
+SM-F196B: Galaxy Z Fold2 5G
+SM-G928A: Galaxy S6 Edge+
+SM-G928AZ: Galaxy S6 Edge+
+SM-G928D: Galaxy S6 Edge+
+SM-G928F: Galaxy S6 Edge+
+SM-G928FD: Galaxy S6 Edge+
+SM-G928I: Galaxy S6 Edge+
+SM-G928K: Galaxy S6 Edge+
+SM-G928L: Galaxy S6 Edge+
+SM-G928P: Galaxy S6 Edge+
+SM-G928PZ: Galaxy S6 Edge+
+SM-G928R4: Galaxy S6 Edge+
+SM-G928R7: Galaxy S6 Edge+
+SM-G928S: Galaxy S6 Edge+
+SM-G928T: Galaxy S6 Edge+
+SM-G928T1: Galaxy S6 Edge+
+SM-G928TR: Galaxy S6 Edge+
+SM-G928V: Galaxy S6 Edge+
+SM-G9280: Galaxy S6 Edge+
+SM-G9288: Galaxy S6 Edge+
+SM-G9289: Galaxy S6 Edge+
+SM-A8000: Galaxy A8
+SM-A800F: Galaxy A8
+SM-A800I: Galaxy A8
+SM-A800S: Galaxy A8
+SM-A800Y: Galaxy A8
+SM-N9200: Galaxy Note 5
+SM-N920C: Galaxy Note 5
+SM-N920T: Galaxy Note 5
+SM-N920A: Galaxy Note 5
+SM-N920I: Galaxy Note 5
+SM-N9208: Galaxy Note 5
+SM-G903FP: Galaxy S5 Neo
+SM-G903WP: Galaxy S5 Neo
+SM-G925A: Galaxy S6 Edge
+SM-G925AZ: Galaxy S6 Edge
+SM-G925F: Galaxy S6 Edge
+SM-G925I: Galaxy S6 Edge
+SM-G925K: Galaxy S6 Edge
+SM-G925L: Galaxy S6 Edge
+SM-G925P: Galaxy S6 Edge
+SM-G925PZ: Galaxy S6 Edge
+SM-G925R4: Galaxy S6 Edge
+SM-G925R7: Galaxy S6 Edge
+SM-G925S: Galaxy S6 Edge
+SM-G925T: Galaxy S6 Edge
+SM-G925T1: Galaxy S6 Edge
+SM-G925TR: Galaxy S6 Edge
+SM-G925V: Galaxy S6 Edge
+SM-G9250: Galaxy S6 Edge
+SM-G9258: Galaxy S6 Edge
+SM-G9259: Galaxy S6 Edge
+SM-G920A: Galaxy S6
+SM-G920AZ: Galaxy S6
+SM-G920D: Galaxy S6
+SM-G920F: Galaxy S6
+SM-G920FD: Galaxy S6
+SM-G920I: Galaxy S6
+SM-G920K: Galaxy S6
+SM-G920L: Galaxy S6
+SM-G920P: Galaxy S6
+SM-G920PZ: Galaxy S6
+SM-G920R4: Galaxy S6
+SM-G920R7: Galaxy S6
+SM-G920S: Galaxy S6
+SM-G920T: Galaxy S6
+SM-G920T1: Galaxy S6
+SM-G920TR: Galaxy S6
+SM-G920V: Galaxy S6
+SM-G9200: Galaxy S6
+SM-G9208: Galaxy S6
+SM-G9209: Galaxy S6
+SM-A700F: Galaxy A7
+SM-A700FD: Galaxy A7
+SM-A700FQ: Galaxy A7
+SM-A700H: Galaxy A7
+SM-A700K: Galaxy A7
+SM-A700L: Galaxy A7
+SM-A700M: Galaxy A7
+SM-A700S: Galaxy A7
+SM-A700X: Galaxy A7
+SM-A700YD: Galaxy A7
+SM-A700YZ: Galaxy A7
+SM-A7000: Galaxy A7
+SM-A7009: Galaxy A7
+SM-A7009W: Galaxy A7
+SM-G530BT: Galaxy Grand Prime
+SM-G530F: Galaxy Grand Prime
+SM-G530FQ: Galaxy Grand Prime
+SM-G530FZ: Galaxy Grand Prime
+SM-G530H: Galaxy Grand Prime
+SM-G530M: Galaxy Grand Prime
+SM-G530MU: Galaxy Grand Prime
+SM-G530P: Galaxy Grand Prime
+SM-G530R4: Galaxy Grand Prime
+SM-G530R7: Galaxy Grand Prime
+SM-G530T: Galaxy Grand Prime
+SM-G530W: Galaxy Grand Prime
+SM-G530Y: Galaxy Grand Prime
+SM-G5306W: Galaxy Grand Prime
+SM-G5308W: Galaxy Grand Prime
+SM-G5309W: Galaxy Grand Prime
+SM-J7109: Galaxy J7
+SM-J710F: Galaxy J7
+SM-J710FN: Galaxy J7
+SM-J710H: Galaxy J7
+SM-J710MN: Galaxy J7
+SM-J710FQ: Galaxy J7
+SM-J710K: Galaxy J7
+SM-J710K: Galaxy J7
+SM-J710GN: Galaxy J7
+SM-J5109: Galaxy J5
+SM-J510F: Galaxy J5
+SM-J510FN: Galaxy J5
+SM-J510H: Galaxy J5
+SM-J510G: Galaxy J5
+SM-J510MN: Galaxy J5
+SM-J510Y: Galaxy J5
+SM-J5108: Galaxy J5
+SM-J510K: Galaxy J5
+SM-J510L: Galaxy J5
+SM-J510S: Galaxy J5
+SM-J510UN: Galaxy J5
+SM-G570F: Galaxy J2 Prime
+SM-G570M: Galaxy J2 Prime
+SM-G532F: Galaxy J2 Prime
+SM-G532M: Galaxy J2 Prime
+SM-G532G: Galaxy J2 Prime
+SM-G610F: Galaxy J7 Prime
+SM-G610M: Galaxy J7 Prime
+SM-G975F: Galaxy S10+
+SM-G960F: Galaxy S9
+SM-F700F: Galaxy Z Flip

data/test/browser_test.rb

@@ -39,7 +39,6 @@ class BrowserTest < Minitest::Test
     assert browser.platform.android?
     assert browser.safari?
     assert browser.webkit?
-    assert browser.modern?
     assert_equal "3.1.2", browser.full_version
     assert_equal "3", browser.version
   end
@@ -51,7 +50,6 @@ class BrowserTest < Minitest::Test
     assert browser.platform.android?
     assert browser.safari?
     assert browser.webkit?
-    assert browser.modern?
     assert_equal "4.0", browser.full_version
     assert_equal "4", browser.version
   end
@@ -62,7 +60,6 @@ class BrowserTest < Minitest::Test
     assert_equal "Internet Explorer", browser.name
     assert browser.device.surface?
     assert browser.ie?
-    assert browser.modern?
     assert_equal "10.0", browser.full_version
     assert_equal "10", browser.version
   end
@@ -93,7 +90,6 @@ class BrowserTest < Minitest::Test
     assert_equal "PhantomJS", browser.name
     assert_equal :phantom_js, browser.id
     assert browser.phantom_js?
-    assert browser.modern?
     assert_equal "1.9.0", browser.full_version
     assert_equal "1", browser.version
     assert browser.phantom_js?(%w[>=1 <2])
@@ -110,14 +106,13 @@ class BrowserTest < Minitest::Test
     refute browser.chrome?(">=65")
   end
 
-  test "detects unknown id" do
+  test "detects unknown browser" do
     browser = Browser.new("Unknown")
-    assert_equal :generic, browser.id
-  end
 
-  test "detects unknown name" do
-    browser = Browser.new("Unknown")
-    assert_equal "Generic Browser", browser.name
+    assert browser.unknown?
+    refute browser.known?
+    assert_equal :unknown_browser, browser.id
+    assert_equal "Unknown Browser", browser.name
   end
 
   test "returns empty language set for missing accept language" do
@@ -159,4 +154,36 @@ class BrowserTest < Minitest::Test
     browser = Browser.new("Fancy new browser")
     refute browser.known?
   end
+
+  test "rejects user agent larger than 2048 bytes" do
+    message = "user_agent cannot be larger than 2048 bytes; actual size is " \
+              "2049 bytes"
+
+    error =
+      begin
+        Browser.new("a" * 2049)
+        nil
+      rescue Browser::Error => error
+        error
+      end
+
+    refute_nil error
+    assert_equal message, error.message
+  end
+
+  test "rejects accept language larger than 2048 bytes" do
+    message = "accept_language cannot be larger than 2048 bytes; actual size " \
+              "is 2049 bytes"
+
+    error =
+      begin
+        Browser.new("Chrome", accept_language: "a" * 2049).accept_language
+        nil
+      rescue Browser::Error => error
+        error
+      end
+
+    refute_nil error
+    assert_equal message, error.message
+  end
 end

data/test/test_helper.rb

@@ -24,3 +24,11 @@ module Minitest
     end
   end
 end
+
+# Override Browser::Base#warn, so we don't output deprecation messages.
+module Browser
+  class Base
+    def warn(*)
+    end
+  end
+end