Ticket #7229: put_and_delete_requires_id2.diff

test/controller/resources_test.rb

@@ -27 +27 @@
-    assert_resource_methods [:new, :preview, :draft], resource, :new,        :get
-  end
-
+  def test_should_resource_controller_name_equal_resource_name_by_default
+    resource = ActionController::Resources::Resource.new(:messages, {})
+    assert_equal 'messages', resource.controller
+  end
+
+  def test_should_resource_controller_name_equal_controller_option
+    resource = ActionController::Resources::Resource.new(:messages, :controller => 'posts')
+    assert_equal 'posts', resource.controller
+  end
+
+  def test_should_all_singleton_paths_be_the_same
+    [ :path, :nesting_path_prefix, :member_path ].each do |method|
+      resource = ActionController::Resources::SingletonResource.new(:messages, :path_prefix => 'admin')
+      assert_equal 'admin/messages', resource.send(method)
+    end
+  end
+
-  def test_default_restful_routes
-    with_restful_routing :messages do
-      assert_simply_restful_for :messages
@@ -116 +133 @@
-    end
-  end
-
-
-  def test_with_new_action
-    with_restful_routing :messages, :new => { :preview => :post } do
-      preview_options = {:action => 'preview'}
@@ -280 +296 @@
-    end
-  end
-
+  def test_should_not_allow_delete_or_put_on_collection_path
+    controller_name = :messages
+    with_restful_routing controller_name do
+      options = { :controller => controller_name.to_s }
+      collection_path = "/#{controller_name}"
+
+      assert_raises(ActionController::RoutingError) do
+        assert_recognizes(options.merge(:action => 'update'), :path => collection_path, :method => :put)
+      end
+
+      assert_raises(ActionController::RoutingError) do
+        assert_recognizes(options.merge(:action => 'destroy'), :path => collection_path, :method => :delete)
+      end
+    end
+  end
+
-  protected
-    def with_restful_routing(*args)
-      with_routing do |set|
@@ -309 +341 @@
-    def assert_restful_routes_for(controller_name, options = {})
-      (options[:options] ||= {})[:controller] = controller_name.to_s
-
-
-
-
+
+
+
+
+
-
-      with_options(options[:options]) do |controller|
-        controller.assert_routing collection_path,            :action => 'index'
-        controller.assert_routing "#{collection_path}.xml" ,  :action => 'index', :format => 'xml'
-        controller.assert_routing new_path,                   :action => 'new'
-        controller.assert_routing member_path,                :action => 'show', :id => '1'
-
+
+
+
-        controller.assert_routing "#{member_path}.xml",       :action => 'show', :id => '1', :format => 'xml'
+        controller.assert_routing formatted_edit_member_path, :action => 'edit', :id => '1', :format => 'xml'
-      end
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
-
-      assert_recognizes(
-        options[:options].merge(:action => 'destroy', :id => '1'),
-        :path => member_path, :method => :delete)
-
-      yield options[:options] if block_given?
-    end
-
@@ -354 +394 @@
-      full_prefix = "/#{options[:path_prefix]}#{controller_name}"
-      name_prefix = options[:name_prefix]
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-      yield options[:options] if block_given?
-    end
-
-    def assert_singleton_routes_for(singleton_name, options = {})
-      (options[:options] ||= {})[:controller] ||= singleton_name.to_s
-
-
+
+
+
+
+
+
-      with_options options[:options] do |controller|
-
-
-
-
+
+
+
+
+
+
-      end
-
+      assert_recognizes(options[:options].merge(:action => 'show'),    :path => full_path, :method => :get)
+      assert_recognizes(options[:options].merge(:action => 'new'),     :path => new_path,  :method => :get)
+      assert_recognizes(options[:options].merge(:action => 'edit'),    :path => edit_path, :method => :get)
-      assert_recognizes(options[:options].merge(:action => 'create'),  :path => full_path, :method => :post)
-      assert_recognizes(options[:options].merge(:action => 'update'),  :path => full_path, :method => :put)
-      assert_recognizes(options[:options].merge(:action => 'destroy'), :path => full_path, :method => :delete)
-
+      assert_recognizes(options[:options].merge(:action => 'show',    :format => 'xml'), :path => "#{full_path}.xml",  :method => :get)
+      assert_recognizes(options[:options].merge(:action => 'new',     :format => 'xml'), :path => "#{new_path}.xml",   :method => :get)
+      assert_recognizes(options[:options].merge(:action => 'edit',    :format => 'xml'), :path => formatted_edit_path, :method => :get)
+      assert_recognizes(options[:options].merge(:action => 'create',  :format => 'xml'), :path => "#{full_path}.xml",  :method => :post)
+      assert_recognizes(options[:options].merge(:action => 'update',  :format => 'xml'), :path => "#{full_path}.xml",  :method => :put)
+      assert_recognizes(options[:options].merge(:action => 'destroy', :format => 'xml'), :path => "#{full_path}.xml",  :method => :delete)
+
-      yield options[:options] if block_given?
-    end
-
@@ -388 +446 @@
-      @response   = ActionController::TestResponse.new
-      get :show, options[:options]
-      options[:options].delete :action
-
+
-      full_path = "/#{options[:path_prefix]}#{singleton_name}"
-
-
-
-
-
+
+
+
+
+
+
+
-    end
-
-    def assert_named_route(expected, route, options)

lib/action_controller/resources.rb

@@ -322 +322 @@
-
-      def map_collection_actions(map, resource)
-        resource.collection_methods.each do |method, actions|
-          route_options = requirements_for(method)
-
-          actions.each do |action|
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-          end
-        end
-      end
-
-      def map_default_collection_actions(map, resource)
-
-
+
+
+
-
-
-
+
+
+
-      end
-
-      def map_default_singleton_actions(map, resource)
-
-
+
+
+
-      end
-
-      def map_new_actions(map, resource)
-        resource.new_methods.each do |method, actions|
-          route_options = requirements_for(method)
-          actions.each do |action|
+            action_options = action_options_for(action, resource, method)
-            if action == :new
-route_options.merge(:action => "new")
-route_options.merge(:action => "new")
+action_options
+action_options
-            else
-route_options.merge(:action => action.to_s)
-route_options.merge(:action => action.to_s)
+action_options
+action_options
-            end
-          end
-        end
-      end
-
+
-      def map_member_actions(map, resource)
-        resource.member_methods.each do |method, actions|
-          route_options = requirements_for(method)
-
-          actions.each do |action|
-
-
+
+
+
-          end
-        end
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-      end
-
-requirement
-method == :any ? {} : { :conditions =>
+condition
+{ :conditions => method == :any ? {} :
-      end
+
+      def action_options_for(action, resource, method = nil)
+        default_options = { :action => action.to_s }
+        require_id = resource.kind_of?(SingletonResource) ? {} : { :requirements => { :id => Regexp.new("[^#{Routing::SEPARATORS.join}]+") } }
+        case default_options[:action]
+          when "index", "new" : default_options.merge(conditions_for(method || :get))
+          when "create"       : default_options.merge(conditions_for(method || :post))
+          when "show", "edit" : default_options.merge(conditions_for(method || :get)).merge(require_id)
+          when "update"       : default_options.merge(conditions_for(method || :put)).merge(require_id)
+          when "destroy"      : default_options.merge(conditions_for(method || :delete)).merge(require_id)
+          else                  default_options.merge(conditions_for(method))
+        end
+      end
-  end
-end
-