0
@@ -200,9 +200,11 @@ module ActionController
0
           end
0
       end
0
 
0
-      attr_accessor :routes, :named_routes, :configuration_file
0
+      attr_accessor :routes, :named_routes, :configuration_files
0
 
0
       def initialize
0
+        self.configuration_files = []
0
+
0
         self.routes = []
0
         self.named_routes = NamedRouteCollection.new
0
 
0
@@ -216,7 +218,6 @@ module ActionController
0
       end
0
 
0
       def draw
0
-        clear!
0
         yield Mapper.new(self)
0
         install_helpers
0
       end
0
@@ -240,8 +241,22 @@ module ActionController
0
         routes.empty?
0
       end
0
 
0
+      def add_configuration_file(path)
0
+        self.configuration_files << path
0
+      end
0
+
0
+      # Deprecated accessor
0
+      def configuration_file=(path)
0
+        add_configuration_file(path)
0
+      end
0
+      
0
+      # Deprecated accessor
0
+      def configuration_file
0
+        configuration_files
0
+      end
0
+
0
       def load!
0
-        Routing.use_controllers! nil # Clear the controller cache so we may discover new ones
0
+        Routing.use_controllers!(nil) # Clear the controller cache so we may discover new ones
0
         clear!
0
         load_routes!
0
       end
0
@@ -250,24 +265,39 @@ module ActionController
0
       alias reload! load!
0
 
0
       def reload
0
-        if @routes_last_modified && configuration_file
0
-          mtime = File.stat(configuration_file).mtime
0
-          # if it hasn't been changed, then just return
0
-          return if mtime == @routes_last_modified
0
-          # if it has changed then record the new time and fall to the load! below
0
-          @routes_last_modified = mtime
0
+        if configuration_files.any? && @routes_last_modified
0
+          if routes_changed_at == @routes_last_modified
0
+            return # routes didn't change, don't reload
0
+          else
0
+            @routes_last_modified = routes_changed_at
0
+          end
0
         end
0
+
0
         load!
0
       end
0
 
0
       def load_routes!
0
-        if configuration_file
0
-          load configuration_file
0
-          @routes_last_modified = File.stat(configuration_file).mtime
0
+        if configuration_files.any?
0
+          configuration_files.each { |config| load(config) }
0
+          @routes_last_modified = routes_changed_at
0
         else
0
           add_route ":controller/:action/:id"
0
         end
0
       end
0
+      
0
+      def routes_changed_at
0
+        routes_changed_at = nil
0
+        
0
+        configuration_files.each do |config|
0
+          config_changed_at = File.stat(config).mtime
0
+
0
+          if routes_changed_at.nil? || config_changed_at > routes_changed_at
0
+            routes_changed_at = config_changed_at 
0
+          end
0
+        end
0
+        
0
+        routes_changed_at
0
+      end
0
 
0
       def add_route(path, options = {})
0
         route = builder.build(path, options)

0
@@ -747,12 +747,16 @@ uses_mocha 'LegacyRouteSet, Route, RouteSet and RouteLoading' do
0
       ActionController::Base.optimise_named_routes = true
0
 
0
       @rs = ::ActionController::Routing::RouteSet.new
0
-      @rs.draw {|m| m.connect ':controller/:action/:id' }
0
 
0
       ActionController::Routing.use_controllers! %w(content admin/user admin/news_feed)
0
     end
0
+    
0
+    def teardown
0
+      @rs.clear!
0
+    end
0
 
0
     def test_default_setup
0
+      @rs.draw {|m| m.connect ':controller/:action/:id' }
0
       assert_equal({:controller => "content", :action => 'index'}, rs.recognize_path("/content"))
0
       assert_equal({:controller => "content", :action => 'list'}, rs.recognize_path("/content/list"))
0
       assert_equal({:controller => "content", :action => 'show', :id => '10'}, rs.recognize_path("/content/show/10"))
0
@@ -769,6 +773,7 @@ uses_mocha 'LegacyRouteSet, Route, RouteSet and RouteLoading' do
0
     end
0
 
0
     def test_ignores_leading_slash
0
+      @rs.clear!
0
       @rs.draw {|m| m.connect '/:controller/:action/:id'}
0
       test_default_setup
0
     end
0
@@ -1002,6 +1007,8 @@ uses_mocha 'LegacyRouteSet, Route, RouteSet and RouteLoading' do
0
     end
0
 
0
     def test_changing_controller
0
+      @rs.draw {|m| m.connect ':controller/:action/:id' }
0
+
0
       assert_equal '/admin/stuff/show/10', rs.generate(
0
         {:controller => 'stuff', :action => 'show', :id => 10},
0
         {:controller => 'admin/user', :action => 'index'}
0
@@ -1155,10 +1162,12 @@ uses_mocha 'LegacyRouteSet, Route, RouteSet and RouteLoading' do
0
     end
0
 
0
     def test_action_expiry
0
+      @rs.draw {|m| m.connect ':controller/:action/:id' }
0
       assert_equal '/content', rs.generate({:controller => 'content'}, {:controller => 'content', :action => 'show'})
0
     end
0
 
0
     def test_recognition_with_uppercase_controller_name
0
+      @rs.draw {|m| m.connect ':controller/:action/:id' }
0
       assert_equal({:controller => "content", :action => 'index'}, rs.recognize_path("/Content"))
0
       assert_equal({:controller => "content", :action => 'list'}, rs.recognize_path("/ConTent/list"))
0
       assert_equal({:controller => "content", :action => 'show', :id => '10'}, rs.recognize_path("/CONTENT/show/10"))
0
@@ -2399,13 +2408,13 @@ uses_mocha 'LegacyRouteSet, Route, RouteSet and RouteLoading' do
0
     def setup
0
       routes.instance_variable_set '@routes_last_modified', nil
0
       silence_warnings { Object.const_set :RAILS_ROOT, '.' }
0
-      ActionController::Routing::Routes.configuration_file = File.join(RAILS_ROOT, 'config', 'routes.rb')
0
+      routes.add_configuration_file(File.join(RAILS_ROOT, 'config', 'routes.rb'))
0
 
0
       @stat = stub_everything
0
     end
0
 
0
     def teardown
0
-      ActionController::Routing::Routes.configuration_file = nil
0
+      ActionController::Routing::Routes.configuration_files.clear
0
       Object.send :remove_const, :RAILS_ROOT
0
     end
0
 
0
@@ -2448,12 +2457,24 @@ uses_mocha 'LegacyRouteSet, Route, RouteSet and RouteLoading' do
0
     end
0
 
0
     def test_load_with_configuration
0
-      routes.configuration_file = "foobarbaz"
0
+      routes.configuration_files.clear
0
+      routes.add_configuration_file("foobarbaz")
0
       File.expects(:stat).returns(@stat)
0
       routes.expects(:load).with("foobarbaz")
0
 
0
       routes.reload
0
     end
0
+    
0
+    def test_load_multiple_configurations
0
+      routes.add_configuration_file("engines.rb")
0
+      
0
+      File.expects(:stat).at_least_once.returns(@stat)
0
+
0
+      routes.expects(:load).with('./config/routes.rb')
0
+      routes.expects(:load).with('engines.rb')
0
+
0
+      routes.reload
0
+    end
0
 
0
     private
0
       def routes