Changeset 4501

Timestamp:

06/28/06 18:11:35 (2 years ago)

Author:

ulysses

Message:

Fix broken traverse_to_controller

Files:

• branches/stable/actionpack/CHANGELOG (modified) (1 diff)
• branches/stable/actionpack/lib/action_controller/routing.rb (modified) (2 diffs)
• branches/stable/actionpack/test/controller/routing_test.rb (modified) (2 diffs)
• branches/stable/actionpack/test/fixtures/application_root (added)
• branches/stable/actionpack/test/fixtures/application_root/app (added)
• branches/stable/actionpack/test/fixtures/application_root/app/controllers (added)
• branches/stable/actionpack/test/fixtures/application_root/app/controllers/a_class_that_contains_a_controller (added)
• branches/stable/actionpack/test/fixtures/application_root/app/controllers/a_class_that_contains_a_controller/poorly_placed_controller.rb (added)
• branches/stable/actionpack/test/fixtures/application_root/app/controllers/module_that_holds_controllers (added)
• branches/stable/actionpack/test/fixtures/application_root/app/controllers/module_that_holds_controllers/nested_controller.rb (added)
• branches/stable/actionpack/test/fixtures/application_root/app/models (added)
• branches/stable/actionpack/test/fixtures/application_root/app/models/a_class_that_contains_a_controller.rb (added)

branches/stable/actionpack/CHANGELOG

@@ +1 @@
+* Fix broken traverse_to_controller. We now:
+  Look for a _controller.rb file under RAILS_ROOT to load.
+  If we find it, we require_dependency it and return the controller it defined. (If none was defined we stop looking.)
+  If we don't find it, we look for a .rb file under RAILS_ROOT to load. If we find it, and it loads a constant we keep looking.
+  Otherwise we check to see if a directory of the same name exists, and if it does we create a module for it.
+
+
-*1.12.2* (June 27th, 2006)
-

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

@@ -225 +225 @@
-          index = start_at
-          mod_name = controller_name = segment = nil
-          
-          while index < length
-            return nil unless /\A[A-Za-z][A-Za-z\d_]*\Z/ =~ (segment = segments[index])
@@ -232 +231 @@
-            mod_name = segment.camelize
-            controller_name = "#{mod_name}Controller"
+            path_suffix = File.join(segments[start_at..(index - 1)])
+            next_mod = nil
-            
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-            end
-            
+            # No controller? Look for the module
-            if mod.const_defined? mod_name
-              next_mod = mod.send(:const_get, mod_name)
-              next_mod = nil unless next_mod.is_a?(Module)
-            else
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-              end
-            end
-            mod = next_mod
-            
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        end
-      end

branches/stable/actionpack/test/controller/routing_test.rb

@@ -978 +978 @@
-    base = File.dirname(File.dirname(File.expand_path(__FILE__)))
-    $: << File.join(base, 'fixtures')
+    Object.send :const_set, :RAILS_ROOT, File.join(base, 'fixtures/application_root')
-    assert_equal nil, ActionController::Routing::ControllerComponent.traverse_to_controller(%w(dont_load pretty please))
-  ensure
-    $:[0..-1] = load_path
+    Object.send :remove_const, :RAILS_ROOT
-  end
-  
@@ -987 +989 @@
-  end
-  
+  # This is evil, but people do it.
+  def test_traverse_to_controller_should_pass_thru_classes
+    load_path = $:.dup
+    base = File.dirname(File.dirname(File.expand_path(__FILE__)))
+    $: << File.join(base, 'fixtures')
+    $: << File.join(base, 'fixtures/application_root/app/controllers')
+    $: << File.join(base, 'fixtures/application_root/app/models')
+    Object.send :const_set, :RAILS_ROOT, File.join(base, 'fixtures/application_root')
+    pair = ActionController::Routing::ControllerComponent.traverse_to_controller(%w(a_class_that_contains_a_controller poorly_placed))
+    
+    # Make sure the container class was loaded properly
+    assert defined?(AClassThatContainsAController)
+    assert_kind_of Class, AClassThatContainsAController
+    assert_equal :you_know_it, AClassThatContainsAController.is_special?
+    
+    # Make sure the controller was too
+    assert_kind_of Array, pair
+    assert_equal 2, pair[1]
+    klass = pair.first
+    assert_kind_of Class, klass
+    assert_equal :decidedly_so, klass.is_evil?
+    assert klass.ancestors.include?(ActionController::Base)
+    assert defined?(AClassThatContainsAController::PoorlyPlacedController)
+    assert_equal klass, AClassThatContainsAController::PoorlyPlacedController
+  ensure
+    $:[0..-1] = load_path
+    Object.send :remove_const, :RAILS_ROOT
+  end
+  
+  def test_traverse_to_nested_controller
+    load_path = $:.dup
+    base = File.dirname(File.dirname(File.expand_path(__FILE__)))
+    $: << File.join(base, 'fixtures')
+    $: << File.join(base, 'fixtures/application_root/app/controllers')
+    Object.send :const_set, :RAILS_ROOT, File.join(base, 'fixtures/application_root')
+    pair = ActionController::Routing::ControllerComponent.traverse_to_controller(%w(module_that_holds_controllers nested))
+    
+    assert_not_equal nil, pair
+    
+    # Make sure that we created a module for the dir
+    assert defined?(ModuleThatHoldsControllers)
+    assert_kind_of Module, ModuleThatHoldsControllers
+
+    # Make sure the controller is ok
+    assert_kind_of Array, pair
+    assert_equal 2, pair[1]
+    klass = pair.first
+    assert_kind_of Class, klass
+    assert klass.ancestors.include?(ActionController::Base)
+    assert defined?(ModuleThatHoldsControllers::NestedController)
+    assert_equal klass, ModuleThatHoldsControllers::NestedController
+  ensure
+    $:[0..-1] = load_path
+    Object.send :remove_const, :RAILS_ROOT
+  end
+  
-end
-