browser 3.0.3 → 5.3.1

data/test/unit/kai_os_test.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class KaiOSTest < Minitest::Test
+  test "detects KaiOS" do
+    browser = Browser.new(Browser["NOKIA_8110"])
+
+    assert browser.firefox?
+    assert_equal "48", browser.version
+    assert_equal "48.0", browser.full_version
+    assert_equal "Firefox", browser.name
+    assert browser.platform.kai_os?
+    assert_equal "KaiOS", browser.platform.name
+    assert_equal "2.5", browser.platform.version
+    refute browser.platform.android?
+  end
+
+  test "detects KaiOS with Android string in user-agent " do
+    browser = Browser.new(Browser["JIOPHONE_2"])
+
+    assert browser.firefox?
+    assert_equal "48", browser.version
+    assert_equal "48.0", browser.full_version
+    assert_equal "Firefox", browser.name
+    assert browser.platform.kai_os?
+    assert_equal "KaiOS", browser.platform.name
+    assert_equal "2.5", browser.platform.version
+    refute browser.platform.android?
+  end
+end

data/test/unit/maxthon_test.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class MaxthonTest < Minitest::Test
+  test "detects Maxthon" do
+    browser = Browser.new(Browser["MAXTHON"])
+    assert browser.maxthon?
+    refute browser.safari?
+    refute browser.chrome?
+    assert_equal "Maxthon", browser.name
+    assert_equal :maxthon, browser.id
+  end
+
+  test "detects correct version" do
+    browser = Browser.new(Browser["MAXTHON"])
+    assert_equal "5.3.8.2000", browser.full_version
+    assert_equal "5", browser.version
+  end
+
+  test "detects version by range" do
+    browser = Browser.new(Browser["MAXTHON"])
+    assert browser.maxthon?(%w[>=5 <6])
+  end
+end

data/test/unit/meta_test.rb

@@ -5,7 +5,7 @@ require "test_helper"
 class MetaTest < Minitest::Test
   class CustomRule < Browser::Meta::Base
     def meta
-      "custom" if browser.ua =~ /Custom/
+      "custom" if /Custom/.match?(browser.ua)
     end
   end
 
@@ -45,4 +45,13 @@ class MetaTest < Minitest::Test
     assert meta.include?("blackberry")
     assert meta.include?("mobile")
   end
+
+  test "returns string representation for unknown platform/device/browser" do
+    browser = Browser.new("Unknown")
+    meta = browser.to_s
+
+    assert meta.include?("unknown_platform")
+    assert meta.include?("unknown_device")
+    assert meta.include?("unknown_browser")
+  end
 end

data/test/unit/micro_messenger_test.rb

@@ -3,18 +3,33 @@
 require "test_helper"
 
 class MicroMessengerTest < Minitest::Test
-  test "detects micro messenger 6.3.15" do
-    browser = Browser.new(Browser["MICRO_MESSENGER"])
+  test "detects micro messenger 7.0.10 on iOS" do
+    browser = Browser.new(Browser["MICRO_MESSENGER_IOS"])
 
     assert browser.micro_messenger?
     assert browser.wechat?
-    assert_equal "6.3.15", browser.full_version
+    assert_equal "7.0.10", browser.full_version
     assert_equal "MicroMessenger", browser.name
     assert_equal :micro_messenger, browser.id
   end
 
-  test "detects version by range" do
-    browser = Browser.new(Browser["MICRO_MESSENGER"])
-    assert browser.wechat?(%w[>=6 <7])
+  test "detects version by range on iOS" do
+    browser = Browser.new(Browser["MICRO_MESSENGER_IOS"])
+    assert browser.wechat?(%w[>=7 <8])
+  end
+
+  test "detects micro messenger 7.0.13.1640 on Android" do
+    browser = Browser.new(Browser["MICRO_MESSENGER_ANDROID"])
+
+    assert browser.micro_messenger?
+    assert browser.wechat?
+    assert_equal "7.0.13.1640", browser.full_version
+    assert_equal "MicroMessenger", browser.name
+    assert_equal :micro_messenger, browser.id
+  end
+
+  test "detects version by range on Android" do
+    browser = Browser.new(Browser["MICRO_MESSENGER_ANDROID"])
+    assert browser.wechat?(%w[>=7 <8])
   end
 end

data/test/unit/miui_browser_test.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class MiuiBrowserTest < Minitest::Test
+  test "detects Miui Browser" do
+    browser = Browser.new(Browser["MIUI_BROWSER"])
+    assert browser.miui_browser?
+    refute browser.safari?
+    refute browser.chrome?
+    assert_equal "Miui Browser", browser.name
+    assert_equal :miui_browser, browser.id
+  end
+
+  test "detects correct version" do
+    browser = Browser.new(Browser["MIUI_BROWSER"])
+    assert_equal "12.3.3", browser.full_version
+    assert_equal "12", browser.version
+  end
+
+  test "detects version by range" do
+    browser = Browser.new(Browser["MIUI_BROWSER"])
+    assert browser.miui_browser?(%w[>=12 <13])
+  end
+end

data/test/unit/opera_test.rb

@@ -20,6 +20,7 @@ class OperaTest < Minitest::Test
     assert browser.opera?
     assert browser.webkit?
     refute browser.chrome?
+    refute browser.safari?
     assert_equal "15.0.1147.44", browser.full_version
     assert_equal "15", browser.version
   end

data/test/unit/platform_test.rb

@@ -5,7 +5,7 @@ require "test_helper"
 class PlatformTest < Minitest::Test
   class CustomPlatform < Browser::Platform::Base
     def match?
-      ua =~ /Custom/
+      ua.include?("Custom")
     end
 
     def id
@@ -20,7 +20,7 @@ class PlatformTest < Minitest::Test
 
     Browser::Platform.matchers.shift
     platform = Browser::Platform.new("Custom")
-    assert_equal :other, platform.id
+    assert_equal :unknown_platform, platform.id
   end
 
   test "implements to_s" do
@@ -35,13 +35,13 @@ class PlatformTest < Minitest::Test
     refute platform == :android
   end
 
-  test "detect other" do
-    platform = Browser::Platform.new("Other")
+  test "detect unknown platforms" do
+    platform = Browser::Platform.new("Unknown")
 
-    assert_equal "Other", platform.name
-    assert_equal :other, platform.id
+    assert_equal "Unknown", platform.name
+    assert_equal :unknown_platform, platform.id
     assert_equal "0", platform.version
-    assert platform.other?
+    assert platform.unknown?
   end
 
   test "detect ios (iPhone)" do
@@ -104,7 +104,7 @@ class PlatformTest < Minitest::Test
   test "detect mac" do
     platform = Browser::Platform.new(Browser["SAFARI"])
 
-    assert_equal "Macintosh", platform.name
+    assert_equal "Mac OS X", platform.name
     assert_equal :mac, platform.id
     assert platform.mac?
     assert_equal "10.6.4", platform.version
@@ -116,6 +116,11 @@ class PlatformTest < Minitest::Test
     assert_equal "0", platform.version
   end
 
+  test "detect mac names" do
+    assert_equal "Mac OS X", Browser::Platform.new(Browser["MAC_OSX"]).name
+    assert_equal "macOS", Browser::Platform.new(Browser["MAC_OS"]).name
+  end
+
   test "detect firefox os" do
     platform = Browser::Platform.new(Browser["FIREFOX_OS"])
 

data/test/unit/qq_test.rb

@@ -9,6 +9,9 @@ class QQTest < Minitest::Test
     assert_equal "6.3.3.432", browser.full_version
     assert_equal "QQ Browser", browser.name
     assert_equal :qq, browser.id
+
+    refute browser.chrome?
+    refute browser.safari?
   end
 
   test "detects QQ browser for Android" do
@@ -17,6 +20,9 @@ class QQTest < Minitest::Test
     assert_equal "6.2", browser.full_version
     assert_equal "QQ Browser", browser.name
     assert_equal :qq, browser.id
+
+    refute browser.chrome?
+    refute browser.safari?
   end
 
   test "detects QQ browser for Mac" do
@@ -25,6 +31,9 @@ class QQTest < Minitest::Test
     assert_equal "4.2.4753.400", browser.full_version
     assert_equal "QQ Browser", browser.name
     assert_equal :qq, browser.id
+
+    refute browser.chrome?
+    refute browser.safari?
   end
 
   test "detects QQ browser lite for Mac" do
@@ -33,5 +42,8 @@ class QQTest < Minitest::Test
     assert_equal "1.0.4", browser.full_version
     assert_equal "QQ Browser", browser.name
     assert_equal :qq, browser.id
+
+    refute browser.chrome?
+    refute browser.safari?
   end
 end

data/test/unit/safari_test.rb

@@ -7,7 +7,7 @@ class SafariTest < Minitest::Test
     browser = Browser.new(Browser["SAFARI3"])
 
     assert browser.safari?
-    assert browser.safari?(3)
+    assert browser.safari?("~>3.0")
     assert_equal "3", browser.version
     assert_equal "3.0.3", browser.full_version
   end
@@ -16,7 +16,7 @@ class SafariTest < Minitest::Test
     browser = Browser.new(Browser["SAFARI4"])
 
     assert browser.safari?
-    assert browser.safari?(4)
+    assert browser.safari?("~>4.0")
     assert_equal "4", browser.version
     assert_equal "4.0.3", browser.full_version
   end
@@ -25,7 +25,7 @@ class SafariTest < Minitest::Test
     browser = Browser.new(Browser["SAFARI5"])
 
     assert browser.safari?
-    assert browser.safari?(5)
+    assert browser.safari?("~>5.0")
     assert_equal "5", browser.version
     assert_equal "5.0.3", browser.full_version
   end
@@ -34,7 +34,7 @@ class SafariTest < Minitest::Test
     browser = Browser.new(Browser["SAFARI6"])
 
     assert browser.safari?
-    assert browser.safari?(6)
+    assert browser.safari?("~>6.0")
     assert_equal "6", browser.version
     assert_equal "6.0", browser.full_version
   end
@@ -43,7 +43,7 @@ class SafariTest < Minitest::Test
     browser = Browser.new(Browser["SAFARI7"])
 
     assert browser.safari?
-    assert browser.safari?(7)
+    assert browser.safari?("~>7.0")
     assert_equal "7", browser.version
     assert_equal "7.0", browser.full_version
   end
@@ -52,7 +52,7 @@ class SafariTest < Minitest::Test
     browser = Browser.new(Browser["SAFARI8"])
 
     assert browser.safari?
-    assert browser.safari?(8)
+    assert browser.safari?("~>8.0")
     assert_equal "8", browser.version
     assert_equal "8.0", browser.full_version
   end
@@ -61,7 +61,7 @@ class SafariTest < Minitest::Test
     browser = Browser.new(Browser["SAFARI9"])
 
     assert browser.safari?
-    assert browser.safari?(9)
+    assert browser.safari?("~>9.0")
     assert_equal "9", browser.version
     assert_equal "9.0.2", browser.full_version
   end
@@ -88,4 +88,9 @@ class SafariTest < Minitest::Test
     browser = Browser.new(Browser["SAFARI9"])
     assert browser.webkit?(%w[>=601 <602])
   end
+
+  test "detects safari version by range" do
+    browser = Browser.new(Browser["SAFARI9"])
+    assert browser.safari?(%w[>=9.0 <10])
+  end
 end

data/test/unit/samsung_browser_test.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class SamsungBrowserTest < Minitest::Test
+  test "detects samsung browser" do
+    browser = Browser.new(Browser["SAMSUNG_BROWSER"])
+
+    assert browser.webkit?
+    assert browser.samsung_browser?
+    assert_equal "11", browser.version
+    assert_equal :samsung_browser, browser.id
+    assert_equal "11.1", browser.full_version
+    assert_equal "Samsung Browser", browser.name
+    refute browser.chrome?
+    refute browser.safari?
+  end
+
+  test "detects version by range" do
+    browser = Browser.new(Browser["SAMSUNG_BROWSER"])
+    assert browser.samsung_browser?(%w[>=11 <12])
+  end
+end

data/test/unit/sougou_browser_test.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class SougouBrowserTest < Minitest::Test
+  test "detects Sougou Browser on desktop device" do
+    browser = Browser.new(Browser["SOUGOU_BROWSER"])
+    assert browser.sougou_browser?
+    refute browser.safari?
+    refute browser.chrome?
+    assert_equal "Sougou Browser", browser.name
+    assert_equal :sougou_browser, browser.id
+  end
+
+  test "detects correct version on desktop device" do
+    browser = Browser.new(Browser["SOUGOU_BROWSER"])
+    assert_equal "0.0", browser.full_version
+    assert_equal "0", browser.version
+  end
+
+  test "detects Sougou Browser on mobile device" do
+    browser = Browser.new(Browser["SOUGOU_BROWSER_MOBILE"])
+    assert browser.sougou_browser?
+    assert browser.device.mobile?
+    refute browser.safari?
+    refute browser.chrome?
+    assert_equal "Sougou Browser", browser.name
+    assert_equal :sougou_browser, browser.id
+  end
+
+  test "detects correct version on mobile device" do
+    browser = Browser.new(Browser["SOUGOU_BROWSER_MOBILE"])
+    assert_equal "5.28.12", browser.full_version
+    assert_equal "5", browser.version
+  end
+
+  test "detects version by range on mobile device" do
+    browser = Browser.new(Browser["SOUGOU_BROWSER_MOBILE"])
+    assert browser.sougou_browser?(%w[>=5 <6])
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browser
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 5.3.1
 platform: ruby
 authors:
 - Nando Vieira
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-10 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,16 +140,16 @@ dependencies:
   name: rubocop-fnando
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -172,10 +172,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/ISSUE_TEMPLATE.md"
+- ".github/workflows/tests.yml"
 - ".gitignore"
+- ".prettierignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
+- FUNDING.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -183,8 +185,8 @@ files:
 - bots.yml
 - browser.gemspec
 - config.ru
-- gemfiles/rails5.gemfile
-- gemfiles/rails6.gemfile
+- gemfiles/rails6_0.gemfile
+- gemfiles/rails6_1.gemfile
 - languages.yml
 - lib/browser.rb
 - lib/browser/accept_language.rb
@@ -213,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
@@ -221,13 +224,16 @@ files:
 - lib/browser/device/wiiu.rb
 - lib/browser/device/xbox_360.rb
 - lib/browser/device/xbox_one.rb
+- lib/browser/duck_duck_go.rb
 - lib/browser/edge.rb
 - lib/browser/electron.rb
 - lib/browser/facebook.rb
 - lib/browser/firefox.rb
-- lib/browser/generic.rb
+- lib/browser/google_search_app.rb
+- lib/browser/huawei_browser.rb
 - lib/browser/instagram.rb
 - lib/browser/internet_explorer.rb
+- lib/browser/maxthon.rb
 - lib/browser/meta.rb
 - lib/browser/meta/base.rb
 - lib/browser/meta/device.rb
@@ -236,7 +242,6 @@ files:
 - lib/browser/meta/ie.rb
 - lib/browser/meta/ios.rb
 - lib/browser/meta/mobile.rb
-- lib/browser/meta/modern.rb
 - lib/browser/meta/platform.rb
 - lib/browser/meta/proxy.rb
 - lib/browser/meta/safari.rb
@@ -247,6 +252,7 @@ files:
 - lib/browser/middleware/context.rb
 - lib/browser/middleware/context/additions.rb
 - lib/browser/middleware/context/url_methods.rb
+- lib/browser/miui_browser.rb
 - lib/browser/nokia.rb
 - lib/browser/opera.rb
 - lib/browser/otter.rb
@@ -259,22 +265,27 @@ files:
 - lib/browser/platform/chrome_os.rb
 - lib/browser/platform/firefox_os.rb
 - lib/browser/platform/ios.rb
+- lib/browser/platform/kai_os.rb
 - lib/browser/platform/linux.rb
 - lib/browser/platform/mac.rb
-- lib/browser/platform/other.rb
+- lib/browser/platform/unknown.rb
 - lib/browser/platform/windows.rb
 - lib/browser/platform/windows_mobile.rb
 - lib/browser/platform/windows_phone.rb
 - lib/browser/qq.rb
 - lib/browser/rails.rb
 - lib/browser/safari.rb
+- lib/browser/samsung_browser.rb
 - lib/browser/snapchat.rb
+- lib/browser/sougou_browser.rb
 - lib/browser/sputnik.rb
 - lib/browser/testing.rb
 - lib/browser/uc_browser.rb
+- lib/browser/unknown.rb
 - 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
@@ -295,18 +306,24 @@ files:
 - test/unit/chrome_test.rb
 - test/unit/console_test.rb
 - test/unit/device_test.rb
+- test/unit/duck_duck_go_test.rb
 - test/unit/edge_test.rb
 - test/unit/electron_test.rb
 - test/unit/facebook_test.rb
 - test/unit/firefox_test.rb
 - test/unit/generic_test.rb
+- test/unit/google_search_app_test.rb
+- test/unit/huawei_browser_test.rb
 - test/unit/instagram_test.rb
 - test/unit/internet_explorer_test.rb
 - test/unit/ios_app_test.rb
 - test/unit/ios_test.rb
+- test/unit/kai_os_test.rb
 - test/unit/kindle_test.rb
+- test/unit/maxthon_test.rb
 - test/unit/meta_test.rb
 - test/unit/micro_messenger_test.rb
+- test/unit/miui_browser_test.rb
 - test/unit/nokia_test.rb
 - test/unit/opera_test.rb
 - test/unit/otter_test.rb
@@ -314,18 +331,21 @@ files:
 - test/unit/proxy_test.rb
 - test/unit/qq_test.rb
 - test/unit/safari_test.rb
+- test/unit/samsung_browser_test.rb
 - test/unit/snapchat_test.rb
+- test/unit/sougou_browser_test.rb
 - test/unit/sputnik_test.rb
 - test/unit/uc_browser_test.rb
 - test/unit/weibo_test.rb
 - test/unit/windows_phone_test.rb
 - test/unit/windows_test.rb
 - test/unit/yandex_test.rb
-homepage: http://github.com/fnando/browser
+homepage: https://github.com/fnando/browser
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  changelog_uri: https://github.com/fnando/browser/blob/main/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -333,15 +353,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Do some browser detection with Ruby.
 test_files:
@@ -364,18 +384,24 @@ test_files:
 - test/unit/chrome_test.rb
 - test/unit/console_test.rb
 - test/unit/device_test.rb
+- test/unit/duck_duck_go_test.rb
 - test/unit/edge_test.rb
 - test/unit/electron_test.rb
 - test/unit/facebook_test.rb
 - test/unit/firefox_test.rb
 - test/unit/generic_test.rb
+- test/unit/google_search_app_test.rb
+- test/unit/huawei_browser_test.rb
 - test/unit/instagram_test.rb
 - test/unit/internet_explorer_test.rb
 - test/unit/ios_app_test.rb
 - test/unit/ios_test.rb
+- test/unit/kai_os_test.rb
 - test/unit/kindle_test.rb
+- test/unit/maxthon_test.rb
 - test/unit/meta_test.rb
 - test/unit/micro_messenger_test.rb
+- test/unit/miui_browser_test.rb
 - test/unit/nokia_test.rb
 - test/unit/opera_test.rb
 - test/unit/otter_test.rb
@@ -383,7 +409,9 @@ test_files:
 - test/unit/proxy_test.rb
 - test/unit/qq_test.rb
 - test/unit/safari_test.rb
+- test/unit/samsung_browser_test.rb
 - test/unit/snapchat_test.rb
+- test/unit/sougou_browser_test.rb
 - test/unit/sputnik_test.rb
 - test/unit/uc_browser_test.rb
 - test/unit/weibo_test.rb

data/.travis.yml

@@ -1,23 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.7
-  - 2.6
-  - 2.5
-gemfile:
-  - Gemfile
-  - gemfiles/rails5.gemfile
-  - gemfiles/rails6.gemfile
-script: bundle exec rake
-notifications:
-  email: false
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - "./cc-test-reporter before-build"
-after_script:
-  - "./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT"
-env:
-  global:
-    secure: LrxynbbiJMX5vy/UVPfQsnT21oUpqpuHbUM9YOy0+ZYfDCjprvM/UGxFgjM+unRzyPI0mrNyU65ohpj8R1//tvdFW+xYau6QmFgSTU6OAQrckW/n+jqwQZV37a38wEGV0QvA6A0HW9pTrJfatUBmpaAeHAxcaBMk51tEgX/8poA=

data/lib/browser/meta/modern.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Browser
-  module Meta
-    class Modern < Base
-      def meta
-        "modern" if browser.modern?
-      end
-    end
-  end
-end