rack-bouncer 1.2.1 → 1.3.0

data/.gitignore

@@ -1,3 +1,4 @@
 pkg/*
 .DS_Store
 *.gem
+*.tmproj

data/README.md

@@ -4,13 +4,14 @@ A Rack middleware that expels undesirable browsers out of your website. This pro
 
 | _Browser_         | _Undesirable Versions_ |
 |-------------------|------------------------|
-| Internet Explorer | < 8                    |
+| Internet Explorer | < 8.0                  |
+| Firefox           | < 4.0                  |
 | AOL               | All                    |
 
 ## usage
 
     gem install rack-bouncer
-    require "rack/bouncer"
+    require "rack-bouncer"
 
 The default redirects users to [Browse Happy](http://browsehappy.com/):
 
@@ -24,11 +25,15 @@ You can redirect users to a URL as well:
 
     use Rack::Bouncer, :redirect => "http://slashdot.org"
 
-You can even specify a minimum version of IE like so:
+You can specify a minimum version of IE like so:
 
     use Rack::Bouncer, :redirect => "http://slashdot.org", :minimum_ie => 6.0
 
-You can even specify a set of safe paths:
+You can specify a minimum version of Firefox like so:
+
+    use Rack::Bouncer, :redirect => "http://slashdot.org", :minimum_firefox => 3.6
+
+You can specify a set of safe paths:
 
     use Rack::Bouncer, :safe_paths => ["/asset", "/images", "/stylesheets", "/javascripts", "/feedback"]
 

data/lib/rack-bouncer.rb

@@ -0,0 +1,2 @@
+# encoding: UTF-8
+require "rack/bouncer"

data/lib/rack/bouncer.rb

@@ -2,12 +2,13 @@
 
 module Rack
   class Bouncer
-    VERSION = "1.2.1"
+    VERSION = "1.3.0"
 
     DEFAULT_OPTIONS = {
-      :safe_paths => ["/asset", "/images", "/stylesheets", "/javascripts", "/feedback"],
-      :redirect   => "http://browsehappy.com/",
-      :minimum_ie => 8.0
+      :safe_paths      => ["/asset", "/images", "/stylesheets", "/javascripts", "/feedback"],
+      :redirect        => "http://browsehappy.com/",
+      :minimum_ie      => 8.0,
+      :minimum_firefox => 4.0
     }
 
     def initialize(app, options = {})
@@ -16,49 +17,76 @@ module Rack
     end
 
     def call(env)
-      if !safe_path(env) && (ie6_found_in?(env) || aol_found_in?(env))
-        kick_it
-      else
-        @app.call(env)
+      return @app.call(env) if safe_path?(env)
+      return @app.call(env) if 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
+
+      @app.call(env)
     end
 
     private
 
-    def safe_path(env)
-      path       = env["PATH_INFO"]
-      safe_paths = @options[:safe_paths].join("|")
+    def safe_path?(env)
+      return true if @options[:redirect] == env["PATH_INFO"]
+      return env["PATH_INFO"] =~ Regexp.new("^(#{@options[:safe_paths].join("|")})")
+    end
 
-      path == @options[:redirect] || path =~ Regexp.new("^(#{safe_paths})")
+    def user_agent_blank?(env)
+      env["HTTP_USER_AGENT"].nil? || env["HTTP_USER_AGENT"].empty?
     end
 
-    def ie6_found_in?(env)
-      if env["HTTP_USER_AGENT"]
-        is_ie?(env["HTTP_USER_AGENT"]) and ie_version(env["HTTP_USER_AGENT"]) < @options[:minimum_ie] and @options[:redirect] != env["PATH_INFO"]
-      end
+    def kick_it
+      [302, {"Location" => @options[:redirect], "Content-Type" => "text/html"}, "Browser not supported"]
+    end
+
+    # Internet Explorer
+    ###############################################################################################
+
+    def undesirable_ie_present?(user_agent)
+      is_ie?(user_agent) && ie_version(user_agent) < @options[:minimum_ie]
     end
 
-    def is_ie?(ua_string)
+    def is_ie?(user_agent)
       # We need at least one digit to be able to get the version, hence the \d
-      ua_string.match(/MSIE \d/) ? true : false
+      user_agent.match(/MSIE \d/) ? true : false
     end
 
-    def aol_found_in?(env)
-      if env["HTTP_USER_AGENT"]
-        is_aol?(env["HTTP_USER_AGENT"])
-      end
+    def ie_version(user_agent)
+      user_agent.match(/MSIE (\S+)/)[1].to_f
     end
 
-    def is_aol?(ua_string)
-      ua_string.match(/AOL \d/) ? true : false
+    # AOL
+    ###############################################################################################
+
+    def undesirable_aol_present?(user_agent)
+      is_aol?(user_agent)
     end
 
-    def ie_version(ua_string)
-      ua_string.match(/MSIE (\S+)/)[1].to_f
+    def is_aol?(user_agent)
+      user_agent.match(/AOL \d/) ? true : false
     end
 
-    def kick_it
-      [302, {"Location" => @options[:redirect], "Content-Type" => "text/html"}, "Browser not supported"]
+    # Firefox
+    ###############################################################################################
+
+    def undesirable_firefox_present?(user_agent)
+      is_firefox?(user_agent) && firefox_version(user_agent) < @options[:minimum_firefox]
+    end
+
+    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
+    end
+
+    def firefox_version(user_agent)
+      user_agent.match(/Firefox\/(\S+)/)[1].to_f
     end
   end
 end

data/rack-bouncer.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.name        = "rack-bouncer"
   s.version     = Rack::Bouncer::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Jerod Santo", "Julio Cesar Ody", "Will Jessop", "Ryan Sobol"]
+  s.authors     = ["Julio Cesar Ody", "Jerod Santo", "Will Jessop", "Ryan Sobol"]
   s.email       = "contact@ryansobol.com"
   s.homepage    = "https://github.com/ryansobol/rack-bouncer"
   s.summary     = "A Rack middleware that expels undesirable browsers out of your website."

data/test/lib/rack/bouncer_test.rb

@@ -3,7 +3,7 @@ require "rubygems"
 require "minitest/autorun"
 require "rack/mock"
 
-require "rack/bouncer"
+require "rack-bouncer"
 
 class TestApp
   def call(env)
@@ -18,7 +18,7 @@ end
 class Rack::Bouncer::Test < MiniTest::Unit::TestCase
 
   def test_version
-    assert_equal "1.2.1", Rack::Bouncer::VERSION
+    assert_equal "1.3.0", Rack::Bouncer::VERSION
   end
 
   def test_default_safe_paths
@@ -34,6 +34,10 @@ class Rack::Bouncer::Test < MiniTest::Unit::TestCase
     assert_equal 8.0, Rack::Bouncer::DEFAULT_OPTIONS[:minimum_ie]
   end
 
+  def test_default_minimum_firefox
+    assert_equal 4.0, Rack::Bouncer::DEFAULT_OPTIONS[:minimum_firefox]
+  end
+
   def test_allows_if_no_user_agent_specified
     request  = create_request
     response = request.get("/")
@@ -175,6 +179,48 @@ class Rack::Bouncer::Test < MiniTest::Unit::TestCase
   # Firefox
   #################################################################################################
 
+  def test_expels_firefox_3_6
+    request  = create_request
+    response = request.get("/", {"HTTP_USER_AGENT" => "Mozilla/5.0(Windows; U; Windows NT 5.2; rv:1.9.2) Gecko/20100101 Firefox/3.6" })
+    assert_equal 302, response.status
+    assert_equal response.location, "http://browsehappy.com/"
+  end
+
+  def test_allows_firefox_3_6_when_minimum
+    request  = create_request(:minimum_firefox => 3.6)
+    response = request.get("/", {"HTTP_USER_AGENT" => "Mozilla/5.0(Windows; U; Windows NT 5.2; rv:1.9.2) Gecko/20100101 Firefox/3.6" })
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_expels_firefox_3_6_2
+    request  = create_request
+    response = request.get("/", {"HTTP_USER_AGENT" => "Mozilla/5.0 (X11; U; Linux i686; fr; rv:1.9.2.2) Gecko/20100316 Firefox/3.6.2" })
+    assert_equal 302, response.status
+    assert_equal response.location, "http://browsehappy.com/"
+  end
+
+  def test_expels_firefox_3_6_b5
+    request  = create_request
+    response = request.get("/", {"HTTP_USER_AGENT" => "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2b5) Gecko/20091204 Firefox/3.6b5" })
+    assert_equal 302, response.status
+    assert_equal response.location, "http://browsehappy.com/"
+  end
+
+  def test_expels_firefox_3_6_22
+    request  = create_request
+    response = request.get("/", {"HTTP_USER_AGENT" => "Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10.4; en-US; rv:1.9.2.22) Gecko/20110902 Firefox/3.6.22" })
+    assert_equal 302, response.status
+    assert_equal response.location, "http://browsehappy.com/"
+  end
+
+  def test_expels_firefox_3_8
+    request  = create_request
+    response = request.get("/", {"HTTP_USER_AGENT" => "Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) Gecko/20121223 Ubuntu/9.25 (jaunty) Firefox/3.8" })
+    assert_equal 302, response.status
+    assert_equal response.location, "http://browsehappy.com/"
+  end
+
   def test_allows_firefox_4
     request  = create_request
     response = request.get("/", {"HTTP_USER_AGENT" => "Mozilla/5.0 (Windows NT 6.1; rv:2.0.1) Gecko/20100101 Firefox/4.0" })
@@ -182,6 +228,48 @@ class Rack::Bouncer::Test < MiniTest::Unit::TestCase
     assert_equal "Hi Internets!", response.body
   end
 
+  def test_allows_firefox_4_0_1
+    request  = create_request
+    response = request.get("/", {"HTTP_USER_AGENT" => "Mozilla/5.0 (X11; Linux i686; rv:2.0.1) Gecko/20110518 Firefox/4.0.1" })
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_allows_firefox_5
+    request  = create_request
+    response = request.get("/", {"HTTP_USER_AGENT" => "Mozilla/5.0 (Windows NT 5.1; U; rv:5.0) Gecko/20100101 Firefox/5.0" })
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_allows_firefox_6
+    request  = create_request
+    response = request.get("/", {"HTTP_USER_AGENT" => "Mozilla/5.0 (Windows NT 6.1; rv:6.0) Gecko/20110814 Firefox/6.0" })
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_allows_firefox_9
+    request  = create_request
+    response = request.get("/", {"HTTP_USER_AGENT" => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:9.0) Gecko/20100101 Firefox/9.0" })
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_allows_firefox_9_0_a2
+    request  = create_request
+    response = request.get("/", {"HTTP_USER_AGENT" => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:9.0a2) Gecko/20111101 Firefox/9.0a2" })
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
+  def test_allows_firefox_10_0_a4
+    request  = create_request
+    response = request.get("/", {"HTTP_USER_AGENT" => "Mozilla/6.0 (Macintosh; I; Intel Mac OS X 11_7_9; de-LI; rv:1.9b4) Gecko/2012010317 Firefox/10.0a4" })
+    assert_equal 200, response.status
+    assert_equal "Hi Internets!", response.body
+  end
+
   # Safari
   #################################################################################################
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: rack-bouncer
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
-  - 1
-  version: 1.2.1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
-- Jerod Santo
 - Julio Cesar Ody
+- Jerod Santo
 - Will Jessop
 - Ryan Sobol
 autorequire: 
@@ -68,6 +68,7 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- lib/rack-bouncer.rb
 - lib/rack/bouncer.rb
 - rack-bouncer.gemspec
 - test/lib/rack/bouncer_test.rb