lighttpd_pathinfo_fix 1.0.1 → 1.0.2

data/lib/lighttpd_pathinfo_fix.rb

@@ -3,15 +3,23 @@
 # This middleware fixes this issue. This is also
 # modified to account for the case when SCRIPT_NAME is the name of the 404 script
 class LighttpdPathinfoFix
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
+  DBG = 'DEBUG_LIGHTTPD_PATH_INFO_FIX'
   
   def initialize(app)
     @app = app
   end
   
   def call(env)
-    return @app.call(env) unless env["FCGI_ROLE"] && (env["SERVER_SOFTWARE"] =~ /lightt/i)
-    return @app.call(env) unless env["PATH_INFO"].nil? || env["PATH_INFO"].empty?
+    unless env["SERVER_SOFTWARE"].to_s =~ /lightt/i
+      inform("Skipping lighttpd pathinfo fix this since this is not a Lighttpd install")
+      return @app.call(env)
+    end
+    
+    unless env["PATH_INFO"].to_s.empty?
+      inform("Skipping lighttpd pathinfo fix - PATH_INFO was #{env["PATH_INFO"]}")
+      return @app.call(env)
+    end
     
     # Retreive the actual URI
     uri, qs = env["REQUEST_URI"].to_s.split('?')
@@ -19,7 +27,16 @@ class LighttpdPathinfoFix
     # Ensure URI has a leading slash
     uri = "/#{uri}" unless uri =~ /^\//
     munged_env = env.merge("PATH_INFO" => uri, "QUERY_STRING" => qs, "SCRIPT_NAME" => "")
+    inform("Munged PATH_INFO to be #{uri}")
     
     @app.call(munged_env)
   end
+  
+  private
+  
+  def inform(msg)
+    if ENV[DBG]
+      File.open("/tmp/lighttpd_pathinfo_fix.log", "w") {|f| f.write(msg) }
+    end
+  end
 end

data/test/test_lighttpd_pathinfo_fix.rb

@@ -1,4 +1,5 @@
 require "test/unit"
+require "stringio"
 require "lighttpd_pathinfo_fix"
 require "flexmock"
 require "flexmock/test_unit"
@@ -73,4 +74,25 @@ class TestLighttpdPathinfoFix < Test::Unit::TestCase
     @fix.call(source)
   end
   
+  def test_writes_to_logfile
+    debug_var = 'DEBUG_LIGHTTPD_PATH_INFO_FIX'
+    # FINISH ME
+    flunk
+  end
+  
+  def test_root_path_properly_munged_even_without_fcgi_role
+    source = {"SERVER_SOFTWARE"=>"lighttpd/1.4.19",
+      "SCRIPT_NAME"=>"/config.ru", "PATH_INFO"=>"",
+      "SCRIPT_FILENAME"=>"/Code/apps/flame_bacula_search/config.ru",
+      "DOCUMENT_ROOT"=>"/Code/apps/flame_bacula_search",
+      "REQUEST_URI"=>"/?foo=bar", "REDIRECT_URI"=>"/config.ru", "QUERY_STRING"=>"", "REQUEST_PATH"=>"/"}
+    dest = {"SERVER_SOFTWARE"=>"lighttpd/1.4.19",
+      "SCRIPT_NAME"=>"", "PATH_INFO"=>"/", "SCRIPT_FILENAME"=>"/Code/apps/flame_bacula_search/config.ru",
+      "DOCUMENT_ROOT"=>"/Code/apps/flame_bacula_search", "REQUEST_URI"=>"/?foo=bar",
+      "REDIRECT_URI"=>"/config.ru", "QUERY_STRING"=>"foo=bar", "REQUEST_PATH"=>"/"}
+    
+    @app.should_receive(:call).with(dest).once
+    @fix.call(source)
+  end
+  
 end

metadata

@@ -2,7 +2,7 @@
 name: lighttpd_pathinfo_fix
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -10,7 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-04 00:00:00 Z
+date: 2011-07-18 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: flexmock
@@ -29,9 +30,9 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.9.4
+        version: "2.10"
   type: :development
   version_requirements: *id002
 description: |-
@@ -57,6 +58,7 @@ files:
 - lib/lighttpd_pathinfo_fix.rb
 - test/test_lighttpd_pathinfo_fix.rb
 - .gemtest
+has_rdoc: true
 homepage: http://github.com/julik/lighttpd_pathinfo_fix
 licenses: []
 
@@ -81,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: lighttpd_pathinfo_fix
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: This middleware fixes the lighttpd PATH_INFO for apps mounted at / in a way that is compatible with everything