Exclude request from 404 exception env inspection

Yeah, this is ghetto, but it makes github/github#15020 simpler.

Right now, we have to store the `request` object in `Thread.current` for constraints-based routing if we want access to the request when running our constraint match.

See github/github#14468 for additional background, where the `request` was removed from the `env` because it was causing unexpected needles for all 404s.

NOTE: This `env` is not the same as `request.env`, it's a subset produced by [`extract_request_environment`](685cb901fc/actionpack/lib/action_controller/routing/route_set.rb (L442)).

cc @github/discussions @github/rails

README.md

@@ -1,6 +0,0 @@
-# GitHub Rails
-
-This is GitHub's fork of Rails 2.3.
-
-Please note that this fork is **unsupported**. It is not guaranteed to receive security patches or remain stable. **Use at your own risk.**
-

actionmailer/Rakefile

@@ -23,6 +23,8 @@ task :default => [ :test ]
 Rake::TestTask.new { |t|
   t.libs << "test"
   t.pattern = 'test/*_test.rb'
+  t.verbose = true
+  t.warning = false
 }
 
 

actionmailer/actionmailer.gemspec

@@ -1,14 +0,0 @@
-Gem::Specification.new do |s|
-  s.name = 'actionmailer'
-  s.version = '2.3.18'
-  s.summary = 'Service layer for easy email delivery and testing.'
-  s.description = 'Makes it trivial to test and deliver emails sent from a single service layer.'
-
-  s.author = 'David Heinemeier Hansson'
-  s.email = 'david@loudthinking.com'
-  s.homepage = 'http://www.rubyonrails.org'
-
-  s.require_path = 'lib'
-
-  s.add_dependency 'actionpack', '= 2.3.18'
-end

actionpack/Rakefile

@@ -30,12 +30,16 @@ Rake::TestTask.new(:test_action_pack) do |t|
   # make sure we include the tests in alphabetical order as on some systems
   # this will not happen automatically and the tests (as a whole) will error
   t.test_files = Dir.glob( "test/[cftv]*/**/*_test.rb" ).sort
+
+  t.verbose = true
+  #t.warning = true
 end
 
 desc 'ActiveRecord Integration Tests'
 Rake::TestTask.new(:test_active_record_integration) do |t|
   t.libs << "test"
   t.test_files = Dir.glob("test/activerecord/*_test.rb")
+  t.verbose = true
 end
 
 

actionpack/actionpack.gemspec

@@ -1,15 +0,0 @@
-Gem::Specification.new do |s|
-  s.name = 'actionpack'
-  s.version = '2.3.18'
-  s.summary = 'Web-flow and rendering framework putting the VC in MVC.'
-  s.description = 'Eases web-request routing, handling, and response as a half-way front, half-way page controller. Implemented with specific emphasis on enabling easy unit/integration testing that doesn\'t require a browser.'
-
-  s.author = 'David Heinemeier Hansson'
-  s.email = 'david@loudthinking.com'
-  s.homepage = 'http://www.rubyonrails.org'
-
-  s.require_path = 'lib'
-
-  s.add_dependency 'activesupport', '= 2.3.18'
-  s.add_dependency 'rack', '~> 1.4'
-end

actionpack/lib/action_controller/base.rb

@@ -1332,7 +1332,10 @@ module ActionController #:nodoc:
         if action_methods.include?(action_name)
           send(action_name)
           default_render unless performed?
-        elsif defined?(self.method_missing) # returns "method" if method_missing is public or protected, but not if it's private
+        elsif RUBY_VERSION == "1.9.3" && respond_to?(:method_missing)
+          method_missing action_name.intern
+          default_render unless performed?
+        elsif RUBY_VERSION >= "2.0.0" && respond_to?(:method_missing, true) && !method(:method_missing).private?
           method_missing action_name.intern
           default_render unless performed?
         else

actionpack/lib/action_controller/routing/recognition_optimisation.rb

@@ -63,7 +63,7 @@ module ActionController
         elsif !allows.empty?
           raise MethodNotAllowed.new(*allows)
         else
-          raise RoutingError, "No route matches #{path.inspect} with #{environment.inspect}"
+          raise RoutingError, "No route matches #{path.inspect} with #{environment.except(:request).inspect}"
         end
       end
 

actionpack/lib/action_controller/routing/route_set.rb

@@ -192,7 +192,14 @@ module ActionController
                 url_for(#{hash_access_method}(opts))                                        #   url_for(hash_for_users_url(opts))
                                                                                             #
               end                                                                           # end
-
+              #Add an alias to support the now deprecated formatted_* URL.                  # #Add an alias to support the now deprecated formatted_* URL.
+              def formatted_#{selector}(*args)                                              # def formatted_users_url(*args)
+                ActiveSupport::Deprecation.warn(                                            #   ActiveSupport::Deprecation.warn(
+                  "formatted_#{selector}() has been deprecated. " +                         #     "formatted_users_url() has been deprecated. " +
+                  "Please pass format to the standard " +                                   #     "Please pass format to the standard " +
+                  "#{selector} method instead.", caller)                                    #     "users_url method instead.", caller)
+                #{selector}(*args)                                                          #   users_url(*args)
+              end                                                                           # end
               protected :#{selector}                                                        # protected :users_url
             end_eval
             helpers << selector

actionpack/test/controller/url_rewriter_test.rb

@@ -357,6 +357,24 @@ class UrlWriterTests < ActionController::TestCase
     ActionController::Routing::Routes.load!
   end
 
+  def test_formatted_url_methods_are_deprecated
+    ActionController::Routing::Routes.draw do |map|
+      map.resources :posts
+    end
+    # We need to create a new class in order to install the new named route.
+    kls = Class.new { include ActionController::UrlWriter }
+    controller = kls.new
+    params = {:id => 1, :format => :xml}
+    assert_deprecated do
+      assert_equal("/posts/1.xml", controller.send(:formatted_post_path, params))    
+    end
+    assert_deprecated do
+      assert_equal("/posts/1.xml", controller.send(:formatted_post_path, 1, :xml))    
+    end
+  ensure
+    ActionController::Routing::Routes.load!
+  end
+
   def test_multiple_includes_maintain_distinct_options
     first_class = Class.new { include ActionController::UrlWriter }
     second_class = Class.new { include ActionController::UrlWriter }

activerecord/Rakefile

@@ -64,6 +64,7 @@ for adapter in %w( mysql postgresql sqlite sqlite3 firebird db2 oracle sybase op
     end
     adapter_short = adapter == 'db2' ? adapter : adapter[/^[a-z]+/]
     t.test_files=Dir.glob( "test/cases/**/*_test{,_#{adapter_short}}.rb" ).sort
+    t.verbose = true
   }
 
   namespace adapter do

activerecord/activerecord.gemspec

@@ -1,17 +0,0 @@
-Gem::Specification.new do |s|
-  s.name = 'activerecord'
-  s.version = '2.3.18'
-  s.summary = 'Implements the ActiveRecord pattern for ORM.'
-  s.description = 'Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM. It ties database tables and classes together for business objects, like Customer or Subscription, that can find, save, and destroy themselves without resorting to manual SQL.'
-
-  s.author = 'David Heinemeier Hansson'
-  s.email = 'david@loudthinking.com'
-  s.homepage = 'http://www.rubyonrails.org'
-
-  s.require_path = 'lib'
-  s.files = ['README']
-  s.rdoc_options = ['--main', 'README']
-  s.extra_rdoc_files = ['README']
-
-  s.add_dependency 'activesupport', '= 2.3.18'
-end

activerecord/lib/active_record/base.rb

@@ -2920,23 +2920,15 @@ module ActiveRecord #:nodoc:
         attributes.each do |k, v|
           if k.to_s.include?("(")
             multiparameter_attributes << [ k, v ]
+          elsif RUBY_VERSION == "1.9.3"
+            respond_to?(:"#{k}=") ? send(:"#{k}=", v) : raise(UnknownAttributeError, "unknown attribute: #{k}")
           else
-            _assign_attribute(k, v)
+            (respond_to?(:"#{k}=", true) && !method(:"#{k}=").private?) ? send(:"#{k}=", v) : raise(UnknownAttributeError, "unknown attribute: #{k}")
           end
         end
 
         assign_multiparameter_attributes(multiparameter_attributes) unless  multiparameter_attributes.empty?        
       end
-
-      def _assign_attribute(k, v)
-        public_send("#{k}=", v)
-      rescue NoMethodError => e
-        if respond_to?("#{k}=")
-          raise e
-        else
-          raise UnknownAttributeError, "unknown attribute: #{k}"
-        end
-      end
     
       def create_or_update
         raise ReadOnlyRecord if readonly?

activerecord/lib/active_record/calculations.rb

@@ -261,7 +261,7 @@ module ActiveRecord
             key_records = key_records.inject({}) { |hsh, r| hsh.merge(r.id => r) }
           end
 
-          calculated_data.inject({}) do |all, row|
+          calculated_data.inject(ActiveSupport::OrderedHash.new) do |all, row|
             key   = group_aliases.map{|group_alias| type_cast_calculated_value(row[group_alias], group_columns[group_alias])}
             key   = key.first if key.size == 1
             key   = key_records[key] if associated

activerecord/lib/active_record/validations.rb

@@ -295,7 +295,7 @@ module ActiveRecord
 
     # Removes all errors that have been added.
     def clear
-      @errors = {}
+      @errors = ActiveSupport::OrderedHash.new
     end
 
     # Returns the total number of errors added. Two errors added to the same attribute will be counted as such.

activerecord/test/cases/nested_attributes_test.rb

@@ -552,7 +552,7 @@ module NestedAttributesOnACollectionAssociationTests
   end
 
   def test_should_sort_the_hash_by_the_keys_before_building_new_associated_models
-    attributes = {}
+    attributes = ActiveSupport::OrderedHash.new
     attributes['123726353'] = { :name => 'Grace OMalley' }
     attributes['2'] = { :name => 'Privateers Greed' } # 2 is lower then 123726353
     @pirate.send(association_setter, attributes)
@@ -562,6 +562,7 @@ module NestedAttributesOnACollectionAssociationTests
 
   def test_should_raise_an_argument_error_if_something_else_than_a_hash_is_passed
     assert_nothing_raised(ArgumentError) { @pirate.send(association_setter, {}) }
+    assert_nothing_raised(ArgumentError) { @pirate.send(association_setter, ActiveSupport::OrderedHash.new) }
 
     assert_raise_with_message ArgumentError, 'Hash or Array expected, got String ("foo")' do
       @pirate.send(association_setter, "foo")

activeresource/Rakefile

@@ -31,6 +31,8 @@ Rake::TestTask.new { |t|
   t.libs << activesupport_path if File.directory?(activesupport_path)
   t.libs << "test"
   t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+  t.warning = true
 }
 
 

activeresource/activeresource.gemspec

@@ -1,17 +0,0 @@
-Gem::Specification.new do |s|
-  s.name = 'activeresource'
-  s.version = '2.3.18'
-  s.summary = 'Think Active Record for web resources.'
-  s.description = 'Wraps web resources in model classes that can be manipulated through XML over REST.'
-
-  s.author = 'David Heinemeier Hansson'
-  s.email = 'david@loudthinking.com'
-  s.homepage = 'http://www.rubyonrails.org'
-
-  s.require_path = 'lib'
-  s.files = ['README']
-  s.rdoc_options = ['--main', 'README']
-  s.extra_rdoc_files = ['README']
-
-  s.add_dependency 'activesupport', '= 2.3.18'
-end

activesupport/Rakefile

@@ -18,6 +18,8 @@ task :default => :test
 Rake::TestTask.new { |t| 
   t.libs << "test"
   t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+  t.warning = true
 }
 
 # Create compressed packages

activesupport/activesupport.gemspec

@@ -1,12 +0,0 @@
-Gem::Specification.new do |s|
-  s.name = 'activesupport'
-  s.version = '2.3.18'
-  s.summary = 'Support and utility classes used by the Rails framework.'
-  s.description = 'Utility library which carries commonly used classes and goodies from the Rails framework'
-
-  s.author = 'David Heinemeier Hansson'
-  s.email = 'david@loudthinking.com'
-  s.homepage = 'http://www.rubyonrails.org'
-
-  s.require_path = 'lib'
-end

activesupport/lib/active_support/core_ext/enumerable.rb

@@ -1,6 +1,40 @@
 require 'active_support/ordered_hash'
 
 module Enumerable
+  # Ruby 1.8.7 introduces group_by, but the result isn't ordered. Override it.
+  remove_method(:group_by) if [].respond_to?(:group_by) && RUBY_VERSION < '1.9'
+
+  # Collect an enumerable into sets, grouped by the result of a block. Useful,
+  # for example, for grouping records by date.
+  #
+  # Example:
+  #
+  #   latest_transcripts.group_by(&:day).each do |day, transcripts| 
+  #     p "#{day} -> #{transcripts.map(&:class).join(', ')}"
+  #   end
+  #   "2006-03-01 -> Transcript"
+  #   "2006-02-28 -> Transcript"
+  #   "2006-02-27 -> Transcript, Transcript"
+  #   "2006-02-26 -> Transcript, Transcript"
+  #   "2006-02-25 -> Transcript"
+  #   "2006-02-24 -> Transcript, Transcript"
+  #   "2006-02-23 -> Transcript"
+  def group_by
+    assoc = ActiveSupport::OrderedHash.new
+
+    each do |element|
+      key = yield(element)
+
+      if assoc.has_key?(key)
+        assoc[key] << element
+      else
+        assoc[key] = [element]
+      end
+    end
+
+    assoc
+  end unless [].respond_to?(:group_by)
+
   # Calculates a sum from the elements. Examples:
   #
   #  payments.sum { |p| p.price * p.tax_rate }
@@ -28,6 +62,26 @@ module Enumerable
     end
   end
 
+  # Iterates over a collection, passing the current element *and* the
+  # +memo+ to the block. Handy for building up hashes or
+  # reducing collections down to one object. Examples:
+  #
+  #   %w(foo bar).each_with_object({}) { |str, hsh| hsh[str] = str.upcase } #=> {'foo' => 'FOO', 'bar' => 'BAR'}
+  #
+  # *Note* that you can't use immutable objects like numbers, true or false as
+  # the memo. You would think the following returns 120, but since the memo is
+  # never changed, it does not.
+  #
+  #   (1..5).each_with_object(1) { |value, memo| memo *= value } # => 1
+  #
+  def each_with_object(memo, &block)
+    memo.tap do |m|
+      each do |element|
+        block.call(element, m)
+      end
+    end
+  end unless [].respond_to?(:each_with_object)
+
   # Convert an enumerable to a hash. Examples:
   #
   #   people.index_by(&:login)
@@ -49,6 +103,15 @@ module Enumerable
     size > 1
   end
 
+  # Returns true if none of the elements match the given block.
+  #
+  #   success = responses.none? {|r| r.status / 100 == 5 }
+  #
+  # This is a builtin method in Ruby 1.8.7 and later.
+  def none?(&block)
+    !any?(&block)
+  end unless [].respond_to?(:none?)
+
   
   # The negative of the Enumerable#include?. Returns true if the collection does not include the object.
   def exclude?(object)

activesupport/lib/active_support/ordered_hash.rb

@@ -1 +1,168 @@
-ActiveSupport::OrderedHash = Hash
+require 'yaml'
+
+YAML.add_builtin_type("omap") do |type, val|
+  ActiveSupport::OrderedHash[val.map(&:to_a).map(&:first)]
+end
+
+# OrderedHash is namespaced to prevent conflicts with other implementations
+module ActiveSupport
+  class OrderedHash < ::Hash #:nodoc:
+    def to_yaml_type
+      "!tag:yaml.org,2002:omap"
+    end
+
+    def to_yaml(opts = {})
+      YAML.quick_emit(self, opts) do |out|
+        out.seq(taguri, to_yaml_style) do |seq|
+          each do |k, v|
+            seq.add(k => v)
+          end
+        end
+      end
+    end
+
+    # Hash is ordered in Ruby 1.9!
+    if RUBY_VERSION < '1.9'
+      def initialize(*args, &block)
+        super
+        @keys = []
+      end
+
+      def self.[](*args)
+        ordered_hash = new
+
+        if (args.length == 1 && args.first.is_a?(Array))
+          args.first.each do |key_value_pair|
+            next unless (key_value_pair.is_a?(Array))
+            ordered_hash[key_value_pair[0]] = key_value_pair[1]
+          end
+
+          return ordered_hash
+        end
+
+        unless (args.size % 2 == 0)
+          raise ArgumentError.new("odd number of arguments for Hash")
+        end
+
+        args.each_with_index do |val, ind|
+          next if (ind % 2 != 0)
+          ordered_hash[val] = args[ind + 1]
+        end
+
+        ordered_hash
+      end
+
+      def initialize_copy(other)
+        super
+        # make a deep copy of keys
+        @keys = other.keys
+      end
+
+      def []=(key, value)
+        @keys << key if !has_key?(key)
+        super
+      end
+
+      def delete(key)
+        if has_key? key
+          index = @keys.index(key)
+          @keys.delete_at index
+        end
+        super
+      end
+
+      def delete_if
+        super
+        sync_keys!
+        self
+      end
+
+      def reject!
+        super
+        sync_keys!
+        self
+      end
+
+      def reject(&block)
+        dup.reject!(&block)
+      end
+
+      def keys
+        @keys.dup
+      end
+
+      def values
+        @keys.collect { |key| self[key] }
+      end
+
+      def to_hash
+        self
+      end
+
+      def to_a
+        @keys.map { |key| [ key, self[key] ] }
+      end
+
+      def each_key
+        @keys.each { |key| yield key }
+      end
+
+      def each_value
+        @keys.each { |key| yield self[key]}
+      end
+
+      def each
+        @keys.each {|key| yield [key, self[key]]}
+      end
+
+      alias_method :each_pair, :each
+
+      def clear
+        super
+        @keys.clear
+        self
+      end
+
+      def shift
+        k = @keys.first
+        v = delete(k)
+        [k, v]
+      end
+
+      def merge!(other_hash)
+        if block_given?
+          other_hash.each { |k, v| self[k] = key?(k) ? yield(k, self[k], v) : v }
+        else
+          other_hash.each { |k, v| self[k] = v }
+        end
+        self
+      end
+
+      alias_method :update, :merge!
+
+      def merge(other_hash, &block)
+        dup.merge!(other_hash, &block)
+      end
+
+      # When replacing with another hash, the initial order of our keys must come from the other hash -ordered or not.
+      def replace(other)
+        super
+        @keys = other.keys
+        self
+      end
+
+      def invert
+        OrderedHash[self.to_a.map!{|key_value_pair| key_value_pair.reverse}]
+      end
+
+      def inspect
+        "#<OrderedHash #{super}>"
+      end
+
+      private
+        def sync_keys!
+          @keys.delete_if {|k| !has_key?(k)}
+        end
+    end
+  end
+end

activesupport/lib/active_support/ordered_options.rb

@@ -1,5 +1,5 @@
 module ActiveSupport #:nodoc:
-  class OrderedOptions < Hash #:nodoc:
+  class OrderedOptions < OrderedHash #:nodoc:
     def []=(key, value)
       super(key.to_sym, value)
     end

activesupport/test/caching_test.rb

@@ -178,8 +178,6 @@ class MemoryStoreTest < ActiveSupport::TestCase
 end
 
 uses_memcached 'memcached backed store' do
-  next # these tests are broken on CI
-
   class MemCacheStoreTest < ActiveSupport::TestCase
     def setup
       @cache = ActiveSupport::Cache.lookup_store(:mem_cache_store)

railties/Rakefile

@@ -35,6 +35,8 @@ end
 Rake::TestTask.new("regular_test") do |t|
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
+  t.warning = true
+  t.verbose = true
 end
 
 

railties/guides/rails_guides/indexer.rb

@@ -20,7 +20,7 @@ module RailsGuides
     def process(string, current_level=3, counters=[1])
       s = StringScanner.new(string)
 
-      level_hash = {}
+      level_hash = ActiveSupport::OrderedHash.new
 
       while !s.eos?
         re = %r{^h(\d)(?:\((#.*?)\))?\s*\.\s*(.*)$}

railties/lib/rails/rack/metal.rb

@@ -34,7 +34,7 @@ module Rails
 
       def initialize(app)
         @app = app
-        @metals = {}
+        @metals = ActiveSupport::OrderedHash.new
         self.class.metals.each { |app| @metals[app] = true }
         freeze
       end

railties/railties.gemspec

@@ -1,22 +0,0 @@
-Gem::Specification.new do |s|
-  s.name = 'rails'
-  s.version = '2.3.18'
-  s.summary = 'Web-application framework with template engine, control-flow layer, and ORM.'
-  s.description = "Rails is a framework for building web-application using CGI, FCGI, mod_ruby, or WEBrick\non top of either MySQL, PostgreSQL, SQLite, DB2, SQL Server, or Oracle with eRuby- or Builder-based templates."
-
-  s.author = 'David Heinemeier Hansson'
-  s.email = 'david@loudthinking.com'
-  s.homepage = 'http://www.rubyonrails.org'
-
-  s.require_path = 'lib'
-  s.files = ['bin/rails']
-  s.executables = ['rails']
-  s.rdoc_options = ['--exclude', '.']
-
-  s.add_dependency 'rake',           '>= 0.8.3'
-  s.add_dependency 'activesupport',  '= 2.3.18'
-  s.add_dependency 'activerecord',   '= 2.3.18'
-  s.add_dependency 'actionpack',     '= 2.3.18'
-  s.add_dependency 'actionmailer',   '= 2.3.18'
-  s.add_dependency 'activeresource', '= 2.3.18'
-end

script/cibuild

@@ -3,5 +3,38 @@
 set -x
 set -e
 
-script/cibuild-on 1.9.3-p231-tcs-github
-script/cibuild-on 2.0.0-github
+RUBY_VERSION="$(cat .ruby-version)"
+
+# Use the right Ruby /without/ rbenv
+ruby_dir=$(dirname "$(RBENV_VERSION=$RUBY_VERSION rbenv which ruby)")
+export PATH=$ruby_dir:$PATH
+
+# Announce who we are
+ruby -v
+
+# Because Rails 2.3 doesn't use Bundler for its own tests,
+# we need to setup an isolated gem environment.
+
+gem_environment_version="$(md5sum Gemfile.sh | cut -d' ' -f1)-$(ruby -e 'print RUBY_VERSION')"
+
+gem_dir=`pwd`/.gem
+gem_pristine_dir=${gem_dir}-${gem_environment_version}
+
+export GEM_HOME=$gem_dir
+export GEM_PATH=$gem_dir:$GEM_PATH
+export GEM_ROOT=$gem_dir
+
+rm -rf $gem_dir
+
+if [ ! -d $gem_pristine_dir ]; then
+  mkdir $gem_dir
+
+  . Gemfile.sh
+
+  mv $gem_dir $gem_pristine_dir
+fi
+
+cp -r $gem_pristine_dir $gem_dir
+
+# Go ham
+rake

script/cibuild-on

@@ -1,40 +0,0 @@
-#!/bin/bash
-
-set -x
-set -e
-
-RUBY_VERSION="$1"
-
-# Use the right Ruby /without/ rbenv
-ruby_dir=$(dirname "$(RBENV_VERSION=$RUBY_VERSION rbenv which ruby)")
-export PATH=$ruby_dir:$PATH
-
-# Announce who we are
-ruby -v
-
-# Because Rails 2.3 doesn't use Bundler for its own tests,
-# we need to setup an isolated gem environment.
-
-gem_environment_version="$(md5sum Gemfile.sh | cut -d' ' -f1)-$(ruby -e 'print RUBY_VERSION')"
-
-gem_dir=`pwd`/.gem
-gem_pristine_dir=${gem_dir}-${gem_environment_version}
-
-export GEM_HOME=$gem_dir
-export GEM_PATH=$gem_dir:$GEM_PATH
-export GEM_ROOT=$gem_dir
-
-rm -rf $gem_dir
-
-if [ ! -d $gem_pristine_dir ]; then
-  mkdir $gem_dir
-
-  . Gemfile.sh
-
-  mv $gem_dir $gem_pristine_dir
-fi
-
-cp -r $gem_pristine_dir $gem_dir
-
-# Go ham
-rake