browser 1.1.0 → 2.0.0.rc1

data/test/unit/proxy_test.rb

@@ -6,10 +6,10 @@ class ProxyTest < Minitest::Test
     OPERA_MINI
     UC_BROWSER
   ].each do |name|
-    ua = $ua[name]
+    ua = Browser[name]
 
-    test "detect #{ua} as proxy" do
-      browser = Browser.new(ua: ua)
+    test "detect #{name} as proxy" do
+      browser = Browser.new(ua)
 
       assert browser.proxy?
       assert browser.meta.include?("proxy")

data/test/unit/safari_test.rb

@@ -0,0 +1,66 @@
+require "test_helper"
+
+class SafariTest < Minitest::Test
+  test "detect safari 3" do
+    browser = Browser.new(Browser["SAFARI3"])
+
+    assert browser.safari?
+    assert browser.safari?(3)
+    assert_equal "3", browser.version
+    assert_equal "3.0.3", browser.full_version
+  end
+
+  test "detect safari 4" do
+    browser = Browser.new(Browser["SAFARI4"])
+
+    assert browser.safari?
+    assert browser.safari?(4)
+    assert_equal "4", browser.version
+    assert_equal "4.0.3", browser.full_version
+  end
+
+  test "detect safari 5" do
+    browser = Browser.new(Browser["SAFARI5"])
+
+    assert browser.safari?
+    assert browser.safari?(5)
+    assert_equal "5", browser.version
+    assert_equal "5.0.3", browser.full_version
+  end
+
+  test "detect safari 6" do
+    browser = Browser.new(Browser["SAFARI6"])
+
+    assert browser.safari?
+    assert browser.safari?(6)
+    assert_equal "6", browser.version
+    assert_equal "6.0", browser.full_version
+  end
+
+  test "detect safari 7" do
+    browser = Browser.new(Browser["SAFARI7"])
+
+    assert browser.safari?
+    assert browser.safari?(7)
+    assert_equal "7", browser.version
+    assert_equal "7.0", browser.full_version
+  end
+
+  test "detect safari 8" do
+    browser = Browser.new(Browser["SAFARI8"])
+
+    assert browser.safari?
+    assert browser.safari?(8)
+    assert_equal "8", browser.version
+    assert_equal "8.0", browser.full_version
+  end
+
+  test "detect safari 9" do
+    browser = Browser.new(Browser["SAFARI9"])
+
+    assert browser.safari?
+    assert browser.safari?(9)
+    assert_equal "9", browser.version
+    assert_equal "9.0.2", browser.full_version
+  end
+end

data/test/unit/uc_browser_test.rb

@@ -1,13 +1,9 @@
 require "test_helper"
 
 class UcBrowserTest < Minitest::Test
-  setup do
-    @browser = Browser.new(ua: $ua["UC_BROWSER"])
-  end
-
   test "detects UC Browser" do
-    assert @browser.mobile?
-    assert @browser.uc_browser?
-    assert_equal @browser.name, "UC Browser"
+    browser = Browser.new(Browser["UC_BROWSER"])
+    assert browser.uc_browser?
+    assert_equal browser.name, "UCBrowser"
   end
 end

data/test/unit/windows_phone_test.rb

@@ -1,54 +1,33 @@
 require "test_helper"
 
 class WindowPhoneTest < Minitest::Test
-  setup do
-    @browser = Browser.new
-  end
-
   test "detects windows phone" do
-    @browser.ua = $ua["WINDOWS_PHONE"]
+    browser = Browser.new(Browser["WINDOWS_PHONE"])
 
-    assert @browser.ie?
-    assert_equal "7", @browser.version
-    assert @browser.mobile?
-    assert @browser.windows_phone?
-    refute @browser.windows_mobile?
-    refute @browser.tablet?
+    assert browser.ie?
+    assert_equal "7", browser.version
+    assert browser.platform.windows_phone?
+    refute browser.platform.windows_mobile?
   end
 
   test "detects windows phone 8" do
-    @browser.ua = $ua["WINDOWS_PHONE8"]
+    browser = Browser.new(Browser["WINDOWS_PHONE8"])
 
-    assert @browser.ie?
-    assert_equal "10", @browser.version
-    assert @browser.mobile?
-    assert @browser.windows_phone?
-    refute @browser.windows_mobile?
-    refute @browser.tablet?
+    assert browser.ie?
+    assert_equal "10", browser.version
+    assert browser.platform.windows_phone?
+    refute browser.platform.windows_mobile?
   end
 
   test "detects windows phone 8.1" do
-    @browser.ua = $ua["WINDOWS_PHONE_81"]
-
-    assert @browser.ie?
-    assert_equal "Internet Explorer", @browser.name
-    assert_equal :ie, @browser.id
-    assert_equal "11", @browser.version
-    assert_equal "11.0", @browser.full_version
-    assert @browser.mobile?
-    assert @browser.windows_phone?
-    refute @browser.windows_mobile?
-    refute @browser.tablet?
-  end
-
-  test "detects windows mobile (windows phone 8)" do
-    @browser.ua = $ua["WINDOWS_PHONE8"]
-
-    assert @browser.ie?
-    assert_equal "10", @browser.version
-    assert @browser.mobile?
-    assert @browser.windows_phone?
-    refute @browser.windows_mobile?
-    refute @browser.tablet?
+    browser = Browser.new(Browser["WINDOWS_PHONE_81"])
+
+    assert browser.ie?
+    assert_equal "Internet Explorer", browser.name
+    assert_equal :ie, browser.id
+    assert_equal "11", browser.version
+    assert_equal "11.0", browser.full_version
+    assert browser.platform.windows_phone?
+    refute browser.platform.windows_mobile?
   end
 end

data/test/unit/windows_test.rb

@@ -1,64 +1,62 @@
 require "test_helper"
 
 class WindowsTest < Minitest::Test
-  setup do
-    @browser = Browser.new
-  end
-
   test "detects windows x64" do
-    @browser.ua = $ua["IE10_X64_WINX64"]
-    assert @browser.windows_x64?
-    refute @browser.windows_wow64?
-    assert @browser.windows_x64_inclusive?
+    browser = Browser.new(Browser["IE10_X64_WINX64"])
+    assert browser.platform.windows_x64?
+    refute browser.platform.windows_wow64?
+    assert browser.platform.windows_x64_inclusive?
   end
 
   test "detects windows wow64" do
-    @browser.ua = $ua["WINDOWS_WOW64"]
-    refute @browser.windows_x64?
-    assert @browser.windows_wow64?
-    assert @browser.windows_x64_inclusive?
+    browser = Browser.new(Browser["WINDOWS_WOW64"])
+    refute browser.platform.windows_x64?
+    assert browser.platform.windows_wow64?
+    assert browser.platform.windows_x64_inclusive?
   end
 
-  test "detects windows platform" do
-    @browser.ua = "Windows"
-    assert_equal :windows, @browser.platform
-    assert @browser.windows?
+  test "detects windows_xp" do
+    browser = Browser.new(Browser["WINDOWS_XP"])
+
+    assert browser.platform.windows?
+    assert browser.platform.windows_xp?
   end
 
-  test "detects windows_xp" do
-    @browser.ua = $ua["WINDOWS_XP"]
+  test "detects windows_xp (64-bit)" do
+    browser = Browser.new(Browser["WINDOWS_XP_64"])
 
-    assert @browser.windows?
-    assert @browser.windows_xp?
+    assert browser.platform.windows?
+    assert browser.platform.windows_xp?
+    assert browser.platform.windows_x64?
   end
 
   test "detects windows_vista" do
-    @browser.ua = $ua["WINDOWS_VISTA"]
+    browser = Browser.new(Browser["WINDOWS_VISTA"])
 
-    assert @browser.windows?
-    assert @browser.windows_vista?
+    assert browser.platform.windows?
+    assert browser.platform.windows_vista?
   end
 
   test "detects windows7" do
-    @browser.ua = $ua["WINDOWS7"]
+    browser = Browser.new(Browser["WINDOWS7"])
 
-    assert @browser.windows?
-    assert @browser.windows7?
+    assert browser.platform.windows?
+    assert browser.platform.windows7?
   end
 
   test "detects windows8" do
-    @browser.ua = $ua["WINDOWS8"]
+    browser = Browser.new(Browser["WINDOWS8"])
 
-    assert @browser.windows?
-    assert @browser.windows8?
-    refute @browser.windows8_1?
+    assert browser.platform.windows?
+    assert browser.platform.windows8?
+    refute browser.platform.windows8_1?
   end
 
   test "detects windows8.1" do
-    @browser.ua = $ua["WINDOWS81"]
+    browser = Browser.new(Browser["WINDOWS81"])
 
-    assert @browser.windows?
-    assert @browser.windows8?
-    assert @browser.windows8_1?
+    assert browser.platform.windows?
+    assert browser.platform.windows8?
+    assert browser.platform.windows8_1?
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browser
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,22 +129,56 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".bundle/config"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - README.md
 - Rakefile
+- bin/rake
+- bot_exceptions.yml
 - bots.yml
 - browser.gemspec
 - config.ru
 - gemfiles/rails3.gemfile
 - languages.yml
 - lib/browser.rb
+- lib/browser/accept_language.rb
 - lib/browser/action_controller.rb
+- lib/browser/base.rb
+- lib/browser/blackberry.rb
+- lib/browser/bot.rb
+- lib/browser/chrome.rb
+- lib/browser/detect_version.rb
+- lib/browser/device.rb
+- lib/browser/device/base.rb
+- lib/browser/device/blackberry_playbook.rb
+- lib/browser/device/ipad.rb
+- lib/browser/device/iphone.rb
+- lib/browser/device/ipod_touch.rb
+- lib/browser/device/kindle.rb
+- lib/browser/device/kindle_fire.rb
+- lib/browser/device/playstation3.rb
+- lib/browser/device/playstation4.rb
+- lib/browser/device/psp.rb
+- lib/browser/device/psvita.rb
+- lib/browser/device/surface.rb
+- lib/browser/device/tv.rb
+- lib/browser/device/unknown.rb
+- lib/browser/device/wii.rb
+- lib/browser/device/wiiu.rb
+- lib/browser/device/xbox_360.rb
+- lib/browser/device/xbox_one.rb
+- lib/browser/edge.rb
+- lib/browser/firefox.rb
+- lib/browser/generic.rb
+- lib/browser/internet_explorer.rb
 - lib/browser/meta/base.rb
+- lib/browser/meta/device.rb
 - lib/browser/meta/generic_browser.rb
 - lib/browser/meta/id.rb
 - lib/browser/meta/ie.rb
@@ -154,22 +188,33 @@ files:
 - lib/browser/meta/platform.rb
 - lib/browser/meta/proxy.rb
 - lib/browser/meta/safari.rb
+- lib/browser/meta/tablet.rb
 - lib/browser/meta/webkit.rb
-- lib/browser/methods/blackberry.rb
-- lib/browser/methods/bots.rb
-- lib/browser/methods/consoles.rb
-- lib/browser/methods/devices.rb
-- lib/browser/methods/ie.rb
-- lib/browser/methods/language.rb
-- lib/browser/methods/mobile.rb
-- lib/browser/methods/platform.rb
-- lib/browser/methods/proxy.rb
-- lib/browser/methods/tv.rb
 - lib/browser/middleware.rb
 - lib/browser/middleware/context.rb
 - lib/browser/middleware/context/additions.rb
 - lib/browser/middleware/context/url_methods.rb
+- lib/browser/nokia.rb
+- lib/browser/opera.rb
+- lib/browser/phantom_js.rb
+- lib/browser/platform.rb
+- lib/browser/platform/adobe_air.rb
+- lib/browser/platform/android.rb
+- lib/browser/platform/base.rb
+- lib/browser/platform/blackberry.rb
+- lib/browser/platform/chrome_os.rb
+- lib/browser/platform/firefox_os.rb
+- lib/browser/platform/ios.rb
+- lib/browser/platform/linux.rb
+- lib/browser/platform/mac.rb
+- lib/browser/platform/other.rb
+- lib/browser/platform/windows.rb
+- lib/browser/platform/windows_mobile.rb
+- lib/browser/platform/windows_phone.rb
 - lib/browser/rails.rb
+- lib/browser/safari.rb
+- lib/browser/testing.rb
+- lib/browser/uc_browser.rb
 - lib/browser/version.rb
 - search_engines.yml
 - test/browser_test.rb
@@ -177,12 +222,16 @@ files:
 - test/sample_app.rb
 - test/test_helper.rb
 - test/ua.yml
+- test/ua_bots.yml
+- test/ua_search_engines.yml
+- test/unit/accept_language_test.rb
 - test/unit/adobe_air_test.rb
 - test/unit/android_test.rb
 - test/unit/blackberry_test.rb
 - test/unit/bots_test.rb
 - test/unit/chrome_test.rb
 - test/unit/console_test.rb
+- test/unit/device_test.rb
 - test/unit/firefox_test.rb
 - test/unit/ie_test.rb
 - test/unit/ios_app_test.rb
@@ -190,7 +239,9 @@ files:
 - test/unit/kindle_test.rb
 - test/unit/nokia_test.rb
 - test/unit/opera_test.rb
+- test/unit/platform_test.rb
 - test/unit/proxy_test.rb
+- test/unit/safari_test.rb
 - test/unit/uc_browser_test.rb
 - test/unit/windows_phone_test.rb
 - test/unit/windows_test.rb
@@ -198,19 +249,7 @@ homepage: http://github.com/fnando/browser
 licenses:
 - MIT
 metadata: {}
-post_install_message: |2+
-
-  #################### WARNING ##############################
-  #                                                         #
-  #   Internet Explorer detection has changed on v1.0.0+.   #
-  #   If this is important for you, please read             #
-  #   https://github.com/fnando/browser#internet-explorer   #
-  #                                                         #
-  #   iOS webviews and web apps aren't detect as Safari     #
-  #   anymore, so be aware of that if that's your case.     #
-  #                                                         #
-  ###########################################################
-
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -218,12 +257,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -236,12 +275,16 @@ test_files:
 - test/sample_app.rb
 - test/test_helper.rb
 - test/ua.yml
+- test/ua_bots.yml
+- test/ua_search_engines.yml
+- test/unit/accept_language_test.rb
 - test/unit/adobe_air_test.rb
 - test/unit/android_test.rb
 - test/unit/blackberry_test.rb
 - test/unit/bots_test.rb
 - test/unit/chrome_test.rb
 - test/unit/console_test.rb
+- test/unit/device_test.rb
 - test/unit/firefox_test.rb
 - test/unit/ie_test.rb
 - test/unit/ios_app_test.rb
@@ -249,7 +292,9 @@ test_files:
 - test/unit/kindle_test.rb
 - test/unit/nokia_test.rb
 - test/unit/opera_test.rb
+- test/unit/platform_test.rb
 - test/unit/proxy_test.rb
+- test/unit/safari_test.rb
 - test/unit/uc_browser_test.rb
 - test/unit/windows_phone_test.rb
 - test/unit/windows_test.rb