browser 2.5.2 → 5.3.1

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Browser
+  class Sputnik < Base
+    def id
+      :sputnik
+    end
+
+    def name
+      "Sputnik"
+    end
+
+    def full_version
+      ua[%r{SputnikBrowser/([\d.]+)}, 1] || "0.0"
+    end
+
+    def match?
+      ua.include?("SputnikBrowser")
+    end
+  end
+end

data/lib/browser/uc_browser.rb

@@ -11,11 +11,11 @@ module Browser
     end
 
     def full_version
-      ua[%r[UCBrowser/([\d.]+)], 1] || "0.0"
+      ua[%r{UCBrowser/([\d.]+)}, 1] || "0.0"
     end
 
     def match?
-      ua =~ /UCBrowser/
+      ua.include?("UCBrowser")
     end
   end
 end

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

@@ -1,23 +1,23 @@
 # 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
-      ua[%r[(?:QuickTime)/([\d.]+)], 1] ||
-        ua[%r[CoreMedia v([\d.]+)], 1] ||
+      ua[%r{(?:QuickTime)/([\d.]+)}, 1] ||
+        ua[/CoreMedia v([\d.]+)/, 1] ||
         "0.0"
     end
 
@@ -25,9 +25,7 @@ module Browser
       true
     end
 
-    private
-
-    def infer_name
+    private def infer_name
       (NAMES.find {|key, _| ua.include?(key) } || []).last
     end
   end

data/lib/browser/version.rb

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

data/lib/browser/weibo.rb

@@ -11,11 +11,11 @@ module Browser
     end
 
     def full_version
-      ua[%r[(?:__weibo__)([\d.]+)]i, 1] || "0.0"
+      ua[/(?:__weibo__)([\d.]+)/i, 1] || "0.0"
     end
 
     def match?
-      ua =~ /__weibo__/i
+      ua.match?(/__weibo__/i)
     end
   end
 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.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/search_engines.yml

@@ -1,6 +1,6 @@
+ask jeeves: "Ask Jeeves"
 baidu: "Chinese search engine"
 bingbot: "Microsoft bing bot"
+duckduckbot: "Duck Duck Go"
 googlebot: "Google spider"
 slurp: "Yahoo spider"
-duckduckbot: "Duck Duck Go"
-ask jeeves: "Ask Jeeves"

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])
@@ -105,14 +101,18 @@ class BrowserTest < Minitest::Test
     assert_equal "0", browser.version
   end
 
-  test "detects unknown id" do
-    browser = Browser.new("Unknown")
-    assert_equal :generic, browser.id
+  test "ignores malformed strings when comparing versions" do
+    browser = Browser.new("Chrome/65.0.3325.99.FreeBrowser.3.0.5")
+    refute browser.chrome?(">=65")
   end
 
-  test "detects unknown name" do
+  test "detects unknown browser" 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
@@ -132,7 +132,7 @@ class BrowserTest < Minitest::Test
     browser = Browser.new("", accept_language: accept_language)
     languages = browser.accept_language.map(&:full)
 
-    assert_equal ["en-US", "en", "pt-BR", "pt"], languages
+    assert_equal %w[en-US en pt-BR pt], languages
   end
 
   test "removes duplicate items" do
@@ -154,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/rails_test.rb

@@ -19,4 +19,14 @@ class RailsTest < Minitest::Test
     assert_equal 200, last_response.status
     assert_equal "Chrome:en-US", last_response.body
   end
+
+  test "renders json" do
+    get "/api/pages", {}, "HTTP_USER_AGENT" => Browser["COMMONCRAWL"],
+                          "HTTP_ACCEPT" => "application/json",
+                          "HTTP_ACCEPT_LANGUAGE" => "en-US;q=0.8"
+
+    assert_equal 200, last_response.status
+    assert_equal true, JSON.parse(last_response.body)["isBot"]
+    assert_equal "en-US", JSON.parse(last_response.body)["acceptLanguages"][0]
+  end
 end

data/test/sample_app.rb

@@ -9,12 +9,24 @@ class PagesController < ActionController::Base
   end
 end
 
+class PotsController < ActionController::API
+  def index
+    render json: {
+      isBot: browser.bot?,
+      acceptLanguages: browser.accept_language.map(&:full)
+    }
+  end
+end
+
 class SampleApp < Rails::Application
   config.secret_token = "99f19f08db7a37bdcb9d6701f54dca"
   config.secret_key_base = "99f19f08db7a37bdcb9d6701f54dca"
   config.eager_load = true
   config.active_support.deprecation = :log
 
+  # Introduced by Rails 6.
+  config.hosts << "example.org" if config.respond_to?(:hosts)
+
   routes.append do
     default_headers = {"Content-Type" => "text/html"}
 
@@ -29,6 +41,8 @@ class SampleApp < Rails::Application
     }
 
     get "/home", to: "pages#home"
+
+    get "/api/pages", to: "pots#index"
   end
 
   config.middleware.use Browser::Middleware do

data/test/test_helper.rb

@@ -3,7 +3,7 @@
 require "simplecov"
 SimpleCov.start
 
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 require "bundler/setup"
 require "minitest/autorun"
 require "minitest/utils"
@@ -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