browser 0.1.0 → 0.1.1

data/Rakefile

@@ -1,7 +1,7 @@
 require "rcov/rcovtask"
 require "rake/testtask"
 require "rake/rdoctask"
-require "lib/browser/version"
+require "./lib/browser/version"
 
 Rcov::RcovTask.new do |t|
   t.test_files = FileList["test/**/*_test.rb"]

data/lib/browser.rb

@@ -21,7 +21,9 @@ class Browser
     :iphone     => "iPhone",
     :ipod       => "iPod Touch",
     :opera      => "Opera",
-    :other      => "Other"
+    :other      => "Other",
+    :safari     => "Safari",
+    :psp        => "PlayStation Portable"
   }
 
   LANGUAGES = {
@@ -173,6 +175,8 @@ class Browser
     when firefox?     then :firefox
     when android?     then :android
     when blackberry?  then :blackberry
+    when safari?      then :safari
+    when psp?         then :psp
     else
       :other
     end
@@ -199,9 +203,14 @@ class Browser
     safari? || firefox? || opera? || (ie? && version >= "7")
   end
 
+  # Detect if browser is WebKit-based.
+  def webkit?
+    !!(ua =~ /AppleWebKit/i)
+  end
+
   # Detect if browser is mobile.
   def mobile?
-    !!(ua =~ /(Mobile|Symbian|MIDP|Windows CE)/) || blackberry?
+    !!(ua =~ /(Mobile|Symbian|MIDP|Windows CE)/) || blackberry? || psp?
   end
 
   # Detect if browser is BlackBerry
@@ -269,6 +278,11 @@ class Browser
     ie? && version == "9"
   end
 
+  # Detect if browser is running from PSP.
+  def psp?
+    !!(ua =~ /PSP/)
+  end
+
   # Detect if browser is Opera.
   def opera?
     !!(ua =~ /Opera/)
@@ -304,7 +318,7 @@ class Browser
   def meta
     Array.new.tap do |m|
       m << id
-      m << "safari safari#{version}" if safari?
+      m << "webkit safari safari#{version}" if safari?
       m << "#{id}#{version}" unless safari?
       m << platform
       m << "capable" if capable?

data/lib/browser/action_controller.rb

@@ -7,8 +7,8 @@ class Browser
     private
     def browser
       @browser ||= Browser.new(
-        :accept_language => request.headers["ACCEPT_LANGUAGE"],
-        :ua => request.headers["USER_AGENT"]
+        :accept_language => request.headers["Accept-Language"],
+        :ua => request.headers["User-Agent"]
       )
     end
   end

data/lib/browser/version.rb

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

data/test/browser_test.rb

@@ -14,6 +14,7 @@ class BrowserTest < Test::Unit::TestCase
   IPHONE     = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_0 like Mac OS X; en-us) AppleWebKit/420.1 (KHTML, like Gecko) Version/3.0 Mobile/1A542a Safari/419.3"
   IPOD       = "Mozilla/5.0 (iPod; U; CPU like Mac OS X; en) AppleWebKit/420.1 (KHTML, like Gecko) Version/3.0 Mobile/3A100a Safari/419.3"
   IPAD       = "Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B367 Safari/531.21.10"
+  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"
   IE6        = "Mozilla/5.0 (Windows; U; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 2.0.50727)"
   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)"
@@ -23,6 +24,7 @@ class BrowserTest < Test::Unit::TestCase
   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"
   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)"
 
   def setup
     @browser = Browser.new
@@ -66,18 +68,31 @@ class BrowserTest < Test::Unit::TestCase
     assert_equal "iPhone", @browser.name
     assert @browser.iphone?
     assert @browser.safari?
+    assert @browser.webkit?
     assert @browser.mobile?
     assert @browser.capable?
     assert_equal "3.0", @browser.full_version
     assert_equal "3", @browser.version
   end
 
+  def test_detect_safari
+    @browser.ua = SAFARI
+
+    assert_equal "Safari", @browser.name
+    assert @browser.safari?
+    assert @browser.webkit?
+    assert @browser.capable?
+    assert_equal "5.0.1", @browser.full_version
+    assert_equal "5", @browser.version
+  end
+
   def test_detect_ipod
     @browser.ua = IPOD
 
     assert_equal "iPod Touch", @browser.name
     assert @browser.ipod?
     assert @browser.safari?
+    assert @browser.webkit?
     assert @browser.mobile?
     assert @browser.capable?
     assert_equal "3.0", @browser.full_version
@@ -90,6 +105,7 @@ class BrowserTest < Test::Unit::TestCase
     assert_equal "iPad", @browser.name
     assert @browser.ipad?
     assert @browser.safari?
+    assert @browser.webkit?
     assert @browser.capable?
     assert_equal "4.0.4", @browser.full_version
     assert_equal "4", @browser.version
@@ -165,6 +181,7 @@ class BrowserTest < Test::Unit::TestCase
     assert_equal "Chrome", @browser.name
     assert @browser.chrome?
     assert @browser.safari?
+    assert @browser.webkit?
     assert @browser.capable?
     assert_equal "5.0.375.99", @browser.full_version
     assert_equal "5", @browser.version
@@ -176,6 +193,7 @@ class BrowserTest < Test::Unit::TestCase
     assert_equal "Android", @browser.name
     assert @browser.android?
     assert @browser.safari?
+    assert @browser.webkit?
     assert @browser.mobile?
     assert @browser.capable?
     assert_equal "3.1.2", @browser.full_version
@@ -193,6 +211,14 @@ class BrowserTest < Test::Unit::TestCase
     assert_equal "4", @browser.version
   end
 
+  def test_detect_psp
+    @browser.ua = PSP
+
+    assert_equal "PlayStation Portable", @browser.name
+    assert @browser.psp?
+    assert @browser.mobile?
+  end
+
   def test_detect_other_mobiles
     @browser.ua = "Symbian OS"
     assert @browser.mobile?
@@ -217,12 +243,12 @@ class BrowserTest < Test::Unit::TestCase
 
   def test_return_string_representation
     @browser.ua = CHROME
-    assert_equal "chrome safari safari5 mac capable", @browser.to_s
+    assert_equal "chrome webkit safari safari5 mac capable", @browser.to_s
   end
 
   def test_return_string_representation_for_mobile
     @browser.ua = IPHONE
-    assert_equal "iphone safari safari3 mac capable mobile", @browser.to_s
+    assert_equal "iphone webkit safari safari3 mac capable mobile", @browser.to_s
   end
 
   def test_return_string_representation_for_handcap

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: browser
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Nando Vieira
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-16 00:00:00 -03:00
+date: 2010-10-13 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -48,7 +47,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -57,7 +55,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"