drop rails 3.x specific feature detection in railtie

Author: kares

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

@@ -14,47 +14,30 @@ module JRuby::Rack
   class Railtie < ::Rails::Railtie
 
     config.before_configuration do |app|
-      paths = app.config.paths; public = JRuby::Rack.public_path
-      if paths.respond_to?(:'[]') && paths.respond_to?(:keys)
-        # Rails 3.1/3.2/4.x: paths["app/controllers"] style
+      public = JRuby::Rack.public_path
+      if public # nil if /public does not exist
+        paths = app.config.paths
         old_public  = Pathname.new(paths['public'].to_a.first)
         javascripts = Pathname.new(paths['public/javascripts'].to_a.first)
         stylesheets = Pathname.new(paths['public/stylesheets'].to_a.first)
         paths['public'] = public.to_s; public = Pathname.new(public)
         paths['public/javascripts'] = public.join(javascripts.relative_path_from(old_public)).to_s
         paths['public/stylesheets'] = public.join(stylesheets.relative_path_from(old_public)).to_s
-      else
-        # Rails 3.0: old paths.app.controllers style
-        old_public  = Pathname.new(paths.public.to_a.first)
-        javascripts = Pathname.new(paths.public.javascripts.to_a.first)
-        stylesheets = Pathname.new(paths.public.stylesheets.to_a.first)
-        paths.public = public.to_s; public = Pathname.new(public)
-        paths.public.javascripts = public.join(javascripts.relative_path_from(old_public)).to_s
-        paths.public.stylesheets = public.join(stylesheets.relative_path_from(old_public)).to_s
-      end if public # nil if /public does not exist
+      end
     end
 
     # TODO prefix initializers with 'jruby_rack.' !?
 
     initializer 'set_servlet_logger', :before => :initialize_logger do |app|
       app.config.logger ||= begin
-        config = app.config; logger = JRuby::Rack.logger
+        logger = JRuby::Rack.logger
+        config = app.config
         log_level = config.log_level || :info
         logger.level = logger.class.const_get(log_level.to_s.upcase)
-        log_formatter = config.log_formatter if config.respond_to?(:log_formatter) # >= 4.0
+        log_formatter = config.log_formatter if config.respond_to?(:log_formatter)
         logger.formatter = log_formatter if log_formatter && logger.respond_to?(:formatter=)
-        if defined?(ActiveSupport::TaggedLogging)
-          if ActiveSupport::TaggedLogging.is_a?(Class) # Rails 3.2
-            logger = ActiveSupport::TaggedLogging.new(logger)
-          else # Rails 4.0
-            # extends the logger as well as it's logger.formatter instance :
-            # NOTE: good idea to keep or should we use a clone as Rails.logger ?
-            #dup_logger = logger.dup
-            #dup_logger.formatter = logger.formatter.dup
-            logger = ActiveSupport::TaggedLogging.new(logger)
-          end
-        end
-        logger
+        require 'active_support/tagged_logging' unless defined?(ActiveSupport::TaggedLogging)
+        ActiveSupport::TaggedLogging.new(logger) # returns a logger.clone
       end
     end