rack-wwwhisper 1.1.5 → 1.1.6

data/lib/rack/wwwhisper.rb

@@ -11,11 +11,11 @@ require 'rack/wwwhisper_version'
 
 module Rack
 
-# Communicates with the wwwhisper service to authorize each incomming
+# Communicates with the wwwhisper service to authorize each incoming
 # request. Acts as a proxy for requests to locations handled by
 # wwwhisper (/wwwhisper/auth and /wwwhisper/admin)
 #
-# For each incomming request an authorization query is sent.
+# For each incoming request an authorization query is sent.
 # The query contains a normalized path that a request is
 # trying to access and wwwhisper session cookies. The
 # query result determines the action to be performed:
@@ -24,6 +24,8 @@ module Rack
 #       page is returned.
 # [403] the user is not authorized, request is denied, error is returned.
 # [any other] error while communicating with wwwhisper, request is denied.
+#
+# This class is thread safe, it can handle multiple simultaneous requests.
 class WWWhisper
   # Path prefix of requests that are passed to wwwhisper.
   @@WWWHISPER_PREFIX = '/wwwhisper/'
@@ -59,8 +61,16 @@ class WWWhisper
   #    HTML documents (has a default value).
   def initialize(app)
     @app = app
-    if ENV['WWWHISPER_DISABLE'] == "1"
+    if not ENV['WWWHISPER_URL']
       def self.call(env)
+        # Delay check for WWWHISPER_DISABLE until the first
+        # request. This way Rails assets pipeline does not fail if
+        # environment variables are not set (as is the case on
+        # Heroku).
+        if ENV['WWWHISPER_DISABLE'] != '1'
+          raise(StandardError,
+                'WWWHISPER_URL nor WWWHISPER_DISABLE environment variable set')
+        end
         @app.call(env)
       end
       return
@@ -68,10 +78,7 @@ class WWWhisper
 
     @app = NoPublicCache.new(app)
 
-    if not ENV['WWWHISPER_URL']
-      raise StandardError, 'WWWHISPER_URL environment variable not set'
-    end
-
+    # net/http/persistent connections are thread safe.
     @http = http_init('wwwhisper')
     @wwwhisper_uri = parse_uri(ENV['WWWHISPER_URL'])
 
@@ -127,7 +134,7 @@ class WWWhisper
   def parse_uri(uri)
     parsed_uri = Addressable::URI.parse(uri)
     # If port is not specified, net/http/persistent uses port 80 for
-    # https connections which is counterintuitive.
+    # https connections which is counter-intuitive.
     parsed_uri.port ||= parsed_uri.default_port
     parsed_uri
   end

data/lib/rack/wwwhisper_version.rb

@@ -1,3 +1,3 @@
 module Rack
-  WWWHISPER_VERSION = '1.1.5'
+  WWWHISPER_VERSION = '1.1.6'
 end

data/test/test_wwwhisper.rb

@@ -70,11 +70,27 @@ class TestWWWhisper < Test::Unit::TestCase
 
   def test_wwwhisper_url_required
     ENV.delete('WWWHISPER_URL')
+    # Exception should not be raised during initialization, but during
+    # the first request.
+    @wwwhisper = Rack::WWWhisper.new(MockBackend.new(nil))
     assert_raise(StandardError) {
-      Rack::WWWhisper.new(@backend)
+      get '/foo/bar'
     }
   end
 
+  def test_disable_wwwhisper
+    ENV.delete('WWWHISPER_URL')
+    ENV['WWWHISPER_DISABLE'] = "1"
+    # Configure MockBackend to make sure REMOTE_USER is not set.
+    @wwwhisper = Rack::WWWhisper.new(MockBackend.new(nil))
+
+    path = '/foo/bar'
+    get path
+    assert last_response.ok?
+    assert_equal 'Hello World', last_response.body
+    assert_nil last_response['User']
+  end
+
   def test_auth_query_path
     assert_equal('/wwwhisper/auth/api/is-authorized/?path=/foo/bar',
                  @wwwhisper.auth_query('/foo/bar'))
@@ -305,19 +321,6 @@ class TestWWWhisper < Test::Unit::TestCase
     assert_requested :get, full_url(@wwwhisper.auth_query(path))
   end
 
-  def test_disable_wwwhisper
-    ENV.delete('WWWHISPER_URL')
-    ENV['WWWHISPER_DISABLE'] = "1"
-    # Configure MockBackend to make sure REMOTE_USER is not set.
-    @wwwhisper = Rack::WWWhisper.new(MockBackend.new(nil))
-
-    path = '/foo/bar'
-    get path
-    assert last_response.ok?
-    assert_equal 'Hello World', last_response.body
-    assert_nil last_response['User']
-  end
-
   def test_chunked_encoding_from_wwwhisper_removed
     path = '/foo/bar'
     stub_request(:get, full_url(@wwwhisper.auth_query(path))).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-wwwhisper
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -107,7 +107,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Middleware that uses wwwhisper service to authorize requests.
+description: Middleware uses wwwhisper service to authorize requests.
 email: wrr@mixedbit.org
 executables: []
 extensions: []
@@ -130,18 +130,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 239074857713187767
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 239074857713187767
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24