Changeset 4638

Timestamp:

07/31/06 20:00:18 (2 years ago)

Author:

rick

Message:

Fixed the new_#{resource}_url route and added named route tests for Simply Restful. [Rick Olson]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/resources.rb (modified) (1 diff)
• trunk/actionpack/test/controller/resources_test.rb (modified) (8 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fixed the new_#{resource}_url route and added named route tests for Simply Restful.  [Rick Olson]
-
-* Added map.resources from the Simply Restful plugin [DHH]. Examples (the API has changed to use plurals!):

trunk/actionpack/lib/action_controller/resources.rb

@@ -137 +137 @@
-          actions.each do |action|
-            path = action == :new ? resource.new_path : "#{resource.new_path};#{action}"
-plural
+singular
-            name = "#{action}_#{name}" unless action == :new
-

trunk/actionpack/test/controller/resources_test.rb

@@ -2 +2 @@
-
-class MessagesController < ActionController::Base
+  def index() render :nothing => true end
-  def rescue_action(e) raise e end
-end
@@ -12 +13 @@
-  def test_default_restful_routes
-    with_restful_routing :messages do
-
-
-
+
-    end
-  end
@@ -20 +19 @@
-  def test_with_path_prefix
-    with_restful_routing :messages, :path_prefix => '/thread/:thread_id' do
-restful_routes
+simply_restful
-    end
-  end
@@ -26 +25 @@
-  def test_with_collection_action
-    with_restful_routing :messages, :collection => { :rss => :get } do
+      rss_options = {:action => 'rss'}
+      rss_path    = "/messages;rss"
-      assert_restful_routes_for :messages do |options|
-
+
+
+
+
+
-      end
-    end
@@ -35 +40 @@
-    [:put, :post].each do |method|
-      with_restful_routing :messages, :member => { :mark => method } do
+        mark_options = {:action => 'mark', :id => '1'}
+        mark_path    = "/messages/1;mark"
-        assert_restful_routes_for :messages do |options|
-
-
-
+
+
+
+
+
-        end
-      end
@@ -46 +55 @@
-  def test_with_new_action
-    with_restful_routing :messages, :new => { :preview => :post } do
+      preview_options = {:action => 'preview'}
+      preview_path    = "/messages/new;preview"
-      assert_restful_routes_for :messages do |options|
-
-
-
+
+
+
+
+
-      end
-    end
@@ -80 +93 @@
-      end
-    end
-
+
+
+
+
+
+
+
-    def assert_restful_routes_for(controller_name, options = {})
-      (options[:options] ||= {})[:controller] = controller_name.to_s
@@ -104 +123 @@
-        options[:options].merge(:action => 'destroy', :id => '1'),
-        {:path => "/#{options[:path_prefix]}#{controller_name}/1", :method => :delete})
-
+
-      yield options[:options] if block_given?
-    end
+    
+    # test named routes like foo_path and foos_path map to the correct options.
+    def assert_restful_named_routes_for(controller_name, singular_name = nil, options = {})
+      if singular_name.is_a?(Hash)
+        options       = singular_name
+        singular_name = nil
+      end
+      singular_name ||= controller_name.to_s.singularize
+      (options[:options] ||= {})[:controller] = controller_name.to_s
+      @controller = "#{controller_name.to_s.camelize}Controller".constantize.new
+      @request    = ActionController::TestRequest.new
+      @response   = ActionController::TestResponse.new
+      get :index, options[:options]
+      options[:options].delete :action
+
+      full_prefix = "/#{options[:path_prefix]}#{controller_name}"
+
+      assert_named_route "#{full_prefix}",        "#{controller_name}_path",           options[:options]
+      assert_named_route "#{full_prefix}.xml",    "formatted_#{controller_name}_path", options[:options].merge(:format => 'xml')
+      assert_named_route "#{full_prefix}/new",    "new_#{singular_name}_path",         options[:options]
+      assert_named_route "#{full_prefix}/1",      "#{singular_name}_path",             options[:options].merge(:id => '1')
+      assert_named_route "#{full_prefix}/1;edit", "edit_#{singular_name}_path",        options[:options].merge(:id => '1')
+      assert_named_route "#{full_prefix}/1.xml",  "formatted_#{singular_name}_path",   options[:options].merge(:format => 'xml', :id => '1')
+      yield options[:options] if block_given?
+    end
+
+    def assert_named_route(expected, route, options)
+      actual =  @controller.send(route, options) rescue $!.class.name
+      assert_equal expected, actual, "Error on route: #{route}(#{options.inspect})"
+    end
-end