browser 0.1.4 → 0.1.5

data/Gemfile.lock

@@ -1,34 +1,41 @@
 PATH
   remote: .
   specs:
-    browser (0.1.4)
+    browser (0.1.5)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
+      journey (~> 1.0.4)
       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)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
-    activesupport (3.2.3)
+    activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    builder (3.0.0)
+    awesome_print (1.1.0)
+    builder (3.0.3)
+    coderay (1.0.7)
     erubis (2.7.0)
     hike (1.2.1)
-    i18n (0.6.0)
-    journey (1.0.3)
-    json (1.7.3)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.5)
+    method_source (0.8)
     multi_json (1.3.6)
+    pry (0.9.10)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -37,6 +44,7 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
+    slop (3.3.3)
     sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -47,7 +55,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (~> 3.0)
+  actionpack
+  awesome_print
   browser!
-  rake (~> 0.9)
-  rdoc (~> 3.12)
+  pry
+  rake
+  rdoc

data/README.rdoc

@@ -12,6 +12,7 @@ Do some browser detection with Ruby. Includes ActionController integration.
   require "browser"
 
   browser = Browser.new(:ua => "some string", :accept_language => "en-us")
+  browser.name        # readable browser name
   browser.safari?
   browser.opera?
   browser.chrome?
@@ -39,7 +40,7 @@ Just add it to the Gemfile or `environment.rb`, depending of your Rails version.
 This adds a helper method called `browser`, that inspects your current user agent.
 
   <% if browser.ie6? %>
-    <p class="disclaimer">Your're running an older IE version. Please update it!</p>
+    <p class="disclaimer">You're running an older IE version. Please update it!</p>
   <% end %>
 
 == Maintainer

data/browser.gemspec

@@ -17,7 +17,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "actionpack"   , "~> 3.0"
-  s.add_development_dependency "rake"         , "~> 0.9"
-  s.add_development_dependency "rdoc"         , "~> 3.12"
+  s.add_development_dependency "actionpack"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rdoc"
+  s.add_development_dependency "pry"
+  s.add_development_dependency "awesome_print"
 end

data/lib/browser.rb

@@ -230,7 +230,7 @@ class Browser
 
   # Detect if browser is mobile.
   def mobile?
-    !!(ua =~ /(Mobile|Symbian|MIDP|Windows CE)/) || blackberry? || psp?
+    !!(ua =~ /(Mobi(le)?|Symbian|MIDP|Windows CE)/) || blackberry? || psp? || opera_mini?
   end
 
   # Detect if browser is QuickTime
@@ -245,7 +245,7 @@ class Browser
 
   # Detect if browser is Android.
   def android?
-    !!(ua =~ /Android/)
+    !!(ua =~ /Android/ && !opera?)
   end
 
   # Detect if browser is Apple CoreMedia.
@@ -318,6 +318,11 @@ class Browser
     !!(ua =~ /Opera/)
   end
 
+  # Detect if browser is Opera Mini.
+  def opera_mini?
+    !!(ua =~ /Opera Mini/)
+  end
+
   # Detect if current platform is Macintosh.
   def mac?
     !!(ua =~ /Mac OS X/)
@@ -335,7 +340,12 @@ class Browser
 
   # Detect if browser is tablet (currently just iPad or Android).
   def tablet?
-    ipad? || (android? && !mobile?)
+    !!(ipad? || (android? && !mobile?))
+  end
+
+  # Detect if browser is Kindle.
+  def kindle?
+    !!(ua =~ /Kindle/)
   end
 
   # Return the platform.

data/lib/browser/version.rb

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

data/test/browser_test.rb

@@ -1,25 +1,33 @@
+# -*- encoding: utf-8 -*-
 require "test_helper"
 
 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)"
-  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.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)"
-  COREMEDIA  = "Apple Mac OS X v10.6.4 CoreMedia v1.0.0.10F569"
+  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)"
+  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.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)"
+  COREMEDIA     = "Apple Mac OS X v10.6.4 CoreMedia v1.0.0.10F569"
+  XOOM          = "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"
+  NEXUS_TABLET  = "Mozilla/5.0 (Linux; Android 4.1.1; Nexus 7 Build/JRO03D) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Safari/535.19"
+  OPERA_MINI    = "Opera/9.80 (Android; Opera Mini/7.029952/28.2359;u; fr) Presto/2.8.119 Version/11.10"
+  OPERA_MOBI    = "Opera/9.8 (Android 2.3.5; Linux; Opera Mobi/ADR-1205181138; U; en) Presto/2.10.254 Version/12.00"
+  WINDOWS_PHONE = "Mozilla/4.0 (compatible; MSIE 7.0; Windows Phone OS 7.0; Trident/3.1; IEMobile/7.0; DELL; Venue Pro)"
+  KINDLE        = "Mozilla/5.0 (Linux; U; en-US) AppleWebKit/528.5+ (KHTML, like Gecko, Safari/528.5+) Version/4.0 Kindle/3.0 (screen 600×800; rotate)"
+  KINDLE_FIRE   = "Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Kindle Fire Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1"
 
   def setup
     @browser = Browser.new
@@ -367,4 +375,59 @@ class BrowserTest < Test::Unit::TestCase
     methods = ActionController::Base.private_instance_methods.collect {|m| m.to_sym}
     assert methods.include?(:browser)
   end
+
+  def test_xoom
+    @browser.ua = XOOM
+
+    assert @browser.android?
+    assert @browser.tablet?
+    assert !@browser.mobile?
+  end
+
+  def test_nexus_tablet
+    @browser.ua = NEXUS_TABLET
+
+    assert @browser.android?
+    assert @browser.tablet?
+    assert !@browser.mobile?
+  end
+
+  def test_opera_mini
+    @browser.ua = OPERA_MINI
+
+    assert @browser.opera_mini?
+    assert !@browser.tablet?
+    assert @browser.mobile?
+  end
+
+  def test_opera_mobi
+    @browser.ua = OPERA_MOBI
+
+    assert @browser.opera?
+    assert !@browser.tablet?
+    assert @browser.mobile?
+  end
+
+  def test_windows_phone
+    @browser.ua = WINDOWS_PHONE
+
+    assert @browser.ie?
+    assert_equal "7", @browser.version
+    assert @browser.mobile?
+    assert !@browser.tablet?
+  end
+
+  def test_kindle_monochrome
+    @browser.ua = KINDLE
+
+    assert @browser.kindle?
+    assert @browser.webkit?
+  end
+
+  def test_kindle_fire
+    @browser.ua = KINDLE_FIRE
+
+    assert @browser.kindle?
+    assert @browser.webkit?
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browser
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,56 +9,88 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Do some browser detection with Ruby.
 email:
 - fnando.vieira@gmail.com
@@ -89,24 +121,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 701530694838661058
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 701530694838661058
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Do some browser detection with Ruby.
-test_files:
-- test/browser_test.rb
-- test/test_helper.rb
+test_files: []