which_browser 0.1.0 → 0.1.1

data/README.md

@@ -0,0 +1,25 @@
+Which Browser
+-------------
+
+Which Browser adds a few helper methods to a rack request so you can write cleaner logic in your views.
+
+For example, the age old battle against IE 5 & 6 can be handled like so:
+  
+    stylesheet_link_tag "ie" if request.old_ie?
+
+
+Here's some other popular helpers:
+
+    request.ie?
+    request.ie6?
+    request.ipad?
+    request.ipod?
+    request.iphone?
+    request.mobile_safari?
+    
+
+
+License
+-------
+
+Copyright (c) 2011 Spencer Steffen, released under the New BSD License All rights reserved.

data/lib/which_browser/version.rb

@@ -1,3 +1,3 @@
 module WhichBrowser
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/which_browser.rb

@@ -1,10 +1,5 @@
 module WhichBrowser
 
-  def test_user_agent(regex)
-    self.env["HTTP_USER_AGENT"] && self.env["HTTP_USER_AGENT"].match(regex) != nil
-  end
-
-
   # =============================================
   # OS Methods
   
@@ -60,25 +55,86 @@ module WhichBrowser
     test_user_agent(/Opera/)
   end
   
-  
-  # =============================================
-  # IE Methods
-  
   def ie?
     test_user_agent(/MSIE\s[56789]/)
   end
   
   def old_ie?
-    test_user_agent(/MSIE\s[56]/)
+    test_user_agent(/MSIE\s[456]/)
   end
   
-  [5,6,7,8].each do |num|
-    define_method "ie#{num}?" do
-      test_user_agent Regexp.new("MSIE\s#{num}")
-    end
+  
+  # =============================================
+  # Versions
+  
+  
+  def test_user_agent(regex)
+    self.user_agent && self.user_agent.match(regex) != nil
   end
   
+    
+  private
+    
+    def method_missing(method, *args, &block)
+      if matches = method.to_s.match(/^(ie|safari|ios|ff|firefox|chrome|opera)\_version$/)
 
+        get_browser_version(matches[1])
+
+      elsif matches = method.to_s.match(/^(ie|safari|ff|firefox|chrome|opera)(_[l|g]te?)?([0-9]+)\?$/)
+
+        browser_v = self.send(matches[1] + "_version")
+        
+        # method really is missing
+        super if browser_v == nil
+        
+        # browser version not found
+        return false unless browser_v        
+        
+        operator = matches[2].to_s.sub('_', '')
+        version  = matches[3].to_f
+        
+        case operator
+          when 'lt'
+            browser_v < version
+          when 'gt'
+            browser_v > version            
+          when 'lte'
+            browser_v <= version
+          when 'gte'
+            browser_v >= version
+          else
+            test_user_agent Regexp.new("MSIE\s#{version.to_i}")
+        end
+      
+      else
+        super
+      end 
+    end
+    
+    
+    def get_browser_version(name)
+      case name
+        when 'ie'
+          extract_version_with(/MSIE\s?([0-9\.]+)/)
+        when 'safari'
+          extract_version_with(/Version\/([0-9\.]+)\sSafari/)
+        when 'ios'
+          extract_version_with(/Version\/([0-9\.]+)\sMobile/)
+        when 'ff', 'firefox'
+          extract_version_with(/Firefox\/([0-9\.]+)/)
+        when 'chrome'
+          extract_version_with(/Chrome\/([0-9\.]+)/)
+        when 'opera'       
+          return false unless opera?
+          extract_version_with(/Version\/([0-9\.]+)$/)
+      end
+    end
+    
+    def extract_version_with(regex)
+      v = (self.user_agent.match(regex) || [])[1].to_f
+      0 < v ? v : false      
+    end
+    
 end
 
 Rack::Request.send(:include, WhichBrowser)

data/test/dummy/app.rb

@@ -0,0 +1,26 @@
+require 'rubygems'
+require 'ramaze'
+
+require File.expand_path("../../../lib/which_browser", __FILE__)
+
+class MainController < Ramaze::Controller
+  def index
+    {  
+    
+      "USER AGENT"     => request.user_agent,
+      "IE"             => request.ie?,
+      "IE 6?"          => request.ie6?,
+      "IE 7?"          => request.ie7?,
+      "IE LT 6?"       => request.ie_lt6?,
+      "IE LT 7?"       => request.ie_lt7?,
+      "IE GT 7?"       => request.ie_gt7?,
+      "IE LTE 6?"      => request.ie_lte6?,
+      "IE LTE 7?"      => request.ie_lte7?,
+      "IE GTE 7?"      => request.ie_gte7?
+    }.to_a.collect!{ |key,value|
+      "#{key}: \t\t #{value}"
+    }.join("<br/>")
+  end
+end
+
+Ramaze.start(:mode => :dev)

data/test/test_chrome.rb

@@ -0,0 +1,25 @@
+require_relative 'helper'
+	
+class TestChrome < Test::Unit::TestCase
+
+  # chrome tests
+  
+  should "be chrome on mac" do
+  	request = get_request(:Chrome, '8.0.552.237')  	
+  	assert request.chrome?
+  	assert request.mac?
+  end
+
+  should "be chrome on pc" do
+  	request = get_request(:Chrome, '0.2.149.30')  	
+  	assert request.chrome?
+  	assert request.pc?
+  end
+  
+  should "be chrome on linux" do
+  	request = get_request(:Chrome, '4.0.202.2')  	
+  	assert request.chrome?
+  	assert request.linux?
+  end
+  
+end

data/test/test_firefox.rb

@@ -0,0 +1,25 @@
+require_relative 'helper'
+	
+class TestFirefox < Test::Unit::TestCase
+
+  # firefox tests
+  
+  should "be firefox on mac" do
+  	request = get_request(:Firefox, '3.6')  	
+  	assert request.firefox?
+  	assert request.mac?
+  end
+
+  should "be firefox on pc" do
+  	request = get_request(:Firefox, '3.1')  	
+  	assert request.firefox?
+  	assert request.pc?
+  end
+  
+  should "be firefox on linux" do
+  	request = get_request(:Firefox, '3.5')  	
+  	assert request.firefox?
+  	assert request.linux?
+  end
+  
+end

data/test/test_internet_explorer.rb

@@ -0,0 +1,83 @@
+require_relative 'helper'
+	
+class TestInternetExplorer < Test::Unit::TestCase
+  
+  # ie tests
+  
+  should "be ie 5" do
+  	request = get_request(:IE, '5.5')  	
+  	assert request.ie?
+  	assert request.old_ie?
+  	assert request.ie5?
+  	assert request.pc?
+  end
+
+  should "be ie 6" do
+  	request = get_request(:IE, '6.0')  	
+  	assert request.ie?
+  	assert request.old_ie?
+  	assert request.ie6?
+  	assert request.pc?
+  end
+
+  should "be ie 7" do
+  	request = get_request(:IE, '7.0b')  	
+  	assert request.ie?
+  	assert !request.old_ie?
+  	assert request.ie7?
+  	assert request.pc?
+  end
+  
+  should "be ie 8" do
+  	request = get_request(:IE, '8.0') 	
+  	assert request.ie?
+  	assert !request.old_ie?
+  	assert request.ie8?
+  	assert request.pc?
+  end
+  
+  should "be less than ie 6" do
+    request = get_request(:IE, '5.5')    
+  	assert !request.ie_lt5?
+  	assert request.ie_lt6?
+  	assert request.ie_lt7?
+  	assert request.ie_lt8?
+  	assert request.ie_lt9?
+  end
+  
+  should "be greater than ie 6" do
+    request = get_request(:IE, '6.0')
+    assert request.ie_gt5?
+  	assert !request.ie_gt6?
+  	assert !request.ie_gt7?
+  	assert !request.ie_gt8?
+  	assert !request.ie_gt9? 
+  end
+  
+  should "be greater than or equal to ie 6" do
+    request = get_request(:IE, '6.0')
+    assert request.ie_gte5?
+  	assert request.ie_gte6?
+  	assert !request.ie_gte7?
+  	assert !request.ie_gte8?
+  	assert !request.ie_gte9? 
+  end
+  
+  should "be greater than or equal to ie 8" do
+    request = get_request(:IE, '8.0')
+    assert request.ie_gte5?
+  	assert request.ie_gte6?
+  	assert request.ie_gte7?
+  	assert request.ie_gte8?
+  	assert !request.ie_gte9? 
+  end
+  
+  should "be false if not ie" do
+    request = get_request(:Safari, '4.0.1')
+    assert !request.ie_lt5?
+  	assert !request.ie_gt6?
+  	assert !request.ie_lte7?
+  	assert !request.ie_gte8?
+  end
+ 
+end

data/test/test_safari.rb

@@ -0,0 +1,42 @@
+require_relative 'helper'
+	
+class TestSafari < Test::Unit::TestCase
+
+  # safari tests
+
+  should "be safari on mac" do
+  	request = get_request(:Safari, '4.0.1')
+  	assert request.safari?
+  	assert request.mac?
+  end
+
+  should "be safari on windows" do
+  	request = get_request(:Safari, '4.0.3')  	
+  	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,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: which_browser
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors: 
 - Spencer Steffen
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 -08:00
+date: 2011-02-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 1
         version: 1.0.1
   type: :runtime
   version_requirements: *id001
@@ -40,10 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 11
-        - 3
         version: 2.11.3
   type: :development
   version_requirements: *id002
@@ -59,11 +47,17 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
+- README.md
 - Rakefile
 - lib/which_browser.rb
 - lib/which_browser/version.rb
+- test/dummy/app.rb
 - test/helper.rb
+- test/test_chrome.rb
+- test/test_firefox.rb
+- test/test_internet_explorer.rb
 - test/test_requests.rb
+- test/test_safari.rb
 - which_browser.gemspec
 has_rdoc: true
 homepage: ""
@@ -79,24 +73,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Which Browser adds a few helper methods to a rack request.
 test_files: 
+- test/dummy/app.rb
 - test/helper.rb
+- test/test_chrome.rb
+- test/test_firefox.rb
+- test/test_internet_explorer.rb
 - test/test_requests.rb
+- test/test_safari.rb