Changeset 6594

Timestamp:

04/27/07 16:58:36 (2 years ago)

Author:

david

Message:

Added map.namespace to deal with the common situation of admin sections and the like [DHH]

Files:

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

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added map.namespace to deal with the common situation of admin sections and the like [DHH]
+
+    Before:
+    
+      map.resources :products, :path_prefix => "admin", :controller => "admin/products", :collection => { :inventory => :get }, :member => { :duplicate => :post }
+      map.resources :tags, :name_prefix => 'admin_product_', :path_prefix => "admin/products/:product_id", :controller => "admin/product_tags"
+      map.resources :images, :name_prefix => 'admin_product_', :path_prefix => "admin/products/:product_id", :controller => "admin/product_images"
+      map.resources :variants, :name_prefix => 'admin_product_', :path_prefix => "admin/products/:product_id", :controller => "admin/product_variants"
+
+    After:
+    
+      map.namespace(:admin) do |admin|
+        admin.resources :products,
+          :collection => { :inventory => :get },
+          :member     => { :duplicate => :post },
+          :has_many   => [ :tags, :images, :variants ]
+      end
-
-* Added :name_prefix as standard for nested resources [DHH]. WARNING: May be backwards incompatible with your app

trunk/actionpack/lib/action_controller/resources.rb

@@ -19 +19 @@
-      
-      def controller
-(options[:controller] || plural).to_s
+"#{options[:namespace]}#{(options[:controller] || plural).to_s}"
-      end
-      
@@ -301 +301 @@
-      entities.each { |entity| map_singleton_resource(entity, options.dup, &block) }
-    end
+
+    # Enables the use of resources in a module by setting the name_prefix, path_prefix, and namespace for the model.
+    # Example:
+    #
+    #   map.namespace(:admin) do |admin|
+    #     admin.resources :products,
+    #       :has_many => [ :tags, :images, :variants ]
+    #   end
+    #
+    # This will create admin_products_url pointing to "admin/products", which will look for an Admin::ProductsController.
+    # It'll also create admin_product_tags_url pointing to "admin/products/#{product_id}/tags", which will look for
+    # Admin::TagsController.
+    def namespace(name, options = {}, &block)
+      with_options({ :path_prefix => name, :name_prefix => "#{name}_", :namespace => "#{name}/" }.merge(options), &block)
+    end
+
-
-    private

trunk/actionpack/test/controller/resources_test.rb

@@ -15 +15 @@
-class AccountController <  ResourcesController; end
-class AdminController   <  ResourcesController; end
+
+module Backoffice
+  class ProductsController < ResourcesController; end
+end
-
-class ResourcesTest < Test::Unit::TestCase
@@ -385 +389 @@
-  end
-
+  def test_resources_in_namespace
+    with_routing do |set|
+      set.draw do |map|
+        map.namespace :backoffice do |backoffice|
+          backoffice.resources :products
+        end
+      end
+      
+      assert_simply_restful_for :products, :controller => "backoffice/products", :name_prefix => 'backoffice_', :path_prefix => 'backoffice/'
+    end
+  end
+  
+  def test_resources_using_namespace
+    with_routing do |set|
+      set.draw do |map|
+        map.resources :products, :namespace => "backoffice/"
+      end
+      
+      assert_simply_restful_for :products, :controller => "backoffice/products"
+    end
+  end
+
-  protected
-    def with_restful_routing(*args)
@@ -403 +429 @@
-    def assert_simply_restful_for(controller_name, options = {})
-      assert_restful_routes_for       controller_name, options
-
+nil, 
-    end
-
@@ -412 +438 @@
-
-    def assert_restful_routes_for(controller_name, options = {})
-
+
+
-
-      collection_path            = "/#{options[:path_prefix]}#{controller_name}"
@@ -457 +484 @@
-      end
-      singular_name ||= controller_name.to_s.singularize
-
-
+
+
+
+
+
-      @request    = ActionController::TestRequest.new
-      @response   = ActionController::TestResponse.new