Router accepts member routes on resource. [#4624 state:resolved]

1 files changed, 14 insertions, 5 deletions

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 8a8d21c434..63c553dd07 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -622,13 +622,22 @@ module ActionDispatch
         end
 
         def member
-          unless @scope[:scope_level] == :resources
-            raise ArgumentError, "can't use member outside resources scope"
+          unless [:resources, :resource].include?(@scope[:scope_level])
+            raise ArgumentError, "You can't use member action outside resources and resource scope."
           end
 
-          with_scope_level(:member) do
-            scope(':id', :name_prefix => parent_resource.member_name, :as => "") do
-              yield
+          case @scope[:scope_level]
+          when :resources
+            with_scope_level(:member) do
+              scope(':id', :name_prefix => parent_resource.member_name, :as => "") do
+                yield
+              end
+            end
+          when :resource
+            with_scope_level(:member) do
+              scope(':id', :as => "") do
+                yield
+              end
             end
           end
         end