browser 2.3.0 → 2.4.0

data/test/rails_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 require "browser/rails"
 require "sample_app"

data/test/sample_app.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 require "rails"
 require "browser"
 
 class PagesController < ActionController::Base
   def home
-    render text: "#{browser.name}:#{browser.accept_language.first.full}"
+    render html: "#{browser.name}:#{browser.accept_language.first.full}"
   end
 end
 

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+
+require "simplecov"
+SimpleCov.start
 
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
 require "bundler/setup"

data/test/ua.yml

@@ -46,6 +46,7 @@ IE9: 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)'
 IE9_CHROME_FRAME: 'Mozilla/5.0 (Windows NT 6.1; WOW64; chromeframe/26.0.1410.43) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.43 Safari/537.31'
 IE9_COMPAT: 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; Trident/5.0)'
 IE_WITHOUT_TRIDENT: Mozilla/4.0 (compatible; MSIE8.0; Windows NT 6.0) .NET CLR 2.0.50727)
+IOS3: 'Mozilla/5.0 (iPad; U; CPU iPhone OS 3_0 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B314 Safari/531.21.10'
 IOS4: 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7'
 IOS5: 'Mozilla/5.0 (iPhone; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3'
 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'

data/test/ua_bots.yml

@@ -1,4 +1,5 @@
 ADLXBOT: 'Mozilla/5.0 (compatible; adidxbot/2.0; +http://www.bing.com/bingbot.htm)'
+APIS_GOOGLE: 'APIs-Google; (+https://developers.google.com/webmasters/APIs-Google.html)'
 APPLE_BOT: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/600.2.5 (KHTML, like Gecko) Version/8.0.2 Safari/600.2.5 (Applebot/0.1)'
 ASK: 'Mozilla/2.0 (compatible; Ask Jeeves/Teoma; +http://sp.ask.com/docs/about/tech_crawling.html)'
 AWS_ELB: ELB-HealthChecker/1.0
@@ -27,11 +28,14 @@ MSNBOT: 'msnbot/2.0b (+http://search.msn.com/msnbot.htm)'
 MSNBOT_MEDIA: 'msnbot-media/1.1 (+http://search.msn.com/msnbot.htm)'
 NETCRAFT2: Netcraft SSL Server Survey - contact info@netcraft.com
 NETCRAFT: Mozilla/5.0 (compatible; NetcraftSurveyAgent/1.0; +info@netcraft.com)
+NEWRELICPINGER: NewRelicPinger/1.0 (12345)
 PRIVACYAWAREBOT: 'Mozilla/5.0 (compatible; PrivacyAwareBot/1.1; +http://www.privacyaware.org)'
+PROXIMIC: 'Mozilla/5.0 (compatible; proximic; +http://www.proximic.com/info/spider.php)'
 QUERYSEEKER: 'QuerySeekerSpider ( http://queryseeker.com/bot.html )'
 SCRAPY: 'Scrapy/0.18.4 (+http://scrapy.org)'
 SEOKICKS: 'Mozilla/5.0 (compatible; SEOkicks-Robot; +http://www.seokicks.de/robot.html)'
 SISTRIX: 'Mozilla/5.0 (compatible; SISTRIX Crawler; http://crawler.sistrix.net/)'
+SOCIALRANKIO: SocialRankIOBot; http://socialrank.io/about
 SQUIDER: 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36 Squider/0.01'
 STRIPE: 'Stripe/1.0 (+https://stripe.com/docs/webhooks)'
 TINEYE: 'TinEye-bot/0.51 (see http://www.tineye.com/crawler.html)'

data/test/unit/accept_language_test.rb

@@ -1,10 +1,18 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class AcceptLanguageTest < Minitest::Test
   def assert_language(item, expect = {})
     assert_equal expect[:code], item.code, "failed code comparison"
-    assert_equal expect[:region], item.region, "failed region comparison"
+
+    if expect[:region]
+      assert_equal expect[:region], item.region, "failed region comparison"
+    else
+      assert_nil item.region,
+                 "region should be nil; got #{item.region.inspect} instead"
+    end
+
     assert_equal expect[:quality], item.quality, "failed quality comparison"
   end
 
@@ -26,6 +34,35 @@ class AcceptLanguageTest < Minitest::Test
     assert_nil language.name
   end
 
+  test "returns code" do
+    language = Browser::AcceptLanguage.new("en-GB")
+    assert_equal "en", language.code
+  end
+
+  test "returns formatted code" do
+    %w[EN-GB En-GB eN-GB].each do |locale|
+      language = Browser::AcceptLanguage.new(locale)
+      assert_equal "en", language.code
+    end
+  end
+
+  test "returns region" do
+    language = Browser::AcceptLanguage.new("en-GB")
+    assert_equal "GB", language.region
+  end
+
+  test "returns formatted region" do
+    %w[en-gb en-Gb en-gB].each do |locale|
+      language = Browser::AcceptLanguage.new(locale)
+      assert_equal "GB", language.region
+    end
+  end
+
+  test "returns nil for language without region" do
+    language = Browser::AcceptLanguage.new("en")
+    assert_nil language.region
+  end
+
   test "parses language with quality" do
     language = Browser::AcceptLanguage.new("en-GB;q=0.8")
     assert_language language, code: "en", region: "GB", quality: 0.8

data/test/unit/adobe_air_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class AdobeAirTest < Minitest::Test

data/test/unit/aliases_test.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require "test_helper"
+require "browser/aliases"
+
+class AliasesTest < Minitest::Test
+  class BrowserMock
+    include Browser::Aliases
+
+    def platform
+      @platform ||= Object.new
+    end
+
+    def device
+      @device ||= Object.new
+    end
+  end
+
+  Browser::Aliases::PLATFORM_ALIASES.each do |method_name|
+    test "adds #{method_name.inspect} as a platform alias" do
+      browser = BrowserMock.new
+
+      browser.platform.define_singleton_method(method_name) do
+        :called
+      end
+
+      assert_equal :called, browser.public_send(method_name)
+    end
+  end
+
+  Browser::Aliases::DEVICE_ALIASES.each do |method_name|
+    test "adds #{method_name.inspect} as a device alias" do
+      browser = BrowserMock.new
+
+      browser.device.define_singleton_method(method_name) do
+        :called
+      end
+
+      assert_equal :called, browser.public_send(method_name)
+    end
+  end
+end

data/test/unit/alipay_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class AlipayTest < Minitest::Test
@@ -19,4 +20,9 @@ class AlipayTest < Minitest::Test
     assert_equal "Alipay", browser.name
     assert_equal "9.0.1.073001", browser.full_version
   end
+
+  test "detects version by range" do
+    browser = Browser.new(Browser["ALIPAY_IOS"])
+    assert browser.alipay?(%w[>=2 <3])
+  end
 end

data/test/unit/android_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class AndroidTest < Minitest::Test

data/test/unit/blackberry_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class BlackberryTest < Minitest::Test

data/test/unit/bots_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class BotsTest < Minitest::Test
@@ -87,4 +88,14 @@ class BotsTest < Minitest::Test
     assert browser.platform.android?
     refute browser.bot?
   end
+
+  test "extends list in runtime" do
+    browser = Browser.new("Faraday/0.9.2")
+    refute browser.bot?
+
+    Browser::Bot.bots["faraday"] = "Faraday"
+    assert browser.bot?
+
+    Browser::Bot.bots.delete("faraday")
+  end
 end

data/test/unit/chrome_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class ChromeTest < Minitest::Test
@@ -55,6 +56,11 @@ class ChromeTest < Minitest::Test
     assert_equal "41", browser.version
   end
 
+  test "detects yandex version by range" do
+    browser = Browser.new(Browser["YANDEX_BROWSER"])
+    assert browser.yandex?(%w[>=41 <42])
+  end
+
   test "detects chrome frame" do
     browser = Browser.new(Browser["IE9_CHROME_FRAME"])
 
@@ -64,4 +70,9 @@ class ChromeTest < Minitest::Test
     assert_equal "26.0.1410.43", browser.full_version
     assert_equal "26", browser.version
   end
+
+  test "detects version by range" do
+    browser = Browser.new(Browser["CHROME"])
+    assert browser.chrome?(%w[>=5 <6])
+  end
 end

data/test/unit/console_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class ConsoleTest < Minitest::Test

data/test/unit/device_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class DeviceTest < Minitest::Test
@@ -36,6 +37,13 @@ class DeviceTest < Minitest::Test
     assert_equal "iPad", device.name
   end
 
+  test "detect old ipad" do
+    device = Browser::Device.new(Browser["IOS3"])
+    assert device.ipad?
+    assert_equal :ipad, device.id
+    assert_equal "iPad", device.name
+  end
+
   test "detect ipod" do
     device = Browser::Device.new(Browser["IPOD"])
     assert device.ipod_touch?

data/test/unit/edge_test.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class EdgeTest < ActionController::TestCase
+  test "detects Microsoft Edge" do
+    browser = Browser.new(Browser["MS_EDGE"])
+
+    assert_equal :edge, browser.id
+    assert_equal "Microsoft Edge", browser.name
+    assert_equal "12.0", browser.full_version
+    assert_equal "12", browser.version
+    assert browser.platform.windows10?
+    assert browser.edge?
+    assert browser.modern?
+    refute browser.webkit?
+    refute browser.chrome?
+    refute browser.safari?
+    refute browser.device.mobile?
+  end
+
+  test "detects Microsoft Edge in compatibility view" do
+    browser = Browser.new(Browser["MS_EDGE_COMPAT"])
+
+    assert_equal :edge, browser.id
+    assert_equal "Microsoft Edge", browser.name
+    assert_equal "12.0", browser.full_version
+    assert_equal "12", browser.version
+    assert_equal "7.0", browser.msie_full_version
+    assert_equal "7", browser.msie_version
+    assert browser.edge?
+    assert browser.compatibility_view?
+    refute browser.modern?
+    refute browser.webkit?
+    refute browser.chrome?
+    refute browser.safari?
+    refute browser.device.mobile?
+  end
+
+  test "detects Microsoft Edge Mobile" do
+    browser = Browser.new(Browser["MS_EDGE_MOBILE"])
+
+    assert_equal :edge, browser.id
+    assert_equal "Microsoft Edge", browser.name
+    assert_equal "12.0", browser.full_version
+    assert_equal "12", browser.version
+    refute browser.platform.windows10?
+    assert browser.platform.windows_phone?
+    assert browser.edge?
+    assert browser.modern?
+    refute browser.webkit?
+    refute browser.chrome?
+    refute browser.safari?
+  end
+
+  test "detects version by range" do
+    browser = Browser.new(Browser["MS_EDGE"])
+    assert browser.edge?(%w[>=12 <13])
+  end
+end

data/test/unit/firefox_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class FirefoxTest < Minitest::Test
@@ -44,4 +45,9 @@ class FirefoxTest < Minitest::Test
     assert_equal "14.0", browser.full_version
     assert_equal "14", browser.version
   end
+
+  test "detects version by range" do
+    browser = Browser.new(Browser["FIREFOX"])
+    assert browser.firefox?(%w[>=3 <4])
+  end
 end

data/test/unit/generic_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class GenericTest < Minitest::Test

data/test/unit/{ie_test.rb → internet_explorer_test.rb}

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class IeTest < Minitest::Test
@@ -153,56 +154,6 @@ class IeTest < Minitest::Test
     assert_equal "11", browser.version
   end
 
-  test "detects Microsoft Edge" do
-    browser = Browser.new(Browser["MS_EDGE"])
-
-    assert_equal :edge, browser.id
-    assert_equal "Microsoft Edge", browser.name
-    assert_equal "12.0", browser.full_version
-    assert_equal "12", browser.version
-    assert browser.platform.windows10?
-    assert browser.edge?
-    assert browser.modern?
-    refute browser.webkit?
-    refute browser.chrome?
-    refute browser.safari?
-    refute browser.device.mobile?
-  end
-
-  test "detects Microsoft Edge in compatibility view" do
-    browser = Browser.new(Browser["MS_EDGE_COMPAT"])
-
-    assert_equal :edge, browser.id
-    assert_equal "Microsoft Edge", browser.name
-    assert_equal "12.0", browser.full_version
-    assert_equal "12", browser.version
-    assert_equal "7.0", browser.msie_full_version
-    assert_equal "7", browser.msie_version
-    assert browser.edge?
-    assert browser.compatibility_view?
-    refute browser.modern?
-    refute browser.webkit?
-    refute browser.chrome?
-    refute browser.safari?
-    refute browser.device.mobile?
-  end
-
-  test "detects Microsoft Edge Mobile" do
-    browser = Browser.new(Browser["MS_EDGE_MOBILE"])
-
-    assert_equal :edge, browser.id
-    assert_equal "Microsoft Edge", browser.name
-    assert_equal "12.0", browser.full_version
-    assert_equal "12", browser.version
-    refute browser.platform.windows10?
-    assert browser.platform.windows_phone?
-    assert browser.edge?
-    assert browser.modern?
-    refute browser.webkit?
-    refute browser.chrome?
-    refute browser.safari?
-  end
-
   test "detects IE without Trident" do
     browser = Browser.new(Browser["IE_WITHOUT_TRIDENT"])
 

data/test/unit/ios_app_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class IosAppTest < Minitest::Test

data/test/unit/ios_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class IosTest < Minitest::Test

data/test/unit/kindle_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class KindleTest < Minitest::Test

data/test/unit/meta_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "test_helper"
 
 class MetaTest < Minitest::Test