Ticket #8469: inferencing_url_helpers.diff

actionpack/test/controller/inferencing_helpers_test.rb

@@ +1 @@
+require File.dirname(__FILE__) + '/../abstract_unit'
+require File.join(File.dirname(__FILE__), 'inferencing_helpers_controller')
+
+class InferencingHelpersBaseTest < Test::Unit::TestCase
+  include ActionView::Helpers::UrlHelper
+
+  def setup
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @controller = InferencingHelpersController.new
+  end
+
+  def test_truth; assert true; end
+
+  protected
+  def with_nested_resource_expectation
+    with_routing do |set|
+      set.draw do |map|
+        # NOTE - we set the name_prefix to nil so that the
+        # controller's show_xxx methods are a little less noisy
+        map.resources :widgets do |widget|
+          widget.resources :flanges, :name_prefix => nil do |flange|
+            flange.resources :grommets, :name_prefix => nil
+          end
+        end
+        # Make sure our get() calls can route properly
+        map.inferencing_helpers 'inferencing_helpers/:action', :controller => 'inferencing_helpers'
+      end
+      yield
+      assert_equal expected_result, @response.body unless expected_result.nil?
+    end
+  end
+end
+
+class InferencingHelpersFlangeTest < InferencingHelpersBaseTest
+  def test_specified_positional_path
+    with_nested_resource_expectation { get :show_specified_positional_path }
+  end
+
+  def test_segments_specified_only_in_options
+    with_nested_resource_expectation { get :show_segments_specified_only_in_options }
+  end
+
+  def test_inferred_positional_path
+    with_nested_resource_expectation { get :show_inferred_positional_path }
+  end
+
+  def test_instance_id_inference
+    with_nested_resource_expectation { get :show_instance_id_inference }
+  end
+
+  def test_inference_precedence
+    with_nested_resource_expectation { get :show_inference_precedence }
+  end
+
+  protected 
+  def expected_result
+    '/widgets/a_widget/flanges/a_flange'
+  end
+end
+
+class InferencingHelpersGrommetTest < InferencingHelpersBaseTest
+  def test_deep_inferred_positional_path
+    with_nested_resource_expectation { get :show_deep_inferred_positional_path }
+  end
+
+  def test_positionals_always_overrides_instance_variables
+    with_nested_resource_expectation { get :show_positionals_always_overrides_instance_variables }
+  end
+
+  def test_options_always_overrides_instance_variables
+    with_nested_resource_expectation { get :show_options_always_overrides_instance_variables }
+  end
+
+  def test_positionals_always_overrides_options
+    with_nested_resource_expectation { get :show_positionals_always_overrides_options }
+  end
+
+  protected
+  def expected_result
+    '/widgets/a_widget/flanges/a_flange/grommets/a_grommet'
+  end
+end
+
+class InferencingHelpersAdditionalParamsTest < InferencingHelpersBaseTest
+  def test_additional_params_with_positionals
+    with_nested_resource_expectation { get :show_additional_params_with_positionals }
+  end
+
+  def test_additional_params_with_segments_only_in_options
+    with_nested_resource_expectation { get :show_additional_params_with_just_options }
+  end
+
+  def test_additional_params_with_mixed_segments
+    with_nested_resource_expectation { get :show_additional_params_with_mixed_args }
+  end
+
+  def test_additional_params_with_segments_inferred
+    with_nested_resource_expectation { get :show_additional_params_with_segments_inferred }
+  end
+
+  protected
+  def expected_result
+    '/widgets/a_widget/flanges/a_flange/grommets?another=param'
+  end
+end
+
+class InferencingHelpersExtraTest < InferencingHelpersBaseTest
+  def test_collection_helpers_need_no_arguments
+    with_nested_resource_expectation do
+      get :show_collection_helpers_need_no_arguments
+      assert_equal '/widgets/a_widget/flanges/a_flange/grommets', @response.body
+    end
+  end
+
+  def test_explosion_because_id_segment_is_never_inferred
+    with_nested_resource_expectation do
+      assert_raises ActionController::RoutingError do
+        get :show_explosion_because_id_segment_is_never_inferred
+      end
+    end
+  end
+
+  def test_explosion_because_no_inference_strategy_available
+    with_nested_resource_expectation do
+      assert_raises ActionController::RoutingError do
+        get :show_explosion_because_no_inference_strategy_available
+      end
+    end
+  end
+
+  def test_explosion_because_too_many_positionals
+    with_nested_resource_expectation do
+      assert_raises ArgumentError do
+        get :show_explosion_because_too_many_positionals
+      end
+    end
+  end
+
+  protected
+  def expected_result
+    nil # no automatic assertion please
+  end
+end

actionpack/test/controller/inferencing_helpers_controller.rb

@@ +1 @@
+class InferencingHelpersController < ActionController::Base
+  self.view_paths = [ "#{File.dirname(__FILE__)}/../fixtures/" ]
+
+  def self.controller_path; 'inferencing_helpers' end
+  def rescue_action(e) raise e end
+
+  # Test routes are set up as follows:
+  # map.resources :widgets do |widget|
+  #   widget.resources :flanges, :name_prefix => nil do |flange|
+  #     flange.resources :grommets, :name_prefix => nil
+  #   end
+  # end
+
+  def show_specified_positional_path
+    # test expects '/widgets/a_widget/flanges/a_flange'
+    render :inline => "<%= flange_path('a_widget', 'a_flange') %>"
+  end
+
+  def show_segments_specified_only_in_options
+    # test expects '/widgets/a_widget/flanges/a_flange'
+    render :inline => "<%= flange_path(:widget_id => 'a_widget', :id => 'a_flange') %>"
+  end
+
+  def show_inferred_positional_path
+    # test expects '/widgets/a_widget/flanges/a_flange'
+    @widget = 'a_widget'
+    render :inline => "<%= flange_path('a_flange') %>"
+  end
+
+  def show_instance_id_inference
+    # test expects '/widgets/a_widget/flanges/a_flange'
+    @widget_id = 'a_widget'
+    render :inline => "<%= flange_path('a_flange') %>"
+  end
+
+  def show_inference_precedence
+    # test expects '/widgets/a_widget/flanges/a_flange'
+    @widget_id = 'bogus_widget'
+    @widget = 'a_widget'
+    render :inline => "<%= flange_path('a_flange') %>"
+  end
+
+  def show_deep_inferred_positional_path
+    # test expects '/widgets/a_widget/flanges/a_flange/grommets/a_grommet'
+    @widget = 'a_widget'
+    render :inline => "<%= grommet_path('a_flange','a_grommet') %>"
+  end
+
+  def show_positionals_always_overrides_instance_variables
+    # test expects '/widgets/a_widget/flanges/a_flange/grommets/a_grommet'
+    @widget = 'bogus_widget'
+    @flange = 'bogus_flange'
+    render :inline => "<%= grommet_path('a_widget', 'a_flange', 'a_grommet') %>"
+  end
+
+  def show_options_always_overrides_instance_variables
+    # test expects '/widgets/a_widget/flanges/a_flange/grommets/a_grommet'
+    @widget = 'bogus_widget'
+    @flange = 'bogus_flange'
+    render :inline => "<%= grommet_path('a_grommet', :widget_id => 'a_widget', :flange_id => 'a_flange') %>"
+  end
+
+  def show_positionals_always_overrides_options
+    # test expects '/widgets/a_widget/flanges/a_flange/grommets/a_grommet'
+    render :inline => "<%= grommet_path('a_widget', 'a_flange', 'a_grommet', :widget_id => 'bogus_widget', :flange_id => 'bogus_flange') %>"
+  end
+
+  def show_additional_params_with_positionals
+    # test expects '/widgets/a_widget/flanges/a_flange/grommets?another=param'
+    render :inline => "<%= grommets_path('a_widget', 'a_flange', :another => 'param') %>"
+  end
+
+  def show_additional_params_with_just_options
+    # test expects '/widgets/a_widget/flanges/a_flange/grommets?another=param'
+    render :inline => "<%= grommets_path(:widget_id => 'a_widget', :flange_id => 'a_flange', :another => 'param') %>"
+  end
+
+  def show_additional_params_with_mixed_args
+    # test expects '/widgets/a_widget/flanges/a_flange/grommets?another=param'
+    render :inline => "<%= grommets_path('a_flange', :widget_id => 'a_widget', :another => 'param') %>"
+  end
+
+  def show_additional_params_with_segments_inferred
+    # test expects '/widgets/a_widget/flanges/a_flange/grommets?another=param'
+    @widget = 'a_widget'
+    @flange = 'a_flange'
+    render :inline => "<%= grommets_path(:another => 'param') %>"
+  end
+
+  def show_collection_helpers_need_no_arguments
+    # test expects '/widgets/a_widget/flanges/a_flange/grommets'
+    @widget = 'a_widget'
+    @flange = 'a_flange'
+    render :inline => "<%= grommets_path() %>"
+  end
+
+  def show_explosion_because_id_segment_is_never_inferred
+    # test expects ActionController::RoutingError
+    @widget = 'a_widget'
+    @flange = 'a_flange'
+    @grommet = @id = @grommet_id = 'a_grommet'
+    render :inline => "<%= grommet_path() %>"
+  end
+
+  def show_explosion_because_no_inference_strategy_available
+    # test expects ActionController::RoutingError
+    # @widget is required by the route but is missing here
+    @flange = 'a_flange'
+    render :inline => "<%= grommet_path('a_grommet') %>"
+  end
+
+  def show_explosion_because_too_many_positionals
+    # test expects ArgumentError
+    render :inline => "<%= grommet_path('a_widget', 'a_flange', 'a_grommet', 'extra_positional') %>"
+  end
+end

actionpack/lib/action_controller/routing.rb

@@ -1129 +1129 @@
-          
-          def define_url_helper(route, name, kind, options)
-            selector = url_helper_name(name, kind)
-
+
+
-            # The segment keys used for positional paramters
-            segment_keys = route.segments.collect do |segment|
-              segment.key if segment.respond_to? :key
-            end.compact
-
-
+
+
+
+
+
+
+
+
-            @module.send :module_eval, <<-end_eval # We use module_eval to avoid leaks
-
-
-
+
+
+
+
+
+
+
+
+
-                else
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                  end
-                end
-                
-                url_for(#{hash_access_method}(opts))
-              end
+              url_for(opts)
+            end
-            end_eval
+            
-            @module.send(:protected, selector)
-            helpers << selector
-          end
-
+
+
+
+
+
+
+
+
+
+
-      end
-  
-      attr_accessor :routes, :named_routes