From 516f102e5f8e481c31aebdcc562d98e87fd0c5ed Mon Sep 17 00:00:00 2001 From: Nathan Broadbent Date: Sun, 15 Jan 2012 10:34:51 +0800 Subject: [PATCH] Refactored watchable_args and build_original_fullpath methods in railties/lib/rails/application.rb --- railties/lib/rails/application.rb | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 1314966044561..2778dce331a0b 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -114,11 +114,8 @@ def routes_reloader #:nodoc: # Returns an array of file paths appended with a hash of directories-extensions # suitable for ActiveSupport::FileUpdateChecker API. def watchable_args - files = [] - files.concat config.watchable_files + files, dirs = config.watchable_files.dup, config.watchable_dirs.dup - dirs = {} - dirs.merge! config.watchable_dirs ActiveSupport::Dependencies.autoload_paths.each do |path| dirs[path.to_s] = [:rb] end @@ -293,15 +290,7 @@ def initialize_console #:nodoc: end def build_original_fullpath(env) - path_info = env["PATH_INFO"] - query_string = env["QUERY_STRING"] - script_name = env["SCRIPT_NAME"] - - if query_string.present? - "#{script_name}#{path_info}?#{query_string}" - else - "#{script_name}#{path_info}" - end + ["#{env["SCRIPT_NAME"]}#{env["PATH_INFO"]}", env["QUERY_STRING"]].reject(&:blank?).join("?") end end end