browser 1.1.0 → 2.0.0.rc1

data/test/unit/ios_app_test.rb

@@ -1,10 +1,10 @@
 require "test_helper"
 
 class IosAppTest < Minitest::Test
-  let(:browser) { Browser.new(ua: $ua["IOS_WEBVIEW"]) }
+  let(:browser) { Browser.new(Browser["IOS_WEBVIEW"]) }
 
   test "detect as ios" do
-    assert browser.ios?
+    assert browser.platform.ios?
   end
 
   test "don't detect as safari" do
@@ -12,6 +12,6 @@ class IosAppTest < Minitest::Test
   end
 
   test "detect as webview" do
-    assert browser.ios_webview?
+    assert browser.platform.ios_webview?
   end
 end

data/test/unit/ios_test.rb

@@ -1,143 +1,136 @@
 require "test_helper"
 
 class IosTest < Minitest::Test
-  setup do
-    @browser = Browser.new
-  end
-
   test "detects iphone" do
-    @browser.ua = $ua["IPHONE"]
-
-    assert_equal "iPhone", @browser.name
-    assert @browser.iphone?
-    assert @browser.safari?
-    assert @browser.webkit?
-    assert @browser.mobile?
-    assert @browser.modern?
-    assert @browser.ios?
-    refute @browser.tablet?
-    refute @browser.mac?
-    assert_equal "3.0", @browser.full_version
-    assert_equal "3", @browser.version
+    browser = Browser.new(Browser["IPHONE"])
+
+    assert_equal "Safari", browser.name
+    assert browser.safari?
+    assert browser.webkit?
+    assert browser.modern?
+    assert browser.platform.ios?
+    refute browser.platform.mac?
+    assert_equal "3.0", browser.full_version
+    assert_equal "3", browser.version
   end
 
   test "detects safari" do
-    @browser.ua = $ua["SAFARI"]
-
-    assert_equal "Safari", @browser.name
-    assert @browser.safari?
-    assert @browser.webkit?
-    assert @browser.modern?
-    assert_equal "5.0.1", @browser.full_version
-    assert_equal "5", @browser.version
+    browser = Browser.new(Browser["SAFARI"])
+
+    assert_equal "Safari", browser.name
+    assert browser.safari?
+    assert browser.webkit?
+    assert browser.modern?
+    assert_equal "5.0.1", browser.full_version
+    assert_equal "5", browser.version
   end
 
   test "detects safari in webapp mode" do
-    @browser.ua = $ua["SAFARI_IPAD_WEBAPP_MODE"]
-    refute @browser.safari?
-    assert @browser.ios_webview?
+    browser = Browser.new(Browser["SAFARI_IPAD_WEBAPP_MODE"])
+    refute browser.safari?
+    assert browser.platform.ios_webview?
 
-    @browser.ua = $ua["SAFARI_IPHONE_WEBAPP_MODE"]
-    refute @browser.safari?
-    assert @browser.ios_webview?
+    browser = Browser.new(Browser["SAFARI_IPHONE_WEBAPP_MODE"])
+    refute browser.safari?
+    assert browser.platform.ios_webview?
   end
 
   test "detects ipod" do
-    @browser.ua = $ua["IPOD"]
-
-    assert_equal "iPod Touch", @browser.name
-    assert @browser.ipod?
-    assert @browser.safari?
-    assert @browser.webkit?
-    assert @browser.mobile?
-    assert @browser.modern?
-    assert @browser.ios?
-    refute @browser.tablet?
-    refute @browser.mac?
-    assert_equal "3.0", @browser.full_version
-    assert_equal "3", @browser.version
+    browser = Browser.new(Browser["IPOD"])
+
+    assert_equal "Safari", browser.name
+    assert browser.safari?
+    assert browser.webkit?
+    assert browser.platform.ios?
+    refute browser.device.tablet?
+    refute browser.platform.mac?
+    assert_equal "3.0", browser.full_version
+    assert_equal "3", browser.version
   end
 
   test "detects ipad" do
-    @browser.ua = $ua["IPAD"]
-
-    assert_equal "iPad", @browser.name
-    assert @browser.ipad?
-    assert @browser.safari?
-    assert @browser.webkit?
-    assert @browser.modern?
-    assert @browser.ios?
-    assert @browser.tablet?
-    refute @browser.mobile?
-    refute @browser.mac?
-    assert_equal "4.0.4", @browser.full_version
-    assert_equal "4", @browser.version
+    browser = Browser.new(Browser["IPAD"])
+
+    assert_equal "Safari", browser.name
+    assert browser.safari?
+    assert browser.webkit?
+    assert browser.modern?
+    assert browser.platform.ios?
+    refute browser.platform.mac?
+    assert_equal "4.0.4", browser.full_version
+    assert_equal "4", browser.version
   end
 
   test "detects ios4" do
-    @browser.ua = $ua["IOS4"]
-    assert @browser.ios?
-    assert @browser.ios?(4)
-    refute @browser.mac?
+    browser = Browser.new(Browser["IOS4"])
+    assert browser.platform.ios?
+    assert browser.platform.ios?(4)
+    refute browser.platform.mac?
   end
 
-
   test "detects ios5" do
-    @browser.ua = $ua["IOS5"]
-    assert @browser.ios?
-    assert @browser.ios?(5)
-    refute @browser.mac?
+    browser = Browser.new(Browser["IOS5"])
+    assert browser.platform.ios?
+    assert browser.platform.ios?(5)
+    refute browser.platform.mac?
   end
 
   test "detects ios6" do
-    @browser.ua = $ua["IOS6"]
-    assert @browser.ios?
-    assert @browser.ios?(6)
-    refute @browser.mac?
+    browser = Browser.new(Browser["IOS6"])
+    assert browser.platform.ios?
+    assert browser.platform.ios?(6)
+    refute browser.platform.mac?
   end
 
   test "detects ios7" do
-    @browser.ua = $ua["IOS7"]
-    assert @browser.ios?
-    assert @browser.ios?(7)
-    refute @browser.mac?
+    browser = Browser.new(Browser["IOS7"])
+    assert browser.platform.ios?
+    assert browser.platform.ios?(7)
+    refute browser.platform.mac?
   end
 
   test "detects ios8" do
-    @browser.ua = $ua["IOS8"]
-    assert @browser.ios?
-    assert @browser.ios?(8)
-    refute @browser.mac?
+    browser = Browser.new(Browser["IOS8"])
+    assert browser.platform.ios?
+    assert browser.platform.ios?(8)
+    refute browser.platform.mac?
   end
 
   test "detects ios9" do
-    @browser.ua = $ua["IOS9"]
-    assert @browser.ios?
-    assert @browser.ios?(9)
-    refute @browser.mac?
+    browser = Browser.new(Browser["IOS9"])
+    assert browser.platform.ios?
+    assert browser.platform.ios?(9)
+    refute browser.platform.mac?
   end
 
   test "don't detect as two different versions" do
-    @browser.ua = $ua["IOS8"]
-    assert @browser.ios?(8)
-    refute @browser.ios?(7)
+    browser = Browser.new(Browser["IOS8"])
+    assert browser.platform.ios?(8)
+    refute browser.platform.ios?(7)
   end
 
-  test "warn about deprecated numbered version" do
-    message = "Browser#ios8? is deprecated; use Browser#ios?(version) instead"
-    assert_deprecated(message, __FILE__, __LINE__) { @browser.ios8? }
-  end
-
-  test "returns string representation for ios" do
-    @browser.ua = $ua["IPHONE"]
-    meta = @browser.to_s
+  test "returns string representation for iphone" do
+    browser = Browser.new(Browser["IPHONE"])
+    meta = browser.to_s
 
-    assert meta.include?("iphone")
     assert meta.include?("webkit")
     assert meta.include?("ios")
     assert meta.include?("safari")
     assert meta.include?("safari3")
     assert meta.include?("modern")
     assert meta.include?("mobile")
+    refute meta.include?("tablet")
+  end
+
+  test "returns string representation for ipad" do
+    browser = Browser.new(Browser["IPAD"])
+    meta = browser.to_s
+
+    assert meta.include?("webkit")
+    assert meta.include?("ios")
+    assert meta.include?("safari")
+    assert meta.include?("modern")
+    assert meta.include?("tablet")
+    refute meta.include?("mobile")
   end
 end

data/test/unit/kindle_test.rb

@@ -1,41 +1,27 @@
 require "test_helper"
 
 class KindleTest < Minitest::Test
-  setup do
-    @browser = Browser.new
-  end
-
   test "detects kindle monochrome" do
-    @browser.ua = $ua["KINDLE"]
-
-    assert @browser.kindle?
-    assert @browser.webkit?
+    browser = Browser.new(Browser["KINDLE"])
+    assert browser.webkit?
   end
 
   test "detects kindle fire" do
-    @browser.ua = $ua["KINDLE_FIRE"]
-
-    assert @browser.kindle?
-    assert @browser.webkit?
+    browser = Browser.new(Browser["KINDLE_FIRE"])
+    assert browser.webkit?
   end
 
   test "detects kindle fire hd" do
-    @browser.ua = $ua["KINDLE_FIRE_HD"]
+    browser = Browser.new(Browser["KINDLE_FIRE_HD"])
 
-    assert @browser.silk?
-    assert @browser.kindle?
-    assert @browser.webkit?
-    assert @browser.modern?
-    refute @browser.mobile?
+    assert browser.webkit?
+    assert browser.modern?
   end
 
   test "detects kindle fire hd mobile" do
-    @browser.ua = $ua["KINDLE_FIRE_HD_MOBILE"]
+    browser = Browser.new(Browser["KINDLE_FIRE_HD_MOBILE"])
 
-    assert @browser.silk?
-    assert @browser.kindle?
-    assert @browser.webkit?
-    assert @browser.modern?
-    assert @browser.mobile?
+    assert browser.webkit?
+    assert browser.modern?
   end
 end

data/test/unit/nokia_test.rb

@@ -1,13 +1,9 @@
 require "test_helper"
 
 class NokiaTest < Minitest::Test
-  setup do
-    @browser = Browser.new(ua: $ua["NOKIA"])
-  end
-
   test "detects Nokia S40" do
-    assert @browser.mobile?
-    assert @browser.nokia?
-    assert_equal @browser.name, "Nokia S40 Ovi Browser"
+    browser = Browser.new(Browser["NOKIA"])
+    assert browser.nokia?
+    assert_equal "Nokia S40 Ovi Browser", browser.name
   end
 end

data/test/unit/opera_test.rb

@@ -1,46 +1,36 @@
 require "test_helper"
 
 class OperaTest < Minitest::Test
-  setup do
-    @browser = Browser.new
-  end
-
   test "detects opera" do
-    @browser.ua = $ua["OPERA"]
+    browser = Browser.new(Browser["OPERA"])
 
-    assert_equal "Opera", @browser.name
-    assert @browser.opera?
-    refute @browser.modern?
-    assert_equal "11.64", @browser.full_version
-    assert_equal "11", @browser.version
+    assert_equal "Opera", browser.name
+    assert browser.opera?
+    refute browser.modern?
+    assert_equal "11.64", browser.full_version
+    assert_equal "11", browser.version
   end
 
   test "detects opera next" do
-    @browser.ua = $ua["OPERA_NEXT"]
-
-    assert_equal "Opera", @browser.name
-    assert_equal :opera, @browser.id
-    assert @browser.opera?
-    assert @browser.webkit?
-    assert @browser.modern?
-    refute @browser.chrome?
-    assert_equal "15.0.1147.44", @browser.full_version
-    assert_equal "15", @browser.version
+    browser = Browser.new(Browser["OPERA_NEXT"])
+
+    assert_equal "Opera", browser.name
+    assert_equal :opera, browser.id
+    assert browser.opera?
+    assert browser.webkit?
+    assert browser.modern?
+    refute browser.chrome?
+    assert_equal "15.0.1147.44", browser.full_version
+    assert_equal "15", browser.version
   end
 
   test "detects opera mini" do
-    @browser.ua = $ua["OPERA_MINI"]
-
-    assert @browser.opera_mini?
-    refute @browser.tablet?
-    assert @browser.mobile?
+    browser = Browser.new(Browser["OPERA_MINI"])
+    assert browser.opera_mini?
   end
 
   test "detects opera mobi" do
-    @browser.ua = $ua["OPERA_MOBI"]
-
-    assert @browser.opera?
-    refute @browser.tablet?
-    assert @browser.mobile?
+    browser = Browser.new(Browser["OPERA_MOBI"])
+    assert browser.opera?
   end
 end

data/test/unit/platform_test.rb

@@ -0,0 +1,161 @@
+require "test_helper"
+
+class PlatformTest < Minitest::Test
+  test "detect other" do
+    platform = Browser::Platform.new("Other")
+
+    assert_equal "Other", platform.name
+    assert_equal :other, platform.id
+    assert_equal "0", platform.version
+  end
+
+  test "detect ios (iPhone)" do
+    platform = Browser::Platform.new(Browser["IOS4"])
+
+    assert_equal "iOS (iPhone)", platform.name
+    assert_equal :ios, platform.id
+    assert platform.ios?
+    assert_equal "4", platform.version
+  end
+
+  test "detect ios (iPad)" do
+    platform = Browser::Platform.new(Browser["IOS9"])
+
+    assert_equal "iOS (iPad)", platform.name
+    assert_equal :ios, platform.id
+    assert platform.ios?
+    assert_equal "9", platform.version
+  end
+
+  test "detect ios (iPod Touch)" do
+    platform = Browser::Platform.new(Browser["IPOD"])
+
+    assert_equal "iOS (iPod)", platform.name
+    assert_equal :ios, platform.id
+    assert platform.ios?
+    assert_equal "0", platform.version
+  end
+
+  test "detect linux" do
+    platform = Browser::Platform.new(Browser["FIREFOX"])
+
+    assert_equal "Generic Linux", platform.name
+    assert_equal :linux, platform.id
+    assert platform.linux?
+    assert_equal "0", platform.version
+  end
+
+  test "detect mac" do
+    platform = Browser::Platform.new(Browser["SAFARI"])
+
+    assert_equal "Macintosh", platform.name
+    assert_equal :mac, platform.id
+    assert platform.mac?
+    assert_equal "0", platform.version
+  end
+
+  test "detect firefox os" do
+    platform = Browser::Platform.new(Browser["FIREFOX_OS"])
+
+    assert_equal "Firefox OS", platform.name
+    assert_equal :firefox_os, platform.id
+    assert platform.firefox_os?
+    assert_equal "0", platform.version
+  end
+
+  test "detect windows phone" do
+    platform = Browser::Platform.new(Browser["MS_EDGE_MOBILE"])
+
+    assert_equal "Windows Phone", platform.name
+    assert_equal :windows_phone, platform.id
+    assert platform.windows_phone?
+    assert_equal "10.0", platform.version
+  end
+
+  test "detect windows mobile" do
+    platform = Browser::Platform.new(Browser["WINDOWS_MOBILE"])
+
+    assert_equal "Windows Mobile", platform.name
+    assert_equal :windows_mobile, platform.id
+    assert platform.windows_mobile?
+    assert_equal "0", platform.version
+  end
+
+  test "detect blackberry 10" do
+    platform = Browser::Platform.new(Browser["BLACKBERRY10"])
+
+    assert_equal "BlackBerry", platform.name
+    assert_equal :blackberry, platform.id
+    assert platform.blackberry?
+    assert_equal "10.0.9.1675", platform.version
+  end
+
+  test "detect blackberry 4" do
+    platform = Browser::Platform.new(Browser["BLACKBERRY4"])
+
+    assert_equal "BlackBerry", platform.name
+    assert_equal :blackberry, platform.id
+    assert platform.blackberry?
+    assert_equal "4.2.1", platform.version
+  end
+
+  test "detect blackberry 4 (other)" do
+    platform = Browser::Platform.new(Browser["BLACKBERRY"])
+
+    assert_equal "BlackBerry", platform.name
+    assert_equal :blackberry, platform.id
+    assert platform.blackberry?
+    assert_equal "4.1.0", platform.version
+  end
+
+  test "detect blackberry 5" do
+    platform = Browser::Platform.new(Browser["BLACKBERRY5"])
+
+    assert_equal "BlackBerry", platform.name
+    assert_equal :blackberry, platform.id
+    assert platform.blackberry?
+    assert_equal "5.0.0.93", platform.version
+  end
+
+  test "detect blackberry 6" do
+    platform = Browser::Platform.new(Browser["BLACKBERRY6"])
+
+    assert_equal "BlackBerry", platform.name
+    assert_equal :blackberry, platform.id
+    assert platform.blackberry?
+    assert_equal "6.0.0.141", platform.version
+  end
+
+  test "detect blackberry 7" do
+    platform = Browser::Platform.new(Browser["BLACKBERRY7"])
+
+    assert_equal "BlackBerry", platform.name
+    assert_equal :blackberry, platform.id
+    assert platform.blackberry?
+    assert_equal "7.0.0.1", platform.version
+  end
+
+  test "detect android" do
+    platform = Browser::Platform.new(Browser["ANDROID_CUPCAKE"])
+
+    assert_equal "Android", platform.name
+    assert_equal :android, platform.id
+    assert platform.android?
+    assert_equal "1.5", platform.version
+  end
+
+  test "detect chrome os" do
+    platform = Browser::Platform.new(Browser["CHROME_OS"])
+
+    assert_equal "Chrome OS", platform.name
+    assert_equal :chrome_os, platform.id
+    assert platform.chrome_os?
+    assert_equal "3701.81.0", platform.version
+  end
+
+  test "detect adobe air" do
+    platform = Browser::Platform.new(Browser["ADOBE_AIR"])
+
+    assert platform.adobe_air?
+  end
+end