browser 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78fd9a10d5ca6461be5395616edcc1456967a595363f027548bf8a9fa0bfdf10
-  data.tar.gz: 599be9a3080333b44234ecf4c7ec21572e81e5dc3d04fccfa66a631bc6897494
+  metadata.gz: 4e5b6ed4dfb725a6d4814c3bd7a0a3897c0fe4fdeb9679d048cbb42123d6117c
+  data.tar.gz: b053a5fcf79d5fbea19849bde05125598563ac1b754dcd661f8c9fb96df2f3d4
 SHA512:
-  metadata.gz: ca6e173a47d2d1489816eb4794c57abc4fc3ff6f1ae63826570c71213e1177813895595240c995704ff50d22666ddae78900ac8eeea77cff93f3f63397bf4d7a
-  data.tar.gz: a09fe431f93c0dc9dd24ae2b1679538c4f61586b8334458adb41e6475c50da5850a747e1630b3904be57ccc360bc12333632cf1986978417e690aca4f8747356
+  metadata.gz: 9ea11931654143308193198a53edf5009dd301e04610e736c7da191c16c3578dd96df95213c787591f916859f604e01a61ef6baf12744a5ad84499dcaf93bf57
+  data.tar.gz: 7983885eca85b9cf2812f37b291020b2a8ef9ba3a7ee1a44f2a28e643fb786e6565d2a9394f57728c0444d82dc0ca7655eb6568b12578d9e50d8d191d7ca20c9

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 5.1.0
+
+- Add Samsung device detection.
+- Delay parsing `Accept-Language` until `Browser::Base#accept_language` is
+  called for the first time.
+- Bump up default size limit for `Accept-Language` and `User-Agent` to 2048
+  bytes.
+
 ## 5.0.0
 
 - Rename `Browser::Platform#other?` to `Browser::Platform#unknown?`.
@@ -18,7 +26,7 @@
 - Fix QQ detection.
 - Fix Alipay detection.
 - Add Sougou Browser detection.
-- User agent has a size limit of 512 bytes. This can be customized through 
+- User agent has a size limit of 512 bytes. This can be customized through
   `Browser.user_agent_size_limit`.
 - Accept-Language has a size limit of 256 bytes. This can be customized through
   `Browser.accept_language_size_limit`.

data/README.md

@@ -90,6 +90,7 @@ browser.device.tv?
 browser.device.vita?
 browser.device.wii?
 browser.device.wiiu?
+browser.device.samsung?
 browser.device.switch?
 browser.device.xbox?
 browser.device.xbox_360?
@@ -352,16 +353,16 @@ end
 
 ### Restrictions
 
-- User agent has a size limit of 512 bytes. This can be customized through 
+- User agent has a size limit of 2048 bytes. This can be customized through
   `Browser.user_agent_size_limit=(size)`.
-- Accept-Language has a size limit of 256 bytes. This can be customized through
+- Accept-Language has a size limit of 2048 bytes. This can be customized through
   `Browser.accept_language_size_limit=(size)`.
 
 If size is not respected, then `Browser::Error` is raised.
 
 ```ruby
-Browser.user_agent_size_limit = 1024
-Browser.accept_language_size_limit = 150
+Browser.user_agent_size_limit = 4096
+Browser.accept_language_size_limit = 4096
 ```
 
 ## Development

data/lib/browser/base.rb

@@ -6,15 +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)
-      validate_size(:accept_language, accept_language.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.
@@ -22,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.
@@ -263,7 +267,7 @@ module Browser
 
       raise Error,
             "#{subject} cannot be larger than #{size_limit} bytes; " \
-            "actual size is #{actual_bytesize}"
+            "actual size is #{actual_bytesize} bytes"
     end
   end
 end

data/lib/browser/browser.rb

@@ -62,8 +62,8 @@ module Browser
     attr_accessor :accept_language_size_limit
   end
 
-  self.user_agent_size_limit = 512
-  self.accept_language_size_limit = 256
+  self.user_agent_size_limit = 2048
+  self.accept_language_size_limit = 2048
 
   # Hold the list of browser matchers.
   # Order is important.

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,
@@ -191,6 +193,11 @@ 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?

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/version.rb

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

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

@@ -155,21 +155,35 @@ class BrowserTest < Minitest::Test
     refute browser.known?
   end
 
-  test "rejects user agent larger than 512 bytes" do
-    message = "user_agent cannot be larger than 512 bytes; actual size is " \
-              "513 bytes"
-
-    assert_raises(Browser::Error, message) do
-      Browser.new("a" * 513)
-    end
-  end
-
-  test "rejects accept language larger than 256 bytes" do
-    message = "accept_language cannot be larger than 256 bytes; actual size " \
-              "is 257 bytes"
-
-    assert_raises(Browser::Error, message) do
-      Browser.new("Chrome", accept_language: "a" * 257)
-    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/ua.yml

@@ -136,6 +136,10 @@ 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_BROWSER: "Mozilla/5.0 (Linux; Android 10; SAMSUNG SM-N960U) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/11.1 Chrome/75.0.3770.143 Mobile Safari/537.36"
 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"
+SAMSUNG_SM-G975F: "Mozilla/5.0 (Linux; Android 10; SM-G975F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.101 Mobile Safari/537.36"
+SAMSUNG_SM-G960F: "Mozilla/5.0 (Linux; Android 8.0.0; SM-G960F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.127 Mobile Safari/537.36"
+SAMSUNG_SM-F700F: "Mozilla/5.0 (Linux; Android 10; SAMSUNG SM-F700F) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/11.1 Chrome/75.0.3770.143 Mobile Safari/537.36"
+SAMSUNG_SM-FAKE: "Mozilla/5.0 (Linux; Android 8.0.0; SM-0000) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.127 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)
 SNAPCHAT_EMPTY_STRING_VERSION: "Mozilla/5.0 (Linux; Android 9; SM-N960U Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/78.0.3904.96 Mobile Safari/537.36Snapchat10.70.0.0 (SM-N960U; Android 9#N960USQS3CSJ2#28; gzip)"

data/test/unit/device_test.rb

@@ -258,4 +258,31 @@ class DeviceTest < Minitest::Test
       assert_equal name, device.name
     end
   end
+
+  test "detect samsung devices" do
+    device = Browser::Device.new(Browser["SAMSUNG_SM-G975F"])
+
+    assert device.samsung?
+    assert_equal :samsung, device.id
+    assert_equal "Samsung Galaxy S10+", device.name
+  end
+
+  test "detect generic samsung devices" do
+    device = Browser::Device.new(Browser["SAMSUNG_SM-FAKE"])
+
+    assert device.samsung?
+    assert_equal :samsung, device.id
+    assert_equal "Samsung SM-0000", device.name
+  end
+
+  {
+    "SAMSUNG_SM-G975F" => "Samsung Galaxy S10+",
+    "SAMSUNG_SM-G960F" => "Samsung Galaxy S9",
+    "SAMSUNG_SM-F700F" => "Samsung Galaxy Z Flip"
+  }.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browser
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2020-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -215,6 +215,7 @@ files:
 - lib/browser/device/playstation4.rb
 - lib/browser/device/psp.rb
 - lib/browser/device/psvita.rb
+- lib/browser/device/samsung.rb
 - lib/browser/device/surface.rb
 - lib/browser/device/switch.rb
 - lib/browser/device/tv.rb
@@ -283,6 +284,7 @@ files:
 - lib/browser/version.rb
 - lib/browser/weibo.rb
 - lib/browser/yandex.rb
+- samsung.yml
 - search_engines.yml
 - test/browser_test.rb
 - test/middleware_test.rb
@@ -356,7 +358,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Do some browser detection with Ruby.