rack-bouncer 1.4.0 → 1.4.1

data/README.md

@@ -29,7 +29,7 @@ You can redirect users to a URL as well:
 
 You can specify a minimum version of Chrome like so:
 
-    use Rack::Bouncer, :minimum_firefox => 6.0
+    use Rack::Bouncer, :minimum_chrome => 6.0
 
 You can specify a minimum version of Firefox like so:
 
@@ -45,9 +45,7 @@ You can specify a minimum version of Safari like so:
 
 You can specify a set of safe paths:
 
-    use Rack::Bouncer, :safe_paths => ["/asset", "/images", "/stylesheets", "/javascripts", "/feedback"]
-
-*NOTE:* By default, the above paths are safe already.
+    use Rack::Bouncer, :safe_paths => ["/assets", "/feedback.html"]
 
 ## warning
 

data/lib/rack/bouncer.rb

@@ -2,10 +2,10 @@
 
 module Rack
   class Bouncer
-    VERSION = "1.4.0"
+    VERSION = "1.4.1"
 
     DEFAULT_OPTIONS = {
-      :safe_paths      => ["/asset", "/images", "/stylesheets", "/javascripts", "/feedback"],
+      :safe_paths      => [],
       :redirect        => "http://browsehappy.com/",
       :minimum_chrome  => 7.0,
       :minimum_firefox => 4.0,
@@ -19,10 +19,11 @@ module Rack
     end
 
     def call(env)
-      return @app.call(env) if safe_path?(env) || user_agent_blank?(env)
-
+      path_info  = env["PATH_INFO"]
       user_agent = env["HTTP_USER_AGENT"]
 
+      return @app.call(env) if safe_path?(path_info) || user_agent_blank?(user_agent)
+
       return expel if undesirable_ie?(user_agent)      ||
                       undesirable_aol?(user_agent)     ||
                       undesirable_firefox?(user_agent) ||
@@ -34,13 +35,15 @@ module Rack
 
     private
 
-    def safe_path?(env)
-      return true if @options[:redirect] == env["PATH_INFO"]
-      return env["PATH_INFO"] =~ Regexp.new("^(#{@options[:safe_paths].join("|")})")
+    def safe_path?(path_info)
+      return true if path_info == @options[:redirect]
+
+      return false if @options[:safe_paths].empty?
+      return path_info =~ Regexp.new("^(#{@options[:safe_paths].join("|")})")
     end
 
-    def user_agent_blank?(env)
-      env["HTTP_USER_AGENT"].nil? || env["HTTP_USER_AGENT"].empty?
+    def user_agent_blank?(user_agent)
+      user_agent.nil? || user_agent.empty?
     end
 
     def expel

data/test/lib/rack/bouncer_test.rb

@@ -3,15 +3,14 @@ require "test_helper"
 
 class Rack::BouncerTest < MiniTest::Unit::TestCase
   def test_version
-    assert_equal "1.4.0", Rack::Bouncer::VERSION
+    assert_equal "1.4.1", 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]
+    assert_equal [], Rack::Bouncer::DEFAULT_OPTIONS[:safe_paths]
   end
 
   def test_default_redirect
@@ -93,37 +92,16 @@ class Rack::BouncerTest < MiniTest::Unit::TestCase
     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_0])
+  def test_allows_given_1_safe_path
+    request  = create_request(:safe_paths => ["/assets"])
+    response = request.get("/assets", "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_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_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_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_0])
+  def test_allows_given_2_safe_paths
+    request  = create_request(:safe_paths => ["/assets", "/feedback.html"])
+    response = request.get("/feedback.html", "HTTP_USER_AGENT" => USER_AGENTS[:ie_6_0])
     assert_equal 200, response.status
     assert_equal "Hi Internets!", response.body
   end

metadata

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