Changeset 6783

Timestamp:

05/19/07 16:26:44 (2 years ago)

Author:

xal

Message:

Allow routes to be declared off namespaces

Files:

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

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
-
+* Allow routes to be decalred under namespaces [Tobias Luetke]: 
+  
+  map.namespace :admin do |admin|
+    admin.root :controller => "products"       
+    admin.feed 'feed.xml', :controller => 'products', :action => 'feed', :format => 'xml'
+  end
+  
-* Update to script.aculo.us 1.7.1_beta3.  [Thomas Fuchs]
-

trunk/actionpack/lib/action_controller/resources.rb

@@ -339 +339 @@
-      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)
-      if options[:namespace]
-        with_options({:path_prefix => "#{options.delete(:path_prefix)}/#{name}", :name_prefix => "#{options.delete(:name_prefix)}#{name}_", :namespace => "#{options.delete(:namespace)}#{name}/" }.merge(options), &block)
-      else
-        with_options({ :path_prefix => name.to_s, :name_prefix => "#{name}_", :namespace => "#{name}/" }.merge(options), &block)
-      end
-    end
-
-
-    private

trunk/actionpack/lib/action_controller/routing.rb

@@ -871 +871 @@
-      def divide_route_options(segments, options)
-        options = options.dup
+        
+        if options[:namespace]
+          options[:controller] = "#{options[:path_prefix]}/#{options[:controller]}"
+          options.delete(:path_prefix)
+          options.delete(:name_prefix)
+          options.delete(:namespace)
+        end        
+                
-        requirements = (options.delete(:requirements) || {}).dup
-        defaults     = (options.delete(:defaults)     || {}).dup
@@ -880 +888 @@
-          hash[key] = value
-        end
-
+        
-        [defaults, requirements, conditions]
-      end
@@ -962 +970 @@
-        # Wrap the path with slashes
-        path = "/#{path}" unless path[0] == ?/
-
+
+
+
-    
-        segments = segments_for_route_path(path)
@@ -1011 +1021 @@
-          @set.add_named_route(name, path, options)
-        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)
+          if options[:namespace]
+            with_options({:path_prefix => "#{options.delete(:path_prefix)}/#{name}", :name_prefix => "#{options.delete(:name_prefix)}#{name}_", :namespace => "#{options.delete(:namespace)}#{name}/" }.merge(options), &block)
+          else
+            with_options({:path_prefix => name, :name_prefix => "#{name}_", :namespace => "#{name}/" }.merge(options), &block)
+          end
+        end
+        
-
-        def method_missing(route_name, *args, &proc)
@@ -1194 +1224 @@
-  
-      def add_named_route(name, path, options = {})
-
+
+
-      end
-  

trunk/actionpack/test/controller/resources_test.rb

@@ -428 +428 @@
-    end
-  end
-
+
-  protected
-    def with_restful_routing(*args)

trunk/actionpack/test/controller/routing_test.rb

@@ -1692 +1692 @@
-    assert_equal "/people/list", url
-  end
-
+
-  def test_root_map
-    Object.const_set(:PeopleController, Class.new)
@@ -1706 +1706 @@
-    Object.send(:remove_const, :PeopleController)
-  end
+  
+  
+  def test_namespace
+    Object.const_set(:Api, Module.new { |m| m.const_set(:ProductsController, Class.new) })
+
+    set.draw do |map| 
+      
+      map.namespace 'api' do |api|
+        api.route 'inventory', :controller => "products", :action => 'inventory'
+      end
+      
+    end
+
+    request.path = "/api/inventory"
+    request.method = :get
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("api/products", request.path_parameters[:controller])
+    assert_equal("inventory", request.path_parameters[:action])
+  ensure
+    Object.send(:remove_const, :Api)
+  end
+  
+
+  def test_namespaced_root_map
+    Object.const_set(:Api, Module.new { |m| m.const_set(:ProductsController, Class.new) })
+
+    set.draw do |map| 
+      
+      map.namespace 'api' do |api|
+        api.root :controller => "products"       
+      end
+      
+    end
+
+    request.path = "/api"
+    request.method = :get
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("api/products", request.path_parameters[:controller])
+    assert_equal("index", request.path_parameters[:action])
+  ensure
+    Object.send(:remove_const, :Api)
+  end
-
-  def test_generate_finds_best_fit