browser 0.1.3 → 0.1.4

data/Gemfile

@@ -1,2 +1,2 @@
-source "http://gems.simplesideias.com.br"
+source :rubygems
 gemspec

data/Gemfile.lock

@@ -1,38 +1,47 @@
 PATH
   remote: .
   specs:
-    browser (0.1.3)
+    browser (0.1.4)
 
 GEM
-  remote: http://gems.simplesideias.com.br/
+  remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionpack (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activesupport (3.0.9)
-    builder (2.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.0)
-    rack (1.2.3)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    builder (3.0.0)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    journey (1.0.3)
+    json (1.7.3)
+    multi_json (1.3.6)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rake (0.9.2)
-    tzinfo (0.3.29)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    tilt (1.3.3)
 
 PLATFORMS
   ruby
@@ -41,3 +50,4 @@ DEPENDENCIES
   actionpack (~> 3.0)
   browser!
   rake (~> 0.9)
+  rdoc (~> 3.12)

data/README.rdoc

@@ -14,6 +14,7 @@ Do some browser detection with Ruby. Includes ActionController integration.
   browser = Browser.new(:ua => "some string", :accept_language => "en-us")
   browser.safari?
   browser.opera?
+  browser.chrome?
   browser.mobile?
   browser.firefox?
   browser.ie?

data/Rakefile

@@ -12,12 +12,13 @@ Rake::TestTask.new do |t|
   t.ruby_opts = %w[-rubygems]
 end
 
-require "rdoc/task"
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   rdoc.main = "README.rdoc"
   rdoc.rdoc_dir = "doc"
   rdoc.title = "Browser API"
-  rdoc.options += %w[ --line-numbers --inline-source --charset utf-8 ]
-  rdoc.rdoc_files.include("README.rdoc")
-  rdoc.rdoc_files.include("lib/**/*.rb")
+  rdoc.options += %w[ --line-numbers --charset utf-8 ]
+  rdoc.rdoc_files.include("README.rdoc", "lib/**/*.rb")
 end
+
+task :default => :test

data/browser.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "actionpack"   , "~> 3.0"
   s.add_development_dependency "rake"         , "~> 0.9"
+  s.add_development_dependency "rdoc"         , "~> 3.12"
 end

data/lib/browser.rb

@@ -28,9 +28,12 @@ class Browser
     :core_media => "Apple CoreMedia"
   }
 
-  VERSION_REGEX = /(?:Version|MSIE|Opera|Firefox|Chrome|QuickTime|BlackBerry[^\/]+|CoreMedia v)[\/ ]?([a-z0-9.]+)/i
+  VERSIONS = {
+    :default => /(?:Version|MSIE|Firefox|Chrome|QuickTime|BlackBerry[^\/]+|CoreMedia v)[\/ ]?([a-z0-9.]+)/i,
+    :opera => /Opera\/.*? Version\/([\d.]+)/
+  }
 
-  COMPATIBILITY_VIEW_REGEXP = /Trident\/([0-9.]+)/
+  TRIDENT_VERSION_REGEX = /Trident\/([0-9.]+)/
 
   LANGUAGES = {
     "af"    => "Afrikaans",
@@ -202,13 +205,7 @@ class Browser
 
   # Return the full version.
   def full_version
-    if compatibility_view?
-      _, v = *ua.match(COMPATIBILITY_VIEW_REGEXP)
-      v.gsub!(/^([0-9])/) { $1.to_i + 4 }
-    else
-      _, v = *ua.match(VERSION_REGEX)
-    end
-
+    _, v = *ua.match(VERSIONS.fetch(id, VERSIONS[:default]))
     v || "0.0"
   end
 
@@ -218,7 +215,7 @@ class Browser
   end
 
   def compatibility_view?
-    ie? && ua.match(COMPATIBILITY_VIEW_REGEXP)
+    ie? && ua.match(TRIDENT_VERSION_REGEX) && version.to_i < ($1.to_i + 4)
   end
 
   # Detect if browser is WebKit-based.
@@ -336,6 +333,11 @@ class Browser
     !!(ua =~ /Linux/)
   end
 
+  # Detect if browser is tablet (currently just iPad or Android).
+  def tablet?
+    ipad? || (android? && !mobile?)
+  end
+
   # Return the platform.
   def platform
     case

data/lib/browser/version.rb

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

data/test/browser_test.rb

@@ -11,10 +11,11 @@ class BrowserTest < Test::Unit::TestCase
   IE8_COMPAT = "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; Trident/4.0; SLCC1; Media Center PC 5.0; .NET CLR 3.5.21022)"
   IE9        = "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)"
   IE9_COMPAT = "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; Trident/5.0)"
-  OPERA      = "Opera/9.99 (Windows NT 5.1; U; pl) Presto/9.9.9"
+  OPERA      = "Opera/9.80 (Macintosh; Intel Mac OS X 10.7.4; U; en) Presto/2.10.229 Version/11.64"
   FIREFOX    = "Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) Gecko/20121223 Ubuntu/9.25 (jaunty) Firefox/3.8"
   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"
+  TABLOID    = "Mozilla/5.0 (Linux; U; Android 3.0; en-us; Xoom Build/HRI39) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13"
   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)"
@@ -66,6 +67,7 @@ class BrowserTest < Test::Unit::TestCase
     assert @browser.mobile?
     assert @browser.capable?
     assert @browser.ios?
+    assert @browser.tablet? == false
     assert_equal "3.0", @browser.full_version
     assert_equal "3", @browser.version
   end
@@ -91,6 +93,7 @@ class BrowserTest < Test::Unit::TestCase
     assert @browser.mobile?
     assert @browser.capable?
     assert @browser.ios?
+    assert @browser.tablet? == false
     assert_equal "3.0", @browser.full_version
     assert_equal "3", @browser.version
   end
@@ -104,6 +107,7 @@ class BrowserTest < Test::Unit::TestCase
     assert @browser.webkit?
     assert @browser.capable?
     assert @browser.ios?
+    assert @browser.tablet?
     assert_equal "4.0.4", @browser.full_version
     assert_equal "4", @browser.version
   end
@@ -137,6 +141,7 @@ class BrowserTest < Test::Unit::TestCase
     assert @browser.ie?
     assert @browser.ie8?
     assert @browser.capable?
+    assert @browser.compatibility_view? == false
     assert_equal "8.0", @browser.full_version
     assert_equal "8", @browser.version
   end
@@ -146,11 +151,12 @@ class BrowserTest < Test::Unit::TestCase
 
     assert_equal "Internet Explorer", @browser.name
     assert @browser.ie?
-    assert @browser.ie8?
+    assert @browser.ie7?
+    assert !@browser.ie8?
     assert @browser.capable?
     assert @browser.compatibility_view?
-    assert_equal "8.0", @browser.full_version
-    assert_equal "8", @browser.version
+    assert_equal "7.0", @browser.full_version
+    assert_equal "7", @browser.version
   end
 
   def test_detect_ie9
@@ -160,6 +166,7 @@ class BrowserTest < Test::Unit::TestCase
     assert @browser.ie?
     assert @browser.ie9?
     assert @browser.capable?
+    assert !@browser.compatibility_view?
     assert_equal "9.0", @browser.full_version
     assert_equal "9", @browser.version
   end
@@ -169,11 +176,12 @@ class BrowserTest < Test::Unit::TestCase
 
     assert_equal "Internet Explorer", @browser.name
     assert @browser.ie?
-    assert @browser.ie9?
+    assert @browser.ie7?
+    assert !@browser.ie9?
     assert @browser.capable?
     assert @browser.compatibility_view?
-    assert_equal "9.0", @browser.full_version
-    assert_equal "9", @browser.version
+    assert_equal "7.0", @browser.full_version
+    assert_equal "7", @browser.version
   end
 
   def test_detect_opera
@@ -182,8 +190,8 @@ class BrowserTest < Test::Unit::TestCase
     assert_equal "Opera", @browser.name
     assert @browser.opera?
     assert @browser.capable?
-    assert_equal "9.99", @browser.full_version
-    assert_equal "9", @browser.version
+    assert_equal "11.64", @browser.full_version
+    assert_equal "11", @browser.version
   end
 
   def test_detect_firefox
@@ -216,16 +224,32 @@ class BrowserTest < Test::Unit::TestCase
     assert @browser.safari?
     assert @browser.webkit?
     assert @browser.mobile?
+    assert @browser.tablet? == false
     assert @browser.capable?
     assert_equal "3.1.2", @browser.full_version
     assert_equal "3", @browser.version
   end
 
+  def test_detect_android_tablet
+    @browser.ua = TABLOID
+
+    assert_equal "Android", @browser.name
+    assert @browser.android?
+    assert @browser.safari?
+    assert @browser.webkit?
+    assert @browser.mobile? == false
+    assert @browser.tablet?
+    assert @browser.capable?
+    assert_equal "4.0", @browser.full_version
+    assert_equal "4", @browser.version
+  end
+
   def test_detect_blackberry
     @browser.ua = BLACKBERRY
 
     assert_equal "BlackBerry", @browser.name
     assert @browser.blackberry?
+    assert @browser.tablet? == false
     assert @browser.mobile?
     assert @browser.capable? == false
     assert_equal "4.1.0", @browser.full_version
@@ -261,12 +285,16 @@ class BrowserTest < Test::Unit::TestCase
   def test_detect_other_mobiles
     @browser.ua = "Symbian OS"
     assert @browser.mobile?
+    assert @browser.tablet? == false
 
     @browser.ua = "MIDP-2.0"
     assert @browser.mobile?
+    assert @browser.tablet? == false
 
     @browser.ua = "Windows CE"
     assert @browser.mobile?
+    assert @browser.tablet? == false
+
   end
 
   def test_return_a_zero_version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browser
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-15 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70196031340500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70196031340500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70196031339680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +37,28 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70196031339680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
 description: Do some browser detection with Ruby.
 email:
 - fnando.vieira@gmail.com
@@ -65,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1304431903925043845
+      hash: 701530694838661058
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -74,10 +100,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1304431903925043845
+      hash: 701530694838661058
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Do some browser detection with Ruby.