6 files changed, 31 insertions, 25 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 2778dce331..c163081bfc 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -290,7 +290,15 @@ module Rails
     end
 
     def build_original_fullpath(env)
-      ["#{env["SCRIPT_NAME"]}#{env["PATH_INFO"]}", env["QUERY_STRING"]].reject(&:blank?).join("?")
+      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
     end
   end
 end
diff --git a/railties/lib/rails/code_statistics.rb b/railties/lib/rails/code_statistics.rb
index 435ea83ad8..03538b2422 100644
--- a/railties/lib/rails/code_statistics.rb
+++ b/railties/lib/rails/code_statistics.rb
@@ -37,24 +37,26 @@ class CodeStatistics #:nodoc:
 
         next unless file_name =~ pattern
 
-        f = File.open(directory + "/" + file_name)
         comment_started = false
-        while line = f.gets
-          stats["lines"]     += 1
-          if(comment_started)
-            if line =~ /^=end/
-              comment_started = false
-            end
-            next
-          else
-            if line =~ /^=begin/
-              comment_started = true
+        
+        File.open(directory + "/" + file_name) do |f|
+          while line = f.gets
+            stats["lines"]     += 1
+            if(comment_started)
+              if line =~ /^=end/
+                comment_started = false
+              end
               next
+            else
+              if line =~ /^=begin/
+                comment_started = true
+                next
+              end
             end
+            stats["classes"]   += 1 if line =~ /^\s*class\s+[_A-Z]/
+            stats["methods"]   += 1 if line =~ /^\s*def\s+[_a-z]/
+            stats["codelines"] += 1 unless line =~ /^\s*$/ || line =~ /^\s*#/
           end
-          stats["classes"]   += 1 if line =~ /^\s*class\s+[_A-Z]/
-          stats["methods"]   += 1 if line =~ /^\s*def\s+[_a-z]/
-          stats["codelines"] += 1 unless line =~ /^\s*$/ || line =~ /^\s*#/
         end
       end
 
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index 45f55a2a0a..32793b1a70 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -246,7 +246,7 @@ module Rails
         sentinel = /\.routes\.draw do\s*$/
 
         in_root do
-          inject_into_file 'config/routes.rb', "\n  #{routing_code}\n", { :after => sentinel, :verbose => false }
+          inject_into_file 'config/routes.rb', "\n  #{routing_code}", { :after => sentinel, :verbose => false }
         end
       end
 
diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb
index a98244c525..8f779316c1 100644
--- a/railties/lib/rails/generators/base.rb
+++ b/railties/lib/rails/generators/base.rb
@@ -254,17 +254,13 @@ module Rails
             nesting = class_name.split('::')
             last_name = nesting.pop
 
-            # Hack to limit const_defined? to non-inherited on 1.9
-            extra = []
-            extra << false unless Object.method(:const_defined?).arity == 1
-
             # Extract the last Module in the nesting
             last = nesting.inject(Object) do |last_module, nest|
-              break unless last_module.const_defined?(nest, *extra)
+              break unless last_module.const_defined?(nest, false)
               last_module.const_get(nest)
             end
 
-            if last && last.const_defined?(last_name.camelize, *extra)
+            if last && last.const_defined?(last_name.camelize, false)
               raise Error, "The name '#{class_name}' is either already used in your application " <<
                            "or reserved by Ruby on Rails. Please choose an alternative and run "  <<
                            "this generator again."
diff --git a/railties/lib/rails/generators/generated_attribute.rb b/railties/lib/rails/generators/generated_attribute.rb
index 29a2ad3111..7dfc1aa599 100644
--- a/railties/lib/rails/generators/generated_attribute.rb
+++ b/railties/lib/rails/generators/generated_attribute.rb
@@ -32,8 +32,8 @@ module Rails
           case type
           when /(string|text|binary|integer)\{(\d+)\}/
             return $1, :limit => $2.to_i
-          when /decimal\{(\d+)(,|\.|\-)(\d+)\}/
-            return :decimal, :precision => $1.to_i, :scale => $3.to_i
+          when /decimal\{(\d+)[,.-](\d+)\}/
+            return :decimal, :precision => $1.to_i, :scale => $2.to_i
           else
             return type, {}
           end
diff --git a/railties/lib/rails/rubyprof_ext.rb b/railties/lib/rails/rubyprof_ext.rb
index f6e90357ce..017eba3a76 100644
--- a/railties/lib/rails/rubyprof_ext.rb
+++ b/railties/lib/rails/rubyprof_ext.rb
@@ -12,7 +12,7 @@ module Prof #:nodoc:
     io.puts " time   seconds   seconds    calls  ms/call  ms/call  name"
 
     sum = 0.0
-    for r in results
+    results.each do |r|
       sum += r.self_time
 
       name =  if r.method_class.nil?