browser 1.0.1 → 1.1.0

data/lib/browser/meta/proxy.rb

@@ -0,0 +1,9 @@
+class Browser
+  module Meta
+    class Proxy < Base
+      def meta
+        "proxy" if browser.proxy?
+      end
+    end
+  end
+end

data/lib/browser/methods/blackberry.rb

@@ -0,0 +1,51 @@
+class Browser
+  module BlackBerry
+    # Return BlackBerry version.
+    def blackberry_version
+      ua[/BB(10)/, 1] ||
+      ua[/BlackBerry\d+\/(\d+)/, 1] ||
+      ua[/BlackBerry.*?Version\/(\d+)/, 1]
+    end
+
+    # Detect if browser is BlackBerry
+    def blackberry?(version = nil)
+      !!(ua =~ /(BlackBerry|BB10)/) && detect_version?(blackberry_version, version)
+    end
+
+    # Detect if is BlackBerry 4.
+    def blackberry4?
+      deprecate "Browser##{__method__} is deprecated; use Browser#ie?(version) instead"
+      blackberry?(4)
+    end
+
+    # Detect if is BlackBerry 5.
+    def blackberry5?
+      deprecate "Browser##{__method__} is deprecated; use Browser#ie?(version) instead"
+      blackberry?(5)
+    end
+
+    # Detect if is BlackBerry 6.
+    def blackberry6?
+      deprecate "Browser##{__method__} is deprecated; use Browser#ie?(version) instead"
+      blackberry?(6)
+    end
+
+    # Detect if is BlackBerry 7.
+    def blackberry7?
+      deprecate "Browser##{__method__} is deprecated; use Browser#ie?(version) instead"
+      blackberry?(7)
+    end
+
+    # Detect if is BlackBerry 10.
+    def blackberry10?
+      deprecate "Browser##{__method__} is deprecated; use Browser#blackberry?(version) instead"
+      blackberry?(10)
+    end
+
+    private
+
+    def blackberry_running_safari?
+      blackberry? && safari?
+    end
+  end
+end

data/lib/browser/methods/ie.rb

@@ -36,38 +36,44 @@ class Browser
     end
 
     # Detect if browser is Internet Explorer.
-    def ie?
-      msie? || modern_ie?
+    def ie?(version = nil)
+      (msie? || modern_ie?) && detect_version?(ie_version, version)
     end
 
     # Detect if browser is Internet Explorer 6.
     def ie6?
-      ie? && version == "6"
+      deprecate "Browser##{__method__} is deprecated; use Browser#ie?(version) instead"
+      ie?(6)
     end
 
     # Detect if browser is Internet Explorer 7.
     def ie7?
-      ie? && version == "7"
+      deprecate "Browser##{__method__} is deprecated; use Browser#ie?(version) instead"
+      ie?(7)
     end
 
     # Detect if browser is Internet Explorer 8.
     def ie8?
-      ie? && version == "8"
+      deprecate "Browser##{__method__} is deprecated; use Browser#ie?(version) instead"
+      ie?(8)
     end
 
     # Detect if browser is Internet Explorer 9.
     def ie9?
-      ie? && version == "9"
+      deprecate "Browser##{__method__} is deprecated; use Browser#ie?(version) instead"
+      ie?(9)
     end
 
     # Detect if browser is Internet Explorer 10.
     def ie10?
-      ie? && version == "10"
+      deprecate "Browser##{__method__} is deprecated; use Browser#ie?(version) instead"
+      ie?(10)
     end
 
     # Detect if browser is Internet Explorer 11.
     def ie11?
-      ie? && version == "11"
+      deprecate "Browser##{__method__} is deprecated; use Browser#ie?(version) instead"
+      ie?(11)
     end
 
     # Detect if browser is Microsoft Edge.

data/lib/browser/methods/mobile.rb

@@ -10,16 +10,16 @@ class Browser
       !!(ua =~ /Opera Mini/)
     end
 
-    # Detect if browser is BlackBerry
-    def blackberry?
-      !!(ua =~ /(BlackBerry)/)
-    end
-
     # Detect if browser is Adobe AIR.
     def adobe_air?
       !!(ua =~ /adobeair/i)
     end
 
+    # Detect if browser is Nokia S40 Ovi Browser.
+    def nokia?
+      !!(ua =~ /S40OviBrowser/)
+    end
+
     private
 
     # Regex taken from http://detectmobilebrowsers.com

data/lib/browser/methods/platform.rb

@@ -1,63 +1,69 @@
 class Browser
   module Platform
     # Detect if browser is Android.
-    def android?
-      !!(ua =~ /Android/ && !opera?)
+    def android?(version = nil)
+      !!(ua =~ /Android/ && !opera?) && detect_version?(android_version, version)
+    end
+
+    # Detect Android version.
+    def android_version
+      ua[/Android ([\d.]+)/, 1]
+    end
+
+    # Return the iOS version.
+    def ios_version
+      ua[/OS (\d)/, 1]
+    end
+
+    # Detect if running on iOS app webview.
+    def ios_app?
+      ios? && !ua.include?("Safari")
+    end
+
+    # Detect if is iOS webview.
+    def ios_webview?
+      ios_app?
     end
 
     # Detect if browser is ios?.
-    def ios?
-      ipod? || ipad? || iphone?
+    def ios?(version = nil)
+      (ipod? || ipad? || iphone?) && detect_version?(ios_version, version)
     end
 
     # Detect if is iOS4.
     def ios4?
-      ios? && !!(ua =~ /OS 4/)
+      deprecate "Browser##{__method__} is deprecated; use Browser#ios?(version) instead"
+      ios?(4)
     end
 
     # Detect if is iOS5.
     def ios5?
-      ios? && !!(ua =~ /OS 5/)
+      deprecate "Browser##{__method__} is deprecated; use Browser#ios?(version) instead"
+      ios?(5)
     end
 
     # Detect if is iOS6.
     def ios6?
-      ios? && !!(ua =~ /OS 6/)
+      deprecate "Browser##{__method__} is deprecated; use Browser#ios?(version) instead"
+      ios?(6)
     end
 
     # Detect if is iOS7.
     def ios7?
-      ios? && !!(ua =~ /OS 7/)
+      deprecate "Browser##{__method__} is deprecated; use Browser#ios?(version) instead"
+      ios?(7)
     end
 
     # Detect if is iOS8.
     def ios8?
-      ios? && !!(ua =~ /OS 8/)
-    end
-
-    # Detect if is BlackBerry 4.
-    def blackberry4?
-      blackberry? && !!(ua =~ %r[BlackBerry\d+/4])
-    end
-
-    # Detect if is BlackBerry 5.
-    def blackberry5?
-      blackberry? && !!(ua =~ %r[BlackBerry\d+/5])
-    end
-
-    # Detect if is BlackBerry 6.
-    def blackberry6?
-      blackberry? && !!(ua =~ %r[Version/6])
-    end
-
-    # Detect if is BlackBerry 7.
-    def blackberry7?
-      blackberry? && !!(ua =~ %r[Version/7])
+      deprecate "Browser##{__method__} is deprecated; use Browser#ios?(version) instead"
+      ios?(8)
     end
 
-    # Detect if is BlackBerry 10.
-    def blackberry10?
-      !!(ua =~ /BB10/)
+    # Detect if is iOS9.
+    def ios9?
+      deprecate "Browser##{__method__} is deprecated; use Browser#ios?(version) instead"
+      ios?(9)
     end
 
     # Detect if current platform is Macintosh.
@@ -111,7 +117,7 @@ class Browser
 
     # Detect if current platform is Windows in 64-bit architecture.
     def windows_x64?
-      windows? && !!(ua =~ /(Win64|x64)/) && !!(ua =~ /x64/)
+      !!(windows? && ua =~ /(Win64|x64)/)
     end
 
     def windows_wow64?

data/lib/browser/methods/proxy.rb

@@ -0,0 +1,8 @@
+class Browser
+  module Proxy
+    # Detect if browser is a proxy browser
+    def proxy?
+      nokia? || uc_browser? || opera_mini?
+    end
+  end
+end

data/lib/browser/methods/tv.rb

@@ -2,7 +2,7 @@ class Browser
   module Tv
     # Detect if browser is Television
     def tv?
-      !!(ua =~ /tv/i)
+      !!(ua =~ /(tv|Android.*?ADT-1|Nexus Player)/i)
     end
   end
 end

data/lib/browser/version.rb

@@ -1,8 +1,8 @@
 class Browser
   module Version
     MAJOR = 1
-    MINOR = 0
-    PATCH = 1
+    MINOR = 1
+    PATCH = 0
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/test/browser_test.rb

@@ -0,0 +1,248 @@
+require "test_helper"
+
+class BrowserTest < Minitest::Test
+  setup do
+    @browser = Browser.new
+  end
+
+  test "yields self when block is given" do
+    browser = nil
+    Browser.new {|b| browser = b }
+    assert_kind_of Browser, browser
+  end
+
+  test "responds to ua methods" do
+    assert @browser.respond_to?(:ua)
+    assert @browser.respond_to?(:ua=)
+  end
+
+  test "delegates ua methods" do
+    @browser.user_agent = "Safari"
+    assert_equal "Safari", @browser.ua
+
+    @browser.ua = "Mozilla"
+    assert_equal "Mozilla", @browser.user_agent
+  end
+
+  test "sets accept language while instantiating object" do
+    @browser = Browser.new(:accept_language => "pt-br")
+    assert_equal ["pt-br"], @browser.accept_language
+  end
+
+  test "sets user agent while instantianting object" do
+    @browser = Browser.new(:ua => "Safari")
+    assert_equal "Safari", @browser.ua
+
+    @browser = Browser.new(:user_agent => "Chrome")
+    assert_equal "Chrome", @browser.ua
+  end
+
+  test "detects android" do
+    @browser.ua = $ua["ANDROID"]
+
+    assert_equal "Android", @browser.name
+    assert @browser.android?
+    refute @browser.safari?
+    assert @browser.webkit?
+    assert @browser.mobile?
+    refute @browser.tablet?
+    assert @browser.modern?
+    assert_equal "3.1.2", @browser.full_version
+    assert_equal "3", @browser.version
+  end
+
+  test "detects android tablet" do
+    @browser.ua = $ua["TABLOID"]
+
+    assert_equal "Android", @browser.name
+    assert @browser.android?
+    refute @browser.safari?
+    assert @browser.webkit?
+    refute @browser.mobile?
+    assert @browser.tablet?
+    assert @browser.modern?
+    assert_equal "4.0", @browser.full_version
+    assert_equal "4", @browser.version
+  end
+
+  test "detects surface tablet" do
+    @browser.ua = $ua["SURFACE"]
+
+    assert_equal "Internet Explorer", @browser.name
+    assert @browser.surface?
+    assert @browser.ie?
+    refute @browser.mobile?
+    assert @browser.tablet?
+    assert @browser.modern?
+    assert_equal "10.0", @browser.full_version
+    assert_equal "10", @browser.version
+  end
+
+  test "detects quicktime" do
+    @browser.ua = $ua["QUICKTIME"]
+
+    assert_equal "QuickTime", @browser.name
+    assert @browser.quicktime?
+    assert_equal "7.6.8", @browser.full_version
+    assert_equal "7", @browser.version
+  end
+
+  test "detects core media" do
+    @browser.ua = $ua["COREMEDIA"]
+
+    assert_equal "Apple CoreMedia", @browser.name
+    assert @browser.core_media?
+    assert_equal "1.0.0.10F569", @browser.full_version
+    assert_equal "1", @browser.version
+  end
+
+  test "detects phantom.js" do
+    @browser.ua = $ua["PHANTOM_JS"]
+
+    assert_equal "PhantomJS", @browser.name
+    assert @browser.phantom_js?
+    refute @browser.tablet?
+    refute @browser.mobile?
+    assert @browser.modern?
+    assert_equal "1.9.0", @browser.full_version
+    assert_equal "1", @browser.version
+  end
+
+  test "detects other mobiles" do
+    @browser.ua = "Symbian OS"
+    assert @browser.mobile?
+    refute @browser.tablet?
+
+    @browser.ua = "MIDP-2.0"
+    assert @browser.mobile?
+    refute @browser.tablet?
+  end
+
+  test "detects windows mobile" do
+    @browser.ua = $ua["WINDOWS_MOBILE"]
+
+    assert @browser.mobile?
+    assert @browser.windows?
+    assert @browser.windows_mobile?
+    refute @browser.windows_phone?
+    refute @browser.tablet?
+  end
+
+  test "returns a zero version" do
+    @browser.ua = "Bot"
+    assert_equal "0.0", @browser.full_version
+    assert_equal "0", @browser.version
+  end
+
+  test "sets meta" do
+    @browser.ua = $ua["CHROME"]
+    assert_kind_of Array, @browser.meta
+  end
+
+  test "returns string representation" do
+    @browser.ua = $ua["CHROME"]
+    meta = @browser.to_s
+
+    assert meta.include?("chrome")
+    assert meta.include?("webkit")
+    assert meta.include?("mac")
+    assert meta.include?("modern")
+  end
+
+  test "returns string representation for mobile" do
+    @browser.ua = $ua["BLACKBERRY"]
+    meta = @browser.to_s
+
+    assert meta.include?("blackberry")
+    assert meta.include?("blackberry4")
+    assert meta.include?("other")
+    assert meta.include?("mobile")
+  end
+
+  test "detects unknown id" do
+    @browser.ua = "Unknown"
+    assert_equal :other, @browser.id
+  end
+
+  test "detects unknown name" do
+    @browser.ua = "Unknown"
+    assert_equal "Other", @browser.name
+  end
+
+  test "detects mac platform" do
+    @browser.ua = "Mac OS X"
+    assert_equal :mac, @browser.platform
+    assert @browser.mac?
+  end
+
+  test "detects linux platform" do
+    @browser.ua = "Linux"
+    assert_equal :linux, @browser.platform
+    assert @browser.linux?
+  end
+
+  test "detects unknown platform" do
+    @browser.ua = "Unknown"
+    assert_equal :other, @browser.platform
+  end
+
+  test "returns all known languages" do
+    @browser.accept_language = "en-us,en;q=0.8,pt-br;q=0.5,pt;q=0.3"
+    assert_equal ["en-us", "en", "pt-br", "pt"], @browser.accept_language
+  end
+
+  test "detects xoom" do
+    @browser.ua = $ua["XOOM"]
+
+    assert @browser.android?
+    assert @browser.tablet?
+    refute @browser.mobile?
+  end
+
+  test "detects nexus tablet" do
+    @browser.ua = $ua["NEXUS_TABLET"]
+
+    assert @browser.android?
+    assert @browser.tablet?
+    refute @browser.mobile?
+  end
+
+  test "detects nook" do
+    @browser.ua = $ua["NOOK"]
+
+    assert @browser.tablet?
+    refute @browser.mobile?
+  end
+
+  test "detects samsung" do
+    @browser.ua = $ua["SAMSUNG"]
+
+    assert @browser.tablet?
+    refute @browser.mobile?
+  end
+
+  test "removes duplicate items" do
+    @browser.ua = $ua["SAFARI"]
+    assert_equal ["safari"], @browser.meta.select {|item| item == "safari" }
+  end
+
+  test "detects meta aliased as to_a" do
+    @browser.ua = $ua["SAFARI"]
+    assert_equal @browser.meta, @browser.to_a
+  end
+
+  test "detects tv" do
+    @browser.ua = $ua["SMART_TV"]
+    assert @browser.tv?
+  end
+
+  test "knows a supported browser" do
+    @browser.ua = "Chrome"
+    assert @browser.known?
+  end
+
+  test "does not know an unsupported browser" do
+    @browser.ua = "Fancy new browser"
+    refute @browser.known?
+  end
+end