rack-bouncer 1.3.1 → 1.4.0

data/README.md

@@ -4,9 +4,11 @@ A Rack middleware that expels undesirable browsers out of your website. This pro
 
 | _Browser_         | _Undesirable Versions_ |
 |-------------------|------------------------|
-| Internet Explorer | < 8.0                  |
-| Firefox           | < 4.0                  |
 | AOL               | All                    |
+| Chrome            | < 7.0                  |
+| Firefox           | < 4.0                  |
+| Internet Explorer | < 8.0                  |
+| Safari            | < 4.0                  |
 
 ## usage
 
@@ -19,19 +21,27 @@ The default redirects users to [Browse Happy](http://browsehappy.com/):
 
 You can redirect users to a page in your website:
 
-    use Rack::Bouncer, :redirect => "/bouncer.html"
+    use Rack::Bouncer, :redirect => "/requirements.html"
 
 You can redirect users to a URL as well:
 
-    use Rack::Bouncer, :redirect => "http://slashdot.org"
+    use Rack::Bouncer, :redirect => "https://www.google.com/chrome"
 
-You can specify a minimum version of IE like so:
+You can specify a minimum version of Chrome like so:
 
-    use Rack::Bouncer, :redirect => "http://slashdot.org", :minimum_ie => 6.0
+    use Rack::Bouncer, :minimum_firefox => 6.0
 
 You can specify a minimum version of Firefox like so:
 
-    use Rack::Bouncer, :redirect => "http://slashdot.org", :minimum_firefox => 3.6
+    use Rack::Bouncer, :minimum_firefox => 3.6
+
+You can specify a minimum version of IE like so:
+
+    use Rack::Bouncer, :minimum_ie => 6.0
+
+You can specify a minimum version of Safari like so:
+
+    use Rack::Bouncer, :minimum_safari => 3.0
 
 You can specify a set of safe paths:
 
@@ -39,6 +49,22 @@ You can specify a set of safe paths:
 
 *NOTE:* By default, the above paths are safe already.
 
+## warning
+
+I use this gem in a production Rails app and it works great.  But in development, my app throws the following error whenever the `Rack::Bouncer` middleware is triggered:
+
+    !! Unexpected error while processing request: thread 0x1001d5258 tried to join itself
+
+I'm using the following versions of Ruby and Rails:
+
+    $ ruby -v
+    ruby 1.8.7 (2011-02-18 patchlevel 334) [i686-darwin10.7.0], MBARI 0x6770, Ruby Enterprise Edition 2011.03
+    
+    $ rails -v
+    Rails 2.3.14
+
+If anyone has a suggestion, I'd appreciate your help.
+
 ## contributing
 
 Pull requests are very welcome. You'd be doing me a favor if you could test cover your enhancement and ensure the test suite passes *before* initiating a pull request.

data/lib/rack/bouncer.rb

@@ -2,13 +2,15 @@
 
 module Rack
   class Bouncer
-    VERSION = "1.3.1"
+    VERSION = "1.4.0"
 
     DEFAULT_OPTIONS = {
       :safe_paths      => ["/asset", "/images", "/stylesheets", "/javascripts", "/feedback"],
       :redirect        => "http://browsehappy.com/",
+      :minimum_chrome  => 7.0,
+      :minimum_firefox => 4.0,
       :minimum_ie      => 8.0,
-      :minimum_firefox => 4.0
+      :minimum_safari  => 4.0
     }
 
     def initialize(app, options = {})
@@ -17,16 +19,15 @@ module Rack
     end
 
     def call(env)
-      return @app.call(env) if safe_path?(env)
-      return @app.call(env) if user_agent_blank?(env)
+      return @app.call(env) if safe_path?(env) || user_agent_blank?(env)
 
       user_agent = env["HTTP_USER_AGENT"]
 
-      if undesirable_ie_present?(user_agent)  ||
-         undesirable_aol_present?(user_agent) ||
-         undesirable_firefox_present?(user_agent)
-        return kick_it
-      end
+      return expel if undesirable_ie?(user_agent)      ||
+                      undesirable_aol?(user_agent)     ||
+                      undesirable_firefox?(user_agent) ||
+                      undesirable_safari?(user_agent)  ||
+                      undesirable_chrome?(user_agent)
 
       @app.call(env)
     end
@@ -42,51 +43,53 @@ module Rack
       env["HTTP_USER_AGENT"].nil? || env["HTTP_USER_AGENT"].empty?
     end
 
-    def kick_it
-      [302, {"Location" => @options[:redirect], "Content-Type" => "text/html"}, "Browser not supported"]
+    def expel
+      header = { "Location" => @options[:redirect], "Content-Type" => "text/html" }
+      [302, header, "User Agent not permitted"]
     end
 
-    # Internet Explorer
-    ###############################################################################################
+    def undesirable_ie?(user_agent)
+      match = user_agent.match(/MSIE (\S+)/)
+      return false if match.nil?
 
-    def undesirable_ie_present?(user_agent)
-      is_ie?(user_agent) && ie_version(user_agent) < @options[:minimum_ie]
-    end
+      version = match[1].to_f
+      return false if version == 0.0
 
-    def is_ie?(user_agent)
-      # We need at least one digit to be able to get the version, hence the \d
-      user_agent.match(/MSIE \d/) ? true : false
+      version < @options[:minimum_ie]
     end
 
-    def ie_version(user_agent)
-      user_agent.match(/MSIE (\S+)/)[1].to_f
+    def undesirable_aol?(user_agent)
+      user_agent.match(/AOL \S+/) ? true : false
     end
 
-    # AOL
-    ###############################################################################################
+    def undesirable_firefox?(user_agent)
+      match = user_agent.match(/Firefox\/(\S+)/)
+      return false if match.nil?
 
-    def undesirable_aol_present?(user_agent)
-      is_aol?(user_agent)
-    end
+      version = match[1].to_f
+      return false if version == 0.0
 
-    def is_aol?(user_agent)
-      user_agent.match(/AOL \d/) ? true : false
+      version < @options[:minimum_firefox]
     end
 
-    # Firefox
-    ###############################################################################################
+    def undesirable_safari?(user_agent)
+      match = user_agent.match(/Version\/(\S+)\s+Safari\/\S+/)
+      return false if match.nil?
 
-    def undesirable_firefox_present?(user_agent)
-      is_firefox?(user_agent) && firefox_version(user_agent) < @options[:minimum_firefox]
-    end
+      version = match[1].to_f
+      return false if version == 0.0
 
-    def is_firefox?(user_agent)
-      # We need at least one digit to be able to get the version, hence the \d
-      user_agent.match(/Firefox\/\d/) ? true : false
+      version < @options[:minimum_safari]
     end
 
-    def firefox_version(user_agent)
-      user_agent.match(/Firefox\/(\S+)/)[1].to_f
+    def undesirable_chrome?(user_agent)
+      match = user_agent.match(/Chrome\/(\S+)\s+Safari\/\S+/)
+      return false if match.nil?
+
+      version = match[1].to_f
+      return false if version == 0.0
+
+      version < @options[:minimum_chrome]
     end
   end
 end

data/test/lib/rack/bouncer/aol_test.rb

@@ -1,30 +1,37 @@
 require "test_helper"
 
 class Rack::Bouncer::AOLTest < MiniTest::Unit::TestCase
-  def test_expels_aol_6
+  def test_expels_aol_l4me
     request  = create_request
-    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:aol_6])
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:aol_l4me])
     assert_equal 302, response.status
     assert_equal response.location, "http://browsehappy.com/"
   end
 
-  def test_expels_aol_7
+  def test_expels_aol_6_0
     request  = create_request
-    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:aol_7])
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:aol_6_0])
     assert_equal 302, response.status
     assert_equal response.location, "http://browsehappy.com/"
   end
 
-  def test_expels_aol_8
+  def test_expels_aol_7_0
     request  = create_request
-    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:aol_8])
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:aol_7_0])
     assert_equal 302, response.status
     assert_equal response.location, "http://browsehappy.com/"
   end
 
-  def test_expels_aol_9
+  def test_expels_aol_8_0
     request  = create_request
-    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:aol_9])
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:aol_8_0])
+    assert_equal 302, response.status
+    assert_equal response.location, "http://browsehappy.com/"
+  end
+
+  def test_expels_aol_9_0
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:aol_9_0])
     assert_equal 302, response.status
     assert_equal response.location, "http://browsehappy.com/"
   end

data/test/lib/rack/bouncer/chrome_test.rb

@@ -1,9 +1,100 @@
 require "test_helper"
 
 class Rack::Bouncer::ChromeTest < MiniTest::Unit::TestCase
-  def test_allows_chrome_16
+  def test_allows_chrome_l4me
     request  = create_request
-    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:chrome_16])
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:chrome_l4me])
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_expels_chrome_6_0
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:chrome_6_0])
+    assert_equal 302, response.status
+    assert_equal response.location, "http://browsehappy.com/"
+  end
+
+  def test_allows_chrome_6_0_when_minimum
+    request  = create_request(:minimum_chrome => 6.0)
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:chrome_6_0])
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_allows_chrome_7_0
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:chrome_7_0])
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_allows_chrome_8_0
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:chrome_8_0])
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_allows_chrome_9_0
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:chrome_9_0])
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_allows_chrome_10_0
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:chrome_10_0])
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_allows_chrome_11_0
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:chrome_11_0])
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_allows_chrome_12_0
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:chrome_12_0])
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_allows_chrome_13_0
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:chrome_13_0])
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_allows_chrome_14_0
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:chrome_14_0])
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_allows_chrome_15_0
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:chrome_15_0])
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_allows_chrome_16_0
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:chrome_16_0])
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_allows_chrome_17_0
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:chrome_17_0])
     assert_equal 200, response.status
     assert_equal "Hi Internets!", response.body
   end

data/test/lib/rack/bouncer/firefox_test.rb

@@ -1,6 +1,13 @@
 require "test_helper"
 
 class Rack::Bouncer::FirefoxTest < MiniTest::Unit::TestCase
+  def test_allows_firefox_l4me
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:firefox_l4me])
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
   def test_expels_firefox_3_6
     request  = create_request
     response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:firefox_3_6])
@@ -43,9 +50,9 @@ class Rack::Bouncer::FirefoxTest < MiniTest::Unit::TestCase
     assert_equal response.location, "http://browsehappy.com/"
   end
 
-  def test_allows_firefox_4
+  def test_allows_firefox_4_0
     request  = create_request
-    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:firefox_4])
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:firefox_4_0])
     assert_equal 200, response.status
     assert_equal "Hi Internets!", response.body
   end
@@ -57,23 +64,23 @@ class Rack::Bouncer::FirefoxTest < MiniTest::Unit::TestCase
     assert_equal "Hi Internets!", response.body
   end
 
-  def test_allows_firefox_5
+  def test_allows_firefox_5_0
     request  = create_request
-    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:firefox_5])
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:firefox_5_0])
     assert_equal 200, response.status
     assert_equal "Hi Internets!", response.body
   end
 
-  def test_allows_firefox_6
+  def test_allows_firefox_6_0
     request  = create_request
-    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:firefox_6])
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:firefox_6_0])
     assert_equal 200, response.status
     assert_equal "Hi Internets!", response.body
   end
 
-  def test_allows_firefox_9
+  def test_allows_firefox_9_0
     request  = create_request
-    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:firefox_9])
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:firefox_9_0])
     assert_equal 200, response.status
     assert_equal "Hi Internets!", response.body
   end

data/test/lib/rack/bouncer/ie_test.rb

@@ -1,72 +1,58 @@
 require "test_helper"
 
 class Rack::Bouncer::IETest < MiniTest::Unit::TestCase
-  def test_allows_ie_if_no_version_available
+  def test_allows_ie_l4me
     request  = create_request
-    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:ie_no_version])
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:ie_l4me])
     assert_equal 200, response.status
     assert_equal "Hi Internets!", response.body
   end
 
-  def test_expels_ie_6_and_redirects_to_default
-    request  = create_request
-    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:ie_6])
-    assert_equal 302, response.status
-    assert_equal response.location, "http://browsehappy.com/"
-  end
-
-  def test_expels_ie_6_and_redirects_to_internal_url
-    request  = create_request(:redirect => "/foo")
-    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:ie_6])
-    assert_equal 302, response.status
-    assert_equal response.location, "/foo"
-  end
-
-  def test_expels_ie_6_and_redirects_to_external_url
-    request  = create_request(:redirect => "http://getfirefox.com")
-    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:ie_6])
-    assert_equal 302, response.status
-    assert_equal response.location, "http://getfirefox.com"
-  end
-
-  def test_allows_ie_6_when_minimum
+  def test_allows_ie_6_0_when_minimum
     request  = create_request(:minimum_ie => 6.0)
-    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:ie_6])
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:ie_6_0])
     assert_equal 200, response.status
     assert_equal "Hi Internets!", response.body
   end
 
-  def test_expels_ie_7
+  def test_expels_ie_7_0
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:ie_7_0])
+    assert_equal 302, response.status
+    assert_equal response.location, "http://browsehappy.com/"
+  end
+
+  def test_expels_ie_7_0_b
     request  = create_request
-    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:ie_7])
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:ie_7_0_b])
     assert_equal 302, response.status
     assert_equal response.location, "http://browsehappy.com/"
   end
 
-  def test_allows_ie_7_when_minimum
+  def test_allows_ie_7_0_when_minimum
     request  = create_request(:minimum_ie => 7.0)
-    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:ie_7])
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:ie_7_0])
     assert_equal 200, response.status
     assert_equal "Hi Internets!", response.body
   end
 
-  def test_allows_ie_8
+  def test_allows_ie_8_0
     request  = create_request
-    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:ie_8])
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:ie_8_0])
     assert_equal 200, response.status
     assert_equal "Hi Internets!", response.body
   end
 
-  def test_allows_ie_8_when_minimum
+  def test_allows_ie_8_0_when_minimum
     request  = create_request(:minimum_ie => 8.0)
-    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:ie_8])
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:ie_8_0])
     assert_equal 200, response.status
     assert_equal "Hi Internets!", response.body
   end
 
-  def test_allows_ie_9
+  def test_allows_ie_9_0
     request  = create_request
-    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:ie_9])
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:ie_9_0])
     assert_equal 200, response.status
     assert_equal "Hi Internets!", response.body
   end

data/test/lib/rack/bouncer/safari_test.rb

@@ -1,6 +1,97 @@
 require "test_helper"
 
 class Rack::Bouncer::SafariTest < MiniTest::Unit::TestCase
+  def test_allows_safari_l4me
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:safari_l4me])
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_expels_safari_3_0
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:safari_3_0])
+    assert_equal 302, response.status
+    assert_equal response.location, "http://browsehappy.com/"
+  end
+
+  def test_allows_safari_3_0_when_minimum
+    request  = create_request(:minimum_safari => 3.0)
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:safari_3_0])
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_expels_safari_3_0_1
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:safari_3_0_1])
+    assert_equal 302, response.status
+    assert_equal response.location, "http://browsehappy.com/"
+  end
+
+  def test_allows_safari_3_0_1_when_minimum
+    request  = create_request(:minimum_safari => 3.0)
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:safari_3_0_1])
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_expels_safari_3_1
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:safari_3_1])
+    assert_equal 302, response.status
+    assert_equal response.location, "http://browsehappy.com/"
+  end
+
+  def test_allows_safari_3_1_when_minimum
+    request  = create_request(:minimum_safari => 3.1)
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:safari_3_1])
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_expels_safari_3_1_2
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:safari_3_1_2])
+    assert_equal 302, response.status
+    assert_equal response.location, "http://browsehappy.com/"
+  end
+
+  def test_allows_safari_3_1_2_when_minimum
+    request  = create_request(:minimum_safari => 3.1)
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:safari_3_1_2])
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_allows_safari_4_0
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:safari_4_0])
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_allows_safari_4_0_1
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:safari_4_0_1])
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_allows_safari_4_0_dp1
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:safari_4_0_dp1])
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_allows_safari_4_1
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:safari_4_1])
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
   def test_allows_safari_5_0
     request  = create_request
     response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:safari_5_0])
@@ -8,10 +99,24 @@ class Rack::Bouncer::SafariTest < MiniTest::Unit::TestCase
     assert_equal "Hi Internets!", response.body
   end
 
+  def test_allows_safari_5_0_1
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:safari_5_0_1])
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
   def test_allows_safari_5_1
     request  = create_request
     response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:safari_5_1])
     assert_equal 200, response.status
     assert_equal "Hi Internets!", response.body
   end
+
+  def test_allows_safari_5_1_2
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:safari_5_1_2])
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
 end

data/test/lib/rack/bouncer_test.rb

@@ -3,9 +3,12 @@ require "test_helper"
 
 class Rack::BouncerTest < MiniTest::Unit::TestCase
   def test_version
-    assert_equal "1.3.1", Rack::Bouncer::VERSION
+    assert_equal "1.4.0", Rack::Bouncer::VERSION
   end
 
+  # Default Options
+  #################################################################################################
+
   def test_default_safe_paths
     expected = ["/asset", "/images", "/stylesheets", "/javascripts", "/feedback"]
     assert_equal expected, Rack::Bouncer::DEFAULT_OPTIONS[:safe_paths]
@@ -15,14 +18,25 @@ class Rack::BouncerTest < MiniTest::Unit::TestCase
     assert_equal "http://browsehappy.com/", Rack::Bouncer::DEFAULT_OPTIONS[:redirect]
   end
 
-  def test_default_minimum_ie
-    assert_equal 8.0, Rack::Bouncer::DEFAULT_OPTIONS[:minimum_ie]
+  def test_default_minimum_chrome
+    assert_equal 7.0, Rack::Bouncer::DEFAULT_OPTIONS[:minimum_chrome]
   end
 
   def test_default_minimum_firefox
     assert_equal 4.0, Rack::Bouncer::DEFAULT_OPTIONS[:minimum_firefox]
   end
 
+  def test_default_minimum_ie
+    assert_equal 8.0, Rack::Bouncer::DEFAULT_OPTIONS[:minimum_ie]
+  end
+
+  def test_default_minimum_safari
+    assert_equal 4.0, Rack::Bouncer::DEFAULT_OPTIONS[:minimum_safari]
+  end
+
+  # Edge Cases
+  #################################################################################################
+
   def test_allows_if_no_user_agent_specified
     request  = create_request
     response = request.get("/")
@@ -37,54 +51,79 @@ class Rack::BouncerTest < MiniTest::Unit::TestCase
     assert_equal "Hi Internets!", response.body
   end
 
+  # Redirects
+  #################################################################################################
+
+  def test_redirects_to_default
+    request  = create_request
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:ie_6_0])
+    assert_equal 302, response.status
+    assert_equal response.location, "http://browsehappy.com/"
+  end
+
+  def test_redirects_to_internal_url
+    request  = create_request(:redirect => "/foo")
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:ie_6_0])
+    assert_equal 302, response.status
+    assert_equal response.location, "/foo"
+  end
+
+  def test_redirects_to_external_url
+    request  = create_request(:redirect => "https://www.google.com/chrome")
+    response = request.get("/", "HTTP_USER_AGENT" => USER_AGENTS[:ie_6_0])
+    assert_equal 302, response.status
+    assert_equal response.location, "https://www.google.com/chrome"
+  end
+
+
   # Safe Paths
   #################################################################################################
 
   def test_allows_redirect_path
     request  = create_request(:redirect => "/browser")
-    response = request.get("/browser", "HTTP_USER_AGENT" => USER_AGENTS[:ie_6])
+    response = request.get("/browser", "HTTP_USER_AGENT" => USER_AGENTS[:ie_6_0])
     assert_equal 200, response.status
     assert_equal "Hi Internets!", response.body
   end
 
   def test_expels_non_redirect_path
     request  = create_request(:redirect => "/browser")
-    response = request.get("/wrong", "HTTP_USER_AGENT" => USER_AGENTS[:ie_6])
+    response = request.get("/wrong", "HTTP_USER_AGENT" => USER_AGENTS[:ie_6_0])
     assert_equal 302, response.status
     assert_equal response.location, "/browser"
   end
 
   def test_allows_assets_path
     request  = create_request
-    response = request.get("/asset", "HTTP_USER_AGENT" => USER_AGENTS[:ie_6])
+    response = request.get("/asset", "HTTP_USER_AGENT" => USER_AGENTS[:ie_6_0])
     assert_equal 200, response.status
     assert_equal "Hi Internets!", response.body
   end
 
   def test_allows_images_path
     request  = create_request
-    response = request.get("/images", "HTTP_USER_AGENT" => USER_AGENTS[:ie_6])
+    response = request.get("/images", "HTTP_USER_AGENT" => USER_AGENTS[:ie_6_0])
     assert_equal 200, response.status
     assert_equal "Hi Internets!", response.body
   end
 
   def test_allows_stylesheets_path
     request  = create_request
-    response = request.get("/stylesheets", "HTTP_USER_AGENT" => USER_AGENTS[:ie_6])
+    response = request.get("/stylesheets", "HTTP_USER_AGENT" => USER_AGENTS[:ie_6_0])
     assert_equal 200, response.status
     assert_equal "Hi Internets!", response.body
   end
 
   def test_allows_javascripts_path
     request  = create_request
-    response = request.get("/javascripts", "HTTP_USER_AGENT" => USER_AGENTS[:ie_6])
+    response = request.get("/javascripts", "HTTP_USER_AGENT" => USER_AGENTS[:ie_6_0])
     assert_equal 200, response.status
     assert_equal "Hi Internets!", response.body
   end
 
   def test_allows_feedback_path
     request  = create_request
-    response = request.get("/feedback", "HTTP_USER_AGENT" => USER_AGENTS[:ie_6])
+    response = request.get("/feedback", "HTTP_USER_AGENT" => USER_AGENTS[:ie_6_0])
     assert_equal 200, response.status
     assert_equal "Hi Internets!", response.body
   end

data/test/user_agents.yml

@@ -3,13 +3,15 @@
 # AOL
 ###################################################################################################
 
-:aol_6:
+:aol_l4me:
+  Mozilla/4.0 (compatible; MSIE 5.5; AOL l4me; Windows 98)
+:aol_6_0:
   Mozilla/4.0 (compatible; MSIE 5.5; AOL 6.0; Windows 98)
-:aol_7:
+:aol_7_0:
   Mozilla/4.0 (compatible; MSIE 7.0; AOL 7.0; Windows NT 5.1)
-:aol_8:
+:aol_8_0:
   Mozilla/4.0 (compatible; MSIE 7.0; AOL 8.0; Windows NT 5.1)
-:aol_9:
+:aol_9_0:
   Mozilla/4.0 (compatible; MSIE 7.0; AOL 9.0; Windows NT 5.1)
 :aol_9_1:
   Mozilla/4.0 (compatible; MSIE 7.0; AOL 9.1; AOLBuild 4334.5000; Windows NT 5.1; Trident/4.0)
@@ -21,12 +23,38 @@
 # Chrome
 ###################################################################################################
 
-:chrome_16:
+:chrome_l4me:
+  Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_2) AppleWebKit/535.7 (KHTML, like Gecko) Chrome/l4me Safari/535.7
+:chrome_6_0:
+  Mozilla/5.0 (X11; U; Linux i686; en-US) AppleWebKit/534.1 (KHTML, like Gecko) Chrome/6.0.416.0 Safari/534.1
+:chrome_7_0:
+  Mozilla/5.0 (X11; U; Linux i686; en-US) AppleWebKit/534.7 (KHTML, like Gecko) Chrome/7.0.517.24 Safari/534.7
+:chrome_8_0:
+  Mozilla/5.0 (X11; U; Linux i686; en-US) AppleWebKit/534.10 (KHTML, like Gecko) Chrome/8.0.551.0 Safari/534.10
+:chrome_9_0:
+  Mozilla/5.0 (X11; U; Linux i686; en-US) AppleWebKit/534.13 (KHTML, like Gecko) Chrome/9.0.597.44 Safari/534.13
+:chrome_10_0:
+  Mozilla/5.0 (X11; U; Linux i686; en-US) AppleWebKit/534.15 (KHTML, like Gecko) Chrome/10.0.612.1 Safari/534.15
+:chrome_11_0:
+  Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US) AppleWebKit/534.17 (KHTML, like Gecko) Chrome/11.0.655.0 Safari/534.17
+:chrome_12_0:
+  Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.53 Safari/534.30
+:chrome_13_0:
+  Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.215 Safari/535.1
+:chrome_14_0:
+  Mozilla/5.0 (Windows NT 6.0) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/14.0.792.0 Safari/535.1
+:chrome_15_0:
+  Mozilla/5.0 (Windows NT 5.1) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.872.0 Safari/535.2
+:chrome_16_0:
   Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_2) AppleWebKit/535.7 (KHTML, like Gecko) Chrome/16.0.912.77 Safari/535.7
+:chrome_17_0:
+  Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_2) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.46 Safari/535.11
 
 # Firefox
 ###################################################################################################
 
+:firefox_l4me:
+  Mozilla/5.0(Windows; U; Windows NT 5.2; rv:1.9.2) Gecko/20100101 Firefox/l4me
 :firefox_3_6:
   Mozilla/5.0(Windows; U; Windows NT 5.2; rv:1.9.2) Gecko/20100101 Firefox/3.6
 :firefox_3_6_2:
@@ -37,15 +65,15 @@
   Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10.4; en-US; rv:1.9.2.22) Gecko/20110902 Firefox/3.6.22
 :firefox_3_8:
   Mozilla/5.0 (X11; U; Linux i686; rv:1.9.0.2) Gecko/20121223 Ubuntu/9.25 (jaunty) Firefox/3.8
-:firefox_4:
+:firefox_4_0:
   Mozilla/5.0 (Windows NT 6.1; rv:2.0.1) Gecko/20100101 Firefox/4.0
 :firefox_4_0_1:
   Mozilla/5.0 (X11; Linux i686; rv:2.0.1) Gecko/20110518 Firefox/4.0.1
-:firefox_5:
+:firefox_5_0:
   Mozilla/5.0 (Windows NT 5.1; U; rv:5.0) Gecko/20100101 Firefox/5.0
-:firefox_6:
+:firefox_6_0:
   Mozilla/5.0 (Windows NT 6.1; rv:6.0) Gecko/20110814 Firefox/6.0
-:firefox_9:
+:firefox_9_0:
   Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:9.0) Gecko/20100101 Firefox/9.0
 :firefox_9_0_a2:
   Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:9.0a2) Gecko/20111101 Firefox/9.0a2
@@ -55,15 +83,17 @@
 # Internet Explorer
 ###################################################################################################
 
-:ie_no_version:
+:ie_l4me:
   Mozilla/4.0 (compatible; MSIE l4me; Windows XP)
-:ie_6:
+:ie_6_0:
   Mozilla/4.0 (MSIE 6.0; Windows NT 5.1)
-:ie_7:
+:ie_7_0:
   Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)
-:ie_8:
+:ie_7_0_b:
+  Mozilla/4.0(compatible; MSIE 7.0b; Windows NT 6.0)
+:ie_8_0:
   Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0)
-:ie_9:
+:ie_9_0:
   Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)
 
 # Mozilla
@@ -75,7 +105,29 @@
 # Safari
 ###################################################################################################
 
+:safari_l4me:
+  Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US) AppleWebKit/523.15 (KHTML, like Gecko) Version/l4me Safari/523.15
+:safari_3_0:
+  Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US) AppleWebKit/523.15 (KHTML, like Gecko) Version/3.0 Safari/523.15
+:safari_3_0_1:
+  Mozilla/5.0 (Windows; U; Windows NT 6.0; fi) AppleWebKit/522.12.1 (KHTML, like Gecko) Version/3.0.1 Safari/522.12.2
+:safari_3_1:
+  Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_2; en-us) AppleWebKit/526.1+ (KHTML, like Gecko) Version/3.1 Safari/525.13
+:safari_3_1_2:
+  Mozilla/5.0 (Windows; U; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.1.2 Safari/525.21
+:safari_4_0:
+  Mozilla/5.0 (Windows; U; Windows NT 6.0; ja-JP) AppleWebKit/528.16 (KHTML, like Gecko) Version/4.0 Safari/528.16
+:safari_4_0_1:
+  Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_7; en-us) AppleWebKit/531.2+ (KHTML, like Gecko) Version/4.0.1 Safari/530.18
+:safari_4_0_dp1:
+  Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10_4_11; en) AppleWebKit/528.4+ (KHTML, like Gecko) Version/4.0dp1 Safari/526.11.2
+:safari_4_1:
+  Mozilla/5.0 (Windows; U; Windows NT 5.0; en-en) AppleWebKit/533.16 (KHTML, like Gecko) Version/4.1 Safari/533.16
 :safari_5_0:
   Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US) AppleWebKit/533.18.1 (KHTML, like Gecko) Version/5.0 Safari/533.16
+:safari_5_0_1:
+  Mozilla/5.0 (Windows; U; Windows NT 5.2; en-US) AppleWebKit/533.17.8 (KHTML, like Gecko) Version/5.0.1 Safari/533.17.8
 :safari_5_1:
   Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_8; en-us) AppleWebKit/534.52.7 (KHTML, like Gecko) Version/5.1 Safari/534.52.7
+:safari_5_1_2:
+  Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_2) AppleWebKit/534.52.7 (KHTML, like Gecko) Version/5.1.2 Safari/534.52.7

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-bouncer
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
-  - 1
-  version: 1.3.1
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Julio Cesar Ody