0
@@ -42,7 +42,11 @@ module ActionController
0
   #
0
   # Read more about REST at http://en.wikipedia.org/wiki/Representational_State_Transfer
0
   module Resources
0
+    INHERITABLE_OPTIONS = :namespace, :shallow, :only, :except
0
+
0
     class Resource #:nodoc:
0
+      DEFAULT_ACTIONS = :index, :create, :new, :edit, :show, :update, :destroy
0
+
0
       attr_reader :collection_methods, :member_methods, :new_methods
0
       attr_reader :path_prefix, :name_prefix, :path_segment
0
       attr_reader :plural, :singular
0
@@ -57,6 +61,7 @@ module ActionController
0
 
0
         arrange_actions
0
         add_default_actions
0
+        set_allowed_actions
0
         set_prefixes
0
       end
0
 
0
@@ -113,6 +118,10 @@ module ActionController
0
         @singular.to_s == @plural.to_s
0
       end
0
 
0
+      def has_action?(action)
0
+        !DEFAULT_ACTIONS.include?(action) || action_allowed?(action)
0
+      end
0
+
0
       protected
0
         def arrange_actions
0
           @collection_methods = arrange_actions_by_methods(options.delete(:collection))
0
@@ -125,6 +134,30 @@ module ActionController
0
           add_default_action(new_methods, :get, :new)
0
         end
0
 
0
+        def set_allowed_actions
0
+          only, except = @options.values_at(:only, :except)
0
+          @allowed_actions ||= {}
0
+
0
+          if only == :all || except == :none
0
+            only = nil
0
+            except = []
0
+          elsif only == :none || except == :all
0
+            only = []
0
+            except = nil
0
+          end
0
+
0
+          if only
0
+            @allowed_actions[:only] = Array(only).map(&:to_sym)
0
+          elsif except
0
+            @allowed_actions[:except] = Array(except).map(&:to_sym)
0
+          end
0
+        end
0
+
0
+        def action_allowed?(action)
0
+          only, except = @allowed_actions.values_at(:only, :except)
0
+          (!only || only.include?(action)) && (!except || !except.include?(action))
0
+        end
0
+
0
         def set_prefixes
0
           @path_prefix = options.delete(:path_prefix)
0
           @name_prefix = options.delete(:name_prefix)
0
@@ -353,6 +386,25 @@ module ActionController
0
     #
0
     #   map.resources :users, :has_many => { :posts => :comments }, :shallow => true
0
     #
0
+    # * <tt>:only</tt> and <tt>:except</tt> - Specify which of the seven default actions should be routed to.
0
+    #
0
+    # <tt>:only</tt> and <tt>:except</tt> may be set to <tt>:all</tt>, <tt>:none</tt>, an action name or a
0
+    # list of action names. By default, routes are generated for all seven actions.
0
+    #
0
+    # For example:
0
+    #
0
+    #   map.resources :posts, :only => [:index, :show] do |post|
0
+    #     post.resources :comments, :except => [:update, :destroy]
0
+    #   end
0
+    #   # --> GET /posts (maps to the PostsController#index action)
0
+    #   # --> POST /posts (fails)
0
+    #   # --> GET /posts/1 (maps to the PostsController#show action)
0
+    #   # --> DELETE /posts/1 (fails)
0
+    #   # --> POST /posts/1/comments (maps to the CommentsController#create action)
0
+    #   # --> PUT /posts/1/comments/1 (fails)
0
+    #
0
+    # The <tt>:only</tt> and <tt>:except</tt> options are inherited by any nested resource(s).
0
+    #
0
     # If <tt>map.resources</tt> is called with multiple resources, they all get the same options applied.
0
     #
0
     # Examples:
0
@@ -478,7 +530,7 @@ module ActionController
0
           map_associations(resource, options)
0
 
0
           if block_given?
0
-            with_options(:path_prefix => resource.nesting_path_prefix, :name_prefix => resource.nesting_name_prefix, :namespace => options[:namespace], :shallow => options[:shallow], &block)
0
+            with_options(options.slice(*INHERITABLE_OPTIONS).merge(:path_prefix => resource.nesting_path_prefix, :name_prefix => resource.nesting_name_prefix), &block)
0
           end
0
         end
0
       end
0
@@ -495,7 +547,7 @@ module ActionController
0
           map_associations(resource, options)
0
 
0
           if block_given?
0
-            with_options(:path_prefix => resource.nesting_path_prefix, :name_prefix => resource.nesting_name_prefix, :namespace => options[:namespace], :shallow => options[:shallow], &block)
0
+            with_options(options.slice(*INHERITABLE_OPTIONS).merge(:path_prefix => resource.nesting_path_prefix, :name_prefix => resource.nesting_name_prefix), &block)
0
           end
0
         end
0
       end
0
@@ -507,7 +559,7 @@ module ActionController
0
         name_prefix = "#{options.delete(:name_prefix)}#{resource.nesting_name_prefix}"
0
 
0
         Array(options[:has_one]).each do |association|
0
-          resource(association, :path_prefix => path_prefix, :name_prefix => name_prefix, :namespace => options[:namespace], :shallow => options[:shallow])
0
+          resource(association, options.slice(*INHERITABLE_OPTIONS).merge(:path_prefix => path_prefix, :name_prefix => name_prefix))
0
         end
0
       end
0
 
0
@@ -522,7 +574,7 @@ module ActionController
0
             map_has_many_associations(resource, association, options)
0
           end
0
         when Symbol, String
0
-          resources(associations, :path_prefix => resource.nesting_path_prefix, :name_prefix => resource.nesting_name_prefix, :namespace => options[:namespace], :shallow => options[:shallow], :has_many => options[:has_many])
0
+          resources(associations, options.slice(*INHERITABLE_OPTIONS).merge(:path_prefix => resource.nesting_path_prefix, :name_prefix => resource.nesting_name_prefix, :has_many => options[:has_many]))
0
         else
0
         end
0
       end
0
@@ -531,41 +583,39 @@ module ActionController
0
         resource.collection_methods.each do |method, actions|
0
           actions.each do |action|
0
             [method].flatten.each do |m|
0
-              action_options = action_options_for(action, resource, m)
0
-              map_named_routes(map, "#{action}_#{resource.name_prefix}#{resource.plural}", "#{resource.path}#{resource.action_separator}#{action}", action_options)
0
+              map_resource_routes(map, resource, action, "#{resource.path}#{resource.action_separator}#{action}", "#{action}_#{resource.name_prefix}#{resource.plural}", m)
0
             end
0
           end
0
         end
0
       end
0
 
0
       def map_default_collection_actions(map, resource)
0
-        index_action_options = action_options_for("index", resource)
0
         index_route_name = "#{resource.name_prefix}#{resource.plural}"
0
 
0
         if resource.uncountable?
0
           index_route_name << "_index"
0
         end
0
 
0
-        map_named_routes(map, index_route_name, resource.path, index_action_options)
0
-
0
-        create_action_options = action_options_for("create", resource)
0
-        map_unnamed_routes(map, resource.path, create_action_options)
0
+        map_resource_routes(map, resource, :index, resource.path, index_route_name)
0
+        map_resource_routes(map, resource, :create, resource.path)
0
       end
0
 
0
       def map_default_singleton_actions(map, resource)
0
-        create_action_options = action_options_for("create", resource)
0
-        map_unnamed_routes(map, resource.path, create_action_options)
0
+        map_resource_routes(map, resource, :create, resource.path)
0
       end
0
 
0
       def map_new_actions(map, resource)
0
         resource.new_methods.each do |method, actions|
0
           actions.each do |action|
0
-            action_options = action_options_for(action, resource, method)
0
-            if action == :new
0
-              map_named_routes(map, "new_#{resource.name_prefix}#{resource.singular}", resource.new_path, action_options)
0
-            else
0
-              map_named_routes(map, "#{action}_new_#{resource.name_prefix}#{resource.singular}", "#{resource.new_path}#{resource.action_separator}#{action}", action_options)
0
+            route_path = resource.new_path
0
+            route_name = "new_#{resource.name_prefix}#{resource.singular}"
0
+
0
+            unless action == :new
0
+              route_path = "#{route_path}#{resource.action_separator}#{action}"
0
+              route_name = "#{action}_#{route_name}"
0
             end
0
+
0
+            map_resource_routes(map, resource, action, route_path, route_name, method)
0
           end
0
         end
0
       end
0
@@ -574,34 +624,32 @@ module ActionController
0
         resource.member_methods.each do |method, actions|
0
           actions.each do |action|
0
             [method].flatten.each do |m|
0
-              action_options = action_options_for(action, resource, m)
0
-
0
               action_path = resource.options[:path_names][action] if resource.options[:path_names].is_a?(Hash)
0
               action_path ||= Base.resources_path_names[action] || action
0
 
0
-              map_named_routes(map, "#{action}_#{resource.shallow_name_prefix}#{resource.singular}", "#{resource.member_path}#{resource.action_separator}#{action_path}", action_options)
0
+              map_resource_routes(map, resource, action, "#{resource.member_path}#{resource.action_separator}#{action_path}", "#{action}_#{resource.shallow_name_prefix}#{resource.singular}", m)
0
             end
0
           end
0
         end
0
 
0
-        show_action_options = action_options_for("show", resource)
0
-        map_named_routes(map, "#{resource.shallow_name_prefix}#{resource.singular}", resource.member_path, show_action_options)
0
-
0
-        update_action_options = action_options_for("update", resource)
0
-        map_unnamed_routes(map, resource.member_path, update_action_options)
0
-
0
-        destroy_action_options = action_options_for("destroy", resource)
0
-        map_unnamed_routes(map, resource.member_path, destroy_action_options)
0
+        map_resource_routes(map, resource, :show, resource.member_path, "#{resource.shallow_name_prefix}#{resource.singular}")
0
+        map_resource_routes(map, resource, :update, resource.member_path)
0
+        map_resource_routes(map, resource, :destroy, resource.member_path)
0
       end
0
 
0
-      def map_unnamed_routes(map, path_without_format, options)
0
-        map.connect(path_without_format, options)
0
-        map.connect("#{path_without_format}.:format", options)
0
-      end
0
-
0
-      def map_named_routes(map, name, path_without_format, options)
0
-        map.named_route(name, path_without_format, options)
0
-        map.named_route("formatted_#{name}", "#{path_without_format}.:format", options)
0
+      def map_resource_routes(map, resource, action, route_path, route_name = nil, method = nil)
0
+        if resource.has_action?(action)
0
+          action_options = action_options_for(action, resource, method)
0
+          formatted_route_path = "#{route_path}.:format"
0
+
0
+          if route_name
0
+            map.named_route(route_name, route_path, action_options)
0
+            map.named_route("formatted_#{route_name}", formatted_route_path, action_options)
0
+          else
0
+            map.connect(route_path, action_options)
0
+            map.connect(formatted_route_path, action_options)
0
+          end
0
+        end
0
       end
0
 
0
       def add_conditions_for(conditions, method)

0
@@ -14,6 +14,8 @@ class LogosController < ResourcesController; end
0
 
0
 class AccountsController <  ResourcesController; end
0
 class AdminController   <  ResourcesController; end
0
+class ProductsController < ResourcesController; end
0
+class ImagesController < ResourcesController; end
0
 
0
 module Backoffice
0
   class ProductsController < ResourcesController; end
0
@@ -776,6 +778,121 @@ class ResourcesTest < Test::Unit::TestCase
0
     end
0
   end
0
 
0
+  def test_resource_has_only_show_action
0
+    with_routing do |set|
0
+      set.draw do |map|
0
+        map.resources :products, :only => :show
0
+      end
0
+
0
+      assert_resource_allowed_routes('products', {},                    { :id => '1' }, :show, [:index, :new, :create, :edit, :update, :destroy])
0
+      assert_resource_allowed_routes('products', { :format => 'xml' },  { :id => '1' }, :show, [:index, :new, :create, :edit, :update, :destroy])
0
+    end
0
+  end
0
+
0
+  def test_singleton_resource_has_only_show_action
0
+    with_routing do |set|
0
+      set.draw do |map|
0
+        map.resource :account, :only => :show
0
+      end
0
+
0
+      assert_singleton_resource_allowed_routes('accounts', {},                    :show, [:index, :new, :create, :edit, :update, :destroy])
0
+      assert_singleton_resource_allowed_routes('accounts', { :format => 'xml' },  :show, [:index, :new, :create, :edit, :update, :destroy])
0
+    end
0
+  end
0
+
0
+  def test_resource_does_not_have_destroy_action
0
+    with_routing do |set|
0
+      set.draw do |map|
0
+        map.resources :products, :except => :destroy
0
+      end
0
+
0
+      assert_resource_allowed_routes('products', {},                    { :id => '1' }, [:index, :new, :create, :show, :edit, :update], :destroy)
0
+      assert_resource_allowed_routes('products', { :format => 'xml' },  { :id => '1' }, [:index, :new, :create, :show, :edit, :update], :destroy)
0
+    end
0
+  end
0
+
0
+  def test_singleton_resource_does_not_have_destroy_action
0
+    with_routing do |set|
0
+      set.draw do |map|
0
+        map.resource :account, :except => :destroy
0
+      end
0
+
0
+      assert_singleton_resource_allowed_routes('accounts', {},                    [:new, :create, :show, :edit, :update], :destroy)
0
+      assert_singleton_resource_allowed_routes('accounts', { :format => 'xml' },  [:new, :create, :show, :edit, :update], :destroy)
0
+    end
0
+  end
0
+
0
+  def test_resource_has_only_collection_action
0
+    with_routing do |set|
0
+      set.draw do |map|
0
+        map.resources :products, :except => :all, :collection => { :sale => :get }
0
+      end
0
+
0
+      assert_resource_allowed_routes('products', {},                    { :id => '1' }, [], [:index, :new, :create, :show, :edit, :update, :destroy])
0
+      assert_resource_allowed_routes('products', { :format => 'xml' },  { :id => '1' }, [], [:index, :new, :create, :show, :edit, :update, :destroy])
0
+
0
+      assert_recognizes({ :controller => 'products', :action => 'sale' },                   :path => 'products/sale',     :method => :get)
0
+      assert_recognizes({ :controller => 'products', :action => 'sale', :format => 'xml' }, :path => 'products/sale.xml', :method => :get)
0
+    end
0
+  end
0
+
0
+  def test_resource_has_only_member_action
0
+    with_routing do |set|
0
+      set.draw do |map|
0
+        map.resources :products, :except => :all, :member => { :preview => :get }
0
+      end
0
+
0
+      assert_resource_allowed_routes('products', {},                    { :id => '1' }, [], [:index, :new, :create, :show, :edit, :update, :destroy])
0
+      assert_resource_allowed_routes('products', { :format => 'xml' },  { :id => '1' }, [], [:index, :new, :create, :show, :edit, :update, :destroy])
0
+
0
+      assert_recognizes({ :controller => 'products', :action => 'preview', :id => '1' },                    :path => 'products/1/preview',      :method => :get)
0
+      assert_recognizes({ :controller => 'products', :action => 'preview', :id => '1', :format => 'xml' },  :path => 'products/1/preview.xml',  :method => :get)
0
+    end
0
+  end
0
+
0
+  def test_singleton_resource_has_only_member_action
0
+    with_routing do |set|
0
+      set.draw do |map|
0
+        map.resource :account, :except => :all, :member => { :signup => :get }
0
+      end
0
+
0
+      assert_singleton_resource_allowed_routes('accounts', {},                    [], [:new, :create, :show, :edit, :update, :destroy])
0
+      assert_singleton_resource_allowed_routes('accounts', { :format => 'xml' },  [], [:new, :create, :show, :edit, :update, :destroy])
0
+
0
+      assert_recognizes({ :controller => 'accounts', :action => 'signup' },                   :path => 'account/signup',      :method => :get)
0
+      assert_recognizes({ :controller => 'accounts', :action => 'signup', :format => 'xml' }, :path => 'account/signup.xml',  :method => :get)
0
+    end
0
+  end
0
+
0
+  def test_nested_resource_inherits_only_show_action
0
+    with_routing do |set|
0
+      set.draw do |map|
0
+        map.resources :products, :only => :show do |product|
0
+          product.resources :images
0
+        end
0
+      end
0
+
0
+      assert_resource_allowed_routes('images', { :product_id => '1' },                    { :id => '2' }, :show, [:index, :new, :create, :edit, :update, :destroy], 'products/1/images')
0
+      assert_resource_allowed_routes('images', { :product_id => '1', :format => 'xml' },  { :id => '2' }, :show, [:index, :new, :create, :edit, :update, :destroy], 'products/1/images')
0
+    end
0
+  end
0
+
0
+  def test_nested_resource_has_only_show_and_member_action
0
+    with_routing do |set|
0
+      set.draw do |map|
0
+        map.resources :products, :only => [:index, :show] do |product|
0
+          product.resources :images, :member => { :thumbnail => :get }, :only => :show
0
+        end
0
+      end
0
+
0
+      assert_resource_allowed_routes('images', { :product_id => '1' },                    { :id => '2' }, :show, [:index, :new, :create, :edit, :update, :destroy], 'products/1/images')
0
+      assert_resource_allowed_routes('images', { :product_id => '1', :format => 'xml' },  { :id => '2' }, :show, [:index, :new, :create, :edit, :update, :destroy], 'products/1/images')
0
+
0
+      assert_recognizes({ :controller => 'images', :action => 'thumbnail', :product_id => '1', :id => '2' },                    :path => 'products/1/images/2/thumbnail', :method => :get)
0
+      assert_recognizes({ :controller => 'images', :action => 'thumbnail', :product_id => '1', :id => '2', :format => 'jpg' },  :path => 'products/1/images/2/thumbnail.jpg', :method => :get)
0
+    end
0
+  end
0
+
0
   protected
0
     def with_restful_routing(*args)
0
       with_routing do |set|
0
@@ -979,6 +1096,51 @@ class ResourcesTest < Test::Unit::TestCase
0
       end
0
     end
0
 
0
+    def assert_resource_allowed_routes(controller, options, shallow_options, allowed, not_allowed, path = controller)
0
+      shallow_path = "#{path}/#{shallow_options[:id]}"
0
+      format = options[:format] && ".#{options[:format]}"
0
+      options.merge!(:controller => controller)
0
+      shallow_options.merge!(options)
0
+
0
+      assert_whether_allowed(allowed, not_allowed, options,         'index',    "#{path}#{format}",               :get)
0
+      assert_whether_allowed(allowed, not_allowed, options,         'new',      "#{path}/new#{format}",           :get)
0
+      assert_whether_allowed(allowed, not_allowed, options,         'create',   "#{path}#{format}",               :post)
0
+      assert_whether_allowed(allowed, not_allowed, shallow_options, 'show',     "#{shallow_path}#{format}",       :get)
0
+      assert_whether_allowed(allowed, not_allowed, shallow_options, 'edit',     "#{shallow_path}/edit#{format}",  :get)
0
+      assert_whether_allowed(allowed, not_allowed, shallow_options, 'update',   "#{shallow_path}#{format}",       :put)
0
+      assert_whether_allowed(allowed, not_allowed, shallow_options, 'destroy',  "#{shallow_path}#{format}",       :delete)
0
+    end
0
+
0
+    def assert_singleton_resource_allowed_routes(controller, options, allowed, not_allowed, path = controller.singularize)
0
+      format = options[:format] && ".#{options[:format]}"
0
+      options.merge!(:controller => controller)
0
+
0
+      assert_whether_allowed(allowed, not_allowed, options, 'new',      "#{path}/new#{format}",   :get)
0
+      assert_whether_allowed(allowed, not_allowed, options, 'create',   "#{path}#{format}",       :post)
0
+      assert_whether_allowed(allowed, not_allowed, options, 'show',     "#{path}#{format}",       :get)
0
+      assert_whether_allowed(allowed, not_allowed, options, 'edit',     "#{path}/edit#{format}",  :get)
0
+      assert_whether_allowed(allowed, not_allowed, options, 'update',   "#{path}#{format}",       :put)
0
+      assert_whether_allowed(allowed, not_allowed, options, 'destroy',  "#{path}#{format}",       :delete)
0
+    end
0
+
0
+    def assert_whether_allowed(allowed, not_allowed, options, action, path, method)
0
+      action = action.to_sym
0
+      options = options.merge(:action => action.to_s)
0
+      path_options = { :path => path, :method => method }
0
+
0
+      if Array(allowed).include?(action)
0
+        assert_recognizes options, path_options
0
+      elsif Array(not_allowed).include?(action)
0
+        assert_not_recognizes options, path_options
0
+      end
0
+    end
0
+
0
+    def assert_not_recognizes(expected_options, path)
0
+      assert_raise ActionController::RoutingError, ActionController::MethodNotAllowed, Test::Unit::AssertionFailedError do
0
+        assert_recognizes(expected_options, path)
0
+      end
0
+    end
0
+
0
     def distinct_routes? (r1, r2)
0
       if r1.conditions == r2.conditions and r1.requirements == r2.requirements then
0
         if r1.segments.collect(&:to_s) == r2.segments.collect(&:to_s) then