sant0sk1-rack-noie6 1.0.1 → 1.1.0

data/README.markdown

@@ -1,14 +1,14 @@
 # rack-noie6
 
-rack-noie6 does _everyone_ a favor: it shows the way out of your website to poor souls out there using Internet Explorer 6.
+rack-noie6 does _everyone_ a favor: it shows the way out of your website to poor souls out there using Internet Explorer 6 (or a user configurable minimum).
 
-Originally developed by [juliocesar](http://github.com/juliocesar). I forked and gemified for easier distribution.
+Originally developed by [juliocesar](http://github.com/juliocesar), [sant0sk1](http://github.com/sant0sk1) forked and gemified for easier distribution and [I](http://github.com/wjessop) added the minimum version option.
 
 # general usage
 
 just 
 
-    gem install sant0sk1-rack-noie6 --source http://gems.github.com
+    gem install wjessop-rack-noie6 --source http://gems.github.com
     require 'noie6'
     
 and
@@ -24,11 +24,15 @@ or let the default kick in
 
     use Rack::NoIE6
     
+You can even specify a minimum version of IE like so
+
+    use Rack::NoIE6, :redirect => 'http://slashdot.org', :minimum => 6.0
+    
 # Rails usage
 
 inside environment.rb's Rails::Initializer.run
 
-    config.gem 'sant0sk1-rack-noie6', :lib => 'noie6'
+    config.gem 'wjessop-rack-noie6', :lib => 'noie6'
     config.middleware.use "Rack::NoIE6"
     
 Piece o' cake!

data/Rakefile

@@ -14,7 +14,7 @@ begin
     gemspec.summary = "A Rack middleware to redirect IE6 users out of your website"
     gemspec.email = "jerod.santo@gmail.com"
     gemspec.homepage = "http://github.com/sant0sk1/rack-noie6"
-    gemspec.authors = ["Jerod Santo", "Julio Cesar Ody"]
+    gemspec.authors = ["Jerod Santo", "Julio Cesar Ody", "Will Jessop"]
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
+:patch: 0
 :major: 1
-:minor: 0
+:minor: 1

data/lib/noie6.rb

@@ -4,6 +4,7 @@ module Rack
       @app = app
       @options = options
       @options[:redirect] ||= 'http://www.microsoft.com/windows/internet-explorer/default.aspx'
+      @options[:minimum] ||= 7.0
     end
 
     def call(env)
@@ -13,9 +14,18 @@ module Rack
     private
     def ie6_found_in?(env)
       if env['HTTP_USER_AGENT']
-        env['HTTP_USER_AGENT'][/MSIE 6.0/] and @options[:redirect] != env['PATH_INFO']
+        is_ie?(env['HTTP_USER_AGENT']) and ie_version(env['HTTP_USER_AGENT']) < @options[:minimum] and @options[:redirect] != env['PATH_INFO']
       end
     end
+    
+    def is_ie?(ua_string)
+      # We need at least one digit to be able to get the version, hence the \d
+      ua_string.match(/MSIE \d/) ? true : false
+    end
+    
+    def ie_version(ua_string)
+      ua_string.match(/MSIE (\S+)/)[1].to_f
+    end
 
     def kick_it
       [301, {'Location' => @options[:redirect]}, 'Fail browser is fail']

data/test/noie6_test.rb

@@ -20,6 +20,13 @@ class NoieTest < Test::Unit::TestCase
     assert_equal response.location, 'http://slashdot.org'
   end
   
+  def test_redirects_to_where_it_should_if_user_specified_minimum_not_met
+    request  = Rack::MockRequest.new(Rack::NoIE6.new(TestApp.new, {:redirect => 'http://slashdot.org', :minimum => 6.0}))
+    response = request.get('/', {'HTTP_USER_AGENT' => 'Mozilla/4.0 (compatible; MSIE 5.5b1; Mac_PowerPC)' })
+    assert_equal 301, response.status
+    assert_equal response.location, 'http://slashdot.org'
+  end
+  
   def test_redirects_to_local_urls
     request  = Rack::MockRequest.new(Rack::NoIE6.new(TestApp.new, {:redirect => '/foo'}))
     response = request.get('/foo', {'HTTP_USER_AGENT' => 'MSIE 6.0' })    
@@ -32,6 +39,18 @@ class NoieTest < Test::Unit::TestCase
     assert_equal "Hi Internets!", response.body
   end
   
+  def test_allows_if_UA_version_greater_than_minimum
+    request  = Rack::MockRequest.new(Rack::NoIE6.new(TestApp.new, {:redirect => 'http://slashdot.org'}))
+    response = request.get('/', {'HTTP_USER_AGENT' => 'Mozilla/4.0 (compatible; MSIE 8.0; Windows XP)'})
+    assert_equal "Hi Internets!", response.body
+  end
+  
+  def test_allows_if_no_UA_version_no_available
+    request  = Rack::MockRequest.new(Rack::NoIE6.new(TestApp.new, {:redirect => 'http://slashdot.org'}))
+    response = request.get('/', {'HTTP_USER_AGENT' => 'Mozilla/4.0 (compatible; MSIE l4me; Windows XP)'})
+    assert_equal "Hi Internets!", response.body
+  end
+  
   def test_allows_if_no_user_agent_specified
     request  = Rack::MockRequest.new(Rack::NoIE6.new(TestApp.new, {:redirect => 'http://slashdot.org'}))
     response = request.get('/')

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: sant0sk1-rack-noie6
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jerod Santo
 - Julio Cesar Ody
+- Will Jessop
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-05-11 00:00:00 -07:00
+date: 2009-05-30 00:00:00 -07:00
 default_executable: 
 dependencies: []