Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Made the location of the routes file configurable with config.routes_…

…configuration_file (Scott Fleckenstein) [#88 state:resolved]
  • Loading branch information...
commit 926f4648f0628009336c44f4d31019819434e39c 1 parent e931394
@dhh dhh authored
View
12 actionpack/lib/action_controller/routing/route_set.rb
@@ -189,7 +189,7 @@ def #{selector}(*args)
end
end
- attr_accessor :routes, :named_routes
+ attr_accessor :routes, :named_routes, :configuration_file
def initialize
self.routes = []
@@ -238,8 +238,8 @@ def load!
alias reload! load!
def reload
- if @routes_last_modified && defined?(RAILS_ROOT)
- mtime = File.stat("#{RAILS_ROOT}/config/routes.rb").mtime
+ if @routes_last_modified && configuration_file
+ mtime = File.stat(configuration_file).mtime
# if it hasn't been changed, then just return
return if mtime == @routes_last_modified
# if it has changed then record the new time and fall to the load! below
@@ -249,9 +249,9 @@ def reload
end
def load_routes!
- if defined?(RAILS_ROOT) && defined?(::ActionController::Routing::Routes) && self == ::ActionController::Routing::Routes
- load File.join("#{RAILS_ROOT}/config/routes.rb")
- @routes_last_modified = File.stat("#{RAILS_ROOT}/config/routes.rb").mtime
+ if configuration_file
+ load configuration_file
+ @routes_last_modified = File.stat(configuration_file).mtime
else
add_route ":controller/:action/:id"
end
View
10 actionpack/test/controller/routing_test.rb
@@ -2341,11 +2341,13 @@ class RouteLoadingTest < Test::Unit::TestCase
def setup
routes.instance_variable_set '@routes_last_modified', nil
silence_warnings { Object.const_set :RAILS_ROOT, '.' }
+ ActionController::Routing::Routes.configuration_file = File.join(RAILS_ROOT, 'config', 'routes.rb')
@stat = stub_everything
end
def teardown
+ ActionController::Routing::Routes.configuration_file = nil
Object.send :remove_const, :RAILS_ROOT
end
@@ -2386,6 +2388,14 @@ def test_adding_inflections_forces_reload
Inflector.inflections { |inflect| inflect.uncountable('equipment') }
end
+
+ def test_load_with_configuration
+ routes.configuration_file = "foobarbaz"
+ File.expects(:stat).returns(@stat)
+ routes.expects(:load).with("foobarbaz")
+
+ routes.reload
+ end
private
def routes
View
2  railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Made the location of the routes file configurable with config.routes_configuration_file (Scott Fleckenstein) [#88]
+
* Rails Edge info returns the latest git commit hash [Francesc Esplugas]
* Added Rails.public_path to control where HTML and assets are expected to be loaded from (defaults to Rails.root + "/public") #11581 [nicksieger]
View
10 railties/lib/initializer.rb
@@ -386,6 +386,7 @@ def initialize_framework_views
def initialize_routing
return unless configuration.frameworks.include?(:action_controller)
ActionController::Routing.controller_paths = configuration.controller_paths
+ ActionController::Routing::Routes.configuration_file = configuration.routes_configuration_file
ActionController::Routing::Routes.reload
end
@@ -503,6 +504,10 @@ class Configuration
# The path to the database configuration file to use. (Defaults to
# <tt>config/database.yml</tt>.)
attr_accessor :database_configuration_file
+
+ # The path to the routes configuration file to use. (Defaults to
+ # <tt>config/routes.rb</tt>.)
+ attr_accessor :routes_configuration_file
# The list of rails framework components that should be loaded. (Defaults
# to <tt>:active_record</tt>, <tt>:action_controller</tt>,
@@ -635,6 +640,7 @@ def initialize
self.plugin_locators = default_plugin_locators
self.plugin_loader = default_plugin_loader
self.database_configuration_file = default_database_configuration_file
+ self.routes_configuration_file = default_routes_configuration_file
self.gems = default_gems
for framework in default_frameworks
@@ -775,6 +781,10 @@ def default_database_configuration_file
File.join(root_path, 'config', 'database.yml')
end
+ def default_routes_configuration_file
+ File.join(root_path, 'config', 'routes.rb')
+ end
+
def default_view_path
File.join(root_path, 'app', 'views')
end
Please sign in to comment.
Something went wrong with that request. Please try again.