using out "servlet-specific" path methods in booter

- we're avoiding File.exist? and expanding path specifically for the application layout
this helps for a better boot in non-expanded .war scenarios with current JRuby (1.7.11)

Author: kares

src/main/ruby/jruby/rack/rails/environment2.rb

@@ -9,7 +9,7 @@
 
 # Rails 2.x (JRuby-Rack >= 1.1.0 only supports 2.3) specific booter behavior.
 module JRuby::Rack::RailsBooter::Rails2Environment
-  
+
   # @return [::Rack::Adapter::Rails] a Rack compatible Rails application wrapper
   def to_app
     # backward "compatibility" calling #to_app without a #load_environment
@@ -22,7 +22,7 @@ def to_app
   # Loads the Rails 2.x environment.
   def load_environment
     require 'jruby/rack/rails/boot_hook'
-    load File.join(app_path, 'config', 'environment.rb')
+    load expand_path('config/environment.rb') # load File.join(app_path, 'config', 'environment.rb')
     require 'dispatcher'
     setup_sessions
     setup_logger
@@ -35,9 +35,9 @@ def load_environment
   def set_public_root
     silence_warnings { Object.const_set(:PUBLIC_ROOT, public_path) }
   end
-  
+
   public
-  
+
   # This hook method is called back from within the mechanism installed
   # by rails_boot above. We're setting appropriate defaults for the
   # servlet environment here that can still be overridden (if desired) in
@@ -77,7 +77,7 @@ def setup_relative_url_root
       ActionController::Base.relative_url_root = ENV['RAILS_RELATIVE_URL_ROOT']
     end
   end
-  
+
   def rack_based_sessions?
     defined?(ActionController::Session::AbstractStore)
   end
@@ -100,7 +100,7 @@ def setup_logger
       if defined?(ActiveSupport::BufferedLogger) && # we only support Rails 2.3
           logger.is_a?(ActiveSupport::BufferedLogger)
         # since there's no way to detect whether this is a custom config.logger
-        # declaration or the (default) Rails configured logger we assume all 
+        # declaration or the (default) Rails configured logger we assume all
         # ActiveSupport::BufferedLogger instances to be the default and patch :
         old_dev = logger.send :instance_variable_get, "@log"
         old_dev.close rescue nil
@@ -122,9 +122,9 @@ def java_sessions?
   def pstore_sessions?
     session_options[:database_manager] == (defined?(::CGI::Session::PStore) && ::CGI::Session::PStore)
   end
-  
+
   class RailsRequestSetup # :nodoc only used for (non-rack based) CGI sessions
-    
+
     def initialize(app, session_options)
       @app, @session_options = app, session_options
     end
@@ -135,7 +135,7 @@ def call(env)
       env['rails.session_options'] = options
       @app.call(env)
     end
-    
+
   end
 
 end

src/main/ruby/jruby/rack/rails/environment3.rb

@@ -17,20 +17,20 @@ def to_app
     load_environment
     ::Rails.application
   end
-  
+
   # Loads the Rails environment (*config/environment.rb*).
   def load_environment
-    require File.join(app_path, 'config', 'boot')
+    require expand_path('config/boot.rb')
     require 'jruby/rack/rails/railtie'
-    require File.join(app_path, 'config', 'environment')
+    require expand_path('config/environment.rb')
     require 'jruby/rack/rails/extensions3'
   end
 
   protected
-  
+
   # The public root is set in {JRuby::Rack::Railtie}.
   def set_public_root
     # no-op here
   end
-  
+
 end

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

@@ -26,13 +26,13 @@ def boot!
       super
       ENV['RAILS_ROOT'] = app_path
       ENV['RAILS_ENV'] = rails_env
-
-      if File.exist?(File.join(app_path, "config", "application.rb"))
-        require 'jruby/rack/rails/environment3'
-        extend Rails3Environment
-      else
+      
+      if rails2?
         require 'jruby/rack/rails/environment2'
         extend Rails2Environment
+      else
+        require 'jruby/rack/rails/environment3'
+        extend Rails3Environment
       end
 
       set_public_root
@@ -69,24 +69,32 @@ def run_boot_hooks
       # no-op hooks run when 'jruby/rack/rails/extensions' gets loaded
     end
 
-    public
+    private
 
-    # @see #RailsRackApplicationFactory
-    def self.load_environment # :nodoc
-      rails_booter.load_environment
+    def rails2?
+      # a File.exist? File.join(app_path, 'config/application.rb')
+      ! real_path File.join(layout.app_uri, 'config/application.rb')
     end
 
-    # @see #RailsRackApplicationFactory
-    def self.to_app # :nodoc
-      rails_booter.to_app
-    end
+    class << self
 
-    private
+      # @see #RailsRackApplicationFactory
+      # @private
+      def self.load_environment; rails_booter.load_environment end
+
+      # @see #RailsRackApplicationFactory
+      # @private
+      def to_app; rails_booter.to_app end
+
+      private
+
+      # @private
+      def rails_booter
+        raise "no booter set" unless booter = JRuby::Rack.booter
+        raise "not a rails booter" unless booter.is_a?(JRuby::Rack::RailsBooter)
+        booter
+      end
 
-    def self.rails_booter # :nodoc
-      raise "no booter set" unless booter = JRuby::Rack.booter
-      raise "not a rails booter" unless booter.is_a?(JRuby::Rack::RailsBooter)
-      booter
     end
 
   end

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

@@ -35,10 +35,10 @@ class ::CGI::Session::PStore; end
     @@rack_env.nil? ? ENV.delete('RACK_ENV') : ENV['RACK_ENV'] = @@rack_env
   end
 
-  it "should default RAILS_ROOT to /WEB-INF" do
-    @rack_context.should_receive(:getRealPath).with("/WEB-INF").and_return "./WEB-INF"
+  it "should default rails path to /WEB-INF" do
+    @rack_context.should_receive(:getRealPath).with("/WEB-INF").and_return "/usr/apps/WEB-INF"
     booter.boot!
-    booter.app_path.should == "./WEB-INF"
+    booter.app_path.should == "/usr/apps/WEB-INF"
   end
 
   it "leaves ENV['RAILS_ENV'] as is if it was already set" do
@@ -101,98 +101,100 @@ class ::CGI::Session::PStore; end
     booter.logger.instance_variable_get(:@logdev).write "hello"
   end
 
-  it "should setup java servlet-based sessions if the session store is the default",
-    :lib => [ :stub ] do
+  describe "Rails 2 environment", :lib => :stub do
 
-    booter.boot!
-    booter.should_receive(:rack_based_sessions?).and_return false
+    before do
+      booter.stub(:rails2?).and_return true
+    end
 
-    booter.session_options[:database_manager] = ::CGI::Session::PStore
-    booter.setup_sessions
-    booter.session_options[:database_manager].should == ::CGI::Session::JavaServletStore
-  end
+    it "sets up java servlet-based sessions if the session store is the default" do
 
-  it "should turn off Ruby CGI cookies if the java servlet store is used",
-    :lib => [ :stub ] do
+      booter.boot!
+      booter.should_receive(:rack_based_sessions?).and_return false
 
-    booter.boot!
-    booter.should_receive(:rack_based_sessions?).and_return false
+      booter.session_options[:database_manager] = ::CGI::Session::PStore
+      booter.setup_sessions
+      booter.session_options[:database_manager].should == ::CGI::Session::JavaServletStore
+    end
 
-    booter.session_options[:database_manager] = ::CGI::Session::JavaServletStore
-    booter.setup_sessions
-    booter.session_options[:no_cookies].should == true
-  end
+    it "turns off Ruby CGI cookies if the java servlet store is used" do
 
-  it "should provide the servlet request in the session options if the java servlet store is used",
-    :lib => [ :stub ] do
+      booter.boot!
+      booter.should_receive(:rack_based_sessions?).and_return false
 
-    booter.boot!
-    booter.should_receive(:rack_based_sessions?).twice.and_return false
+      booter.session_options[:database_manager] = ::CGI::Session::JavaServletStore
+      booter.setup_sessions
+      booter.session_options[:no_cookies].should == true
+    end
 
-    booter.session_options[:database_manager] = ::CGI::Session::JavaServletStore
-    booter.setup_sessions
-    booter.instance_variable_set :@load_environment, true
+    it "provides the servlet request in the session options if the java servlet store is used" do
 
-    ::Rack::Adapter::Rails.should_receive(:new).and_return app = double("rails adapter")
-    app.should_receive(:call)
+      booter.boot!
+      booter.should_receive(:rack_based_sessions?).twice.and_return false
 
-    env = { "java.servlet_request" => double("servlet request") }
-    booter.to_app.call(env)
-    env['rails.session_options'].should have_key(:java_servlet_request)
-    env['rails.session_options'][:java_servlet_request].should == env["java.servlet_request"]
-  end
+      booter.session_options[:database_manager] = ::CGI::Session::JavaServletStore
+      booter.setup_sessions
+      booter.instance_variable_set :@load_environment, true
 
-  it "should set the PUBLIC_ROOT constant to the location of the public root",
-    :lib => [ :rails23, :stub ] do
+      ::Rack::Adapter::Rails.should_receive(:new).and_return app = double("rails adapter")
+      app.should_receive(:call)
 
-    begin
-      booter.app_path = File.expand_path("../../../rails", __FILE__)
-      booter.boot!
-      PUBLIC_ROOT.should == booter.public_path
-    ensure
-      Object.send :remove_const, :PUBLIC_ROOT
+      env = { "java.servlet_request" => double("servlet request") }
+      booter.to_app.call(env)
+      env['rails.session_options'].should have_key(:java_servlet_request)
+      env['rails.session_options'][:java_servlet_request].should == env["java.servlet_request"]
     end
-  end
 
-  describe "Rails 2 environment", :lib => :stub do
+    it "should set the PUBLIC_ROOT constant to the location of the public root",
+      :lib => [ :rails23, :stub ] do
 
-    before :each do
-      $servlet_context = @servlet_context
-      @rack_context.should_receive(:getContextPath).and_return "/foo"
       booter.app_path = File.expand_path("../../../rails", __FILE__)
       booter.boot!
-      silence_warnings { booter.load_environment }
+      expect( PUBLIC_ROOT ).to eql booter.public_path
     end
 
-    after(:each) { Object.send :remove_const, :PUBLIC_ROOT }
-
-    after :all do
-      $servlet_context = nil
+    after(:each) do
+      Object.send :remove_const, :PUBLIC_ROOT if Object.const_defined? :PUBLIC_ROOT
     end
 
-    it "should default the page cache directory to the public root" do
-      ActionController::Base.page_cache_directory.should == booter.public_path
-    end
+    context 'booted' do
 
-    it "should default the session store to the java servlet session store" do
-      ActionController::Base.session_store.should == CGI::Session::JavaServletStore
-    end
+      before :each do
+        $servlet_context = @servlet_context
+        @rack_context.should_receive(:getContextPath).and_return "/foo"
+        booter.app_path = File.expand_path("../../../rails", __FILE__)
+        booter.boot!
+        silence_warnings { booter.load_environment }
+      end
 
-    it "should set the ActionView ASSETS_DIR constant to the public root" do
-      ActionView::Helpers::AssetTagHelper::ASSETS_DIR.should == booter.public_path
-    end
+      after(:all) { $servlet_context = nil }
 
-    it "should set the ActionView JAVASCRIPTS_DIR constant to the public root/javascripts" do
-      ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR.should == booter.public_path + "/javascripts"
-    end
+      it "should default the page cache directory to the public root" do
+        ActionController::Base.page_cache_directory.should == booter.public_path
+      end
 
-    it "should set the ActionView STYLESHEETS_DIR constant to the public root/stylesheets" do
-      ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR.should == booter.public_path + "/stylesheets"
-    end
+      it "should default the session store to the java servlet session store" do
+        ActionController::Base.session_store.should == CGI::Session::JavaServletStore
+      end
+
+      it "should set the ActionView ASSETS_DIR constant to the public root" do
+        ActionView::Helpers::AssetTagHelper::ASSETS_DIR.should == booter.public_path
+      end
+
+      it "should set the ActionView JAVASCRIPTS_DIR constant to the public root/javascripts" do
+        ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR.should == booter.public_path + "/javascripts"
+      end
+
+      it "should set the ActionView STYLESHEETS_DIR constant to the public root/stylesheets" do
+        ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR.should == booter.public_path + "/stylesheets"
+      end
+
+      it "should set the ActionController.relative_url_root to the servlet context path" do
+        ActionController::Base.relative_url_root.should == "/foo"
+      end
 
-    it "should set the ActionController.relative_url_root to the servlet context path" do
-      ActionController::Base.relative_url_root.should == "/foo"
     end
+
   end
 
   # NOTE: specs currently only test with a stubbed Rails::Railtie