cleanup support for booting rails (2.x)

Author: kares

src/main/ruby/jruby/rack/rails/environment3.rb renamed to src/main/ruby/jruby/rack/rails/environment.rb

@@ -9,7 +9,7 @@
 
 # Rails 3.x specific booter behavior.
 # @see JRuby::Rack::Railtie
-module JRuby::Rack::RailsBooter::Rails3Environment
+module JRuby::Rack::RailsBooter::RailsEnvironment
 
   # @return [Rails::Application] the (loaded) application instance
   def to_app
@@ -23,7 +23,7 @@ def load_environment
     require expand_path('config/boot.rb')
     require 'jruby/rack/rails/railtie'
     require expand_path('config/environment.rb')
-    require 'jruby/rack/rails/extensions3'
+    require 'jruby/rack/rails/extensions'
   end
 
   protected

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

@@ -27,13 +27,8 @@ def boot!
       ENV['RAILS_ROOT'] = app_path
       ENV['RAILS_ENV'] = rails_env
 
-      if rails2?
-        require 'jruby/rack/rails/environment2'
-        extend Rails2Environment
-      else
-        require 'jruby/rack/rails/environment3'
-        extend Rails3Environment
-      end
+      require 'jruby/rack/rails/environment'
+      extend RailsEnvironment
 
       set_public_root
       self
@@ -71,11 +66,6 @@ def run_boot_hooks
 
     private
 
-    def rails2?
-      app_path = real_path File.join(layout.app_uri, 'config/application.rb')
-      ! ( app_path && File.exist?(app_path) )
-    end
-
     class << self
 
       # @see #RailsRackApplicationFactory
@@ -96,6 +86,5 @@ def rails_booter
       end
 
     end
-
   end
 end

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

@@ -356,47 +356,6 @@ def base_path; "file://#{STUB_DIR}/rails41" end
 
   end
 
-  describe 'rails 2.3', :lib => :rails23 do
-
-    before(:all) do
-      copy_gemfile('rails23')
-      path = File.join(STUB_DIR, 'rails23/WEB-INF/init.rb') # hard-coded RAILS_GEM_VERSION
-      File.open(path, 'w') { |f| f << "RAILS_GEM_VERSION = '#{Rails::VERSION::STRING}'\n" }
-    end
-
-    let(:base_path) { "file://#{STUB_DIR}/rails23" }
-
-    it_should_behave_like 'a rails app'
-
-    context "initialized" do
-
-      before(:all) { initialize_rails 'production', base_path }
-      after(:all)  { restore_rails }
-
-      it "loaded rack ~> 1.1" do
-        @runtime = @rack_factory.getApplication.getRuntime
-        should_eval_as_not_nil "defined?(Rack.release)"
-        should_eval_as_eql_to "Rack.release.to_s[0, 3]", '1.1'
-      end
-
-      it "booted with a servlet logger" do
-        @runtime = @rack_factory.getApplication.getRuntime
-        should_eval_as_not_nil "defined?(Rails)"
-        should_eval_as_not_nil "defined?(Rails.logger)"
-
-        should_eval_as_not_nil "defined?(ActiveSupport::BufferedLogger) && Rails.logger.is_a?(ActiveSupport::BufferedLogger)"
-        should_eval_as_not_nil "Rails.logger.send(:instance_variable_get, '@log')"
-        should_eval_as_eql_to "log = Rails.logger.send(:instance_variable_get, '@log');" +
-                              "log.class.name", 'JRuby::Rack::ServletLog'
-        should_eval_as_eql_to "Rails.logger.level", Logger::INFO
-
-        @runtime.evalScriptlet "Rails.logger.debug 'logging works'"
-      end
-
-    end
-
-  end
-
   def expect_to_have_monkey_patched_chunked
     @runtime.evalScriptlet "require 'rack/chunked'"
     script = %{