browser 0.1.1 → 0.1.2

data/README.rdoc

@@ -45,6 +45,10 @@ This adds a helper method called `browser`, that inspects your current user agen
 
 * Nando Vieira - http://nandovieira.com.br
 
+== Contributors
+
+* http://github.com/chrisyour/browser
+
 == License
 
 (The MIT License)

data/Rakefile

@@ -1,17 +1,7 @@
-require "rcov/rcovtask"
 require "rake/testtask"
 require "rake/rdoctask"
 require "./lib/browser/version"
 
-Rcov::RcovTask.new do |t|
-  t.test_files = FileList["test/**/*_test.rb"]
-  t.rcov_opts = ["--sort coverage", "--exclude .gem"]
-
-  t.output_dir = "coverage"
-  t.libs << "test"
-  t.verbose = true
-end
-
 Rake::TestTask.new do |t|
   t.libs << "lib"
   t.libs << "test"

data/lib/browser.rb

@@ -23,9 +23,13 @@ class Browser
     :opera      => "Opera",
     :other      => "Other",
     :safari     => "Safari",
-    :psp        => "PlayStation Portable"
+    :psp        => "PlayStation Portable",
+    :quicktime  => "QuickTime",
+    :core_media => "Apple CoreMedia"
   }
 
+  VERSION_REGEX = /(?:Version|MSIE|Opera|Firefox|Chrome|QuickTime|BlackBerry[^\/]+|CoreMedia v)[\/ ]?([a-z0-9.]+)/i
+
   LANGUAGES = {
     "af"    => "Afrikaans",
     "sq"    => "Albanian",
@@ -177,6 +181,8 @@ class Browser
     when blackberry?  then :blackberry
     when safari?      then :safari
     when psp?         then :psp
+    when quicktime?   then :quicktime
+    when core_media?  then :core_media
     else
       :other
     end
@@ -194,13 +200,13 @@ class Browser
 
   # Return the full version.
   def full_version
-    _, v = *ua.match(/(?:Version|MSIE|Opera|Firefox|Chrome|BlackBerry[^\/]+)[\/ ]([\d.]+)/)
+    _, v = *ua.match(VERSION_REGEX)
     v || "0.0"
   end
 
   # Return true if browser supports some CSS 3 (Safari, Firefox, Opera & IE7+).
   def capable?
-    safari? || firefox? || opera? || (ie? && version >= "7")
+    webkit? || firefox? || opera? || (ie? && version >= "7")
   end
 
   # Detect if browser is WebKit-based.
@@ -208,11 +214,21 @@ class Browser
     !!(ua =~ /AppleWebKit/i)
   end
 
+  # Detect if browser is ios?.
+  def ios?
+    ipod? || ipad? || iphone?
+  end
+
   # Detect if browser is mobile.
   def mobile?
     !!(ua =~ /(Mobile|Symbian|MIDP|Windows CE)/) || blackberry? || psp?
   end
 
+  # Detect if browser is QuickTime
+  def quicktime?
+    !!(ua =~ /QuickTime/i)
+  end
+
   # Detect if browser is BlackBerry
   def blackberry?
     !!(ua =~ /BlackBerry/)
@@ -223,6 +239,11 @@ class Browser
     !!(ua =~ /Android/)
   end
 
+  # Detect if browser is Apple CoreMedia.
+  def core_media?
+    !!(ua =~ /CoreMedia/)
+  end
+
   # Detect if browser is iPhone.
   def iphone?
     !!(ua =~ /iPhone/)
@@ -240,7 +261,7 @@ class Browser
 
   # Detect if browser is Safari.
   def safari?
-    !!(ua =~ /Safari/)
+    ua =~ /Safari/ && ua !~ /Chrome/
   end
 
   # Detect if browser is Firefox.
@@ -318,8 +339,10 @@ class Browser
   def meta
     Array.new.tap do |m|
       m << id
-      m << "webkit safari safari#{version}" if safari?
-      m << "#{id}#{version}" unless safari?
+      m << "webkit" if webkit?
+      m << "ios" if ios?
+      m << "safari safari#{version}" if safari?
+      m << "#{id}#{version}" unless safari? || chrome?
       m << platform
       m << "capable" if capable?
       m << "mobile" if mobile?

data/lib/browser/version.rb

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

data/test/browser_test.rb

@@ -25,6 +25,8 @@ class BrowserTest < Test::Unit::TestCase
   ANDROID    = "Android SDK 1.5r3: Mozilla/5.0 (Linux; U; Android 1.5; de-; sdk Build/CUPCAKE) AppleWebkit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1"
   BLACKBERRY = "BlackBerry7100i/4.1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 VendorID/103"
   PSP        = "Mozilla/4.0 (PSP (PlayStation Portable); 2.00)"
+  QUICKTIME  = "QuickTime/7.6.8 (qtver=7.6.8;os=Windows NT 5.1Service Pack 3)"
+  COREMEDIA  = "Apple Mac OS X v10.6.4 CoreMedia v1.0.0.10F569"
 
   def setup
     @browser = Browser.new
@@ -71,6 +73,7 @@ class BrowserTest < Test::Unit::TestCase
     assert @browser.webkit?
     assert @browser.mobile?
     assert @browser.capable?
+    assert @browser.ios?
     assert_equal "3.0", @browser.full_version
     assert_equal "3", @browser.version
   end
@@ -95,6 +98,7 @@ class BrowserTest < Test::Unit::TestCase
     assert @browser.webkit?
     assert @browser.mobile?
     assert @browser.capable?
+    assert @browser.ios?
     assert_equal "3.0", @browser.full_version
     assert_equal "3", @browser.version
   end
@@ -107,6 +111,7 @@ class BrowserTest < Test::Unit::TestCase
     assert @browser.safari?
     assert @browser.webkit?
     assert @browser.capable?
+    assert @browser.ios?
     assert_equal "4.0.4", @browser.full_version
     assert_equal "4", @browser.version
   end
@@ -180,7 +185,7 @@ class BrowserTest < Test::Unit::TestCase
 
     assert_equal "Chrome", @browser.name
     assert @browser.chrome?
-    assert @browser.safari?
+    assert !@browser.safari?
     assert @browser.webkit?
     assert @browser.capable?
     assert_equal "5.0.375.99", @browser.full_version
@@ -211,6 +216,24 @@ class BrowserTest < Test::Unit::TestCase
     assert_equal "4", @browser.version
   end
 
+  def test_detect_quicktime
+    @browser.ua = QUICKTIME
+
+    assert_equal "QuickTime", @browser.name
+    assert @browser.quicktime?
+    assert_equal "7.6.8", @browser.full_version
+    assert_equal "7", @browser.version
+  end
+
+  def test_detect_core_media
+    @browser.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
+
   def test_detect_psp
     @browser.ua = PSP
 
@@ -243,12 +266,17 @@ class BrowserTest < Test::Unit::TestCase
 
   def test_return_string_representation
     @browser.ua = CHROME
-    assert_equal "chrome webkit safari safari5 mac capable", @browser.to_s
+    assert_equal "chrome webkit mac capable", @browser.to_s
   end
 
-  def test_return_string_representation_for_mobile
+  def test_return_string_representation_for_ios
     @browser.ua = IPHONE
-    assert_equal "iphone webkit safari safari3 mac capable mobile", @browser.to_s
+    assert_equal "iphone webkit ios safari safari3 mac capable mobile", @browser.to_s
+  end
+
+  def test_return_string_representation_for_mobile
+    @browser.ua = BLACKBERRY
+    assert_equal "blackberry blackberry4 other mobile", @browser.to_s
   end
 
   def test_return_string_representation_for_handcap

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Nando Vieira
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 -03:00
+date: 2010-10-28 00:00:00 -02:00
 default_executable: 
 dependencies: []