:only and :except are now chained for routing resource(s)

Allow chaining the :only and :except options for routing resource(s).
Previously, the following yielded routes for both show and destroy:

resource :account, :only => [:show, :destroy], :except => :destroy

This now yields only the show action. This chaining can be useful for
passing optional :except options to code that makes use of the :only
option (e.g. for a gem with its own routing methods).

1 files changed, 9 insertions, 3 deletions

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 7cfe4693c1..40e00b55c2 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1061,16 +1061,22 @@ module ActionDispatch
             end
           end
 
-          def actions
+          def available_actions
             if only = @options[:only]
               Array(only).map(&:to_sym)
-            elsif except = @options[:except]
-              default_actions - Array(except).map(&:to_sym)
             else
               default_actions
             end
           end
 
+          def actions
+            if except = @options[:except]
+              available_actions - Array(except).map(&:to_sym)
+            else
+              available_actions
+            end
+          end
+
           def name
             @as || @name
           end