Changeset 6951

Timestamp:

06/05/07 19:10:59 (1 year ago)

Author:

bitsweat

Message:

Resources: url_for([parent, child]) generates /parents/1/children/2 for the nested resource. Likewise with the other simply helpful methods like form_for and link_to. Closes #6432.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/polymorphic_routes.rb (modified) (2 diffs)
• trunk/actionpack/lib/action_controller/record_identifier.rb (modified) (1 diff)
• trunk/actionpack/lib/action_view/helpers/form_helper.rb (modified) (2 diffs)
• trunk/actionpack/test/template/form_helper_test.rb (modified) (4 diffs)
• trunk/actionpack/test/template/url_helper_test.rb (modified) (5 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Resources: url_for([parent, child]) generates /parents/1/children/2 for the nested resource. Likewise with the other simply helpful methods like form_for and link_to.  #6432 [mhw, Jonathan Vaught]
-
-* Assume html format when rendering partials in RJS. #8076 [Rick]

trunk/actionpack/lib/action_controller/polymorphic_routes.rb

@@ -1 +1 @@
-module ActionController
-  module PolymorphicRoutes
-
-
+_or_array
+_or_array
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
-    end
-
-
-
+_or_array
+_or_array
-    end
-
- edit new formatted 
+edit new formatted
-      module_eval <<-EOT, __FILE__, __LINE__
-        def #{action}_polymorphic_url(record_or_hash)
@@ -45 +43 @@
-
-      def routing_type(options)
-_
+
-      end
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      end
-  end

trunk/actionpack/lib/action_controller/record_identifier.rb

@@ -26 +26 @@
-  #   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.

trunk/actionpack/lib/action_view/helpers/form_helper.rb

@@ -164 +164 @@
-        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
@@ -175 +180 @@
-        concat('</form>', proc.binding)
-      end
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        options[:html] ||= {}
-        options[:html].reverse_merge!(html_options)
-
-
+
-      end
-

trunk/actionpack/test/template/form_helper_test.rb

@@ -16 +16 @@
-    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 FormHelperTest < Test::Unit::TestCase
@@ -29 +42 @@
-  def setup
-    @post = Post.new
+    @comment = Comment.new
-    def @post.errors() 
-      Class.new{ 
@@ -580 +594 @@
-  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 = ''
@@ -601 +634 @@
-
-  protected
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      else
-
+
+
+
+
+
-      end
-    end

trunk/actionpack/test/template/url_helper_test.rb

@@ -376 +376 @@
-end
-
+class Session
+  attr_accessor :id, :workshop_id, :new_record
+
+  def initialize(id, new_record)
+    @id, @new_record = id, new_record
+  end
+
+  def new_record?
+    @new_record
+  end
+
+  def to_s
+    id.to_s
+  end
+end
+
-class PolymorphicControllerTest < Test::Unit::TestCase
-  class WorkshopsController < ActionController::Base
@@ -395 +411 @@
-  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
-
@@ -400 +436 @@
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
+  end
+
+  def test_new_resource
-    @controller = WorkshopsController.new
-
-
-
+
-    with_restful_routing do
-      get :index
@@ -411 +448 @@
-
-  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
@@ -421 +478 @@
-      with_routing do |set|
-        set.draw do |map|
-
+
+
+
-        end
-        yield