expanding and real paths (esp. with FS layout) should handle nils

Author: kares

src/main/ruby/jruby/rack/app_layout.rb

@@ -76,6 +76,7 @@ def public_uri
       end
 
       def expand_path(path)
+        return nil if path.nil?
         if path.start_with?(app_uri) # gem_path = '/WEB-INF/gems'
           path = path.dup; path[0, app_uri.size] = app_path; path # '[app_path]/gems'
           path
@@ -90,7 +91,7 @@ def expand_path(path)
 
     RailsWebInfLayout = WebInfLayout
 
-    # #deprecated will be removed (with Merb support)
+    # @deprecated will be removed (with Merb support)
     class MerbWebInfLayout < WebInfLayout
 
       def app_uri
@@ -120,7 +121,7 @@ def public_uri
       end
 
       def real_path(path)
-        expand_path(super)
+        path.nil? ? nil : expand_path(super)
       end
 
       def expand_path(path)

src/spec/ruby/jruby/rack/app_layout_spec.rb

@@ -65,6 +65,26 @@
     expect( layout.gem_path ).to eq "/var/local/app/gem"
   end
 
+  it "expands path app_uri relatively" do
+    layout.instance_variable_set :@app_uri, "/WEB-INF/"
+    layout.instance_variable_set :@app_path, "/home/deploy/current/WEB-INF/"
+
+    expect( layout.expand_path("app/gem") ).to eq "/home/deploy/current/WEB-INF/app/gem"
+  end
+
+  it "expands paths starting with app path" do
+    layout.instance_variable_set :@app_uri, "/WEB-INF"
+    layout.instance_variable_set :@app_path, "/home/deploy/current/WEB-INF"
+
+    expect( layout.expand_path("/WEB-INF/app/gem") ).to eq "/home/deploy/current/WEB-INF/app/gem"
+  end
+
+  it "expands nil path as nil" do
+    layout.instance_variable_set :@app_uri, "/WEB-INF/"
+
+    expect( layout.expand_path(nil) ).to eq nil
+  end
+
 end
 
 shared_examples "FileSystemLayout" do
@@ -114,6 +134,14 @@
     expect( layout.public_path ).to eq "/home/public/root"
   end
 
+  it "expands nil path as nil" do
+    expect( layout.expand_path(nil) ).to eq nil
+  end
+
+  it "handles nil real path as nil" do
+    expect( layout.real_path(nil) ).to eq nil
+  end
+
 end
 
 describe JRuby::Rack::FileSystemLayout do