Changeset 6107

Timestamp:

02/04/07 17:19:45 (2 years ago)

Author:

rick

Message:

Add singleton resources from trunk [Rick Olson]

Files:

• branches/1-2-stable/actionpack/CHANGELOG (modified) (1 diff)
• branches/1-2-stable/actionpack/lib/action_controller/resources.rb (modified) (7 diffs)
• branches/1-2-stable/actionpack/test/controller/resources_test.rb (modified) (7 diffs)

branches/1-2-stable/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Add singleton resources from trunk [Rick Olson]
-
-* TestSession supports indifferent access so session['foo'] == session[:foo] in your tests.  #7372 [julik, jean.helou]

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

@@ -19 +19 @@
-      
-      def controller
-
+@controller ||= 
-      end
-      
-      def path
-
+@path ||= 
-      end
-      
-      def new_path
-
+@new_path ||= 
-      end
-      
-      def member_path
-
+@member_path ||= 
-      end
-      
-      def nesting_path_prefix
-
-
-
-ivate
+@nesting_path_prefix ||= 
+
+
+otected
-        def arrange_actions
-          @collection_methods = arrange_actions_by_methods(options.delete(:collection))
@@ -66 +66 @@
-        end
-    end
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    # Creates named routes for implementing verb-oriented controllers. This is
-    # useful for implementing REST API's, where a single resource has different
@@ -218 +231 @@
-    end
-
+    # Creates named routes for implementing verb-oriented controllers for a singleton resource. 
+    # A singleton resource is global to the current user visiting the application, such as a user's
+    # /account profile.
+    # 
+    # See map.resources for general conventions.  These are the main differences:
+    #   - a singular name is given to map.resource.  The default controller name is taken from the singular name.
+    #   - To specify a custom plural name, use the :plural option.  There is no :singular option
+    #   - No default index, new, or create routes are created for the singleton resource controller.
+    #   - When nesting singleton resources, only the singular name is used as the path prefix (example: 'account/messages/1')
+    #
+    # Example:
+    #
+    #   map.resource :account 
+    #
+    #   class AccountController < ActionController::Base
+    #     # POST account_url
+    #     def create
+    #       # create an account
+    #     end
+    #
+    #     # GET new_account_url
+    #     def new
+    #       # return an HTML form for describing the new account
+    #     end
+    #
+    #     # GET account_url
+    #     def show
+    #       # find and return the account
+    #     end
+    #
+    #     # GET edit_account_url
+    #     def edit
+    #       # return an HTML form for editing the account
+    #     end
+    #
+    #     # PUT account_url
+    #     def update
+    #       # find and update the account
+    #     end
+    #
+    #     # DELETE account_url
+    #     def destroy
+    #       # delete the account
+    #     end
+    #   end
+    #
+    # Along with the routes themselves, #resource generates named routes for use in
+    # controllers and views. <tt>map.resource :account</tt> produces the following named routes and helpers:
+    # 
+    #   Named Route   Helpers
+    #   account       account_url, hash_for_account_url, 
+    #                 account_path, hash_for_account_path
+    #   edit_account  edit_account_url, hash_for_edit_account_url,
+    #                 edit_account_path, hash_for_edit_account_path
+    def resource(*entities, &block)
+      options = entities.last.is_a?(Hash) ? entities.pop : { }
+      entities.each { |entity| map_singleton_resource entity, options.dup, &block }
+    end
+
-    private
-      def map_resource(entities, options = {}, &block)
@@ -224 +296 @@
-        with_options :controller => resource.controller do |map|
-          map_collection_actions(map, resource)
+          map_default_collection_actions(map, resource)
+          map_new_actions(map, resource)
+          map_member_actions(map, resource)
+
+          if block_given?
+            with_options(:path_prefix => resource.nesting_path_prefix, &block)
+          end
+        end
+      end
+
+      def map_singleton_resource(entities, options = {}, &block)
+        resource = SingletonResource.new(entities, options)
+
+        with_options :controller => resource.controller do |map|
+          map_collection_actions(map, resource)
+          map_default_singleton_actions(map, resource)
-          map_new_actions(map, resource)
-          map_member_actions(map, resource)
@@ -241 +329 @@
-          end
-        end
-
+
+
+
-        index_action_options = action_options_for("index", resource)
-        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)
-
+        create_action_options = action_options_for("create", resource)
+        map.connect(resource.path, create_action_options)
+        map.connect("#{resource.path}.:format", create_action_options)
+      end
+
+      def map_default_singleton_actions(map, resource)
-        create_action_options = action_options_for("create", resource)
-        map.connect(resource.path, create_action_options)
@@ -287 +383 @@
-        map.connect("#{resource.member_path}.:format", destroy_action_options)
-      end
-
+
-      def conditions_for(method)
-        { :conditions => method == :any ? {} : { :method => method } }
@@ -294 +390 @@
-      def action_options_for(action, resource, method = nil)
-        default_options = { :action => action.to_s }
-
+resource.kind_of?(SingletonResource) ? {} : 
-        case default_options[:action]
-          when "index", "new" : default_options.merge(conditions_for(method || :get))

branches/1-2-stable/actionpack/test/controller/resources_test.rb

@@ -3 +3 @@
-class ResourcesController < ActionController::Base
-  def index() render :nothing => true end
+  alias_method :show, :index
-  def rescue_action(e) raise e end
-end
@@ -10 +11 @@
-class CommentsController < ResourcesController; end
-
+class AccountController <  ResourcesController; end
+class AdminController   <  ResourcesController; end
-
-class ResourcesTest < Test::Unit::TestCase
@@ -33 +36 @@
-    resource = ActionController::Resources::Resource.new(:messages, :controller => 'posts')
-    assert_equal 'posts', resource.controller
+  end
+
+  def test_should_all_singleton_paths_be_the_same
+    [ :path, :nesting_path_prefix, :member_path ].each do |method|
+      resource = ActionController::Resources::SingletonResource.new(:messages, :path_prefix => 'admin')
+      assert_equal 'admin/messages', resource.send(method)
+    end
-  end
-
@@ -188 +198 @@
-  end
-
+  def test_should_create_singleton_resource_routes
+    with_singleton_resources :account do
+      assert_singleton_restful_for :account
+    end
+  end
+
+  def test_should_create_multiple_singleton_resource_routes
+    with_singleton_resources :account, :admin do
+      assert_singleton_restful_for :account
+      assert_singleton_restful_for :admin
+    end
+  end
+
+  def test_should_create_nested_singleton_resource_routes
+    with_routing do |set|
+      set.draw do |map|
+        map.resource :admin do |admin|
+          admin.resource :account
+        end
+      end
+      
+      assert_singleton_restful_for :admin
+      assert_singleton_restful_for :account, :path_prefix => 'admin/'
+    end
+  end
+
+  def test_singleton_resource_with_member_action
+    [:put, :post].each do |method|
+      with_singleton_resources :account, :member => { :reset => method } do
+        reset_options = {:action => 'reset'}
+        reset_path    = "/account;reset"
+        assert_singleton_routes_for :account do |options|
+          assert_recognizes(options.merge(reset_options), :path => reset_path, :method => method)
+        end
+
+        assert_singleton_named_routes_for :account do |options|
+          assert_named_route reset_path, :reset_account_path, reset_options
+        end
+      end
+    end
+  end
+
+  def test_singleton_resource_with_two_member_actions_with_same_method
+    [:put, :post].each do |method|
+      with_singleton_resources :account, :member => { :reset => method, :disable => method } do
+        %w(reset disable).each do |action|
+          action_options = {:action => action}
+          action_path    = "/account;#{action}"
+          assert_singleton_routes_for :account do |options|
+            assert_recognizes(options.merge(action_options), :path => action_path, :method => method)
+          end
+
+          assert_singleton_named_routes_for :account do |options|
+            assert_named_route action_path, "#{action}_account_path".to_sym, action_options
+          end
+        end
+      end
+    end
+  end
+
+  def test_should_nest_resources_in_singleton_resource
+    with_routing do |set|
+      set.draw do |map|
+        map.resource :account do |account|
+          account.resources :messages
+        end
+      end
+      
+      assert_singleton_restful_for :account
+      assert_simply_restful_for :messages, :path_prefix => 'account/'
+    end
+  end
+
+  def test_should_nest_resources_in_singleton_resource_with_path_prefix
+    with_routing do |set|
+      set.draw do |map|
+        map.resource(:account, :path_prefix => ':site_id') do |account|
+          account.resources :messages
+        end
+      end
+
+      assert_singleton_restful_for :account, :path_prefix => '7/', :options => { :site_id => '7' }
+      assert_simply_restful_for :messages, :path_prefix => '7/account/', :options => { :site_id => '7' }
+    end
+  end
+  
+  def test_should_nest_singleton_resource_in_resources
+    with_routing do |set|
+      set.draw do |map|
+        map.resources :threads do |thread|
+          thread.resource :admin
+        end
+      end
+      
+      assert_simply_restful_for :threads
+      assert_singleton_restful_for :admin, :path_prefix => 'threads/5/', :options => { :thread_id => '5' }
+    end
+  end
+
-  def test_should_not_allow_delete_or_put_on_collection_path
-    controller_name = :messages
@@ -211 +320 @@
-      end
-    end
+    
+    def with_singleton_resources(*args)
+      with_routing do |set|
+        set.draw { |map| map.resource(*args) }
+        yield
+      end
+    end
-
-    # runs assert_restful_routes_for and assert_restful_named_routes for on the controller_name and options, without passing a block.
@@ -216 +332 @@
-      assert_restful_routes_for       controller_name, options
-      assert_restful_named_routes_for controller_name, options
+    end
+
+    def assert_singleton_restful_for(singleton_name, options = {})
+      assert_singleton_routes_for       singleton_name, options
+      assert_singleton_named_routes_for singleton_name, options
-    end
-
@@ -285 +406 @@
-    end
-
+    def assert_singleton_routes_for(singleton_name, options = {})
+      (options[:options] ||= {})[:controller] ||= singleton_name.to_s
+
+      full_path           = "/#{options[:path_prefix]}#{singleton_name}"
+      new_path            = "#{full_path}/new"
+      edit_path           = "#{full_path};edit"
+      formatted_edit_path = "#{full_path}.xml;edit"
+
+      with_options options[:options] do |controller|
+        controller.assert_routing full_path,           :action => 'show'
+        controller.assert_routing new_path,            :action => 'new'
+        controller.assert_routing edit_path,           :action => 'edit'
+        controller.assert_routing "#{full_path}.xml",  :action => 'show', :format => 'xml'
+        controller.assert_routing "#{new_path}.xml",   :action => 'new',  :format => 'xml'
+        controller.assert_routing formatted_edit_path, :action => 'edit', :format => 'xml'
+      end
+
+      assert_recognizes(options[:options].merge(:action => 'show'),    :path => full_path, :method => :get)
+      assert_recognizes(options[:options].merge(:action => 'new'),     :path => new_path,  :method => :get)
+      assert_recognizes(options[:options].merge(:action => 'edit'),    :path => edit_path, :method => :get)
+      assert_recognizes(options[:options].merge(:action => 'create'),  :path => full_path, :method => :post)
+      assert_recognizes(options[:options].merge(:action => 'update'),  :path => full_path, :method => :put)
+      assert_recognizes(options[:options].merge(:action => 'destroy'), :path => full_path, :method => :delete)
+
+      assert_recognizes(options[:options].merge(:action => 'show',    :format => 'xml'), :path => "#{full_path}.xml",  :method => :get)
+      assert_recognizes(options[:options].merge(:action => 'new',     :format => 'xml'), :path => "#{new_path}.xml",   :method => :get)
+      assert_recognizes(options[:options].merge(:action => 'edit',    :format => 'xml'), :path => formatted_edit_path, :method => :get)
+      assert_recognizes(options[:options].merge(:action => 'create',  :format => 'xml'), :path => "#{full_path}.xml",  :method => :post)
+      assert_recognizes(options[:options].merge(:action => 'update',  :format => 'xml'), :path => "#{full_path}.xml",  :method => :put)
+      assert_recognizes(options[:options].merge(:action => 'destroy', :format => 'xml'), :path => "#{full_path}.xml",  :method => :delete)
+
+      yield options[:options] if block_given?
+    end
+
+    def assert_singleton_named_routes_for(singleton_name, options = {})
+      (options[:options] ||= {})[:controller] ||= singleton_name.to_s
+      @controller = "#{options[:options][:controller].camelize}Controller".constantize.new
+      @request    = ActionController::TestRequest.new
+      @response   = ActionController::TestResponse.new
+      get :show, options[:options]
+      options[:options].delete :action
+
+      full_path = "/#{options[:path_prefix]}#{singleton_name}"
+
+      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};edit",     "edit_#{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')
+      assert_named_route "#{full_path}.xml;edit", "formatted_edit_#{singleton_name}_path", options[:options].merge(:format => 'xml')
+    end
+
-    def assert_named_route(expected, route, options)
-      actual =  @controller.send(route, options) rescue $!.class.name