browser 3.0.3 → 5.3.1

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.
Files changed (111) hide show
  1. checksums.yaml +4 -4
  2. data/.github/ISSUE_TEMPLATE.md +1 -1
  3. data/.github/workflows/tests.yml +57 -0
  4. data/.prettierignore +1 -0
  5. data/.rubocop.yml +12 -0
  6. data/CHANGELOG.md +101 -19
  7. data/FUNDING.yml +3 -0
  8. data/README.md +104 -67
  9. data/bots.yml +299 -294
  10. data/browser.gemspec +5 -2
  11. data/gemfiles/{rails6.gemfile → rails6_0.gemfile} +0 -0
  12. data/gemfiles/{rails5.gemfile → rails6_1.gemfile} +1 -1
  13. data/lib/browser/accept_language.rb +4 -4
  14. data/lib/browser/alipay.rb +1 -1
  15. data/lib/browser/base.rb +80 -21
  16. data/lib/browser/blackberry.rb +1 -1
  17. data/lib/browser/bot/keyword_matcher.rb +1 -1
  18. data/lib/browser/browser.rb +26 -26
  19. data/lib/browser/chrome.rb +13 -3
  20. data/lib/browser/device/android.rb +1 -1
  21. data/lib/browser/device/blackberry_playbook.rb +1 -1
  22. data/lib/browser/device/ipad.rb +1 -1
  23. data/lib/browser/device/iphone.rb +1 -1
  24. data/lib/browser/device/ipod_touch.rb +1 -1
  25. data/lib/browser/device/kindle.rb +1 -1
  26. data/lib/browser/device/kindle_fire.rb +1 -1
  27. data/lib/browser/device/playstation3.rb +1 -1
  28. data/lib/browser/device/playstation4.rb +1 -1
  29. data/lib/browser/device/psp.rb +1 -1
  30. data/lib/browser/device/psvita.rb +1 -1
  31. data/lib/browser/device/samsung.rb +33 -0
  32. data/lib/browser/device/surface.rb +1 -1
  33. data/lib/browser/device/switch.rb +1 -1
  34. data/lib/browser/device/tv.rb +1 -1
  35. data/lib/browser/device/unknown.rb +1 -1
  36. data/lib/browser/device/wii.rb +1 -1
  37. data/lib/browser/device/wiiu.rb +1 -1
  38. data/lib/browser/device/xbox_360.rb +1 -1
  39. data/lib/browser/device/xbox_one.rb +1 -1
  40. data/lib/browser/device.rb +12 -5
  41. data/lib/browser/duck_duck_go.rb +22 -0
  42. data/lib/browser/edge.rb +3 -3
  43. data/lib/browser/electron.rb +1 -1
  44. data/lib/browser/facebook.rb +1 -1
  45. data/lib/browser/firefox.rb +1 -1
  46. data/lib/browser/google_search_app.rb +21 -0
  47. data/lib/browser/huawei_browser.rb +21 -0
  48. data/lib/browser/instagram.rb +1 -1
  49. data/lib/browser/internet_explorer.rb +2 -2
  50. data/lib/browser/maxthon.rb +21 -0
  51. data/lib/browser/meta/base.rb +0 -1
  52. data/lib/browser/meta.rb +0 -1
  53. data/lib/browser/micro_messenger.rb +1 -1
  54. data/lib/browser/miui_browser.rb +21 -0
  55. data/lib/browser/nokia.rb +1 -1
  56. data/lib/browser/opera.rb +1 -1
  57. data/lib/browser/otter.rb +1 -1
  58. data/lib/browser/phantom_js.rb +1 -1
  59. data/lib/browser/platform/adobe_air.rb +1 -1
  60. data/lib/browser/platform/android.rb +1 -1
  61. data/lib/browser/platform/base.rb +3 -2
  62. data/lib/browser/platform/blackberry.rb +1 -1
  63. data/lib/browser/platform/chrome_os.rb +1 -1
  64. data/lib/browser/platform/firefox_os.rb +1 -1
  65. data/lib/browser/platform/ios.rb +2 -2
  66. data/lib/browser/platform/kai_os.rb +23 -0
  67. data/lib/browser/platform/linux.rb +1 -1
  68. data/lib/browser/platform/mac.rb +5 -3
  69. data/lib/browser/platform/{other.rb → unknown.rb} +3 -3
  70. data/lib/browser/platform/windows.rb +2 -2
  71. data/lib/browser/platform/windows_mobile.rb +1 -1
  72. data/lib/browser/platform/windows_phone.rb +1 -1
  73. data/lib/browser/platform.rb +22 -16
  74. data/lib/browser/qq.rb +1 -1
  75. data/lib/browser/safari.rb +16 -1
  76. data/lib/browser/samsung_browser.rb +21 -0
  77. data/lib/browser/snapchat.rb +1 -1
  78. data/lib/browser/sougou_browser.rb +24 -0
  79. data/lib/browser/sputnik.rb +1 -1
  80. data/lib/browser/uc_browser.rb +1 -1
  81. data/lib/browser/{generic.rb → unknown.rb} +3 -3
  82. data/lib/browser/version.rb +1 -1
  83. data/lib/browser/weibo.rb +1 -1
  84. data/lib/browser/yandex.rb +1 -1
  85. data/samsung.yml +138 -0
  86. data/test/browser_test.rb +37 -6
  87. data/test/ua.yml +23 -1
  88. data/test/ua_bots.yml +8 -3
  89. data/test/unit/adobe_air_test.rb +1 -1
  90. data/test/unit/alipay_test.rb +6 -0
  91. data/test/unit/bots_test.rb +1 -1
  92. data/test/unit/console_test.rb +2 -2
  93. data/test/unit/device_test.rb +30 -3
  94. data/test/unit/duck_duck_go_test.rb +37 -0
  95. data/test/unit/edge_test.rb +34 -2
  96. data/test/unit/google_search_app_test.rb +54 -0
  97. data/test/unit/huawei_browser_test.rb +25 -0
  98. data/test/unit/kai_os_test.rb +31 -0
  99. data/test/unit/maxthon_test.rb +25 -0
  100. data/test/unit/meta_test.rb +10 -1
  101. data/test/unit/micro_messenger_test.rb +21 -6
  102. data/test/unit/miui_browser_test.rb +25 -0
  103. data/test/unit/opera_test.rb +1 -0
  104. data/test/unit/platform_test.rb +13 -8
  105. data/test/unit/qq_test.rb +12 -0
  106. data/test/unit/safari_test.rb +12 -7
  107. data/test/unit/samsung_browser_test.rb +23 -0
  108. data/test/unit/sougou_browser_test.rb +41 -0
  109. metadata +47 -19
  110. data/.travis.yml +0 -23
  111. data/lib/browser/meta/modern.rb +0 -11
@@ -48,15 +48,15 @@ module Browser
48
48
  def quality
49
49
  @quality ||= begin
50
50
  Float(quality_value || 1.0)
51
- rescue ArgumentError
52
- 0.1
51
+ rescue ArgumentError
52
+ 0.1
53
53
  end
54
54
  end
55
55
 
56
56
  private def quality_value
57
57
  qvalue = part[/;q=([\d.]+)/, 1]
58
- qvalue = qvalue =~ /\A0\.0?\z/ ? "0.0" : qvalue
59
- qvalue = qvalue.gsub(/\.+/, ".") if qvalue
58
+ qvalue = /\A0\.0?\z/.match?(qvalue) ? "0.0" : qvalue
59
+ qvalue = qvalue.squeeze(".") if qvalue
60
60
  qvalue
61
61
  end
62
62
  end
@@ -15,7 +15,7 @@ module Browser
15
15
  end
16
16
 
17
17
  def match?
18
- ua =~ /AlipayClient/i
18
+ ua.match?(/AlipayClient/i)
19
19
  end
20
20
  end
21
21
  end
data/lib/browser/base.rb CHANGED
@@ -6,12 +6,11 @@ module Browser
6
6
 
7
7
  attr_reader :ua
8
8
 
9
- # Return an array with all preferred languages that this browser accepts.
10
- attr_reader :accept_language
11
-
12
9
  def initialize(ua, accept_language: nil)
10
+ validate_size(:user_agent, ua.to_s)
11
+
13
12
  @ua = ua
14
- @accept_language = AcceptLanguage.parse(accept_language)
13
+ @accept_language_raw = accept_language.to_s
15
14
  end
16
15
 
17
16
  # Return a meta info about this browser.
@@ -19,6 +18,14 @@ module Browser
19
18
  Meta.get(self)
20
19
  end
21
20
 
21
+ # Return an array with all preferred languages that this browser accepts.
22
+ def accept_language
23
+ @accept_language ||= begin
24
+ validate_size(:accept_language, @accept_language_raw)
25
+ AcceptLanguage.parse(@accept_language_raw)
26
+ end
27
+ end
28
+
22
29
  alias_method :to_a, :meta
23
30
 
24
31
  # Return meta representation as string.
@@ -50,16 +57,6 @@ module Browser
50
57
  @device ||= Device.new(ua)
51
58
  end
52
59
 
53
- # Return true if browser is modern (Webkit, Firefox 17+, IE9+, Opera 12+).
54
- def modern?
55
- warn <<~TEXT
56
- Browser::Base#modern? is now deprecated.
57
- Check https://github.com/fnando/browser/issues/435 for details.
58
- TEXT
59
-
60
- Browser.modern_rules.any? {|rule| rule === self } # rubocop:disable Style/CaseEquality
61
- end
62
-
63
60
  # Detect if browser is Microsoft Internet Explorer.
64
61
  def ie?(expected_version = nil)
65
62
  InternetExplorer.new(ua).match? &&
@@ -109,19 +106,20 @@ module Browser
109
106
 
110
107
  # Detect if browser is WebKit-based.
111
108
  def webkit?(expected_version = nil)
112
- ua =~ /AppleWebKit/i &&
109
+ ua.match?(/AppleWebKit/i) &&
113
110
  (!edge? || Edge.new(ua).chrome_based?) &&
114
111
  detect_version?(webkit_full_version, expected_version)
115
112
  end
116
113
 
117
114
  # Detect if browser is QuickTime
118
115
  def quicktime?(expected_version = nil)
119
- ua =~ /QuickTime/i && detect_version?(full_version, expected_version)
116
+ ua.match?(/QuickTime/i) && detect_version?(full_version, expected_version)
120
117
  end
121
118
 
122
119
  # Detect if browser is Apple CoreMedia.
123
120
  def core_media?(expected_version = nil)
124
- ua =~ /CoreMedia/ && detect_version?(full_version, expected_version)
121
+ ua.include?("CoreMedia") && detect_version?(full_version,
122
+ expected_version)
125
123
  end
126
124
 
127
125
  # Detect if browser is PhantomJS
@@ -132,11 +130,11 @@ module Browser
132
130
 
133
131
  # Detect if browser is Safari.
134
132
  def safari?(expected_version = nil)
135
- Safari.new(ua).match? && detect_version?(version, expected_version)
133
+ Safari.new(ua).match? && detect_version?(full_version, expected_version)
136
134
  end
137
135
 
138
136
  def safari_webapp_mode?
139
- (device.ipad? || device.iphone?) && ua =~ /AppleWebKit/
137
+ (device.ipad? || device.iphone?) && ua.include?("AppleWebKit")
140
138
  end
141
139
 
142
140
  # Detect if browser is Firefox.
@@ -194,7 +192,53 @@ module Browser
194
192
 
195
193
  # Detect if browser is Opera Mini.
196
194
  def opera_mini?(expected_version = nil)
197
- ua =~ /Opera Mini/ && detect_version?(full_version, expected_version)
195
+ ua.include?("Opera Mini") && detect_version?(full_version,
196
+ expected_version)
197
+ end
198
+
199
+ # Detect if browser is DuckDuckGo.
200
+ def duck_duck_go?(expected_version = nil)
201
+ ua.include?("DuckDuckGo") && detect_version?(full_version,
202
+ expected_version)
203
+ end
204
+
205
+ # Detect if browser is Samsung.
206
+ def samsung_browser?(expected_version = nil)
207
+ ua.include?("SamsungBrowser") && detect_version?(full_version,
208
+ expected_version)
209
+ end
210
+
211
+ # Detect if browser is Huawei.
212
+ def huawei_browser?(expected_version = nil)
213
+ HuaweiBrowser.new(ua).match? &&
214
+ detect_version?(full_version, expected_version)
215
+ end
216
+
217
+ # Detect if browser is Xiaomi Miui.
218
+ def miui_browser?(expected_version = nil)
219
+ MiuiBrowser.new(ua).match? &&
220
+ detect_version?(full_version, expected_version)
221
+ end
222
+
223
+ # Detect if browser is Maxthon.
224
+ def maxthon?(expected_version = nil)
225
+ Maxthon.new(ua).match? && detect_version?(full_version, expected_version)
226
+ end
227
+
228
+ # Detect if browser is QQ.
229
+ def qq?(expected_version = nil)
230
+ QQ.new(ua).match? && detect_version?(full_version, expected_version)
231
+ end
232
+
233
+ # Detect if browser is Sougou.
234
+ def sougou_browser?(expected_version = nil)
235
+ SougouBrowser.new(ua).match? &&
236
+ detect_version?(full_version, expected_version)
237
+ end
238
+
239
+ # Detect if browser is Google Search App
240
+ def google_search_app?(expected_version = nil)
241
+ ua.include?("GSA") && detect_version?(full_version, expected_version)
198
242
  end
199
243
 
200
244
  def webkit_full_version
@@ -202,7 +246,11 @@ module Browser
202
246
  end
203
247
 
204
248
  def known?
205
- id != :generic
249
+ !unknown?
250
+ end
251
+
252
+ def unknown?
253
+ id == :unknown_browser
206
254
  end
207
255
 
208
256
  # Detect if browser is a proxy browser.
@@ -214,5 +262,16 @@ module Browser
214
262
  def electron?(expected_version = nil)
215
263
  Electron.new(ua).match? && detect_version?(full_version, expected_version)
216
264
  end
265
+
266
+ private def validate_size(subject, input)
267
+ actual_bytesize = input.bytesize
268
+ size_limit = Browser.public_send("#{subject}_size_limit")
269
+
270
+ return if actual_bytesize < size_limit
271
+
272
+ raise Error,
273
+ "#{subject} cannot be larger than #{size_limit} bytes; " \
274
+ "actual size is #{actual_bytesize} bytes"
275
+ end
217
276
  end
218
277
  end
@@ -17,7 +17,7 @@ module Browser
17
17
  end
18
18
 
19
19
  def match?
20
- ua =~ /BlackBerry|BB10/
20
+ ua.match?(/BlackBerry|BB10/)
21
21
  end
22
22
  end
23
23
  end
@@ -4,7 +4,7 @@ module Browser
4
4
  class Bot
5
5
  class KeywordMatcher
6
6
  def self.call(ua, _browser)
7
- ua =~ /crawl|fetch|search|monitoring|spider|bot/
7
+ ua.match?(/crawl|fetch|search|monitoring|spider|bot/)
8
8
  end
9
9
  end
10
10
  end
@@ -15,7 +15,7 @@ require_relative "firefox"
15
15
  require_relative "edge"
16
16
  require_relative "opera"
17
17
  require_relative "blackberry"
18
- require_relative "generic"
18
+ require_relative "unknown"
19
19
  require_relative "phantom_js"
20
20
  require_relative "uc_browser"
21
21
  require_relative "nokia"
@@ -30,6 +30,13 @@ require_relative "instagram"
30
30
  require_relative "yandex"
31
31
  require_relative "sputnik"
32
32
  require_relative "snapchat"
33
+ require_relative "duck_duck_go"
34
+ require_relative "samsung_browser"
35
+ require_relative "huawei_browser"
36
+ require_relative "miui_browser"
37
+ require_relative "maxthon"
38
+ require_relative "sougou_browser"
39
+ require_relative "google_search_app"
33
40
 
34
41
  require_relative "bot"
35
42
  require_relative "bot/empty_user_agent_matcher"
@@ -44,10 +51,19 @@ require_relative "meta"
44
51
  module Browser
45
52
  EMPTY_STRING = ""
46
53
 
54
+ Error = Class.new(StandardError)
55
+
47
56
  def self.root
48
57
  @root ||= Pathname.new(File.expand_path("../..", __dir__))
49
58
  end
50
59
 
60
+ class << self
61
+ attr_accessor :user_agent_size_limit, :accept_language_size_limit
62
+ end
63
+
64
+ self.user_agent_size_limit = 2048
65
+ self.accept_language_size_limit = 2048
66
+
51
67
  # Hold the list of browser matchers.
52
68
  # Order is important.
53
69
  def self.matchers
@@ -65,41 +81,25 @@ module Browser
65
81
  Instagram, # must be placed before Chrome and Safari
66
82
  Snapchat, # must be placed before Chrome and Safari
67
83
  Weibo, # must be placed before Chrome and Safari
84
+ MicroMessenger, # must be placed before QQ
68
85
  QQ, # must be placed before Chrome and Safari
69
86
  Alipay, # must be placed before Chrome and Safari
70
87
  Electron, # must be placed before Chrome and Safari
71
88
  Yandex, # must be placed before Chrome and Safari
72
89
  Sputnik, # must be placed before Chrome and Safari
90
+ DuckDuckGo, # must be placed before Chrome and Safari
91
+ SamsungBrowser, # must be placed before Chrome and Safari
92
+ HuaweiBrowser, # must be placed before Chrome and Safari
93
+ MiuiBrowser, # must be placed before Chrome and Safari
94
+ Maxthon, # must be placed before Chrome and Safari
95
+ SougouBrowser, # must be placed before Chrome and Safari
96
+ GoogleSearchApp, # must be placed before Chrome and Safari
73
97
  Chrome,
74
98
  Safari,
75
- MicroMessenger,
76
- Generic
99
+ Unknown
77
100
  ]
78
101
  end
79
102
 
80
- # Define the rules which define a modern browser.
81
- # A rule must be a proc/lambda or any object that implements the method
82
- # === and accepts the browser object.
83
- #
84
- # To redefine all rules, clear the existing rules before adding your own.
85
- #
86
- # # Only Chrome Canary is considered modern.
87
- # Browser.modern_rules.clear
88
- # Browser.modern_rules << -> b { b.chrome? && b.version >= "37" }
89
- #
90
- def self.modern_rules
91
- @modern_rules ||= []
92
- end
93
-
94
- modern_rules.tap do |rules|
95
- rules << ->(b) { b.chrome? && b.version.to_i >= 65 }
96
- rules << ->(b) { b.safari? && b.version.to_i >= 10 }
97
- rules << ->(b) { b.firefox? && b.version.to_i >= 52 }
98
- rules << ->(b) { b.ie? && b.version.to_i >= 11 && !b.compatibility_view? }
99
- rules << ->(b) { b.edge? && b.version.to_i >= 15 }
100
- rules << ->(b) { b.opera? && b.version.to_i >= 50 }
101
- end
102
-
103
103
  def self.new(user_agent, **kwargs)
104
104
  matchers
105
105
  .map {|klass| klass.new(user_agent || EMPTY_STRING, **kwargs) }
@@ -20,10 +20,20 @@ module Browser
20
20
  end
21
21
 
22
22
  def match?
23
- ua =~ /Chrome|CriOS/ &&
24
- ua !~ /PhantomJS|FxiOS|YaBrowser|SputnikBrowser|ArchiveBot/ &&
23
+ ua.match?(/Chrome|CriOS/) &&
24
+ !ua.match?(/PhantomJS|FxiOS|ArchiveBot/) &&
25
25
  !opera? &&
26
- !edge?
26
+ !edge? &&
27
+ !duck_duck_go? &&
28
+ !yandex? &&
29
+ !sputnik? &&
30
+ !samsung_browser? &&
31
+ !huawei_browser? &&
32
+ !miui_browser? &&
33
+ !maxthon? &&
34
+ !qq? &&
35
+ !sougou_browser? &&
36
+ !google_search_app?
27
37
  end
28
38
  end
29
39
  end
@@ -13,7 +13,7 @@ module Browser
13
13
  end
14
14
 
15
15
  def match?
16
- ua =~ /Android/
16
+ ua.include?("Android")
17
17
  end
18
18
  end
19
19
  end
@@ -12,7 +12,7 @@ module Browser
12
12
  end
13
13
 
14
14
  def match?
15
- ua =~ /PlayBook.*?RIM Tablet/
15
+ ua.match?(/PlayBook.*?RIM Tablet/)
16
16
  end
17
17
  end
18
18
  end
@@ -12,7 +12,7 @@ module Browser
12
12
  end
13
13
 
14
14
  def match?
15
- ua =~ /iPad/
15
+ ua.include?("iPad")
16
16
  end
17
17
  end
18
18
  end
@@ -12,7 +12,7 @@ module Browser
12
12
  end
13
13
 
14
14
  def match?
15
- ua =~ /iPhone/
15
+ ua.include?("iPhone")
16
16
  end
17
17
  end
18
18
  end
@@ -12,7 +12,7 @@ module Browser
12
12
  end
13
13
 
14
14
  def match?
15
- ua =~ /iPod/
15
+ ua.include?("iPod")
16
16
  end
17
17
  end
18
18
  end
@@ -12,7 +12,7 @@ module Browser
12
12
  end
13
13
 
14
14
  def match?
15
- ua =~ /Kindle/
15
+ ua.include?("Kindle")
16
16
  end
17
17
  end
18
18
  end
@@ -12,7 +12,7 @@ module Browser
12
12
  end
13
13
 
14
14
  def match?
15
- ua =~ /Kindle Fire|KFTT/
15
+ ua.match?(/Kindle Fire|KFTT/)
16
16
  end
17
17
  end
18
18
  end
@@ -12,7 +12,7 @@ module Browser
12
12
  end
13
13
 
14
14
  def match?
15
- ua =~ /PLAYSTATION 3/i
15
+ ua.match?(/PLAYSTATION 3/i)
16
16
  end
17
17
  end
18
18
  end
@@ -12,7 +12,7 @@ module Browser
12
12
  end
13
13
 
14
14
  def match?
15
- ua =~ /PLAYSTATION 4/i
15
+ ua.match?(/PLAYSTATION 4/i)
16
16
  end
17
17
  end
18
18
  end
@@ -12,7 +12,7 @@ module Browser
12
12
  end
13
13
 
14
14
  def match?
15
- ua =~ /PlayStation Portable/
15
+ ua.include?("PlayStation Portable")
16
16
  end
17
17
  end
18
18
  end
@@ -12,7 +12,7 @@ module Browser
12
12
  end
13
13
 
14
14
  def match?
15
- ua =~ /Playstation Vita/
15
+ ua.match?("Playstation Vita")
16
16
  end
17
17
  end
18
18
  end
@@ -0,0 +1,33 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Browser
4
+ class Device
5
+ class Samsung < Base
6
+ REGEX = /\(Linux.*?; Android.*?; (SAMSUNG )?(SM-[A-Z0-9]+).*?\)/i.freeze
7
+
8
+ def self.names
9
+ @names ||= YAML.load_file(Browser.root.join("samsung.yml").to_s)
10
+ end
11
+
12
+ def id
13
+ :samsung
14
+ end
15
+
16
+ def name
17
+ "Samsung #{self.class.names[code] || code}"
18
+ end
19
+
20
+ def code
21
+ matches && matches[2]
22
+ end
23
+
24
+ def matches
25
+ @matches ||= ua.match(REGEX)
26
+ end
27
+
28
+ def match?
29
+ !!matches
30
+ end
31
+ end
32
+ end
33
+ end
@@ -12,7 +12,7 @@ module Browser
12
12
  end
13
13
 
14
14
  def match?
15
- platform.windows_rt? && ua =~ /Touch/
15
+ platform.windows_rt? && ua.include?("Touch")
16
16
  end
17
17
 
18
18
  private def platform
@@ -12,7 +12,7 @@ module Browser
12
12
  end
13
13
 
14
14
  def match?
15
- ua =~ /Nintendo Switch/i
15
+ ua.match?(/Nintendo Switch/i)
16
16
  end
17
17
  end
18
18
  end
@@ -12,7 +12,7 @@ module Browser
12
12
  end
13
13
 
14
14
  def match?
15
- ua =~ /(\btv|Android.*?ADT-1|Nexus Player)/i
15
+ ua.match?(/(\btv|Android.*?ADT-1|Nexus Player)/i)
16
16
  end
17
17
  end
18
18
  end
@@ -4,7 +4,7 @@ module Browser
4
4
  class Device
5
5
  class Unknown < Base
6
6
  def id
7
- :unknown
7
+ :unknown_device
8
8
  end
9
9
 
10
10
  def name
@@ -12,7 +12,7 @@ module Browser
12
12
  end
13
13
 
14
14
  def match?
15
- ua =~ /Nintendo Wii/i
15
+ ua.match?(/Nintendo Wii/i)
16
16
  end
17
17
  end
18
18
  end
@@ -12,7 +12,7 @@ module Browser
12
12
  end
13
13
 
14
14
  def match?
15
- ua =~ /Nintendo WiiU/i
15
+ ua.match?(/Nintendo WiiU/i)
16
16
  end
17
17
  end
18
18
  end
@@ -12,7 +12,7 @@ module Browser
12
12
  end
13
13
 
14
14
  def match?
15
- ua =~ /Xbox/i
15
+ ua.match?(/Xbox/i)
16
16
  end
17
17
  end
18
18
  end
@@ -12,7 +12,7 @@ module Browser
12
12
  end
13
13
 
14
14
  def match?
15
- ua =~ /Xbox One/i
15
+ ua.match?(/Xbox One/i)
16
16
  end
17
17
  end
18
18
  end
@@ -20,6 +20,7 @@ require_relative "device/switch"
20
20
  require_relative "device/tv"
21
21
  require_relative "device/xbox_one"
22
22
  require_relative "device/xbox_360"
23
+ require_relative "device/samsung"
23
24
 
24
25
  module Browser
25
26
  class Device
@@ -29,6 +30,7 @@ module Browser
29
30
  # Order is important.
30
31
  def self.matchers
31
32
  @matchers ||= [
33
+ Samsung,
32
34
  XboxOne,
33
35
  Xbox360,
34
36
  Surface,
@@ -88,7 +90,7 @@ module Browser
88
90
  end
89
91
 
90
92
  def unknown?
91
- id == :unknown
93
+ id == :unknown_device
92
94
  end
93
95
 
94
96
  def ipod_touch?
@@ -158,12 +160,12 @@ module Browser
158
160
 
159
161
  # Detect if browser is Silk.
160
162
  def silk?
161
- ua =~ /Silk/
163
+ ua.include?("Silk")
162
164
  end
163
165
 
164
166
  # Detect if browser is running under Xbox.
165
167
  def xbox?
166
- ua =~ /Xbox/
168
+ ua.include?("Xbox")
167
169
  end
168
170
 
169
171
  # Detect if browser is running under Xbox 360.
@@ -191,13 +193,18 @@ module Browser
191
193
  xbox? || playstation? || nintendo?
192
194
  end
193
195
 
196
+ # Detect if device is a Samsung.
197
+ def samsung?
198
+ id == :samsung
199
+ end
200
+
194
201
  # Regex taken from http://detectmobilebrowsers.com
195
202
  # rubocop:disable Layout/LineLength
196
203
  private def detect_mobile?
197
204
  psp? ||
198
- /zunewp7/i.match(ua) ||
205
+ /zunewp7/i.match?(ua) ||
199
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) ||
200
- %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])
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])
201
208
  end
202
209
  # rubocop:enable Layout/LineLength
203
210
 
@@ -0,0 +1,22 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Browser
4
+ class DuckDuckGo < Base
5
+ def id
6
+ :duckduckgo
7
+ end
8
+
9
+ def name
10
+ "DuckDuckGo"
11
+ end
12
+
13
+ def full_version
14
+ ua[%r{DuckDuckGo/([\d.]+)}, 1] ||
15
+ "0.0"
16
+ end
17
+
18
+ def match?
19
+ ua.include?("DuckDuckGo")
20
+ end
21
+ end
22
+ end
data/lib/browser/edge.rb CHANGED
@@ -11,15 +11,15 @@ module Browser
11
11
  end
12
12
 
13
13
  def full_version
14
- ua[%r{(?:Edge|Edg)/([\d.]+)}, 1] || super
14
+ ua[%r{(?:Edge|Edg|EdgiOS|EdgA)/([\d.]+)}, 1] || super
15
15
  end
16
16
 
17
17
  def match?
18
- ua =~ %r{((?:Edge|Edg)/[\d.]+|Trident/8)}
18
+ ua.match?(%r{((?:Edge|Edg|EdgiOS|EdgA)/[\d.]+|Trident/8)})
19
19
  end
20
20
 
21
21
  def chrome_based?
22
- match? && ua =~ /\bEdg\b/
22
+ match? && ua.match?(/\bEdg\b/)
23
23
  end
24
24
  end
25
25
  end