browser 3.0.3 → 5.1.0

data/browser.gemspec

@@ -8,11 +8,13 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.authors               = ["Nando Vieira"]
   s.email                 = ["fnando.vieira@gmail.com"]
-  s.homepage              = "http://github.com/fnando/browser"
+  s.homepage              = "https://github.com/fnando/browser"
   s.summary               = "Do some browser detection with Ruby."
   s.description           = s.summary
   s.license               = "MIT"
 
+  s.metadata["changelog_uri"] = "https://github.com/fnando/browser/blob/master/CHANGELOG.md"
+  
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- exe/*`

data/lib/browser/base.rb

@@ -6,12 +6,11 @@ module Browser
 
     attr_reader :ua
 
-    # Return an array with all preferred languages that this browser accepts.
-    attr_reader :accept_language
-
     def initialize(ua, accept_language: nil)
+      validate_size(:user_agent, ua.to_s)
+
       @ua = ua
-      @accept_language = AcceptLanguage.parse(accept_language)
+      @accept_language_raw = accept_language.to_s
     end
 
     # Return a meta info about this browser.
@@ -19,6 +18,14 @@ module Browser
       Meta.get(self)
     end
 
+    # Return an array with all preferred languages that this browser accepts.
+    def accept_language
+      @accept_language ||= begin
+        validate_size(:accept_language, @accept_language_raw)
+        AcceptLanguage.parse(@accept_language_raw)
+      end
+    end
+
     alias_method :to_a, :meta
 
     # Return meta representation as string.
@@ -50,16 +57,6 @@ module Browser
       @device ||= Device.new(ua)
     end
 
-    # Return true if browser is modern (Webkit, Firefox 17+, IE9+, Opera 12+).
-    def modern?
-      warn <<~TEXT
-        Browser::Base#modern? is now deprecated.
-        Check https://github.com/fnando/browser/issues/435 for details.
-      TEXT
-
-      Browser.modern_rules.any? {|rule| rule === self } # rubocop:disable Style/CaseEquality
-    end
-
     # Detect if browser is Microsoft Internet Explorer.
     def ie?(expected_version = nil)
       InternetExplorer.new(ua).match? &&
@@ -132,7 +129,7 @@ module Browser
 
     # Detect if browser is Safari.
     def safari?(expected_version = nil)
-      Safari.new(ua).match? && detect_version?(version, expected_version)
+      Safari.new(ua).match? && detect_version?(full_version, expected_version)
     end
 
     def safari_webapp_mode?
@@ -197,12 +194,59 @@ module Browser
       ua =~ /Opera Mini/ && detect_version?(full_version, expected_version)
     end
 
+    # Detect if browser is DuckDuckGo.
+    def duck_duck_go?(expected_version = nil)
+      ua =~ /DuckDuckGo/ && detect_version?(full_version, expected_version)
+    end
+
+    # Detect if browser is Samsung.
+    def samsung_browser?(expected_version = nil)
+      ua =~ /SamsungBrowser/ && detect_version?(full_version, expected_version)
+    end
+
+    # Detect if browser is Huawei.
+    def huawei_browser?(expected_version = nil)
+      HuaweiBrowser.new(ua).match? &&
+        detect_version?(full_version, expected_version)
+    end
+
+    # Detect if browser is Xiaomi Miui.
+    def miui_browser?(expected_version = nil)
+      MiuiBrowser.new(ua).match? &&
+        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)
+    end
+
+    # Detect if browser is QQ.
+    def qq?(expected_version = nil)
+      QQ.new(ua).match? && detect_version?(full_version, expected_version)
+    end
+
+    # Detect if browser is Sougou.
+    def sougou_browser?(expected_version = nil)
+      SougouBrowser.new(ua).match? &&
+        detect_version?(full_version, expected_version)
+    end
+
+    # Detect if browser is Google Search App
+    def google_search_app?(expected_version = nil)
+      ua =~ /GSA/ && detect_version?(full_version, expected_version)
+    end
+
     def webkit_full_version
       ua[%r{AppleWebKit/([\d.]+)}, 1] || "0.0"
     end
 
     def known?
-      id != :generic
+      !unknown?
+    end
+
+    def unknown?
+      id == :unknown_browser
     end
 
     # Detect if browser is a proxy browser.
@@ -214,5 +258,16 @@ module Browser
     def electron?(expected_version = nil)
       Electron.new(ua).match? && detect_version?(full_version, expected_version)
     end
+
+    private def validate_size(subject, input)
+      actual_bytesize = input.bytesize
+      size_limit = Browser.public_send("#{subject}_size_limit")
+
+      return if actual_bytesize < size_limit
+
+      raise Error,
+            "#{subject} cannot be larger than #{size_limit} bytes; " \
+            "actual size is #{actual_bytesize} bytes"
+    end
   end
 end

data/lib/browser/browser.rb

@@ -15,7 +15,7 @@ require_relative "firefox"
 require_relative "edge"
 require_relative "opera"
 require_relative "blackberry"
-require_relative "generic"
+require_relative "unknown"
 require_relative "phantom_js"
 require_relative "uc_browser"
 require_relative "nokia"
@@ -30,6 +30,13 @@ require_relative "instagram"
 require_relative "yandex"
 require_relative "sputnik"
 require_relative "snapchat"
+require_relative "duck_duck_go"
+require_relative "samsung_browser"
+require_relative "huawei_browser"
+require_relative "miui_browser"
+require_relative "maxthon"
+require_relative "sougou_browser"
+require_relative "google_search_app"
 
 require_relative "bot"
 require_relative "bot/empty_user_agent_matcher"
@@ -44,10 +51,20 @@ require_relative "meta"
 module Browser
   EMPTY_STRING = ""
 
+  Error = Class.new(StandardError)
+
   def self.root
     @root ||= Pathname.new(File.expand_path("../..", __dir__))
   end
 
+  class << self
+    attr_accessor :user_agent_size_limit
+    attr_accessor :accept_language_size_limit
+  end
+
+  self.user_agent_size_limit = 2048
+  self.accept_language_size_limit = 2048
+
   # Hold the list of browser matchers.
   # Order is important.
   def self.matchers
@@ -65,41 +82,25 @@ module Browser
       Instagram,            # must be placed before Chrome and Safari
       Snapchat,             # must be placed before Chrome and Safari
       Weibo,                # must be placed before Chrome and Safari
+      MicroMessenger,       # must be placed before QQ
       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
+      DuckDuckGo,           # must be placed before Chrome and Safari
+      SamsungBrowser,       # must be placed before Chrome and Safari
+      HuaweiBrowser,        # must be placed before Chrome and Safari
+      MiuiBrowser,          # must be placed before Chrome and Safari
+      Maxthon,              # must be placed before Chrome and Safari
+      SougouBrowser,        # must be placed before Chrome and Safari
+      GoogleSearchApp,      # must be placed before Chrome and Safari
       Chrome,
       Safari,
-      MicroMessenger,
-      Generic
+      Unknown
     ]
   end
 
-  # Define the rules which define a modern browser.
-  # A rule must be a proc/lambda or any object that implements the method
-  # === and accepts the browser object.
-  #
-  # To redefine all rules, clear the existing rules before adding your own.
-  #
-  #   # Only Chrome Canary is considered modern.
-  #   Browser.modern_rules.clear
-  #   Browser.modern_rules << -> b { b.chrome? && b.version >= "37" }
-  #
-  def self.modern_rules
-    @modern_rules ||= []
-  end
-
-  modern_rules.tap do |rules|
-    rules << ->(b) { b.chrome? && b.version.to_i >= 65 }
-    rules << ->(b) { b.safari? && b.version.to_i >= 10 }
-    rules << ->(b) { b.firefox? && b.version.to_i >= 52 }
-    rules << ->(b) { b.ie? && b.version.to_i >= 11 && !b.compatibility_view? }
-    rules << ->(b) { b.edge? && b.version.to_i >= 15 }
-    rules << ->(b) { b.opera? && b.version.to_i >= 50 }
-  end
-
   def self.new(user_agent, **kwargs)
     matchers
       .map {|klass| klass.new(user_agent || EMPTY_STRING, **kwargs) }

data/lib/browser/chrome.rb

@@ -21,9 +21,19 @@ module Browser
 
     def match?
       ua =~ /Chrome|CriOS/ &&
-        ua !~ /PhantomJS|FxiOS|YaBrowser|SputnikBrowser|ArchiveBot/ &&
+        ua !~ /PhantomJS|FxiOS|ArchiveBot/ &&
         !opera? &&
-        !edge?
+        !edge? &&
+        !duck_duck_go? &&
+        !yandex? &&
+        !sputnik? &&
+        !samsung_browser? &&
+        !huawei_browser? &&
+        !miui_browser? &&
+        !maxthon? &&
+        !qq? &&
+        !sougou_browser? &&
+        !google_search_app?
     end
   end
 end

data/lib/browser/device.rb

@@ -20,6 +20,7 @@ require_relative "device/switch"
 require_relative "device/tv"
 require_relative "device/xbox_one"
 require_relative "device/xbox_360"
+require_relative "device/samsung"
 
 module Browser
   class Device
@@ -29,6 +30,7 @@ module Browser
     # Order is important.
     def self.matchers
       @matchers ||= [
+        Samsung,
         XboxOne,
         Xbox360,
         Surface,
@@ -88,7 +90,7 @@ module Browser
     end
 
     def unknown?
-      id == :unknown
+      id == :unknown_device
     end
 
     def ipod_touch?
@@ -191,13 +193,18 @@ module Browser
       xbox? || playstation? || nintendo?
     end
 
+    # Detect if device is a Samsung.
+    def samsung?
+      id == :samsung
+    end
+
     # Regex taken from http://detectmobilebrowsers.com
     # rubocop:disable Layout/LineLength
     private def detect_mobile?
       psp? ||
       /zunewp7/i.match(ua) ||
       %r{(android|bb\d+|meego).+mobile|avantgo|bada/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino}i.match(ua) ||
-      %r{1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-}i.match(ua[0..3])
+      %r{1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw-(n|u)|c55/|capi|ccwa|cdm-|cell|chtm|cldc|cmd-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc-s|devi|dica|dmob|do(c|p)o|ds(12|-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(-|_)|g1 u|g560|gene|gf-5|g-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd-(m|p|t)|hei-|hi(pt|ta)|hp( i|ip)|hs-c|ht(c(-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i-(20|go|ma)|i230|iac( |-|/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |/)|klon|kpt |kwc-|kyo(c|k)|le(no|xi)|lg( g|/(k|l|u)|50|54|-[a-w])|libw|lynx|m1-w|m3ga|m50/|ma(te|ui|xo)|mc(01|21|ca)|m-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|-([1-8]|c))|phil|pire|pl(ay|uc)|pn-2|po(ck|rt|se)|prox|psio|pt-g|qa-a|qc(07|12|21|32|60|-[2-7]|i-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55/|sa(ge|ma|mm|ms|ny|va)|sc(01|h-|oo|p-)|sdk/|se(c(-|0|1)|47|mc|nd|ri)|sgh-|shar|sie(-|m)|sk-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h-|v-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl-|tdg-|tel(i|m)|tim-|t-mo|to(pl|sh)|ts(70|m-|m3|m5)|tx-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas-|your|zeto|zte-}i.match(ua[0..3])
     end
     # rubocop:enable Layout/LineLength
 

data/lib/browser/device/samsung.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Browser
+  class Device
+    class Samsung < Base
+      REGEX = /\(Linux.*?; Android.*?; (SAMSUNG )?(SM-[A-Z0-9]+).*?\)/i.freeze
+
+      def self.names
+        @names ||= YAML.load_file(Browser.root.join("samsung.yml").to_s)
+      end
+
+      def id
+        :samsung
+      end
+
+      def name
+        "Samsung #{self.class.names[code] || code}"
+      end
+
+      def code
+        matches && matches[2]
+      end
+
+      def matches
+        @matches ||= ua.match(REGEX)
+      end
+
+      def match?
+        !!matches
+      end
+    end
+  end
+end

data/lib/browser/device/unknown.rb

@@ -4,7 +4,7 @@ module Browser
   class Device
     class Unknown < Base
       def id
-        :unknown
+        :unknown_device
       end
 
       def name

data/lib/browser/duck_duck_go.rb

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

data/lib/browser/edge.rb

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

data/lib/browser/google_search_app.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Browser
+  class GoogleSearchApp < Chrome
+    def id
+      :google_search_app
+    end
+
+    def name
+      "Google Search App"
+    end
+
+    def full_version
+      ua[%r{GSA/([\d.]+\d)}, 1] || super
+    end
+
+    def match?
+      ua =~ /GSA/
+    end
+  end
+end

data/lib/browser/huawei_browser.rb

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

data/lib/browser/maxthon.rb

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