Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Browser support: Check iOS Safari engine for all iOS browsers #10002

Merged
merged 3 commits into from
Jan 31, 2024
Merged

Browser support: Check iOS Safari engine for all iOS browsers #10002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbfc273
Browser support: Check iOS Safari engine for all iOS browsers
aduth Jan 30, 2024
7511389
Filter browser matchers after memoization
aduth Jan 30, 2024
1ed647b
Build hash with each_with_object
aduth Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 23 additions & 11 deletions app/services/browser_support.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,29 @@
class BrowserSupport
@cache = LruRedux::Cache.new(1_000)

# rubocop:disable Layout/LineLength
BROWSERSLIST_TO_BROWSER_MAP = {
and_chr: ->(browser, version) { browser.android? && !browser.platform.android_webview? && browser.chrome?(version) },
and_chr: ->(browser, version) { browser.android? && browser.chrome?(version) },
and_uc: ->(browser, version) { browser.android? && browser.uc_browser?(version) },
android: ->(browser, version) { browser.platform.android_webview? && browser.send(:detect_version?, browser.version, version) },
chrome: ->(browser, version) { !browser.platform.android_webview? && browser.chrome?(version) },
android: ->(browser, version) { browser.send(:detect_version?, browser.version, version) },
chrome: ->(browser, version) { browser.chrome?(version) },
edge: ->(browser, version) { browser.edge?(version) },
firefox: ->(browser, version) { browser.firefox?(version) },
ios_saf: ->(browser, version) { browser.ios? && browser.safari?(version) },
ios_saf: ->(browser, version) { browser.ios?(version) },
op_mini: ->(browser, version) { browser.opera_mini?(version) },
op_mob: ->(browser, version) { browser.platform.android? && browser.opera?(version) },
opera: ->(browser, version) { browser.opera?(version) },
safari: ->(browser, version) { browser.safari?(version) },
samsung: ->(browser, version) { browser.samsung_browser?(version) },
}.with_indifferent_access.freeze
# rubocop:enable Layout/LineLength
}.freeze

class << self
def supported?(user_agent)
return false if user_agent.nil?
return true if browser_support_config.nil?

cache.getset(user_agent) do
matchers.any? { |matcher| matcher.call(BrowserCache.parse(user_agent)) }
browser = BrowserCache.parse(user_agent)
matchers_for_browser(browser).any? { |_key, matcher| matcher.call(browser) }
end
end

Expand All @@ -38,15 +37,28 @@ def clear_cache!

attr_reader :cache

def matchers_for_browser(browser)
if browser.ios?
matchers.slice(:ios_saf)
elsif browser.platform.android_webview?
matchers.slice(:android)
else
matchers
end
end

def matchers
@matchers ||= browser_support_config.flat_map do |config_entry|
@matchers ||= browser_support_config.each_with_object({}) do |config_entry, result|
key, version = config_entry.split(' ', 2)
key = key.to_sym
browser_matcher = BROWSERSLIST_TO_BROWSER_MAP[key]
next [] if !browser_matcher
next if !browser_matcher

low_version, _high_version = version.split('-', 2)
low_version = nil if !numeric?(low_version)
proc { |browser| browser_matcher.call(browser, low_version && ">= #{low_version}") }
version_test = low_version && ">= #{low_version}"
matcher = proc { |browser| browser_matcher.call(browser, version_test) }
result[key] = matcher
end
end

Expand Down
45 changes: 45 additions & 0 deletions spec/services/browser_support_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,51 @@
end
end

context 'with user agent for chrome on ios' do
# All browsers on iOS use the Safari browser engine, so we expect the specific browser
# version to be disregarded in favor of the iOS version.

context 'with both chrome version and ios version below supported range' do
let(:user_agent) do
# Chrome 100 on iOS 14.0
'Mozilla/5.0 (iPhone; CPU iPhone OS 14_0 like Mac OS X) AppleWebKit/605.1.15 ' \
'(KHTML, like Gecko) CriOS/100.0.0000.000 Mobile/15E148 Safari/604.1'
end

it { expect(supported).to eq(false) }
end

context 'with chrome version above supported range, ios version below supported range' do
let(:user_agent) do
# Chrome 120 on iOS 14.0
'Mozilla/5.0 (iPhone; CPU iPhone OS 14_0 like Mac OS X) AppleWebKit/605.1.15 ' \
'(KHTML, like Gecko) CriOS/120.0.0000.000 Mobile/15E148 Safari/604.1'
end

it { expect(supported).to eq(false) }
end

context 'with chrome version below supported range, ios version above supported range' do
let(:user_agent) do
# Chrome 100 on iOS 15.0
'Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 ' \
'(KHTML, like Gecko) CriOS/120.0.0000.000 Mobile/15E148 Safari/604.1'
end

it { expect(supported).to eq(true) }
end

context 'with both chrome version and ios version above supported range' do
let(:user_agent) do
# Chrome 120 on iOS 17.3
'Mozilla/5.0 (iPhone; CPU iPhone OS 17_3 like Mac OS X) AppleWebKit/605.1.15 ' \
'(KHTML, like Gecko) CriOS/120.0.0000.000 Mobile/15E148 Safari/604.1'
end

it { expect(supported).to eq(true) }
end
end

context 'with opera desktop user agent' do
let(:user_agent) do
# Opera 83
Expand Down