which_browser 0.2.0 → 0.2.1

data/.travis.yml

@@ -3,6 +3,5 @@ rvm:
   - 1.9.2
   - 1.9.3
   - rbx
-  - rbx-2.0
   - ree
   - jruby

data/README.md

@@ -35,6 +35,7 @@ Here's some other popular helpers:
     request.ipod?
     request.iphone?
     request.mobile_safari?
+    request.blackberry?
 
 
 Installation
@@ -46,7 +47,7 @@ As usual, just use the `gem install` command:
     
 Or add which_browser as a gem in your Gemfile:
 
-    gem 'which_browser', '>= 0.2.0' 
+    gem 'which_browser', '>= 0.2.1' 
 
 Then run `bundle install`
 

data/lib/which_browser/version.rb

@@ -1,3 +1,3 @@
 module WhichBrowser
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/which_browser.rb

@@ -16,7 +16,7 @@ module WhichBrowser
   end
   
   def mobile?
-     test_user_agent(/Mobile|webOS/)
+     test_user_agent(/Mobile|webOS|Nokia|Symbian/)
   end
   
   
@@ -39,6 +39,17 @@ module WhichBrowser
     mobile_safari? && test_user_agent(/iPad/)
   end
   
+  # =============================================
+  # Blackberry
+  
+  def blackberry?
+    test_user_agent(/BlackBerry/)
+  end
+  
+  def symbian?
+    test_user_agent(/Nokia|Symbian/)
+  end
+  
   
   # =============================================
   # Browsers
@@ -125,7 +136,7 @@ module WhichBrowser
           extract_version_with(/MSIE\s?([0-9\.]+)/)
         when 'safari'
           extract_version_with(/Version\/([0-9\.]+)\sSafari/)
-        when 'ios'
+        when 'ios', 'blackberry'
           extract_version_with(/Version\/([0-9\.]+)\sMobile/)
         when 'ff', 'firefox'
           extract_version_with(/Firefox\/([0-9\.]+)/)

data/test/helper.rb

@@ -33,7 +33,6 @@ register :IE, '6.0b', :'Windows XP',   :msie, '6.0b', 'Mozilla/4.0 (compatible;
 register :IE, '6.0',  :'Windows XP',   :msie, '6.0',  'Mozilla/5.0 (Windows; U; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 2.0.50727)'
 register :IE, '5.5',  :'Windows 98',   :msie, '4.0',  'Mozilla/4.0 (compatible; MSIE 5.50; Windows NT; SiteKiosk 4.9; SiteCoach 1.0)'
 
-
 register :Opera, '9.99', :'Windows XP', :presto,  '9.9.9',    'Opera/9.99 (Windows NT 5.1; U; pl) Presto/9.9.9'
 register :Opera, '9.70', :Linux,        :gecko,   '20061208', 'Mozilla/5.0 (Linux i686 ; U; en; rv:1.8.1) Gecko/20061208 Firefox/2.0.0 Opera 9.70'
 register :Opera, '9.64', :Linux,        :presto,  '2.1.1',    'Opera/9.64 (X11; Linux i686; U; Linux Mint; it) Presto/2.1.1'
@@ -44,8 +43,6 @@ register :Chrome, '0.2.149.27', :'Windows 2003',  :webkit, '525.13', 'Mozilla/5.
 register :Chrome, '0.2.149.30', :'Windows Vista', :webkit, '525.13', 'Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US) AppleWebKit/525.13 (KHTML, like Gecko) Chrome/0.2.149.30 Safari/525.13'
 register :Chrome, '8.0.552.237', :'Mac OS X 10_6_6', :webkit, '534.10', 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_6; en-US) AppleWebKit/534.10 (KHTML, like Gecko) Chrome/8.0.552.237 Safari/534.10'
 
-
-
 register :Konqueror, '4.2',     :Linux, :khtml,     '4.2.4',    'Mozilla/5.0 (compatible; Konqueror/4.2; Linux; X11; x86_64) KHTML/4.2.4 (like Gecko) Fedora/4.2.4-2.fc11'
 register :Konqueror, '3.1-rc6', :Linux, :konqueror, '3.1-rc6', 'Mozilla/5.0 (compatible; Konqueror/3.1-rc6; i686 Linux; 20021105)'
 
@@ -56,13 +53,15 @@ register :PSP, '2.00', :Playstation, :unknown, nil, 'PSP (PlayStation Portable);
 register :PSP, '2.00', :Playstation, :unknown, nil, 'Mozilla/4.0 (PSP (PlayStation Portable); 2.00)'
 
 register :Firefox, '3.5', :Linux,         :gecko, '20090624',   'Mozilla/5.0 (X11;U; Linux i686; en-GB; rv:1.9.1) Gecko/20090624 Ubuntu/9.04 (jaunty) Firefox/3.5'
-#register :Firefox, '3.5', :'Windows 7',   :gecko, '20090612',   'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1) Gecko/20090612 Firefox/3.5'
 register :Firefox, '3.1', :'Windows XP',  :gecko, '2009011606', 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.6pre) Gecko/2009011606 Firefox/3.1'
 register :Firefox, '3.0', :Linux,         :gecko, '2008062315', 'Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9) Gecko/2008062315 (Gentoo) Firefox/3.0'
 register :Firefox, '2.0', :Linux,         :gecko, '20061202',   'Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.8.1) Gecko/20061202 Firefox/2.0'
 register :Firefox, '3.6', :'OS X 10.6',   :gecko, '20100914',   'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.10) Gecko/20100914 Firefox/3.6.10'
 
+register :BlackBerry, '7.0.0.296', :'9xxx', :webkit, '534.11', 'Mozilla/5.0 (BlackBerry; U; BlackBerry 9860; en-GB) AppleWebKit/534.11+ (KHTML, like Gecko) Version/7.0.0.296 Mobile Safari/534.11+'
+register :BlackBerry, '6.0.0.246', :'9800', :webkit, '534.1',  'Mozilla/5.0 (BlackBerry; U; BlackBerry 9800; en-US) AppleWebKit/534.1+ (KHTML, like Gecko) Version/6.0.0.246 Mobile Safari/534.1+'
 
+register :Symbian, '10.0.018', :'9x', :webkit, '413', 'Mozilla/5.0 (SymbianOS/9.2; U; Series60/3.1 NokiaN95/10.0.018; Profile/MIDP-2.0 Configuration/CLDC-1.1 ) AppleWebKit/413 (KHTML, like Gecko) Safari/413'
 
 
 def get_request(name, version=nil)

data/test/test_mobile.rb

@@ -0,0 +1,41 @@
+require File.expand_path('../helper', __FILE__)
+	
+class TestMobile < MiniTest::Unit::TestCase
+  
+  should "be safari ipad" do
+  	request = get_request(:MobileSafari, 'iPad')
+  	assert !request.safari?
+  	assert request.mobile_safari?
+  	assert request.ipad?
+  	assert request.mobile?
+  end
+  
+  should "be safari ipod" do
+  	request = get_request(:MobileSafari, 'iPod')  	
+  	assert !request.safari?
+  	assert request.mobile_safari?
+  	assert request.ipod?
+  	assert request.mobile?
+  end
+  
+  should "be safari iphone" do
+  	request = get_request(:MobileSafari, 'iPhone')  	
+  	assert !request.safari?
+  	assert request.mobile_safari?
+  	assert request.iphone?
+  	assert request.mobile?
+  end
+
+  should "be blackberry" do
+  	request = get_request(:BlackBerry, '7.0.0.296')
+  	assert request.blackberry?
+  	assert request.mobile?
+  end
+  
+  should "be symbian" do
+  	request = get_request(:Symbian, '10.0.018')
+  	assert request.symbian?
+  	assert request.mobile?
+  end
+  
+end

data/test/test_safari.rb

@@ -2,8 +2,6 @@ require File.expand_path('../helper', __FILE__)
 	
 class TestSafari < MiniTest::Unit::TestCase
 
-  # safari tests
-
   should "be safari on mac" do
   	request = get_request(:Safari, '4.0.1')
   	assert request.safari?
@@ -15,28 +13,5 @@ class TestSafari < MiniTest::Unit::TestCase
   	assert request.safari?
   	assert request.pc?
   end
-  
-  # mobile safari tests
-  
-  should "be safari ipad" do
-  	request = get_request(:MobileSafari, 'iPad')
-  	assert !request.safari?
-  	assert request.mobile_safari?
-  	assert request.ipad?
-  end
-  
-  should "be safari ipod" do
-  	request = get_request(:MobileSafari, 'iPod')  	
-  	assert !request.safari?
-  	assert request.mobile_safari?
-  	assert request.ipod?
-  end
-  
-  should "be safari iphone" do
-  	request = get_request(:MobileSafari, 'iPhone')  	
-  	assert !request.safari?
-  	assert request.mobile_safari?
-  	assert request.iphone?
-  end
-  
+    
 end

metadata

@@ -1,71 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: which_browser
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease: 
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Spencer Steffen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-09 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70130667337300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70130667337300
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70130667277520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70130667277520
+- !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70130667273440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70130667273440
+- !ruby/object:Gem::Dependency
   name: minitest_should
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70130667260720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.1
   type: :development
   prerelease: false
-  version_requirements: *id004
-description: Which Browser adds a few helper methods to a rack request making it easier to determine which browser is being used by the client.
-email: 
+  version_requirements: *70130667260720
+description: Which Browser adds a few helper methods to a rack request making it easier
+  to determine which browser is being used by the client.
+email:
 - spencer@citrusme.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -79,47 +76,41 @@ files:
 - test/test_chrome.rb
 - test/test_firefox.rb
 - test/test_internet_explorer.rb
+- test/test_mobile.rb
 - test/test_os.rb
 - test/test_safari.rb
 - which_browser.gemspec
 homepage: https://github.com/citrus/which_browser
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -4551958323863309221
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -4551958323863309221
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Which Browser adds a few helper methods to a rack request making it easier to determine which browser is being used by the client.
-test_files: 
+summary: Which Browser adds a few helper methods to a rack request making it easier
+  to determine which browser is being used by the client.
+test_files:
 - test/dummy/app.rb
 - test/helper.rb
 - test/test_chrome.rb
 - test/test_firefox.rb
 - test/test_internet_explorer.rb
+- test/test_mobile.rb
 - test/test_os.rb
 - test/test_safari.rb