Changeset 7713 for branches/1-2-stable/actionpack/lib/action_controller/resources.rb

Timestamp:

10/01/07 06:44:07 (1 year ago)

Author:

nzkoz

Message:

Change the resource seperator from ; to / change the generated routes to use the new-style named routes. e.g. new_group_user_path(@group) instead of group_new_user_path(@group). [pixeltrix] Closes #8558

Files:

• branches/1-2-stable/actionpack/lib/action_controller/resources.rb (modified) (17 diffs)

branches/1-2-stable/actionpack/lib/action_controller/resources.rb

@@ -3 +3 @@
-    class Resource #:nodoc:
-      attr_reader :collection_methods, :member_methods, :new_methods
-
+ew_n
-      attr_reader :plural, :singular
-      attr_reader :options
@@ -10 +10 @@
-        @plural   = entities
-        @singular = options[:singular] || plural.to_s.singularize
-
+
-        @options = options
-
@@ -17 +17 @@
-        set_prefixes
-      end
-
+
-      def controller
-        @controller ||= (options[:controller] || plural).to_s
-      end
-
+
-      def path
-        @path ||= "#{path_prefix}/#{plural}"
-      end
-
+
-      def new_path
-        @new_path ||= "#{path}/new"
-      end
-
+
-      def member_path
-        @member_path ||= "#{path}/:id"
-      end
-
+
-      def nesting_path_prefix
-        @nesting_path_prefix ||= "#{path}/:#{singular}_id"
-      end
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      protected
-        def arrange_actions
@@ -44 +64 @@
-          @new_methods        = arrange_actions_by_methods(options.delete(:new))
-        end
-
+
-        def add_default_actions
-          add_default_action(member_methods, :get, :edit)
@@ -53 +73 @@
-          @path_prefix = options.delete(:path_prefix)
-          @name_prefix = options.delete(:name_prefix)
+          @new_name_prefix = options.delete(:new_name_prefix)
-        end
-
@@ -61 +82 @@
-          end
-        end
-
+
-        def add_default_action(collection, method, action)
-          (collection[method] ||= []).unshift(action)
@@ -179 +200 @@
-    #   The comment resources work the same, but must now include a value for :article_id.
-    #   
-
-
-
-
-
+article_
+article_
+
+article_
+article_
-    #
-    # * <tt>:name_prefix</tt> -- define a prefix for all generated routes, usually ending in an underscore.
@@ -193 +214 @@
-    # * <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.
@@ -205 +226 @@
-    #  
-    #   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
@@ -236 +257 @@
-    # 
-    # See map.resources for general conventions.  These are the main differences:
-
-
-
+
+
+
+
-    #   - When nesting singleton resources, only the singular name is used as the path prefix (example: 'account/messages/1')
-    #
@@ -301 +323 @@
-
-          if block_given?
-
+:new_name_prefix => resource.nesting_name_prefix, 
-          end
-        end
@@ -316 +338 @@
-
-          if block_given?
-
+:new_name_prefix => resource.nesting_name_prefix, 
-          end
-        end
@@ -325 +347 @@
-          actions.each do |action|
-            action_options = action_options_for(action, resource, method)
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-          end
-        end
@@ -335 +370 @@
-        map.named_route("#{resource.name_prefix}#{resource.plural}", resource.path, index_action_options)
-        map.named_route("formatted_#{resource.name_prefix}#{resource.plural}", "#{resource.path}.:format", index_action_options)
+
+        if resource.deprecate_name_prefix?
+          map.deprecated_named_route("#{resource.name_prefix}#{resource.plural}", "#{resource.plural}")
+          map.deprecated_named_route("formatted_#{resource.name_prefix}#{resource.plural}", "formatted_#{resource.plural}")
+        end
-
-        create_action_options = action_options_for("create", resource)
@@ -352 +392 @@
-            action_options = action_options_for(action, resource, method)
-            if action == :new
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            else
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            end
-          end
@@ -366 +432 @@
-          actions.each do |action|
-            action_options = action_options_for(action, resource, method)
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-          end
-        end
@@ -374 +454 @@
-        map.named_route("#{resource.name_prefix}#{resource.singular}", resource.member_path, show_action_options)
-        map.named_route("formatted_#{resource.name_prefix}#{resource.singular}", "#{resource.member_path}.:format", show_action_options)
+
+        if resource.deprecate_name_prefix?
+          map.deprecated_named_route("#{resource.name_prefix}#{resource.singular}", "#{resource.singular}")
+          map.deprecated_named_route("formatted_#{resource.name_prefix}#{resource.singular}", "formatted_#{resource.singular}")
+        end
-
-        update_action_options = action_options_for("update", resource)