RubyGems - browser - Versions diffs - 1.1.0 → 2.0.0.rc1 - Mend

browser 1.1.0 → 2.0.0.rc1

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 (122) hide show

checksums.yaml +4 -4
data/.bundle/config +2 -0
data/.hound.yml +26 -6
data/.rubocop.yml +26 -6
data/CHANGELOG.md +10 -0
data/README.md +177 -41
data/Rakefile +1 -1
data/bin/rake +16 -0
data/bot_exceptions.yml +1 -0
data/bots.yml +188 -192
data/browser.gemspec +14 -28
data/languages.yml +54 -54
data/lib/browser.rb +82 -202
data/lib/browser/accept_language.rb +47 -0
data/lib/browser/action_controller.rb +1 -1
data/lib/browser/base.rb +159 -0
data/lib/browser/blackberry.rb +21 -0
data/lib/browser/bot.rb +63 -0
data/lib/browser/chrome.rb +23 -0
data/lib/browser/detect_version.rb +19 -0
data/lib/browser/device.rb +175 -0
data/lib/browser/device/base.rb +11 -0
data/lib/browser/device/blackberry_playbook.rb +17 -0
data/lib/browser/device/ipad.rb +17 -0
data/lib/browser/device/iphone.rb +17 -0
data/lib/browser/device/ipod_touch.rb +17 -0
data/lib/browser/device/kindle.rb +17 -0
data/lib/browser/device/kindle_fire.rb +17 -0
data/lib/browser/device/playstation3.rb +17 -0
data/lib/browser/device/playstation4.rb +17 -0
data/lib/browser/device/psp.rb +17 -0
data/lib/browser/device/psvita.rb +17 -0
data/lib/browser/device/surface.rb +23 -0
data/lib/browser/device/tv.rb +17 -0
data/lib/browser/device/unknown.rb +17 -0
data/lib/browser/device/wii.rb +17 -0
data/lib/browser/device/wiiu.rb +17 -0
data/lib/browser/device/xbox_360.rb +17 -0
data/lib/browser/device/xbox_one.rb +17 -0
data/lib/browser/edge.rb +19 -0
data/lib/browser/firefox.rb +19 -0
data/lib/browser/generic.rb +32 -0
data/lib/browser/internet_explorer.rb +61 -0
data/lib/browser/meta/base.rb +1 -1
data/lib/browser/meta/device.rb +9 -0
data/lib/browser/meta/generic_browser.rb +1 -1
data/lib/browser/meta/id.rb +1 -1
data/lib/browser/meta/ie.rb +1 -1
data/lib/browser/meta/ios.rb +2 -2
data/lib/browser/meta/mobile.rb +2 -2
data/lib/browser/meta/modern.rb +1 -1
data/lib/browser/meta/platform.rb +2 -2
data/lib/browser/meta/proxy.rb +1 -1
data/lib/browser/meta/safari.rb +1 -1
data/lib/browser/meta/tablet.rb +9 -0
data/lib/browser/meta/webkit.rb +1 -1
data/lib/browser/middleware.rb +1 -1
data/lib/browser/middleware/context.rb +2 -2
data/lib/browser/middleware/context/additions.rb +1 -1
data/lib/browser/middleware/context/url_methods.rb +3 -3
data/lib/browser/nokia.rb +19 -0
data/lib/browser/opera.rb +19 -0
data/lib/browser/phantom_js.rb +19 -0
data/lib/browser/platform.rb +152 -0
data/lib/browser/platform/adobe_air.rb +21 -0
data/lib/browser/platform/android.rb +21 -0
data/lib/browser/platform/base.rb +15 -0
data/lib/browser/platform/blackberry.rb +21 -0
data/lib/browser/platform/chrome_os.rb +21 -0
data/lib/browser/platform/firefox_os.rb +21 -0
data/lib/browser/platform/ios.rb +28 -0
data/lib/browser/platform/linux.rb +21 -0
data/lib/browser/platform/mac.rb +21 -0
data/lib/browser/platform/other.rb +21 -0
data/lib/browser/platform/windows.rb +21 -0
data/lib/browser/platform/windows_mobile.rb +21 -0
data/lib/browser/platform/windows_phone.rb +21 -0
data/lib/browser/rails.rb +3 -2
data/lib/browser/safari.rb +22 -0
data/lib/browser/testing.rb +23 -0
data/lib/browser/uc_browser.rb +19 -0
data/lib/browser/version.rb +2 -7
data/search_engines.yml +5 -5
data/test/browser_test.rb +71 -172
data/test/middleware_test.rb +7 -7
data/test/sample_app.rb +3 -3
data/test/test_helper.rb +11 -10
data/test/ua.yml +15 -26
data/test/ua_bots.yml +27 -0
data/test/ua_search_engines.yml +6 -0
data/test/unit/accept_language_test.rb +92 -0
data/test/unit/adobe_air_test.rb +5 -10
data/test/unit/android_test.rb +44 -49
data/test/unit/blackberry_test.rb +55 -77
data/test/unit/bots_test.rb +52 -84
data/test/unit/chrome_test.rb +48 -42
data/test/unit/console_test.rb +4 -62
data/test/unit/device_test.rb +193 -0
data/test/unit/firefox_test.rb +32 -27
data/test/unit/ie_test.rb +223 -238
data/test/unit/ios_app_test.rb +3 -3
data/test/unit/ios_test.rb +87 -94
data/test/unit/kindle_test.rb +10 -24
data/test/unit/nokia_test.rb +3 -7
data/test/unit/opera_test.rb +20 -30
data/test/unit/platform_test.rb +161 -0
data/test/unit/proxy_test.rb +3 -3
data/test/unit/safari_test.rb +66 -0
data/test/unit/uc_browser_test.rb +3 -7
data/test/unit/windows_phone_test.rb +19 -40
data/test/unit/windows_test.rb +32 -34
metadata +73 -28
data/lib/browser/methods/blackberry.rb +0 -51
data/lib/browser/methods/bots.rb +0 -35
data/lib/browser/methods/consoles.rb +0 -43
data/lib/browser/methods/devices.rb +0 -41
data/lib/browser/methods/ie.rb +0 -99
data/lib/browser/methods/language.rb +0 -16
data/lib/browser/methods/mobile.rb +0 -35
data/lib/browser/methods/platform.rb +0 -152
data/lib/browser/methods/proxy.rb +0 -8
data/lib/browser/methods/tv.rb +0 -8

data/test/middleware_test.rb CHANGED

@@ -2,7 +2,7 @@ require "test_helper"
 require "browser/rails"
 require "sample_app"
-class Browser::MiddlewareTest < Minitest::Test
+class MiddlewareTest < Minitest::Test
   include Rack::Test::Methods
   def app
@@ -10,40 +10,40 @@ class Browser::MiddlewareTest < Minitest::Test
   end
   test "redirects with 302" do
-    get "/", {}, {"HTTP_USER_AGENT" => "MSIE 6", "HTTP_ACCEPT" => "text/html"}
+    get "/", {}, "HTTP_USER_AGENT" => "MSIE 6", "HTTP_ACCEPT" => "text/html"
     assert_equal 302, last_response.status
   end
   test "redirects ie6 to upgrade path" do
-    get "/", {}, {"HTTP_USER_AGENT" => "MSIE 6", "HTTP_ACCEPT" => "text/html"}
+    get "/", {}, "HTTP_USER_AGENT" => "MSIE 6", "HTTP_ACCEPT" => "text/html"
     follow_redirect!
     assert_equal "UPGRADE: ie6", last_response.body
   end
   test "redirects ie7 to upgrade path" do
-    get "/", {}, {"HTTP_USER_AGENT" => "MSIE 7", "HTTP_ACCEPT" => "text/html"}
+    get "/", {}, "HTTP_USER_AGENT" => "MSIE 7", "HTTP_ACCEPT" => "text/html"
     follow_redirect!
     assert_equal "UPGRADE: ie7", last_response.body
   end
   test "redirects ie8 and returns 404" do
-    get "/", {}, {"HTTP_USER_AGENT" => "MSIE 8", "HTTP_ACCEPT" => "text/html"}
+    get "/", {}, "HTTP_USER_AGENT" => "MSIE 8", "HTTP_ACCEPT" => "text/html"
     follow_redirect!
     assert_equal 404, last_response.status
   end
   test "redirects ie8 with wildcard http accept" do
-    get "/", {}, {"HTTP_USER_AGENT" => "MSIE 8", "HTTP_ACCEPT" => "*/*"}
+    get "/", {}, "HTTP_USER_AGENT" => "MSIE 8", "HTTP_ACCEPT" => "*/*"
     follow_redirect!
     assert_equal 404, last_response.status
   end
   test "ignores non-html requests" do
-    get "/", {}, {"HTTP_USER_AGENT" => "MSIE 6", "HTTP_ACCEPT" => "image/png"}
+    get "/", {}, "HTTP_USER_AGENT" => "MSIE 6", "HTTP_ACCEPT" => "image/png"
     assert_equal 200, last_response.status
   end

data/test/sample_app.rb CHANGED

@@ -10,13 +10,13 @@ class SampleApp < Rails::Application
   routes.append do
     default_headers = {"Content-Type" => "text/html"}
-    root to: -> env { [200, default_headers, ["ROOT"]] }
-    get "upgrade", to: -> env {
+    root to: -> (_env) { [200, default_headers, ["ROOT"]] }
+    get "upgrade", to: lambda {|env|
       browser = Rack::Request.new(env).params["browser"]
       [200, default_headers, ["UPGRADE: #{browser}"]]
     }, as: "upgrade"
-    get "/asset", to: -> env {
+    get "/asset", to: proc {
       [200, {"Content-Type" => "image/png"}, []]
     }
   end

data/test/test_helper.rb CHANGED

@@ -3,18 +3,19 @@ require "bundler/setup"
 require "minitest/autorun"
 require "minitest/utils"
 require "browser"
+require "browser/testing"
 require "yaml"
-$ua = YAML.load_file("./test/ua.yml")
+module Minitest
+  class Test
+    setup do
+      Browser::Bot.instance_variable_set("@detect_empty_ua", false)
+    end
-class Minitest::Test
-  setup do
-    Browser::Bots.instance_variable_set("@detect_empty_ua", false)
-  end
-  def assert_deprecated(message, file, line, &block)
-    message = "#{message} (called from #{file}:#{line})"
-    out, err = capture_io(&block)
-    assert_includes err, message
+    def assert_deprecated(message, file, line, &block)
+      message = "#{message} (called from #{file}:#{line})"
+      _out, err = capture_io(&block)
+      assert_includes err, message
+    end
   end
 end

data/test/ua.yml CHANGED

@@ -16,10 +16,6 @@ ANDROID_LOLLIPOP_51: Mozilla/5.0 (Linux; Android 5.1; Nexus 5 Build/LMY47I) Appl
 ANDROID_NEXUS_PLAYER: Mozilla/5.0 (Linux; Android 5.0; Nexus Player Build/LRX21V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.0
 ANDROID_TV: Mozilla/5.0 (Linux; Android 5.0; ADT-1 Build/LRW87K) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/37.0.0.0 Mobile Safari/537.36
 ANDROID_WITH_SAFARI: 'Mozilla/5.0 (Linux; U; Android 4.3; en-us; SCH-I535 Build/JSS15J) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30'
-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)'
-BAIDU: 'Baiduspider+(+http://www.baidu.com/search/spider.htm)'
-BINGBOT: 'Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)'
 BLACKBERRY10: 'Mozilla/5.0 (BB10; Touch) AppleWebKit/537.10+ (KHTML, like Gecko) Version/10.0.9.1675 Mobile Safari/537.10+'
 BLACKBERRY4: 'BlackBerry8100/4.2.1 Profile/MIDP-2.0 Configuration/CLDC-1.1 VendorID/103'
 BLACKBERRY5: 'BlackBerry9000/5.0.0.93 Profile/MIDP-2.0 Configuration/CLDC-1.1 VendorID/179'
@@ -29,18 +25,12 @@ BLACKBERRY: 'BlackBerry7100i/4.1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Vendo
 CHROME: 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_4; en-US) AppleWebKit/533.4 (KHTML, like Gecko) Chrome/5.0.375.99 Safari/533.4'
 CHROME_OS: 'Mozilla/5.0 (X11; CrOS x86_64 3701.81.0) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.57 Safari/537.31.'
 COREMEDIA: 'Apple Mac OS X v10.6.4 CoreMedia v1.0.0.10F569'
-DAUMOA: Mozilla/5.0 (compatible; MSIE or Firefox mutant; not on Windows server;) Daumoa 4.0
-DOMAINAREANIMATOR: 'Domain Re-Animator Bot (http://domainreanimator.com) - support@domainreanimator.com'
-DOT_BOT: 'Mozilla/5.0 (compatible; DotBot/1.1; http://www.opensiteexplorer.org/dotbot, help@moz.com)'
-DUCKDUCKGO: 'DuckDuckBot/1.0; (+http://duckduckgo.com/duckduckbot.html)'
-FACEBOOK_BOT: 'facebookexternalhit/1.1 (+http://www.facebook.com/externalhit_uatext.php)'
+CUSTOM_APP: "Our App 0.0.1 (Linux; Android 4.0.3; HTC Ruby Build/IML74K; en_CA)"
 FIREFOX: 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) Gecko/20121223 Ubuntu/9.25 (jaunty) Firefox/3.8'
+FIREFOX_IOS: 'Mozilla/5.0 (iPhone; CPU iPhone OS 9_2 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) FxiOS/1.2 Mobile/13C75 Safari/601.1.46'
 FIREFOX_MODERN: 'Mozilla/5.0 (X11; Ubuntu; Linux armv7l; rv:17.0) Gecko/20100101 Firefox/17.0'
+FIREFOX_OS: 'Mozilla/5.0 (Mobile; rv:18.0) Gecko/18.0 Firefox/18.0'
 FIREFOX_TABLET: 'Mozilla/5.0 (Android; Tablet; rv:14.0) Gecko/14.0 Firefox/14.0'
-GOOGLE_BOT: 'Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)'
-GOOGLE_PAGE_SPEED_INSIGHTS: 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.4 (KHTML, like Gecko; Google Page Speed Insights) Chrome/22.0.1229 Safari/537.4'
-GOOGLE_STRUCTURED_DATA_TESTING_TOOL: 'Mozilla/5.0 (compatible; X11; Linux x86_64; Google-StructuredDataTestingTool; +http://www.google.com/webmasters/tools/richsnippets)'
-GRAPESHOT: 'Mozilla/5.0 (compatible; GrapeshotCrawler/2.0; +http://www.grapeshot.co.uk/crawler.php)'
 IE10: 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0; EIE10;ENUSMSN)'
 IE10_COMPAT: 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; Trident/6.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET4.0C; EIE10;ENUSMSN)'
 IE10_X64_WINX64: 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Win64; x64; Trident/6.0)'
@@ -52,6 +42,7 @@ IE7: 'Mozilla/5.0 (Windows; U; MSIE 7.0; Windows NT 6.0; en-US)'
 IE8: 'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.2; Trident/4.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0)'
 IE8_COMPAT: 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; Trident/4.0; SLCC1; Media Center PC 5.0; .NET CLR 3.5.21022)'
 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)
 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'
@@ -68,16 +59,13 @@ KINDLE: 'Mozilla/5.0 (Linux; U; en-US) AppleWebKit/528.5+ (KHTML, like Gecko, Sa
 KINDLE_FIRE: 'Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Kindle Fire Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1'
 KINDLE_FIRE_HD: 'Mozilla/5.0 (Linux; U; en-us; KFTT Build/IML74K) AppleWebKit/535.19 (KHTML, like Gecko) Silk/3.4 Safari/535.19 Silk-Accelerated=true'
 KINDLE_FIRE_HD_MOBILE: 'Mozilla/5.0 (Linux; U; Android 4.0.3; en-us; KFTT Build/IML74K) AppleWebKit/535.19 (KHTML, like Gecko) Silk/3.4 Mobile Safari/535.19 Silk-Accelerated=true'
-LINKDEXBOT: 'Mozilla/5.0 (compatible; linkdexbot/2.0; +http://www.linkdex.com/bots/)'
-LOAD_TIME_BOT: 'Mozilla/5.0 (compatible; LoadTimeBot/0.9; +http://www.loadtime.net/bot.html)'
 LUMIA800: 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0; XBLWP7; ZuneWP7'
-MAIL_RU: 'Mozilla/5.0 (compatible; Linux x86_64; Mail.RU_Bot/2.0; +http://go.mail.ru/help/robots)'
-MEGAINDEX_RU: 'Mozilla/5.0 (compatible; MegaIndex.ru/2.0; +https://www.megaindex.ru/?tab=linkAnalyze)'
+MIDP: MIDP-2.0
 MOBILE_CHROME: 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_1_1 like Mac OS X; en) AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 Safari/7534.48.3'
 MS_EDGE: 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Safari/537.36 Edge/12.0'
 MS_EDGE_COMPAT: 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.2; WOW64; Trident/8.0; .NET4.0C; .NET4.0E; Tablet PC 2.0; Microsoft Outlook 15.0.4433; ms-office; MSOffice 15)'
 MS_EDGE_MOBILE: 'Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; DEVICE INFO) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Mobile Safari/537.36 Edge/12.0'
-MSN_BOT: 'msnbot-media/1.1 (+http://search.msn.com/msnbot.htm)'
+NEXUS7: 'Mozilla/5.0 (Linux; Android 4.3; Nexus 7 Build/JWR66Y) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.72 Safari/537.36'
 NEXUS_TABLET: 'Mozilla/5.0 (Linux; Android 4.1.1; Nexus 7 Build/JRO03D) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Safari/535.19'
 NINTENDO_WII: 'Opera/9.00 (Nintendo Wii; U; ; 1309-9; en)'
 NINTENDO_WIIU: 'Mozilla/5.0 (Nintendo WiiU) AppleWebKit/534.52 (KHTML, like Gecko) NX/2.1.0.8.23 NintendoBrowser/1.1.0.7579.EU'
@@ -93,20 +81,23 @@ PLAYSTATION3: 'Mozilla/5.0 (PLAYSTATION 3; 3.55)'
 PLAYSTATION4: 'Mozilla/5.0 (PlayStation 4 1.020) AppleWebKit/536.26 (KHTML, like Gecko)'
 PSP: 'Mozilla/4.0 (PSP (PlayStation Portable); 2.00)'
 PSP_VITA: 'Mozilla/5.0 (Playstation Vita 1.61) AppleWebKit/531.22.8 (KHTML, like Gecko) Silk/3.2'
-QUERYSEEKER: 'QuerySeekerSpider ( http://queryseeker.com/bot.html )'
 QUICKTIME: 'QuickTime/7.6.8 (qtver=7.6.8;os=Windows NT 5.1Service Pack 3)'
+SAFARI3: 'Mozilla/5.0 (Windows; U; Windows NT 6.0; en) AppleWebKit/522.15.5 (KHTML, like Gecko) Version/3.0.3 Safari/522.15.5'
+SAFARI4: 'Mozilla/5.0 (Windows; U; Windows NT 6.0; fr-ch) AppleWebKit/531.9 (KHTML, like Gecko) Version/4.0.3 Safari/531.9'
+SAFARI5: 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_6; fr-ch) AppleWebKit/533.19.4 (KHTML, like Gecko) Version/5.0.3 Safari/533.19.4'
+SAFARI6: 'Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5355d Safari/8536.25'
+SAFARI7: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9) AppleWebKit/537.71 (KHTML, like Gecko) Version/7.0 Safari/537.71'
+SAFARI8: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_90) AppleWebKit/600.1.25 (KHTML, like Gecko) Version/8.0 Safari/600.1.25'
+SAFARI9: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_2) AppleWebKit/601.3.9 (KHTML, like Gecko) Version/9.0.2 Safari/601.3.9'
 SAFARI: 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_4; en-us) AppleWebKit/533.17.8 (KHTML, like Gecko) Version/5.0.1 Safari/533.17.8'
 SAFARI_IPAD_WEBAPP_MODE: 'Mozilla/5.0 (iPad; U; CPU OS 3_2_1 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Mobile/7B405'
 SAFARI_IPHONE_WEBAPP_MODE: 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.20 (KHTML, like Gecko) Mobile/7B298g'
 SAMSUNG: 'Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; SAMSUNG-SGH-I497 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30'
 SAMSUNG_CHROME: 'Mozilla/5.0 (Linux; Android 4.4.2; en-gb; SAMSUNG GT-I9195/I9195XXUCNEA Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/1.5 Chrome/28.0.1500.94 Mobile Safari/537.36'
-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/)'
 SMART_TV: 'Mozilla/5.0 (SmartHub; SMART-TV; U; Linux/SmartTV) AppleWebKit/531.2+ (KHTML, like Gecko) WebBrowser/1.0 SmartTV Safari/531.2+'
 SURFACE: 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; ARM; Trident/6.0; Touch)'
+SYMBIAN: 'Nokia5250/10.0.011 (SymbianOS/9.4; U; Series60/5.0 Mozilla/5.0; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/525 (KHTML, like Gecko) Safari/525 3gpp-gba'
 TABLOID: 'Mozilla/5.0 (Linux; U; Android 3.0; en-us; Xoom Build/HRI39) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13'
-TINEYE: 'TinEye-bot/0.51 (see http://www.tineye.com/crawler.html)'
 UC_BROWSER: 'Mozilla/5.0 (Linux; U; Android 4.4.2; en-US; GT-I9500 Build/KOT49H) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 UCBrowser/9.9.4.484 U3/0.8.0 Mobile Safari/533.1'
 WINDOWS7: 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0) chromeframe/10.0.648.205'
 WINDOWS81: 'Mozilla/5.0 (IE 11.0; Windows NT 6.3; Trident/7.0; .NET4.0E; .NET4.0C; rv:11.0) like Gecko'
@@ -118,10 +109,8 @@ WINDOWS_PHONE_81: 'Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Tri
 WINDOWS_VISTA: 'Mozilla/5.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0; WOW64; Trident/4.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; .NET CLR 1.0.3705; .NET CLR 1.1.4322)'
 WINDOWS_WOW64: "Mozilla/5.0 (Windows NT 6.3; WOW64; Trident/7.0; Touch; rv:11.0) like Gecko"
 WINDOWS_XP: 'Mozilla/4.0 (compatible; MSIE 7.0b; Windows NT 5.1; FDM; .NET CLR 1.1.4322)'
+WINDOWS_XP_64: 'Mozilla/4.0 (Compatible; MSIE 8.0; Windows NT 5.2; Trident/6.0)'
 XBOX360: 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0; Xbox), or Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0; Xbox)'
 XBOXONE: 'Mozilla/5.0 (Compatible; MSIE 10.0; Windows NT 6.2; Trident /6.0; Xbox; Xbox One)'
 XOOM: 'Mozilla/5.0 (Linux; U; Android 3.0; en-us; Xoom Build/HRI39) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13'
-YAHOO_SLURP: 'Mozilla/5.0 (compatible; Yahoo! Slurp; http://help.yahoo.com/help/us/ysearch/slurp)'
 YANDEX_BROWSER: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2272.118 YaBrowser/15.4.2272.3909 (beta) Yowser/2.0 Safari/537.36'
-YANDEX_DIRECT: 'Mozilla/5.0 (compatible; YandexDirect/3.0; +http://yandex.com/bots)'
-YANDEX_METRIKA: 'Mozilla/5.0 (compatible; YandexMetrika/3.0; +http://yandex.com/bots)'

data/test/ua_bots.yml ADDED

@@ -0,0 +1,27 @@
+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)'
+BAIDU: 'Baiduspider+(+http://www.baidu.com/search/spider.htm)'
+BINGBOT: 'Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)'
+DAUMOA: Mozilla/5.0 (compatible; MSIE or Firefox mutant; not on Windows server;) Daumoa 4.0
+DOMAINAREANIMATOR: 'Domain Re-Animator Bot (http://domainreanimator.com) - support@domainreanimator.com'
+DOT_BOT: 'Mozilla/5.0 (compatible; DotBot/1.1; http://www.opensiteexplorer.org/dotbot, help@moz.com)'
+DUCKDUCKGO: 'DuckDuckBot/1.0; (+http://duckduckgo.com/duckduckbot.html)'
+FACEBOOK_BOT: 'facebookexternalhit/1.1 (+http://www.facebook.com/externalhit_uatext.php)'
+GOOGLE_BOT: 'Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)'
+GOOGLE_PAGE_SPEED_INSIGHTS: 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.4 (KHTML, like Gecko; Google Page Speed Insights) Chrome/22.0.1229 Safari/537.4'
+GOOGLE_STRUCTURED_DATA_TESTING_TOOL: 'Mozilla/5.0 (compatible; X11; Linux x86_64; Google-StructuredDataTestingTool; +http://www.google.com/webmasters/tools/richsnippets)'
+GRAPESHOT: 'Mozilla/5.0 (compatible; GrapeshotCrawler/2.0; +http://www.grapeshot.co.uk/crawler.php)'
+LINKDEXBOT: 'Mozilla/5.0 (compatible; linkdexbot/2.0; +http://www.linkdex.com/bots/)'
+LOAD_TIME_BOT: 'Mozilla/5.0 (compatible; LoadTimeBot/0.9; +http://www.loadtime.net/bot.html)'
+MAIL_RU: 'Mozilla/5.0 (compatible; Linux x86_64; Mail.RU_Bot/2.0; +http://go.mail.ru/help/robots)'
+MEGAINDEX_RU: 'Mozilla/5.0 (compatible; MegaIndex.ru/2.0; +https://www.megaindex.ru/?tab=linkAnalyze)'
+MRCHROME: 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.107 Amigo/45.0.2454.107 MRCHROME SOC Safari/537.36'
+MSN_BOT: 'msnbot-media/1.1 (+http://search.msn.com/msnbot.htm)'
+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/)'
+TINEYE: 'TinEye-bot/0.51 (see http://www.tineye.com/crawler.html)'
+YAHOO_SLURP: 'Mozilla/5.0 (compatible; Yahoo! Slurp; http://help.yahoo.com/help/us/ysearch/slurp)'
+YANDEX_DIRECT: 'Mozilla/5.0 (compatible; YandexDirect/3.0; +http://yandex.com/bots)'
+YANDEX_METRIKA: 'Mozilla/5.0 (compatible; YandexMetrika/3.0; +http://yandex.com/bots)'

data/test/ua_search_engines.yml ADDED

@@ -0,0 +1,6 @@
+ASK: 'Mozilla/2.0 (compatible; Ask Jeeves/Teoma; +http://sp.ask.com/docs/about/tech_crawling.html)'
+BAIDU: 'Baiduspider+(+http://www.baidu.com/search/spider.htm)'
+BINGBOT: 'Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)'
+DUCKDUCKGO: 'DuckDuckBot/1.0; (+http://duckduckgo.com/duckduckbot.html)'
+GOOGLE_BOT: 'Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)'
+YAHOO_SLURP: 'Mozilla/5.0 (compatible; Yahoo! Slurp; http://help.yahoo.com/help/us/ysearch/slurp)'

data/test/unit/accept_language_test.rb ADDED

@@ -0,0 +1,92 @@
+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"
+    assert_equal expect[:quality], item.quality, "failed quality comparison"
+  end
+  test "returns full language" do
+    language = Browser::AcceptLanguage.new("en-GB")
+    assert_equal "en-GB", language.full
+  end
+  test "returns language name" do
+    language = Browser::AcceptLanguage.new("en-GB")
+    assert_equal "English/United Kingdom", language.name
+    language = Browser::AcceptLanguage.new("en")
+    assert_equal "English", language.name
+  end
+  test "returns nil for unknown languages" do
+    language = Browser::AcceptLanguage.new("unknown")
+    assert_nil language.name
+  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
+  end
+  test "parses language without quality" do
+    language = Browser::AcceptLanguage.new("en-GB")
+    assert_language language, code: "en", region: "GB", quality: 1.0
+  end
+  test "parses language without region" do
+    language = Browser::AcceptLanguage.new("en")
+    assert_language language, code: "en", region: nil, quality: 1.0
+  end
+  test "ignores multi-part region" do
+    language = Browser::AcceptLanguage.new("az-AZ-Cyrl")
+    assert_language language, code: "az", region: "AZ", quality: 1.0
+  end
+  test "parses multi-language set" do
+    result = Browser::AcceptLanguage.parse("fr-CA,fr;q=0.8")
+    assert_equal 2, result.count
+    assert_language result[0], code: "fr", region: "CA", quality: 1.0
+    assert_language result[1], code: "fr", region: nil, quality: 0.8
+  end
+  test "parses wildcard" do
+    result = Browser::AcceptLanguage.parse("fr-CA,*;q=0.8")
+    assert_language result[0], code: "fr", region: "CA", quality: 1.0
+    assert_language result[1], code: "*", region: nil, quality: 0.8
+  end
+  test "parses complex set" do
+    result = Browser::AcceptLanguage.parse("fr-CA,fr;q=0.8,en-US;q=0.6,en;q=0.4,*;q=0.1")
+    assert_language result[0], code: "fr", region: "CA", quality: 1.0
+    assert_language result[1], code: "fr", region: nil, quality: 0.8
+    assert_language result[2], code: "en", region: "US", quality: 0.6
+    assert_language result[3], code: "en", region: nil, quality: 0.4
+    assert_language result[4], code: "*", region: nil, quality: 0.1
+  end
+  test "handles random white spaces" do
+    result = Browser::AcceptLanguage.parse("fr-CA, fr;q=0.8,  en-US;q=0.6,en;q=0.4,    *;q=0.1")
+    assert_language result[0], code: "fr", region: "CA", quality: 1.0
+    assert_language result[1], code: "fr", region: nil, quality: 0.8
+    assert_language result[2], code: "en", region: "US", quality: 0.6
+    assert_language result[3], code: "en", region: nil, quality: 0.4
+    assert_language result[4], code: "*", region: nil, quality: 0.1
+  end
+  test "sorts based on quality" do
+    result = Browser::AcceptLanguage.parse("fr-CA,fr;q=0.2,en-US;q=0.6,en;q=0.4,*;q=0.5")
+    assert_language result[0], code: "fr", region: "CA", quality: 1.0
+    assert_language result[1], code: "en", region: "US", quality: 0.6
+    assert_language result[2], code: "*", region: nil, quality: 0.5
+    assert_language result[3], code: "en", region: nil, quality: 0.4
+    assert_language result[4], code: "fr", region: nil, quality: 0.2
+  end
+end

data/test/unit/adobe_air_test.rb CHANGED

@@ -1,17 +1,12 @@
 require "test_helper"
 class AdobeAirTest < Minitest::Test
-  setup do
-    @browser = Browser.new
-  end
   test "detects adobe air" do
-    @browser.ua = $ua["ADOBE_AIR"]
+    browser = Browser.new(Browser["ADOBE_AIR"])
-    assert @browser.adobe_air?
-    assert @browser.webkit?
-    assert_equal @browser.version, "13"
-    assert_equal @browser.full_version, "13.0"
-    assert_equal @browser.name, "Other"
+    assert browser.webkit?
+    assert_equal "0", browser.version
+    assert_equal "0.0", browser.full_version
+    assert_equal "Generic Browser", browser.name
   end
 end

data/test/unit/android_test.rb CHANGED

@@ -1,97 +1,92 @@
 require "test_helper"
 class AndroidTest < Minitest::Test
-  setup do
-    @browser = Browser.new
-  end
   test "detect android cupcake (1.5)" do
-    @browser.ua = $ua['ANDROID_CUPCAKE']
-    assert @browser.android?
-    assert @browser.android?(1.5)
+    browser = Browser.new(Browser["ANDROID_CUPCAKE"])
+    assert browser.platform.android?
+    assert browser.platform.android?(1.5)
   end
   test "detect android donut (1.6)" do
-    @browser.ua = $ua['ANDROID_DONUT']
-    assert @browser.android?
-    assert @browser.android?(1.6)
+    browser = Browser.new(Browser["ANDROID_DONUT"])
+    assert browser.platform.android?
+    assert browser.platform.android?(1.6)
   end
   test "detect android eclair (2.1)" do
-    @browser.ua = $ua['ANDROID_ECLAIR_21']
-    assert @browser.android?
-    assert @browser.android?(2.1)
+    browser = Browser.new(Browser["ANDROID_ECLAIR_21"])
+    assert browser.platform.android?
+    assert browser.platform.android?(2.1)
   end
   test "detect android froyo (2.2)" do
-    @browser.ua = $ua['ANDROID_FROYO']
-    assert @browser.android?
-    assert @browser.android?(2.2)
+    browser = Browser.new(Browser["ANDROID_FROYO"])
+    assert browser.platform.android?
+    assert browser.platform.android?(2.2)
   end
   test "detect android gingerbread (2.3)" do
-    @browser.ua = $ua['ANDROID_GINGERBREAD']
-    assert @browser.android?
-    assert @browser.android?(2.3)
+    browser = Browser.new(Browser["ANDROID_GINGERBREAD"])
+    assert browser.platform.android?
+    assert browser.platform.android?("~> 2.3.0")
   end
   test "detect android honeycomb (3.0)" do
-    @browser.ua = $ua['ANDROID_HONEYCOMB_30']
-    assert @browser.android?
-    assert @browser.android?(3.0)
+    browser = Browser.new(Browser["ANDROID_HONEYCOMB_30"])
+    assert browser.platform.android?
+    assert browser.platform.android?("~> 3.0")
   end
   test "detect android ice cream sandwich (4.0)" do
-    @browser.ua = $ua['ANDROID_ICECREAM']
-    assert @browser.android?
-    assert @browser.android?(4.0)
+    browser = Browser.new(Browser["ANDROID_ICECREAM"])
+    assert browser.platform.android?
+    assert browser.platform.android?("~> 4.0")
   end
   test "detect android jellybean (4.1)" do
-    @browser.ua = $ua['ANDROID_JELLYBEAN_41']
-    assert @browser.android?
-    assert @browser.android?(4.1)
+    browser = Browser.new(Browser["ANDROID_JELLYBEAN_41"])
+    assert browser.platform.android?
+    assert browser.platform.android?("~> 4.1")
   end
   test "detect android jellybean (4.2)" do
-    @browser.ua = $ua['ANDROID_JELLYBEAN_42']
-    assert @browser.android?
-    assert @browser.android?(4.2)
+    browser = Browser.new(Browser["ANDROID_JELLYBEAN_42"])
+    assert browser.platform.android?
+    assert browser.platform.android?(4.2)
   end
   test "detect android jellybean (4.3)" do
-    @browser.ua = $ua['ANDROID_JELLYBEAN_43']
-    assert @browser.android?
-    assert @browser.android?(4.3)
+    browser = Browser.new(Browser["ANDROID_JELLYBEAN_43"])
+    assert browser.platform.android?
+    assert browser.platform.android?(4.3)
   end
   test "detect android kitkat (4.4)" do
-    @browser.ua = $ua['ANDROID_KITKAT']
-    assert @browser.android?
-    assert @browser.android?(4.4)
+    browser = Browser.new(Browser["ANDROID_KITKAT"])
+    assert browser.platform.android?
+    assert browser.platform.android?(4.4)
   end
   test "detect android lollipop (5.0)" do
-    @browser.ua = $ua['ANDROID_LOLLIPOP_50']
-    assert @browser.android?
-    assert @browser.android?(5.0)
+    browser = Browser.new(Browser["ANDROID_LOLLIPOP_50"])
+    assert browser.platform.android?
+    assert browser.platform.android?(5.0)
   end
   test "detect android lollipop (5.1)" do
-    @browser.ua = $ua['ANDROID_LOLLIPOP_51']
-    assert @browser.android?
-    assert @browser.android?(5.1)
+    browser = Browser.new(Browser["ANDROID_LOLLIPOP_51"])
+    assert browser.platform.android?
+    assert browser.platform.android?(5.1)
   end
   test "detect android tv" do
-    @browser.ua = $ua['ANDROID_TV']
-    assert @browser.android?
-    assert @browser.tv?
+    browser = Browser.new(Browser["ANDROID_TV"])
+    assert browser.platform.android?
+    assert browser.device.tv?
   end
   test "detect nexus player" do
-    @browser.ua = $ua['ANDROID_NEXUS_PLAYER']
-    assert @browser.android?
-    assert @browser.tv?
+    browser = Browser.new(Browser["ANDROID_NEXUS_PLAYER"])
+    assert browser.platform.android?
   end
 end