browser 5.3.1 → 6.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/{FUNDING.yml → .github/FUNDING.yml} +2 -1
- data/.github/workflows/{tests.yml → ruby-tests.yml} +17 -17
- data/.rubocop.yml +3 -23
- data/CHANGELOG.md +18 -7
- data/LICENSE.md +20 -0
- data/README.md +11 -4
- data/bots.yml +23 -0
- data/browser.gemspec +4 -5
- data/gemfiles/{rails6_0.gemfile → 7_0.gemfile} +1 -1
- data/gemfiles/{rails6_1.gemfile → 7_1.gemfile} +1 -1
- data/lib/browser/accept_language.rb +1 -1
- data/lib/browser/base.rb +34 -29
- data/lib/browser/browser.rb +4 -3
- data/lib/browser/chrome.rb +4 -0
- data/lib/browser/device.rb +10 -10
- data/lib/browser/edge.rb +1 -1
- data/lib/browser/meta/base.rb +1 -1
- data/lib/browser/platform/ios.rb +1 -1
- data/lib/browser/platform.rb +1 -1
- data/lib/browser/testing.rb +3 -3
- data/lib/browser/version.rb +1 -1
- data/lib/browser.rb +1 -1
- data/search_engines.yml +1 -0
- data/test/browser_test.rb +3 -3
- data/test/rails_test.rb +1 -1
- data/test/sample_app.rb +2 -2
- data/test/test_helper.rb +4 -2
- data/test/ua.yml +10 -4
- data/test/ua_bots.yml +18 -0
- data/test/unit/accept_language_test.rb +1 -1
- data/test/unit/android_app_test.rb +3 -3
- data/test/unit/android_test.rb +17 -17
- data/test/unit/blackberry_test.rb +1 -1
- data/test/unit/bots_test.rb +15 -4
- data/test/unit/chrome_test.rb +7 -0
- data/test/unit/device_test.rb +25 -25
- data/test/unit/edge_test.rb +6 -0
- data/test/unit/electron_test.rb +1 -1
- data/test/unit/facebook_test.rb +3 -3
- data/test/unit/generic_test.rb +3 -3
- data/test/unit/instagram_test.rb +2 -2
- data/test/unit/internet_explorer_test.rb +18 -18
- data/test/unit/ios_app_test.rb +3 -3
- data/test/unit/ios_test.rb +18 -12
- data/test/unit/kindle_test.rb +15 -0
- data/test/unit/meta_test.rb +13 -13
- data/test/unit/platform_test.rb +33 -25
- data/test/unit/proxy_test.rb +2 -2
- data/test/unit/safari_test.rb +14 -9
- data/test/unit/snapchat_test.rb +3 -3
- data/test/unit/uc_browser_test.rb +1 -1
- data/test/unit/windows_test.rb +11 -11
- metadata +12 -77
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 454eed87d491bb62265a7d32ac73b3be33021a13a14424f3f234783a635b4ee6
|
|
4
|
+
data.tar.gz: 59a05cfaa289926bd7961d87e2d75a0cc5ffb1836ce862dc813d24a16ec19ca0
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 027f23bb5b3e06133d025f8870f5b8685e6cbf81463fff5d169a34ed45abd9df41e66435bbcb897849de312a00c7ac4574babea4dc95e1d255802aa25e5d3db8
|
|
7
|
+
data.tar.gz: e8bfa31ce8370a4fe398daefa4321ec6d8878dcc2a14eb147734a4001ea14a2a8ca0771e8e97358d839e49efff3236c5c41c6fa2c444d6417295eae8f80d82a2
|
|
@@ -1,48 +1,47 @@
|
|
|
1
|
-
|
|
1
|
+
---
|
|
2
|
+
name: ruby-tests
|
|
2
3
|
|
|
3
4
|
on:
|
|
4
|
-
|
|
5
|
-
branches:
|
|
6
|
-
- main
|
|
5
|
+
pull_request_target:
|
|
7
6
|
push:
|
|
8
7
|
branches:
|
|
9
8
|
- main
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
- cron: "0 10 * * *"
|
|
9
|
+
workflow_dispatch:
|
|
10
|
+
inputs: {}
|
|
13
11
|
|
|
14
12
|
jobs:
|
|
15
13
|
build:
|
|
16
14
|
name: Tests with Ruby ${{ matrix.ruby }} and ${{ matrix.gemfile }}
|
|
17
15
|
runs-on: "ubuntu-latest"
|
|
16
|
+
if: |
|
|
17
|
+
github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target' ||
|
|
18
|
+
github.actor != 'dependabot[bot]'
|
|
18
19
|
strategy:
|
|
19
20
|
fail-fast: false
|
|
20
21
|
matrix:
|
|
21
|
-
ruby: ["3.
|
|
22
|
+
ruby: ["3.2", "3.3"]
|
|
22
23
|
gemfile:
|
|
23
24
|
- Gemfile
|
|
24
|
-
- gemfiles/
|
|
25
|
-
- gemfiles/
|
|
25
|
+
- gemfiles/7_1.gemfile
|
|
26
|
+
- gemfiles/7_0.gemfile
|
|
26
27
|
|
|
27
28
|
steps:
|
|
28
|
-
- uses: actions/checkout@
|
|
29
|
+
- uses: actions/checkout@v2.4.0
|
|
29
30
|
|
|
30
31
|
- uses: actions/cache@v2
|
|
31
32
|
with:
|
|
32
33
|
path: vendor/bundle
|
|
33
34
|
key: >
|
|
34
|
-
${{ runner.os }}-${{ matrix.ruby }}-gems-${{
|
|
35
|
-
|
|
36
|
-
${{ runner.os }}-${{ matrix.ruby }}-gems-${{ hashFiles(matrix.gemfile) }}
|
|
35
|
+
${{ runner.os }}-${{ matrix.ruby }}-gems-${{
|
|
36
|
+
hashFiles(matrix.gemfile) }}
|
|
37
37
|
|
|
38
38
|
- name: Set up Ruby
|
|
39
|
-
uses:
|
|
39
|
+
uses: ruby/setup-ruby@v1
|
|
40
40
|
with:
|
|
41
41
|
ruby-version: ${{ matrix.ruby }}
|
|
42
42
|
|
|
43
43
|
- name: Install gem dependencies
|
|
44
44
|
env:
|
|
45
|
-
RAILS_ENV: test
|
|
46
45
|
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
|
|
47
46
|
run: |
|
|
48
47
|
gem install bundler
|
|
@@ -51,7 +50,8 @@ jobs:
|
|
|
51
50
|
|
|
52
51
|
- name: Run Tests
|
|
53
52
|
env:
|
|
54
|
-
|
|
53
|
+
PGHOST: localhost
|
|
54
|
+
PGUSER: postgres
|
|
55
55
|
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
|
|
56
56
|
run: |
|
|
57
57
|
bundle exec rake
|
data/.rubocop.yml
CHANGED
|
@@ -4,6 +4,7 @@ inherit_gem:
|
|
|
4
4
|
|
|
5
5
|
AllCops:
|
|
6
6
|
TargetRubyVersion: 2.5
|
|
7
|
+
NewCops: enable
|
|
7
8
|
Exclude:
|
|
8
9
|
- bin/**/*
|
|
9
10
|
- gemfiles/**/*
|
|
@@ -13,29 +14,8 @@ AllCops:
|
|
|
13
14
|
- "*.gemspec"
|
|
14
15
|
- config.ru
|
|
15
16
|
|
|
16
|
-
|
|
17
|
-
Enabled: false
|
|
18
|
-
|
|
19
|
-
Layout/LineLength:
|
|
20
|
-
Max: 80
|
|
21
|
-
|
|
22
|
-
Metrics/MethodLength:
|
|
23
|
-
Enabled: false
|
|
24
|
-
|
|
25
|
-
Style/Alias:
|
|
26
|
-
EnforcedStyle: prefer_alias_method
|
|
27
|
-
|
|
28
|
-
Lint/RedundantCopDisableDirective:
|
|
29
|
-
Enabled: false
|
|
30
|
-
|
|
31
|
-
Metrics/AbcSize:
|
|
32
|
-
Enabled: false
|
|
33
|
-
|
|
34
|
-
Metrics/CyclomaticComplexity:
|
|
35
|
-
Enabled: false
|
|
36
|
-
|
|
37
|
-
Metrics/PerceivedComplexity:
|
|
17
|
+
Naming/VariableNumber:
|
|
38
18
|
Enabled: false
|
|
39
19
|
|
|
40
|
-
|
|
20
|
+
Minitest/EmptyLineBeforeAssertionMethods:
|
|
41
21
|
Enabled: false
|
data/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 6.1.0
|
|
4
|
+
|
|
5
|
+
- Add more bots (mostly related to AI crawlers)
|
|
6
|
+
- Add AppSignal bot
|
|
7
|
+
- Add Checkly bot
|
|
8
|
+
- Detect Chrome when requesting desktop site.
|
|
9
|
+
|
|
10
|
+
## 6.0.0
|
|
11
|
+
|
|
12
|
+
- Add `Browser::Base#chromium_based?`.
|
|
13
|
+
- Change how browser detection works to avoid re-instantiating classes.
|
|
14
|
+
- Bump up minimum required ruby version to 3.2.0.
|
|
15
|
+
|
|
3
16
|
## 5.3.1
|
|
4
17
|
|
|
5
18
|
- Remove Stripe webhooks from bot list.
|
|
@@ -90,13 +103,11 @@
|
|
|
90
103
|
- You can now define new bot matchers by adding a callable object to
|
|
91
104
|
`Browser::Bot.matchers`.
|
|
92
105
|
- Fix `browser.yandex?` and `browser.sputnik?`.
|
|
93
|
-
- [BREAKING CHANGE] Removed methods to enable the bot's empty user agent
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
`crawl|fetch|search|monitoring|spider|bot`, and anything listed under
|
|
99
|
-
https://github.com/fnando/browser/blob/master/bots.yml.
|
|
106
|
+
- [BREAKING CHANGE] Removed methods to enable the bot's empty user agent detection
|
|
107
|
+
(`Browser::Bot.detect_empty_ua!` and `Browser::Bot.detect_empty_ua?`).
|
|
108
|
+
- [BREAKING CHANGE] Bot detection is now more aggressive by default. It matches empty
|
|
109
|
+
user agents, anything that matches `crawl|fetch|search|monitoring|spider|bot`,
|
|
110
|
+
and anything listed under https://github.com/fnando/browser/blob/master/bots.yml.
|
|
100
111
|
- Add Jaunt to the bot list.
|
|
101
112
|
|
|
102
113
|
## 2.7.1
|
data/LICENSE.md
ADDED
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
# The MIT License (MIT)
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2010 Nando Vieira
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
6
|
+
this software and associated documentation files (the "Software"), to deal in
|
|
7
|
+
the Software without restriction, including without limitation the rights to
|
|
8
|
+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
|
9
|
+
the Software, and to permit persons to whom the Software is furnished to do so,
|
|
10
|
+
subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
|
17
|
+
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
|
18
|
+
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
|
19
|
+
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
20
|
+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
data/README.md
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
# Browser
|
|
2
2
|
|
|
3
|
-
[](https://codeclimate.com/github/fnando/browser)
|
|
3
|
+
[](https://github.com/fnando/browser)
|
|
5
4
|
[](https://rubygems.org/gems/browser)
|
|
6
5
|
[](https://rubygems.org/gems/browser)
|
|
7
6
|
|
|
@@ -23,6 +22,7 @@ browser = Browser.new("Some User Agent", accept_language: "en-us")
|
|
|
23
22
|
# General info
|
|
24
23
|
browser.bot?
|
|
25
24
|
browser.chrome?
|
|
25
|
+
browser.chromium_based?
|
|
26
26
|
browser.core_media?
|
|
27
27
|
browser.duck_duck_go?
|
|
28
28
|
browser.edge? # Newest MS browser
|
|
@@ -53,7 +53,6 @@ browser.yandex?
|
|
|
53
53
|
browser.wechat?
|
|
54
54
|
browser.qq?
|
|
55
55
|
browser.weibo?
|
|
56
|
-
browser.yandex?
|
|
57
56
|
browser.sputnik?
|
|
58
57
|
browser.sougou_browser?
|
|
59
58
|
|
|
@@ -323,6 +322,14 @@ Browser::Bot.matchers.delete(Browser::Bot::KeywordMatcher)
|
|
|
323
322
|
Browser::Bot.matchers.delete(Browser::Bot::EmptyUserAgentMatcher)
|
|
324
323
|
```
|
|
325
324
|
|
|
325
|
+
To extend the bot list, you can manipulate the methods below:
|
|
326
|
+
|
|
327
|
+
```ruby
|
|
328
|
+
Browser::Bot.bots.merge!(new_bots_hash)
|
|
329
|
+
Browser::Bot.bot_exceptions += new_exceptions
|
|
330
|
+
Browser::Bot.search_engines.merge!(new_search_engines_hash)
|
|
331
|
+
```
|
|
332
|
+
|
|
326
333
|
### Middleware
|
|
327
334
|
|
|
328
335
|
You can use the `Browser::Middleware` to redirect user agents.
|
|
@@ -425,7 +432,7 @@ information.
|
|
|
425
432
|
|
|
426
433
|
## Maintainer
|
|
427
434
|
|
|
428
|
-
- Nando Vieira -
|
|
435
|
+
- Nando Vieira - https://nandovieira.com
|
|
429
436
|
|
|
430
437
|
## Contributors
|
|
431
438
|
|
data/bots.yml
CHANGED
|
@@ -16,6 +16,7 @@ apachebench: ApacheBench (ab)
|
|
|
16
16
|
apis-google: APIs-Google
|
|
17
17
|
appengine-google: Google App Engine
|
|
18
18
|
applebot: Apple Bot
|
|
19
|
+
appsignal: AppSignal Bot
|
|
19
20
|
archive.org_bot: Internet Archive (archive.org)
|
|
20
21
|
archiveteam archivebot: ArchiveTeam ArchiveBot
|
|
21
22
|
ask jeeves: Ask Jeeves
|
|
@@ -38,6 +39,7 @@ buzzbot: Buzzbot
|
|
|
38
39
|
buzztalk: buzztalk
|
|
39
40
|
catchbot: CatchBot (catchbot.com)
|
|
40
41
|
check_http: Nagios monitor
|
|
42
|
+
checkly: Checkly
|
|
41
43
|
chrome-lighthouse: Chrome-Lighthouse
|
|
42
44
|
cipacrawler: CipaCrawler
|
|
43
45
|
cliqzbot: Cliqzbot
|
|
@@ -291,7 +293,28 @@ zoombot: ZoomBot
|
|
|
291
293
|
zoominfobot: ZoominfoBot
|
|
292
294
|
zyborg: Zyborg
|
|
293
295
|
|
|
296
|
+
# AI Crawlers
|
|
297
|
+
# https://darkvisitors.com
|
|
298
|
+
amazonbot: Amazon
|
|
299
|
+
anthropic-ai: Anthropic-AI
|
|
300
|
+
applebot: Apple
|
|
301
|
+
bytespider: TikTok
|
|
302
|
+
ccbot: Common Crawl
|
|
303
|
+
chatgpt-user: ChatGPT
|
|
304
|
+
claude-web: Anthropic-AI
|
|
305
|
+
cohere-ai: Cohere
|
|
306
|
+
diffbot: Diffbot
|
|
307
|
+
facebookbot: Facebook
|
|
308
|
+
google-extended: Google
|
|
309
|
+
googleother: Google
|
|
310
|
+
gptbot: ChatGPT
|
|
311
|
+
omgili: Webz.io
|
|
312
|
+
perplexitybot: Perplexity
|
|
313
|
+
webz.io: Webz.io
|
|
314
|
+
youbot: You.com
|
|
315
|
+
|
|
294
316
|
# Generic lib user agents go here.
|
|
317
|
+
httpie: HTTPie
|
|
295
318
|
eventmachine httpclient: Ruby http library
|
|
296
319
|
go 1.1 package http: Go 1.1 package http
|
|
297
320
|
htmlparser: HTMLParser
|
data/browser.gemspec
CHANGED
|
@@ -7,27 +7,26 @@ Gem::Specification.new do |s|
|
|
|
7
7
|
s.version = Browser::VERSION
|
|
8
8
|
s.platform = Gem::Platform::RUBY
|
|
9
9
|
s.authors = ["Nando Vieira"]
|
|
10
|
-
s.email = ["fnando.
|
|
10
|
+
s.email = ["me@fnando.com"]
|
|
11
11
|
s.homepage = "https://github.com/fnando/browser"
|
|
12
12
|
s.summary = "Do some browser detection with Ruby."
|
|
13
13
|
s.description = s.summary
|
|
14
14
|
s.license = "MIT"
|
|
15
|
-
s.required_ruby_version = ">= 2.
|
|
15
|
+
s.required_ruby_version = ">= 3.2.0"
|
|
16
16
|
|
|
17
|
+
s.metadata["rubygems_mfa_required"] = "true"
|
|
17
18
|
s.metadata["changelog_uri"] = "https://github.com/fnando/browser/blob/main/CHANGELOG.md"
|
|
18
19
|
|
|
19
20
|
s.files = `git ls-files`.split("\n")
|
|
20
|
-
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
|
|
21
21
|
s.executables = `git ls-files -- exe/*`
|
|
22
22
|
.split("\n")
|
|
23
23
|
.map {|f| File.basename(f) }
|
|
24
24
|
s.require_paths = ["lib"]
|
|
25
25
|
|
|
26
|
-
s.add_development_dependency "bundler"
|
|
26
|
+
s.add_development_dependency "bundler"
|
|
27
27
|
s.add_development_dependency "minitest"
|
|
28
28
|
s.add_development_dependency "minitest-autotest"
|
|
29
29
|
s.add_development_dependency "minitest-utils"
|
|
30
|
-
s.add_development_dependency "pry-meta"
|
|
31
30
|
s.add_development_dependency "rack-test"
|
|
32
31
|
s.add_development_dependency "rails"
|
|
33
32
|
s.add_development_dependency "rake"
|
data/lib/browser/base.rb
CHANGED
|
@@ -26,7 +26,7 @@ module Browser
|
|
|
26
26
|
end
|
|
27
27
|
end
|
|
28
28
|
|
|
29
|
-
|
|
29
|
+
alias to_a meta
|
|
30
30
|
|
|
31
31
|
# Return meta representation as string.
|
|
32
32
|
def to_s
|
|
@@ -59,13 +59,13 @@ module Browser
|
|
|
59
59
|
|
|
60
60
|
# Detect if browser is Microsoft Internet Explorer.
|
|
61
61
|
def ie?(expected_version = nil)
|
|
62
|
-
InternetExplorer
|
|
62
|
+
instance_of?(InternetExplorer) &&
|
|
63
63
|
detect_version?(full_version, expected_version)
|
|
64
64
|
end
|
|
65
65
|
|
|
66
66
|
# Detect if browser is Microsoft Edge.
|
|
67
67
|
def edge?(expected_version = nil)
|
|
68
|
-
Edge
|
|
68
|
+
instance_of?(Edge) && detect_version?(full_version, expected_version)
|
|
69
69
|
end
|
|
70
70
|
|
|
71
71
|
def compatibility_view?
|
|
@@ -82,32 +82,32 @@ module Browser
|
|
|
82
82
|
|
|
83
83
|
# Detect if browser is Instagram.
|
|
84
84
|
def instagram?(expected_version = nil)
|
|
85
|
-
Instagram
|
|
85
|
+
instance_of?(Instagram) &&
|
|
86
86
|
detect_version?(full_version, expected_version)
|
|
87
87
|
end
|
|
88
88
|
|
|
89
89
|
# Detect if browser is Snapchat.
|
|
90
90
|
def snapchat?(expected_version = nil)
|
|
91
|
-
Snapchat
|
|
91
|
+
instance_of?(Snapchat) &&
|
|
92
92
|
detect_version?(full_version, expected_version)
|
|
93
93
|
end
|
|
94
94
|
|
|
95
95
|
# Detect if browser if Facebook.
|
|
96
96
|
def facebook?(expected_version = nil)
|
|
97
|
-
Facebook
|
|
97
|
+
instance_of?(Facebook) &&
|
|
98
98
|
detect_version?(full_version, expected_version)
|
|
99
99
|
end
|
|
100
100
|
|
|
101
101
|
# Detect if browser is Otter.
|
|
102
102
|
def otter?(expected_version = nil)
|
|
103
|
-
Otter
|
|
103
|
+
instance_of?(Otter) &&
|
|
104
104
|
detect_version?(full_version, expected_version)
|
|
105
105
|
end
|
|
106
106
|
|
|
107
107
|
# Detect if browser is WebKit-based.
|
|
108
108
|
def webkit?(expected_version = nil)
|
|
109
109
|
ua.match?(/AppleWebKit/i) &&
|
|
110
|
-
(!edge? ||
|
|
110
|
+
(!edge? || chromium_based?) &&
|
|
111
111
|
detect_version?(webkit_full_version, expected_version)
|
|
112
112
|
end
|
|
113
113
|
|
|
@@ -124,13 +124,13 @@ module Browser
|
|
|
124
124
|
|
|
125
125
|
# Detect if browser is PhantomJS
|
|
126
126
|
def phantom_js?(expected_version = nil)
|
|
127
|
-
PhantomJS
|
|
127
|
+
instance_of?(PhantomJS) &&
|
|
128
128
|
detect_version?(full_version, expected_version)
|
|
129
129
|
end
|
|
130
130
|
|
|
131
131
|
# Detect if browser is Safari.
|
|
132
132
|
def safari?(expected_version = nil)
|
|
133
|
-
Safari
|
|
133
|
+
instance_of?(Safari) && detect_version?(full_version, expected_version)
|
|
134
134
|
end
|
|
135
135
|
|
|
136
136
|
def safari_webapp_mode?
|
|
@@ -139,55 +139,55 @@ module Browser
|
|
|
139
139
|
|
|
140
140
|
# Detect if browser is Firefox.
|
|
141
141
|
def firefox?(expected_version = nil)
|
|
142
|
-
Firefox
|
|
142
|
+
instance_of?(Firefox) && detect_version?(full_version, expected_version)
|
|
143
143
|
end
|
|
144
144
|
|
|
145
145
|
# Detect if browser is Chrome.
|
|
146
146
|
def chrome?(expected_version = nil)
|
|
147
|
-
Chrome
|
|
147
|
+
instance_of?(Chrome) && detect_version?(full_version, expected_version)
|
|
148
148
|
end
|
|
149
149
|
|
|
150
150
|
# Detect if browser is Opera.
|
|
151
151
|
def opera?(expected_version = nil)
|
|
152
|
-
Opera
|
|
152
|
+
instance_of?(Opera) && detect_version?(full_version, expected_version)
|
|
153
153
|
end
|
|
154
154
|
|
|
155
155
|
# Detect if browser is Sputnik.
|
|
156
156
|
def sputnik?(expected_version = nil)
|
|
157
|
-
Sputnik
|
|
157
|
+
instance_of?(Sputnik) && detect_version?(full_version, expected_version)
|
|
158
158
|
end
|
|
159
159
|
|
|
160
160
|
# Detect if browser is Yandex.
|
|
161
161
|
def yandex?(expected_version = nil)
|
|
162
|
-
Yandex
|
|
162
|
+
instance_of?(Yandex) && detect_version?(full_version, expected_version)
|
|
163
163
|
end
|
|
164
|
-
|
|
164
|
+
alias yandex_browser? yandex?
|
|
165
165
|
|
|
166
166
|
# Detect if browser is UCBrowser.
|
|
167
167
|
def uc_browser?(expected_version = nil)
|
|
168
|
-
UCBrowser
|
|
168
|
+
instance_of?(UCBrowser) &&
|
|
169
169
|
detect_version?(full_version, expected_version)
|
|
170
170
|
end
|
|
171
171
|
|
|
172
172
|
# Detect if browser is Nokia S40 Ovi Browser.
|
|
173
173
|
def nokia?(expected_version = nil)
|
|
174
|
-
Nokia
|
|
174
|
+
instance_of?(Nokia) && detect_version?(full_version, expected_version)
|
|
175
175
|
end
|
|
176
176
|
|
|
177
177
|
# Detect if browser is MicroMessenger.
|
|
178
178
|
def micro_messenger?(expected_version = nil)
|
|
179
|
-
MicroMessenger
|
|
179
|
+
instance_of?(MicroMessenger) &&
|
|
180
180
|
detect_version?(full_version, expected_version)
|
|
181
181
|
end
|
|
182
182
|
|
|
183
|
-
|
|
183
|
+
alias wechat? micro_messenger?
|
|
184
184
|
|
|
185
185
|
def weibo?(expected_version = nil)
|
|
186
|
-
Weibo
|
|
186
|
+
instance_of?(Weibo) && detect_version?(full_version, expected_version)
|
|
187
187
|
end
|
|
188
188
|
|
|
189
189
|
def alipay?(expected_version = nil)
|
|
190
|
-
Alipay
|
|
190
|
+
instance_of?(Alipay) && detect_version?(full_version, expected_version)
|
|
191
191
|
end
|
|
192
192
|
|
|
193
193
|
# Detect if browser is Opera Mini.
|
|
@@ -210,29 +210,29 @@ module Browser
|
|
|
210
210
|
|
|
211
211
|
# Detect if browser is Huawei.
|
|
212
212
|
def huawei_browser?(expected_version = nil)
|
|
213
|
-
HuaweiBrowser
|
|
213
|
+
instance_of?(HuaweiBrowser) &&
|
|
214
214
|
detect_version?(full_version, expected_version)
|
|
215
215
|
end
|
|
216
216
|
|
|
217
217
|
# Detect if browser is Xiaomi Miui.
|
|
218
218
|
def miui_browser?(expected_version = nil)
|
|
219
|
-
MiuiBrowser
|
|
219
|
+
instance_of?(MiuiBrowser) &&
|
|
220
220
|
detect_version?(full_version, expected_version)
|
|
221
221
|
end
|
|
222
222
|
|
|
223
223
|
# Detect if browser is Maxthon.
|
|
224
224
|
def maxthon?(expected_version = nil)
|
|
225
|
-
Maxthon
|
|
225
|
+
instance_of?(Maxthon) && detect_version?(full_version, expected_version)
|
|
226
226
|
end
|
|
227
227
|
|
|
228
228
|
# Detect if browser is QQ.
|
|
229
229
|
def qq?(expected_version = nil)
|
|
230
|
-
QQ
|
|
230
|
+
instance_of?(QQ) && detect_version?(full_version, expected_version)
|
|
231
231
|
end
|
|
232
232
|
|
|
233
233
|
# Detect if browser is Sougou.
|
|
234
234
|
def sougou_browser?(expected_version = nil)
|
|
235
|
-
SougouBrowser
|
|
235
|
+
instance_of?(SougouBrowser) &&
|
|
236
236
|
detect_version?(full_version, expected_version)
|
|
237
237
|
end
|
|
238
238
|
|
|
@@ -241,6 +241,11 @@ module Browser
|
|
|
241
241
|
ua.include?("GSA") && detect_version?(full_version, expected_version)
|
|
242
242
|
end
|
|
243
243
|
|
|
244
|
+
# Detect if browser is Chromium-based.
|
|
245
|
+
def chromium_based?
|
|
246
|
+
false
|
|
247
|
+
end
|
|
248
|
+
|
|
244
249
|
def webkit_full_version
|
|
245
250
|
ua[%r{AppleWebKit/([\d.]+)}, 1] || "0.0"
|
|
246
251
|
end
|
|
@@ -260,12 +265,12 @@ module Browser
|
|
|
260
265
|
|
|
261
266
|
# Detect if the browser is Electron.
|
|
262
267
|
def electron?(expected_version = nil)
|
|
263
|
-
Electron
|
|
268
|
+
instance_of?(Electron) && detect_version?(full_version, expected_version)
|
|
264
269
|
end
|
|
265
270
|
|
|
266
271
|
private def validate_size(subject, input)
|
|
267
272
|
actual_bytesize = input.bytesize
|
|
268
|
-
size_limit = Browser.public_send("#{subject}_size_limit")
|
|
273
|
+
size_limit = Browser.public_send(:"#{subject}_size_limit")
|
|
269
274
|
|
|
270
275
|
return if actual_bytesize < size_limit
|
|
271
276
|
|
data/lib/browser/browser.rb
CHANGED
|
@@ -101,8 +101,9 @@ module Browser
|
|
|
101
101
|
end
|
|
102
102
|
|
|
103
103
|
def self.new(user_agent, **kwargs)
|
|
104
|
-
matchers
|
|
105
|
-
|
|
106
|
-
.
|
|
104
|
+
matchers.each do |matcher_class|
|
|
105
|
+
matcher = matcher_class.new(user_agent || EMPTY_STRING, **kwargs)
|
|
106
|
+
return matcher if matcher.match?
|
|
107
|
+
end
|
|
107
108
|
end
|
|
108
109
|
end
|
data/lib/browser/chrome.rb
CHANGED
data/lib/browser/device.rb
CHANGED
|
@@ -96,7 +96,7 @@ module Browser
|
|
|
96
96
|
def ipod_touch?
|
|
97
97
|
id == :ipod_touch
|
|
98
98
|
end
|
|
99
|
-
|
|
99
|
+
alias ipod? ipod_touch?
|
|
100
100
|
|
|
101
101
|
def iphone?
|
|
102
102
|
id == :iphone
|
|
@@ -105,12 +105,12 @@ module Browser
|
|
|
105
105
|
def ps3?
|
|
106
106
|
id == :ps3
|
|
107
107
|
end
|
|
108
|
-
|
|
108
|
+
alias playstation3? ps3?
|
|
109
109
|
|
|
110
110
|
def ps4?
|
|
111
111
|
id == :ps4
|
|
112
112
|
end
|
|
113
|
-
|
|
113
|
+
alias playstation4? ps4?
|
|
114
114
|
|
|
115
115
|
def psp?
|
|
116
116
|
id == :psp
|
|
@@ -119,8 +119,8 @@ module Browser
|
|
|
119
119
|
def playstation_vita?
|
|
120
120
|
id == :psvita
|
|
121
121
|
end
|
|
122
|
-
|
|
123
|
-
|
|
122
|
+
alias vita? playstation_vita?
|
|
123
|
+
alias psp_vita? playstation_vita?
|
|
124
124
|
|
|
125
125
|
def kindle?
|
|
126
126
|
id == :kindle || kindle_fire?
|
|
@@ -133,22 +133,22 @@ module Browser
|
|
|
133
133
|
def nintendo_wii?
|
|
134
134
|
id == :wii
|
|
135
135
|
end
|
|
136
|
-
|
|
136
|
+
alias wii? nintendo_wii?
|
|
137
137
|
|
|
138
138
|
def nintendo_wiiu?
|
|
139
139
|
id == :wiiu
|
|
140
140
|
end
|
|
141
|
-
|
|
141
|
+
alias wiiu? nintendo_wiiu?
|
|
142
142
|
|
|
143
143
|
def nintendo_switch?
|
|
144
144
|
id == :switch
|
|
145
145
|
end
|
|
146
|
-
|
|
146
|
+
alias switch? nintendo_switch?
|
|
147
147
|
|
|
148
148
|
def blackberry_playbook?
|
|
149
149
|
id == :playbook
|
|
150
150
|
end
|
|
151
|
-
|
|
151
|
+
alias playbook? blackberry_playbook?
|
|
152
152
|
|
|
153
153
|
def surface?
|
|
154
154
|
id == :surface
|
|
@@ -202,7 +202,7 @@ module Browser
|
|
|
202
202
|
# rubocop:disable Layout/LineLength
|
|
203
203
|
private def detect_mobile?
|
|
204
204
|
psp? ||
|
|
205
|
-
/zunewp7/i.match?(ua) ||
|
|
205
|
+
/zunewp7|crios/i.match?(ua) ||
|
|
206
206
|
%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) ||
|
|
207
207
|
%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])
|
|
208
208
|
end
|
data/lib/browser/edge.rb
CHANGED