browser_detector 1.0.1 → 1.1.0

data/.gitignore

@@ -3,3 +3,4 @@
 coverage
 rdoc
 pkg
+/.rake_tasks~

data/Rakefile

@@ -10,47 +10,35 @@ begin
     gem.email = "jason@lookforwardenterprises.com"
     gem.homepage = "http://github.com/midas/browser_detector"
     gem.authors = ["C. Jason Harrelson (midas)"]
-    gem.add_development_dependency "shoulda", ">= 2.10.2"
+    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "yard", ">= 0"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
-task :test => :check_dependencies
+task :spec => :check_dependencies
 
-task :default => :test
+task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION')
-    version = File.read('VERSION')
-  else
-    version = ""
+begin
+  require 'yard'
+  YARD::Rake::YardocTask.new
+rescue LoadError
+  task :yardoc do
+    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
   end
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "browser_detector #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+end

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/browser_detector.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{browser_detector}
-  s.version = "1.0.1"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["C. Jason Harrelson (midas)"]
-  s.date = %q{2010-02-04}
+  s.date = %q{2010-11-11}
   s.description = %q{Determines the name and version of the browser currently making a request.}
   s.email = %q{jason@lookforwardenterprises.com}
   s.extra_rdoc_files = [
@@ -29,34 +29,38 @@ Gem::Specification.new do |s|
      "lib/browser_detector/detector.rb",
      "lib/browser_detector/rails.rb",
      "lib/browser_detector/rails/view_helpers.rb",
-     "test/browser_detector/detector_test.rb",
-     "test/browser_detector/rails/view_helpers_test.rb",
-     "test/browser_detector_test.rb",
-     "test/test_helper.rb"
+     "spec/browser_detector/detector_shared_specs.rb",
+     "spec/browser_detector/detector_spec.rb",
+     "spec/browser_detector_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/midas/browser_detector}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Determines the name and version of the browser currently making a request.}
   s.test_files = [
-    "test/browser_detector/detector_test.rb",
-     "test/browser_detector/rails/view_helpers_test.rb",
-     "test/browser_detector_test.rb",
-     "test/test_helper.rb"
+    "spec/browser_detector/detector_shared_specs.rb",
+     "spec/browser_detector/detector_spec.rb",
+     "spec/browser_detector_spec.rb",
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shoulda>, [">= 2.10.2"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
     else
-      s.add_dependency(%q<shoulda>, [">= 2.10.2"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<yard>, [">= 0"])
     end
   else
-    s.add_dependency(%q<shoulda>, [">= 2.10.2"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<yard>, [">= 0"])
   end
 end
 

data/lib/browser_detector.rb

@@ -5,7 +5,7 @@ require 'browser_detector/detector'
 require 'browser_detector/rails/view_helpers'
 
 module BrowserDetector
-  VERSION = '1.0.1'
+  VERSION = File.read( "#{File.dirname __FILE__}/../VERSION" ).chomp
 end
 
 ActionView::Base.send( :include, BrowserDetector::Rails::ViewHelpers ) if defined?( ActionView )

data/lib/browser_detector/detector.rb

@@ -1,17 +1,33 @@
-module BrowserDetector 
-  
-  # The Detector provides the ability to determine browser information from the user 
+module BrowserDetector
+  # The Detector provides the ability to determine browser information from the user
   # agent string.
   #
   class Detector
-    
+    VERSION_REGEX       = /(\d*)\.(\d*)\.*(\d*)\.*(\d*)/
+    CHROME_REGEX        = /.* Chrome\/([\d|.]*).*/i
+    FIREFOX_REGEX       = /.* Firefox\/([\d|.]*).*/i
+    IE_REGEX            = /.*; MSIE ([\d|.]*);.*/i
+    OPERA_REGEX         = /Opera.*Version\/([\d|.]*)/i
+    SAFARI_REGEX        = /.*Gecko\) Version\/([\d|.]*) Safari\/[\d|.]*/i
+    SAFARI_MOBILE_REGEX = /.*Gecko\) Version\/([\d|.]*) Mobile\/.* Safari\/[\d|.]*/i
+
     attr_reader :ua
-    
+
     def initialize( user_agent )
       @ua = user_agent.downcase unless user_agent.nil?
-      @version_regex = /(\d*)\.(\d*)\.*(\d*)\.*(\d*)/
     end
-    
+
+    def self.patterns
+      {
+        CHROME_REGEX        => 'chrome',
+        IE_REGEX            => 'ie',
+        FIREFOX_REGEX       => 'firefox',
+        OPERA_REGEX         => 'opera',
+        SAFARI_REGEX        => 'safari',
+        SAFARI_MOBILE_REGEX => 'safari_mobile'
+      }
+    end
+
     # Returns true if the browser matches the options ent in, otherwise returns false.
     #
     # === Request
@@ -30,7 +46,7 @@ module BrowserDetector
       minor_version = options[:minor_version]
       build_version = options[:build_version]
       revision_version = options[:revision_version]
-      
+
       name ||= self.browser_name
       version ||= self.browser_version
       major_version ||= self.browser_version_major
@@ -44,45 +60,29 @@ module BrowserDetector
       minor_version = minor_version.to_s.strip
       build_version = build_version.to_s.strip
       revision_version = revision_version.to_s.strip
-      
+
       self.browser_name == name && self.browser_version == version && self.browser_version_major == major_version &&
-        self.browser_version_minor == minor_version #&& self.browser_version_build == build_version && 
+        self.browser_version_minor == minor_version #&& self.browser_version_build == build_version &&
         #self.browser_version_revision == revision_version
     end
 
     # Returns the name of the browser that is making this request.  For example 'ie'.
     #
-    # === Request
-    # * +request+ - The request object.
-    #
     def browser_name
       begin
         @browser_name ||= begin
-          ua = @ua
-          if ua.nil?
-            'unknown'
+          return 'unknown' if ua.nil?
+
+          Detector.patterns.each do |pattern, identifier|
+            return identifier if pattern.match( ua )
+          end
+
+          if ua.include?( 'konqueror' )
+            'konqueror'
+          elsif ua.include?( 'netscape' )
+            'netscape'
           else
-            if ua.index( 'msie' ) && !ua.index( 'opera' ) && !ua.index( 'webtv' )
-              if ua.index( 'windows ce' )
-                'ie' + '_ce' #+ ua[ua.index( 'msie' ) + 5].chr 
-              else
-                'ie' # + ua[ua.index( 'msie' ) + 5].chr
-              end
-            elsif ua.include?( 'opera' )
-              'opera'
-            elsif ua.include?( 'konqueror' ) 
-              'konqueror'
-            elsif ua.include?( 'applewebkit/' )
-              'safari'
-            elsif ua.include?( 'chrome' )
-              'chrome'
-            elsif ua.include?( 'firefox' )
-              'firefox'
-            elsif ua.include?( 'netscape' )
-              'netscape'
-            else
-              'unknown'
-            end
+            'unknown'
           end
         end
       rescue
@@ -92,9 +92,6 @@ module BrowserDetector
 
     # Returns the version of the browser that is making this request.  For example '7'.
     #
-    # === Request
-    # * +request+ - The request object.
-    #
     def browser_version
       @browser_version ||= begin
         self.send( "resolve_version_for_#{self.browser_name}".to_sym )
@@ -102,29 +99,29 @@ module BrowserDetector
     end
 
     def browser_version_major
-      match = @version_regex.match( browser_version )
+      match = VERSION_REGEX.match( browser_version )
       return match[1].to_i.to_s unless match.nil? || match.size < 2
       '0'
     end
 
     def browser_version_minor
-      match = @version_regex.match( browser_version )
+      match = VERSION_REGEX.match( browser_version )
       return match[2].to_i.to_s unless match.nil? || match.size < 3
       '0'
     end
-    
+
     def browser_version_build
-      match = @version_regex.match( browser_version )
+      match = VERSION_REGEX.match( browser_version )
       return match[3].to_i.to_s unless match.nil? || match.size < 4 || match[3].empty? || match[3].nil?
       '0'
     end
-    
+
     def browser_version_revision
-      match = @version_regex.match( browser_version )
+      match = VERSION_REGEX.match( browser_version )
       return match[4].to_i.to_s unless match.nil? || match.size < 5 || match[4].empty? || match[4].nil?
       '0'
     end
-    
+
     # Returns the browser name concatenated with the browser version.  for example, 'ie7'.
     #
     # === Request
@@ -133,7 +130,7 @@ module BrowserDetector
     def browser_full_name
       self.send( "browser_full_name_for_#{self.browser_name}".to_sym )
     end
-    
+
     # Returns the browser name concatenated with the browser version.  for example, 'ie7'.
     #
     # === Request
@@ -142,100 +139,116 @@ module BrowserDetector
     def browser_id
       browser_name + browser_version.gsub( /\./, '' )
     end
-    
+
     # Returns true if the current browser type can handle PNGs.
     #
     def can_use_png?
       return browser_version.to_i >= 7 if browser_name== 'ie'
-    	true
-  	end
+      true
+    end
+
+    def webkit?
+      @is_webkit ||= !(/AppleWebKit/i.match( @ua ).nil?)
+    end
+
+    def iphone?
+      @is_iphone ||= (browser_name == Detector.patterns[SAFARI_MOBILE_REGEX])
+    end
 
     # A list of all the browser types that Guilded recognizes.
     #
     def self.all_browsers
-      %w( chrome firefox ie55 ie60 ie70 ie80 konqueror netscape opera safari )
+      %w(chrome firefox ie55 ie60 ie70 ie80 konqueror netscape opera safari)
     end
 
     # A list of all the mobile browser types that Guilded recognizes.
     #
     def self.all_mobile_browsers
-      %w( ie_ce4 iphone )
+      %w(ie_ce4)
     end
-    
+
     def self.user_agents
-      { 
-        :ie55 => 'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.1)', 
-        :ie60 => 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)',
-        :ie70 => 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)',
-        :ie80 => 'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0)',
-        :firefox2 => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.17) Gecko/20080829 Firefox/2.0.0.17',
-        :firefox3 => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.0.11) Gecko/2009060214 Firefox/3.0.11',
-        :firefox35 => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.1.3) Gecko/20090824 Firefox/3.5.3',
-        :firefox35win => 'Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.1.3) Gecko/20090824 Firefox/3.5.3 (.NET CLR 3.5.30729)',
-        :opera10 => 'Opera/9.80 (Macintosh; Intel Mac OS X; U; en) Presto/2.2.15 Version/10.00',
-        :safari403 => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_1; en-US) AppleWebKit/532.2 (KHTML, like Gecko) Chrome/4.0.221.8 Safari/532.2',
-        :iphone3 => 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_1 like Mac OS X; en-us) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7C144 Safari/528.16',
-        :iphone2 => 'Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A535b Safari/419.3',
-        :chrome3 => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/532.0 (KHTML, like Gecko) Chrome/3.0.195.27 Safari/532.0',
-        :chrome4 => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_1; en-US) AppleWebKit/532.2 (KHTML, like Gecko) Chrome/4.0.221.8 Safari/532.2'
+      {
+        :ie55           => 'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.1)',
+        :ie60           => 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)',
+        :ie70           => 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)',
+        :ie80           => 'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0)',
+        :firefox2       => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.17) Gecko/20080829 Firefox/2.0.0.17',
+        :firefox3       => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.0.11) Gecko/2009060214 Firefox/3.0.11',
+        :firefox35      => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.1.3) Gecko/20090824 Firefox/3.5.3',
+        :firefox35win   => 'Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.1.3) Gecko/20090824 Firefox/3.5.3 (.NET CLR 3.5.30729)',
+        :opera10        => 'Opera/9.80 (Macintosh; Intel Mac OS X; U; en) Presto/2.2.15 Version/10.00',
+        :safari40       => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_6; en-us) AppleWebKit/528.16 (KHTML, like Gecko) Version/4.0 Safari/528.16',
+        :safari501      => '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',
+        :chrome3        => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/532.0 (KHTML, like Gecko) Chrome/3.0.195.27 Safari/532.0',
+        :chrome4        => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_1; en-US) AppleWebKit/532.2 (KHTML, like Gecko) Chrome/4.0.221.8 Safari/532.2',
+        :safari_mobile4 => 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_1 like Mac OS X; en-us) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7C144 Safari/528.16',
+        :safari_mobile3 => 'Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A535b Safari/419.3',
       }
     end
-    
+
     protected
-    
+
     def resolve_version_for_ie
-      match = /.*msie (.*); windows nt 5.1/.match( @ua )
+      match = IE_REGEX.match( @ua )
       return match.nil? ? '0' : match[1]
     end
-    
+
     def resolve_version_for_firefox
-      match = /.*\((.*); u;.*firefox\/(.*) \(.net.*/.match( @ua )
-      if match.nil?
-        match = /.*\((.*); u;.*firefox\/(.*)/.match( @ua )
-        return match.nil? ? '0' : match[2]
-      end
-      return match.nil? ? '0' : match[2]
+      match = FIREFOX_REGEX.match( ua )
+      match.nil? ? 0 : match[1]
     end
-    
+
     def resolve_version_for_opera
-      match = /.*\((.*); intel.*version\/(.*)/.match( @ua )
-      return match.nil? ? '0' : match[2]
+      match = OPERA_REGEX.match( @ua )
+      return match.nil? ? '0' : match[1]
     end
-    
+
     def resolve_version_for_safari
-      match = /.* safari\/(.*)/.match( @ua )
-      rev = match.nil? ? 0 : match[1]
-      return case rev
-        when '528.16' then '4.0.0'
-        when '530.18' then '4.0.1'
-        when '530.19' then '4.0.2'
-        when '531.9', '532.2' then '4.0.3'
-        else '0.0.0.0'
-      end
+      match = SAFARI_REGEX.match( @ua )
+      match.nil? ? 0 : match[1]
+    end
+
+    def resolve_version_for_chrome
+      match = CHROME_REGEX.match( @ua )
+      return match.nil? ? '0' : match[1]
+    end
+
+    def resolve_version_for_safari_mobile
+      match = SAFARI_MOBILE_REGEX.match( ua )
+      match.nil? ? 0 : match[1]
     end
-    
+
     def resolve_version_for_unknown
       '0'
     end
-    
+
     def browser_full_name_for_ie
       "Internet Explorer #{browser_version}"
     end
-    
+
     def browser_full_name_for_firefox
       "Firefox #{browser_version}"
     end
-    
+
     def browser_full_name_for_opera
       "Opera #{browser_version}"
     end
-    
+
     def browser_full_name_for_safari
       "Safari #{browser_version}"
     end
-    
+
+    def browser_full_name_for_safari_mobile
+      "Safari Mobile #{browser_version}"
+    end
+
     def browser_full_name_for_unknown
       ""
     end
+
+    def browser_full_name_for_chrome
+      "Chrome #{browser_version}"
+    end
   end
 end