aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-08-11 16:00:29 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-08-11 16:16:09 -0700
commitc25d1707b9577db82ccbd47447247ba644d81432 (patch)
treecf5f2fb2a0ed4b65d15040332b127ed943475475 /actionpack
parentcad27e405213f278f74bf98e7746f2801d9a6258 (diff)
downloadrails-c25d1707b9577db82ccbd47447247ba644d81432.tar.gz
rails-c25d1707b9577db82ccbd47447247ba644d81432.tar.bz2
rails-c25d1707b9577db82ccbd47447247ba644d81432.zip
push scope access up for modules
eventually we'll remove the need to access `scope` inside the Mapping object.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 7361a6374d..3e3f325584 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -72,10 +72,10 @@ module ActionDispatch
defaults = (scope[:defaults] || {}).dup
- new scope, set, path, defaults, as, controller, default_action, options
+ new scope, set, path, defaults, as, controller, default_action, scope[:module], options
end
- def initialize(scope, set, path, defaults, as, controller, default_action, options)
+ def initialize(scope, set, path, defaults, as, controller, default_action, modyoule, options)
@requirements, @conditions = {}, {}
@defaults = defaults
@set = set
@@ -94,7 +94,7 @@ module ActionDispatch
ast = path_ast path
path_params = path_params ast
- options = normalize_options!(options, formatted, path_params, ast, scope[:module])
+ options = normalize_options!(options, formatted, path_params, ast, modyoule)
split_constraints(path_params, scope[:constraints]) if scope[:constraints]