Changeset 6588

Timestamp:

04/26/07 23:11:31 (3 years ago)

Author:

david

Message:

Added :has_many and :has_one for declaring plural and singular resources beneath the current [DHH] Added :name_prefix as standard for nested resources [DHH]

Files:

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

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added :name_prefix as standard for nested resources [DHH]. WARNING: May be backwards incompatible with your app
+
+    Before:
+
+      map.resources :emails do |emails|
+        emails.resources :comments,    :name_prefix => "email_"
+        emails.resources :attachments, :name_prefix => "email_"
+      end
+      
+    After:
+
+      map.resources :emails do |emails|
+        emails.resources :comments
+        emails.resources :attachments
+      end
+    
+    This does mean that if you intended to have comments_url go to /emails/5/comments, then you'll have to set :name_prefix to nil explicitly.
+
+* Added :has_many and :has_one for declaring plural and singular resources beneath the current [DHH]
+
+    Before:
+      
+      map.resources :notes do |notes|
+        notes.resources :comments
+        notes.resources :attachments
+        notes.resource :author
+      end
+    
+    After:
+    
+      map.resources :notes, :has_many => [ :comments, :attachments ], :has_one => :author
-
-* Added that render :xml will try to call to_xml if it can [DHH]. Makes these work:

trunk/actionpack/lib/action_controller/resources.rb

@@ -235 +235 @@
-    def resources(*entities, &block)
-      options = entities.last.is_a?(Hash) ? entities.pop : { }
- entity, options.dup, &block
+(entity, options.dup, &block)
-    end
-
@@ -294 +294 @@
-    def resource(*entities, &block)
-      options = entities.last.is_a?(Hash) ? entities.pop : { }
- entity, options.dup, &block
+(entity, options.dup, &block)
-    end
-
@@ -307 +307 @@
-          map_member_actions(map, resource)
-
+          map_associations(resource, options)
+
-          if block_given?
-
-
+:name_prefix => resource.name_prefix, 
+          
-        end
-      end
@@ -322 +324 @@
-          map_member_actions(map, resource)
-
+          map_associations(resource, options)
+
-          if block_given?
-
+:name_prefix => resource.name_prefix, 
-          end
+        end
+      end
+
+      def map_associations(resource, options)
+        Array(options[:has_many]).each do |association|
+          resources(association, :path_prefix => resource.nesting_path_prefix, :name_prefix => resource.name_prefix)
+        end
+
+        Array(options[:has_one]).each do |association|
+          resource(association, :path_prefix => resource.nesting_path_prefix, :name_prefix => resource.name_prefix)
-        end
-      end

trunk/actionpack/test/controller/resources_test.rb

@@ -10 +10 @@
-class MessagesController < ResourcesController; end
-class CommentsController < ResourcesController; end
+class AuthorsController < ResourcesController; end
+class LogoController < ResourcesController; end
-
-class AccountController <  ResourcesController; end
@@ -248 +250 @@
-    end
-  end
+  
+  def test_resource_has_many_should_become_nested_resources
+    with_routing do |set|
+      set.draw do |map|
+        map.resources :messages, :has_many => [ :comments, :authors ]
+      end
+
+      assert_simply_restful_for :messages
+      assert_simply_restful_for :comments, :path_prefix => 'messages/1/', :options => { :message_id => '1' }
+      assert_simply_restful_for :authors,  :path_prefix => 'messages/1/', :options => { :message_id => '1' }
+    end
+  end
+
+  def test_resource_has_one_should_become_nested_resources
+    with_routing do |set|
+      set.draw do |map|
+        map.resources :messages, :has_one => :logo
+      end
+
+      assert_simply_restful_for :messages
+      assert_singleton_restful_for :logo, :path_prefix => 'messages/1/', :options => { :message_id => '1' }
+    end
+  end
-
-  def test_singleton_resource_with_member_action