aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-08-13 19:40:57 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-08-13 19:40:57 -0700
commit374d66be3e9e994bbe8ad2702ee2209c24b581b0 (patch)
treed1a57dbe47e117e8c1c7888e6585cd659a50f20e
parent047af8dd3c304fbfe625be8b7c600005c69fa593 (diff)
downloadrails-374d66be3e9e994bbe8ad2702ee2209c24b581b0.tar.gz
rails-374d66be3e9e994bbe8ad2702ee2209c24b581b0.tar.bz2
rails-374d66be3e9e994bbe8ad2702ee2209c24b581b0.zip
reduce calls to scope_level
this will help us to encapsulate magical symbols so hopefully we can eliminate hardcoded magic symbols
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 209af7a16d..46d83f7fd7 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1563,7 +1563,7 @@ module ActionDispatch
raise ArgumentError, "must be called with a path and/or options"
end
- if @scope.scope_level == :resources
+ if @scope.resources?
with_scope_level(:root) do
scope(parent_resource.path) do
super(options)
@@ -1913,6 +1913,10 @@ module ActionDispatch
scope_level == :nested
end
+ def resources?
+ scope_level == :resources
+ end
+
def resource_scope?
RESOURCE_SCOPES.include? scope_level
end