Changeset 4749

Timestamp:

08/10/06 16:46:43 (2 years ago)

Author:

ulysses

Message:

Use config.controller_paths instead of pattern matching

Files:

• branches/stable/actionpack/lib/action_controller/routing.rb (modified) (1 diff)
• branches/stable/railties/lib/initializer.rb (modified) (1 diff)

branches/stable/actionpack/lib/action_controller/routing.rb

@@ -263 +263 @@
-        end
-        
+        attr_accessor :controller_paths
+        
-      protected
-        def safe_load_paths #:nodoc:
-          if defined?(RAILS_ROOT)
-            $LOAD_PATH.select do |base|
-              base = File.expand_path(base)
-              extended_root = File.expand_path(RAILS_ROOT)
-              # Exclude all paths that are not nested within app, lib, or components.
-              base.match(/\A#{Regexp.escape(extended_root)}\/*(app|lib|components)\/[a-z]/) || base =~ %r{rails-[\d.]+/builtin}
-            end
-          else
-            $LOAD_PATH
-          end
-        end
-        
-        def attempt_load(mod, const_name, path)
-          has_dir = false
-safe_load
+controller
-            full_path = File.join(load_path, path)
-            file_path = full_path + '.rb'

branches/stable/railties/lib/initializer.rb

@@ -237 +237 @@
-    def initialize_routing
-      return unless configuration.frameworks.include?(:action_controller)
+      ActionController::Routing::ControllerComponent.controller_paths = configuration.controller_paths
-      ActionController::Routing::Routes.reload
-    end