Ensure that iOS platform detection uses OS (fnando#415)

Author: fnando

lib/browser/platform/ios.rb

@@ -4,10 +4,22 @@ module Browser
  class Platform
  class IOS < Base
  MATCHER = /(iPhone|iPad|iPod)/.freeze
- VERSION_MATCHER = /OS ([\d.]+)/.freeze
+ VERSION_MATCHER = /OS ((?<major>\d)_(?<minor>\d)_?(?<patch>\d)?)/.freeze
 
  def version
- ua[VERSION_MATCHER, 1] || "0"
+ matches = VERSION_MATCHER.match(ua)
+
+ return "0" unless matches
+
+ versions = [matches[:major]]
+
+ if matches[:patch]
+ versions.push(matches[:minor], matches[:patch])
+ else
+ versions.push(matches[:minor]) unless matches[:minor] == "0"
+ end
+
+ versions.join(".")
  end
 
  def name

test/ua.yml

@@ -63,6 +63,8 @@ IOS5: "Mozilla/5.0 (iPhone; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46
 IOS6: "Mozilla/5.0 (iPhone; CPU iPhone OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5376e Safari/8536.25"
 IOS7: "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53"
 IOS8: "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12A365 Safari/600.1.4"
+IOS8_1_2: 'Mozilla/5.0 (iPhone; CPU iPhone OS 8_1_2 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12B440 Safari/600.1.4'
+IOS8_3: 'Mozilla/5.0 (iPhone; CPU iPhone OS 8_3 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12F70 Safari/600.1.4'
 IOS9: "Mozilla/5.0 (iPad; CPU OS 9_0 like Mac OS X) AppleWebKit/601.1.17 (KHTML, like Gecko) Version/8.0 Mobile/13A175 Safari/600.1.4"
 IOS_WEBVIEW: Mozilla/5.0 (iPhone; CPU iPhone OS 8_4 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Mobile/12H141
 IPAD: "Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B367 Safari/531.21.10"

test/unit/platform_test.rb

@@ -62,6 +62,27 @@ def id
  assert_equal "9", platform.version
  end
 
+ test "detect specific minor iOS (iPhone)" do
+ platform = Browser::Platform.new(Browser["IOS8_3"])
+
+ assert_equal "iOS (iPhone)", platform.name
+ assert_equal :ios, platform.id
+ assert platform.ios?
+ assert platform.ios?(8.3)
+ assert_equal "8.3", platform.version
+ end
+
+ test "detect specific patch iOS (iPhone)" do
+ platform = Browser::Platform.new(Browser["IOS8_1_2"])
+
+ assert_equal "iOS (iPhone)", platform.name
+ assert_equal :ios, platform.id
+ assert platform.ios?
+ assert platform.ios?("8.1.2")
+ assert platform.ios?("<8.2")
+ assert_equal "8.1.2", platform.version
+ end
+
  test "detect ios (iPod Touch)" do
  platform = Browser::Platform.new(Browser["IPOD"])