Changeset 6485

Timestamp:

03/28/07 21:55:40 (1 year ago)

Author:

david

Message:

Dropped the use of ; as a separator of non-crud actions on resources and went back to the vanilla slash. It was a neat idea, but lots of the non-crud actions turned out not to be RPC (as the ; was primarily intended to discourage), but legitimate sub-resources, like /parties/recent, which didn't deserve the uglification of /parties;recent. Further more, the semicolon caused issues with caching and HTTP authentication in Safari. Just Not Worth It [DHH]

Files:

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

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Dropped the use of ; as a separator of non-crud actions on resources and went back to the vanilla slash. It was a neat idea, but lots of the non-crud actions turned out not to be RPC (as the ; was primarily intended to discourage), but legitimate sub-resources, like /parties/recent, which didn't deserve the uglification of /parties;recent. Further more, the semicolon caused issues with caching and HTTP authentication in Safari. Just Not Worth It [DHH]
-
-* Added that FormTagHelper#submit_tag will return to its original state if the submit fails and you're using :disable_with [DHH]

trunk/actionpack/lib/action_controller/resources.rb

@@ -200 +200 @@
-    # * <tt>:collection</tt> -- add named routes for other actions that operate on the collection.
-    #   Takes a hash of <tt>#{action} => #{method}</tt>, where method is <tt>:get</tt>/<tt>:post</tt>/<tt>:put</tt>/<tt>:delete</tt>
-;
+/
-    # * <tt>:member</tt> -- same as :collection, but for actions that operate on a specific member.
-    # * <tt>:new</tt> -- same as :collection, but for actions that operate on the new resource action.
@@ -212 +212 @@
-    #  
-    #   map.resources :messages, :collection => { :rss => :get }
-;
+/
-    #   #     also adds a named route called "rss_messages"
-    # 
-    #   map.resources :messages, :member => { :mark => :post }
-;
+/
-    #   #     also adds a named route called "mark_message"
-    # 
-    #   map.resources :messages, :new => { :preview => :post }
-;
+/
-    #   #     also adds a named route called "preview_new_message"
-    # 
-    #   map.resources :messages, :new => { :new => :any, :preview => :post }
-;
+/
-    #   #     also adds a named route called "preview_new_message"
-    #   # --> /messages/new can be invoked via any request method
@@ -332 +332 @@
-          actions.each do |action|
-            action_options = action_options_for(action, resource, method)
-;
-.:format;#{action}
+/
+/#{action}.:format
-          end
-        end
@@ -362 +362 @@
-              map.named_route("formatted_#{resource.name_prefix}new_#{resource.singular}", "#{resource.new_path}.:format", action_options)
-            else
-;
-.:format;#{action}
+/
+/#{action}.:format
-            end
-          end
@@ -373 +373 @@
-          actions.each do |action|
-            action_options = action_options_for(action, resource, method)
-;
-.:format;#{action}
+/
+/#{action}.:format
-          end
-        end

trunk/actionpack/test/controller/resources_test.rb

@@ -104 +104 @@
-  def test_with_collection_action
-    rss_options = {:action => 'rss'}
-;
+/
-    actions = { 'a' => :put, 'b' => :post, 'c' => :delete }
-
@@ -112 +112 @@
-
-        actions.each do |action, method|
-;
+/
-        end
-      end
@@ -119 +119 @@
-        assert_named_route rss_path, :rss_messages_path, rss_options
-        actions.keys.each do |action|
-;
+/
-        end
-      end
@@ -129 +129 @@
-      with_restful_routing :messages, :member => { :mark => method } do
-        mark_options = {:action => 'mark', :id => '1'}
-;
+/
-        assert_restful_routes_for :messages do |options|
-          assert_recognizes(options.merge(mark_options), :path => mark_path, :method => method)
@@ -146 +146 @@
-        %w(mark unmark).each do |action|
-          action_options = {:action => action, :id => '1'}
-;
+/
-          assert_restful_routes_for :messages do |options|
-            assert_recognizes(options.merge(action_options), :path => action_path, :method => method)
@@ -162 +162 @@
-    with_restful_routing :messages, :new => { :preview => :post } do
-      preview_options = {:action => 'preview'}
-;
+/
-      assert_restful_routes_for :messages do |options|
-        assert_recognizes(options.merge(preview_options), :path => preview_path, :method => :post)
@@ -253 +253 @@
-      with_singleton_resources :account, :member => { :reset => method } do
-        reset_options = {:action => 'reset'}
-;
+/
-        assert_singleton_routes_for :account do |options|
-          assert_recognizes(options.merge(reset_options), :path => reset_path, :method => method)
@@ -270 +270 @@
-        %w(reset disable).each do |action|
-          action_options = {:action => action}
-;
+/
-          assert_singleton_routes_for :account do |options|
-            assert_recognizes(options.merge(action_options), :path => action_path, :method => method)
@@ -370 +370 @@
-      member_path                = "#{collection_path}/1"
-      new_path                   = "#{collection_path}/new"
-;
-.xml;edit
+/
+/edit.xml
-
-      with_options(options[:options]) do |controller|
@@ -423 +423 @@
-      assert_named_route "#{full_prefix}/new",        "#{name_prefix}new_#{singular_name}_path",            options[:options]
-      assert_named_route "#{full_prefix}/1",          "#{name_prefix}#{singular_name}_path",                options[:options].merge(:id => '1')
-;
+/
-      assert_named_route "#{full_prefix}.xml",        "formatted_#{name_prefix}#{controller_name}_path",    options[:options].merge(            :format => 'xml')
-      assert_named_route "#{full_prefix}/new.xml",    "formatted_#{name_prefix}new_#{singular_name}_path",  options[:options].merge(            :format => 'xml')
-      assert_named_route "#{full_prefix}/1.xml",      "formatted_#{name_prefix}#{singular_name}_path",      options[:options].merge(:id => '1', :format => 'xml')
-.xml;edit
+/edit.xml
-      yield options[:options] if block_given?
-    end
@@ -436 +436 @@
-      full_path           = "/#{options[:path_prefix]}#{singleton_name}"
-      new_path            = "#{full_path}/new"
-;
-.xml;edit
+/
+/edit.xml
-
-      with_options options[:options] do |controller|
@@ -477 +477 @@
-      assert_named_route "#{full_path}",          "#{singleton_name}_path",                options[:options]
-      assert_named_route "#{full_path}/new",      "new_#{singleton_name}_path",            options[:options]
-;
+/
-      assert_named_route "#{full_path}.xml",      "formatted_#{singleton_name}_path",      options[:options].merge(:format => 'xml')
-      assert_named_route "#{full_path}/new.xml",  "formatted_new_#{singleton_name}_path",  options[:options].merge(:format => 'xml')
-.xml;edit
+/edit.xml
-    end
-