From 80bf68aa1ba7aea9aded5094e81af05b159ceaa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 8 May 2011 12:57:07 +0200
Subject: prepend the assets route instead of appending, closes #436

---
 .../lib/action_dispatch/routing/route_set.rb       |  9 +++++---
 actionpack/lib/sprockets/railtie.rb                |  2 +-
 railties/test/application/assets_test.rb           | 27 ++++++++++++++++++++++
 railties/test/application/routing_test.rb          |  4 ++--
 railties/test/railties/shared_tests.rb             |  3 +--
 5 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 railties/test/application/assets_test.rb

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 97e8ccc9a5..5097f6732d 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -224,6 +224,7 @@ module ActionDispatch
         self.valid_conditions.push(:controller, :action)
 
         @append = []
+        @prepend = []
         @disable_clear_and_finalize = false
         clear!
       end
@@ -232,7 +233,6 @@ module ActionDispatch
         clear! unless @disable_clear_and_finalize
         eval_block(block)
         finalize! unless @disable_clear_and_finalize
-
         nil
       end
 
@@ -240,6 +240,10 @@ module ActionDispatch
         @append << block
       end
 
+      def prepend(&block)
+        @prepend << block
+      end
+
       def eval_block(block)
         if block.arity == 1
           raise "You are using the old router DSL which has been removed in Rails 3.1. " <<
@@ -262,8 +266,6 @@ module ActionDispatch
       end
 
       def clear!
-        # Clear the controller cache so we may discover new ones
-        @controller_constraints = nil
         @finalized = false
         routes.clear
         named_routes.clear
@@ -271,6 +273,7 @@ module ActionDispatch
           :parameters_key => PARAMETERS_KEY,
           :request_class  => request_class
         )
+        @prepend.each { |blk| eval_block(blk) }
       end
 
       def install_helpers(destinations = [ActionController::Base, ActionView::Base], regenerate_code = false)
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb
index 9c10decd60..0b4b0638b2 100644
--- a/actionpack/lib/sprockets/railtie.rb
+++ b/actionpack/lib/sprockets/railtie.rb
@@ -39,7 +39,7 @@ module Sprockets
         end
       end
 
-      app.routes.append do
+      app.routes.prepend do
         mount app.assets => assets.prefix
       end
 
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
new file mode 100644
index 0000000000..b03dc3132b
--- /dev/null
+++ b/railties/test/application/assets_test.rb
@@ -0,0 +1,27 @@
+require 'isolation/abstract_unit'
+require 'rack/test'
+
+module ApplicationTests
+  class RoutingTest < Test::Unit::TestCase
+    include ActiveSupport::Testing::Isolation
+    include Rack::Test::Methods
+
+    def setup
+      build_app
+      boot_rails
+    end
+
+    test "assets routes have higher priority" do
+      app_file "app/assets/javascripts/demo.js.erb", "<%= :alert %>();"
+
+      app_file 'config/routes.rb', <<-RUBY
+        AppTemplate::Application.routes.draw do
+          match '*path', :to => lambda { |env| [200, { "Content-Type" => "text/html" }, "Not an asset"] }
+        end
+      RUBY
+
+      get "/assets/demo.js"
+      assert_match "alert()", last_response.body
+    end
+  end
+end
diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb
index 62589c998d..e3a7f8a63c 100644
--- a/railties/test/application/routing_test.rb
+++ b/railties/test/application/routing_test.rb
@@ -1,14 +1,14 @@
 require 'isolation/abstract_unit'
+require 'rack/test'
 
 module ApplicationTests
   class RoutingTest < Test::Unit::TestCase
     include ActiveSupport::Testing::Isolation
+    include Rack::Test::Methods
 
     def setup
       build_app
       boot_rails
-      require 'rack/test'
-      extend Rack::Test::Methods
     end
 
     test "rails/info/properties in development" do
diff --git a/railties/test/railties/shared_tests.rb b/railties/test/railties/shared_tests.rb
index e975950b85..e5debf29ae 100644
--- a/railties/test/railties/shared_tests.rb
+++ b/railties/test/railties/shared_tests.rb
@@ -15,11 +15,10 @@ module RailtiesTest
 
       boot_rails
       require 'rack/test'
-      require 'coffee_script'
       extend Rack::Test::Methods
 
       get "/assets/engine.js"
-      assert_match "alert();", last_response.body
+      assert_match "alert()", last_response.body
     end
 
     def test_copying_migrations
-- 
cgit v1.2.3