Ticket #6432: polymorphic_nested_routes.patch

actionpack/test/template/url_helper_test.rb

@@ -375 +375 @@
-  end
-end
-
+class Session
+  attr_accessor :id, :workshop_id, :new_record
+
+  def initialize(id, new_record)
+    @id, @new_record = id, new_record
+  end
+  
+  #   def save; @id = 1; @post_id = 1 end
+
+  def new_record?
+    @new_record
+  end
+  
+  def to_s
+    id.to_s
+  end
+end
+
-class PolymorphicControllerTest < Test::Unit::TestCase
-  class WorkshopsController < ActionController::Base
-    self.view_paths = ["#{File.dirname(__FILE__)}/../fixtures/"]
@@ -394 +412 @@
-    def rescue_action(e) raise e end
-  end
-
+  class SessionsController < ActionController::Base
+    self.view_paths = ["#{File.dirname(__FILE__)}/../fixtures/"]
+
+    def self.controller_path; 'sessions' end
+
+    def index
+      @workshop = Workshop.new(params[:workshop_id], false)
+      @session = Session.new(1, true)
+      render :inline => "<%= url_for([@workshop, @session]) %>\n<%= link_to('Session', [@workshop, @session]) %>"
+    end
+
+    def show
+      @workshop = Workshop.new(params[:workshop_id], false)
+      @session = Session.new(params[:id], false)
+      render :inline => "<%= url_for([@workshop, @session]) %>\n<%= link_to('Session', [@workshop, @session]) %>"
+    end
+
+    def rescue_action(e) raise e end
+  end
+
-  include ActionView::Helpers::UrlHelper
-
-  def setup
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @controller = WorkshopsController.new
-  end
-
-  def test_new_resource
+    @controller = WorkshopsController.new
+  
-    with_restful_routing do
-      get :index
-      assert_equal "/workshops\n<a href=\"/workshops\">Workshop</a>", @response.body
@@ -410 +449 @@
-  end
-
-  def test_existing_resource
+    @controller = WorkshopsController.new
+
-    with_restful_routing do
-      get :show, :id => 1
-      assert_equal "/workshops/1\n<a href=\"/workshops/1\">Workshop</a>", @response.body
-    end
-  end
-
+  def test_new_nested_resource
+    @controller = SessionsController.new
+  
+    with_restful_routing do
+      get :index, :workshop_id => 1
+      assert_equal "/workshops/1/sessions\n<a href=\"/workshops/1/sessions\">Session</a>", @response.body
+    end
+  end
+
+  def test_existing_nested_resource
+    @controller = SessionsController.new
+  
+    with_restful_routing do
+      get :show, :workshop_id => 1, :id => 1
+      assert_equal "/workshops/1/sessions/1\n<a href=\"/workshops/1/sessions/1\">Session</a>", @response.body
+    end
+  end
+
-  protected
-    def with_restful_routing
-      with_routing do |set|
-        set.draw do |map|
-
+
+
+
-        end
-        yield
-      end

actionpack/test/template/form_helper_test.rb

@@ -15 +15 @@
-      @new_record
-    end
-  end
+  
+  class Comment
+    attr_reader :id
+    attr_reader :post_id
+    def save; @id = 1; @post_id = 1 end
+    def new_record?; @id.nil? end
+    def name
+      @id.nil? ? 'new comment' : "comment ##{@id}"
+    end
+  end
-end
-
+class Comment::Nested < Comment; end
+
+class Test::Unit::TestCase
+  protected
+    def comments_path(post)
+      "/posts/#{post.id}/comments"
+    end
+    
+    def comment_path(post, comment)
+      "/posts/#{post.id}/comments/#{comment.id}"
+    end
+end
+
-class FormHelperTest < Test::Unit::TestCase
-  include ActionView::Helpers::FormHelper
-  include ActionView::Helpers::FormTagHelper
@@ -28 +51 @@
-
-  def setup
-    @post = Post.new
+    @comment = Comment.new
-    def @post.errors() 
-      Class.new{ 
-        def on(field); "can't be empty" if field == "author_name"; end 
@@ -579 +603 @@
-    assert_equal expected, _erbout
-  end
-
+  def test_form_for_with_existing_object_in_list
+    @post.new_record = false
+    @comment.save
+    _erbout = ''
+    form_for([ @post, @comment ]) {}
+
+    expected = "<form action=\"#{comment_path(@post, @comment)}\" class=\"edit_comment\" id=\"edit_comment_1\" method=\"post\"><div style=\"margin:0;padding:0\"><input name=\"_method\" type=\"hidden\" value=\"put\" /></div></form>"
+    assert_dom_equal expected, _erbout
+  end
+
+  def test_form_for_with_new_object_in_list
+    @post.new_record = false
+    _erbout = ''
+    form_for([ @post, @comment ]) {}
+  
+    expected = "<form action=\"#{comments_path(@post)}\" class=\"new_comment\" id=\"new_comment\" method=\"post\"></form>"
+    assert_dom_equal expected, _erbout
+  end
+
-  def test_form_for_with_existing_object_and_custom_url
-    _erbout = ''
-
@@ -600 +643 @@
-
-
-  protected
-
-
-
+
+
+
+
+
+
+
-      else
-
+
+
+
+
+
-      end
-    end
-end

actionpack/lib/action_controller/record_identifier.rb

@@ -25 +25 @@
-  #     end
-  #   end
-  #
-d
+t
-  # that one is being assigned and that the subsequent calls in redirect_to and the RJS expect that same naming 
-  # convention and allows you to write less code if you follow it.
-  module RecordIdentifier

actionpack/lib/action_controller/polymorphic_routes.rb

@@ -1 +1 @@
-module ActionController
-  module PolymorphicRoutes
-
-
+_or_array
+_or_array
-
-      case
-      when options[:action] == "new"
-        send(
-action_prefix(options) + RecordIdentifier.singular_class_name(record) + routing_type(
+build_named_route_call(record_or_hash_or_array, :singular, 
-        )
-
-      when record.respond_to?(:new_record?) && record.new_record?
-        send(
-action_prefix(options) + RecordIdentifier.plural_class_name(record) + routing_type(
+build_named_route_call(record_or_hash_or_array, :plural, 
-        )
-
-      else
-        send(
-action_prefix(options) + RecordIdentifier.singular_class_name(record) + routing_type(options), record_or_hash
+build_named_route_call(record_or_hash_or_array, :singular, options), record_or_hash_or_array
-        )
-      end
-    end
-
-
-
+_or_array
+_or_array
-    end
-
-    %w( edit new formatted ).each do |action|
@@ -44 +44 @@
-      end
-
-      def routing_type(options)
-_
+
-      end
-
-
-
+
+
+
+
+
+
+
+
+
+
-      end
+
+      def extract_record(record_or_hash_or_array)
+        case record_or_hash_or_array
+        when Array: record_or_hash_or_array.last
+        when Hash: record_or_hash_or_array[:id]
+        else record_or_hash_or_array
+        end
+      end
-  end
-end

actionpack/lib/action_view/helpers/form_helper.rb

@@ -163 +163 @@
-        case record_or_name
-        when String, Symbol
-          object_name = record_or_name
+        when Array
+          object = record_or_name.last
+          object_name = ActionController::RecordIdentifier.singular_class_name(object)
+          apply_form_for_options!(object, options, *record_or_name)
+          args.unshift object
-        else
-     
-record_or_name
+
+object
-          apply_form_for_options!(object, options)
-          args.unshift object
-        end
@@ -175 +180 @@
-        concat('</form>', proc.binding)
-      end
-      
-
+, *nested_objects
-        html_options = if object.respond_to?(:new_record?) && object.new_record?
-          { :class  => dom_class(object, :new),  :id => dom_id(object), :method => :post }
-        else
@@ -184 +189 @@
-        
-        options[:html] ||= {}
-        options[:html].reverse_merge!(html_options)
-
-
+
-      end
-
-      # Creates a scope around a specific model object like form_for, but doesn't create the form tags themselves. This makes