actionpack 1.12.2 → 1.12.3

data/CHANGELOG

@@ -1,3 +1,12 @@
+*1.12.3* (June 28th, 2006)
+
+* 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)
 
 * Refinement to avoid exceptions in traverse_to_controller.

data/lib/action_controller/routing.rb

@@ -224,44 +224,70 @@ module ActionController
           length = segments.length
           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])
             index += 1
             
             mod_name = segment.camelize
             controller_name = "#{mod_name}Controller"
+            path_suffix = File.join(segments[start_at..(index - 1)])
+            next_mod = nil
             
-            begin
-              # We use eval instead of const_get to avoid obtaining values from parent modules.
-              controller = eval("mod::#{controller_name}", nil, __FILE__, __LINE__)
-              expected_name = "#{mod.name}::#{controller_name}"
-              
-              # Detect the case when const_get returns an object from a parent namespace.
-              if controller.is_a?(Class) && controller.ancestors.include?(ActionController::Base) && (mod == Object || controller.name == expected_name)
-                return controller, (index - start_at)
-              end
-            rescue NameError => e
-              raise unless /^uninitialized constant .*#{controller_name}$/ =~ e.message                            
+            # If the controller is already present, or if we load it, return it.
+            if mod.const_defined?(controller_name) || attempt_load(mod, controller_name, path_suffix + "_controller") == :defined
+              controller = mod.const_get(controller_name)
+              return nil unless controller.is_a?(Class) && controller.ancestors.include?(ActionController::Base) # it's not really a controller?
+              return [controller, (index - start_at)]
             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
-              suffix = File.join(segments[start_at..index])
-              $:.each do |base|
-                path = File.join(base, suffix)
-                next unless File.directory? path
-                next_mod = Module.new
-                mod.send(:const_set, mod_name, next_mod)
-                break
+              # Try to load a file that defines the module we want.
+              case attempt_load(mod, mod_name, path_suffix)
+                when :defined then next_mod = mod.const_get mod_name
+                when :dir then # We didn't find a file, but there's a dir.
+                  next_mod = Module.new # So create a module for the directory
+                  mod.send :const_set, mod_name, next_mod
+                else
+                  return nil
               end
             end
             mod = next_mod
             
-            return nil unless mod
+            return nil unless mod && mod.is_a?(Module)
+          end
+          nil
+        end
+        
+      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)
+              base[0, extended_root.length] == extended_root || base =~ %r{rails-[\d.]+/builtin}
+            end
+          else
+            $LOAD_PATH
+          end
+        end
+        
+        def attempt_load(mod, const_name, path)
+          has_dir = false
+          safe_load_paths.each do |load_path|
+            full_path = File.join(load_path, path)
+            file_path = full_path + '.rb'
+            if File.file?(file_path) # Found a .rb file? Load it up
+              require_dependency(file_path)
+              return :defined if mod.const_defined? const_name
+            else
+              has_dir ||= File.directory?(full_path)
+            end
           end
+          return (has_dir ? :dir : nil)
         end
       end
     end

data/lib/action_pack/version.rb

@@ -2,7 +2,7 @@ module ActionPack #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 12
-    TINY  = 2
+    TINY  = 3
     
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/controller/routing_test.rb

@@ -977,15 +977,73 @@ class ControllerComponentTest < Test::Unit::TestCase
     load_path = $:.dup
     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
   
   def test_traverse_should_not_trip_on_non_module_constants
     assert_equal nil, ActionController::Routing::ControllerComponent.traverse_to_controller(%w(admin some_constant a))
   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
 
 end

data/test/fixtures/application_root/app/controllers/a_class_that_contains_a_controller/poorly_placed_controller.rb

@@ -0,0 +1,7 @@
+class AClassThatContainsAController::PoorlyPlacedController < ActionController::Base
+  
+  def self.is_evil?
+    :decidedly_so
+  end
+  
+end

data/test/fixtures/application_root/app/controllers/module_that_holds_controllers/nested_controller.rb

@@ -0,0 +1,3 @@
+class ModuleThatHoldsControllers::NestedController < ActionController::Base
+  
+end

data/test/fixtures/application_root/app/models/a_class_that_contains_a_controller.rb

@@ -0,0 +1,7 @@
+class AClassThatContainsAController #often < ActiveRecord::Base
+  
+  def self.is_special?
+    :you_know_it
+  end
+  
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: actionpack
 version: !ruby/object:Gem::Version 
-  version: 1.12.2
-date: 2006-06-27 00:00:00 -05:00
+  version: 1.12.3
+date: 2006-06-29 00:00:00 -05:00
 summary: Web-flow and rendering framework putting the VC in MVC.
 require_paths: 
 - lib
@@ -180,6 +180,7 @@ files:
 - test/controller/verification_test.rb
 - test/controller/webservice_test.rb
 - test/fixtures/addresses
+- test/fixtures/application_root
 - test/fixtures/companies.yml
 - test/fixtures/company.rb
 - test/fixtures/db_definitions
@@ -203,6 +204,14 @@ files:
 - test/fixtures/topic.rb
 - test/fixtures/topics.yml
 - test/fixtures/addresses/list.rhtml
+- test/fixtures/application_root/app
+- test/fixtures/application_root/app/controllers
+- test/fixtures/application_root/app/models
+- test/fixtures/application_root/app/controllers/a_class_that_contains_a_controller
+- test/fixtures/application_root/app/controllers/module_that_holds_controllers
+- test/fixtures/application_root/app/controllers/a_class_that_contains_a_controller/poorly_placed_controller.rb
+- test/fixtures/application_root/app/controllers/module_that_holds_controllers/nested_controller.rb
+- test/fixtures/application_root/app/models/a_class_that_contains_a_controller.rb
 - test/fixtures/db_definitions/sqlite.sql
 - test/fixtures/fun/games
 - test/fixtures/fun/games/hello_world.rhtml