kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Mapping never actually uses @set, so rm

Browse source
This commit is contained in:
Aaron Patterson 2014-05-29 16:13:29 -07:00
parent be137b0ac3
commit 74b73f132a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
actionpack/lib/action_dispatch/routing/mapper.rb
View file

@ -66,8 +66,8 @@ module ActionDispatch
attr_reader :scope, :options, :requirements, :conditions, :defaults attr_reader :scope, :options, :requirements, :conditions, :defaults
attr_reader :to, :default_controller, :default_action attr_reader :to, :default_controller, :default_action
def initialize(set, scope, path, options) def initialize(scope, path, options)
@set, @scope = set, scope @scope = scope
@requirements, @conditions, @defaults = {}, {}, {} @requirements, @conditions, @defaults = {}, {}, {}
options = scope[:options].merge(options) if scope[:options] options = scope[:options].merge(options) if scope[:options]
@ -1515,7 +1515,7 @@ module ActionDispatch
options[:as] = name_for_action(options[:as], action) options[:as] = name_for_action(options[:as], action)
end end
mapping = Mapping.new(@set, @scope, URI.parser.escape(path), options) mapping = Mapping.new(@scope, URI.parser.escape(path), options)
app, conditions, requirements, defaults, as, anchor = mapping.to_route app, conditions, requirements, defaults, as, anchor = mapping.to_route
@set.add_route(app, conditions, requirements, defaults, as, anchor) @set.add_route(app, conditions, requirements, defaults, as, anchor)
end end

2
actionpack/test/dispatch/mapper_test.rb
View file

@ -38,7 +38,7 @@ module ActionDispatch
def test_mapping_requirements def test_mapping_requirements
options = { :controller => 'foo', :action => 'bar', :via => :get } options = { :controller => 'foo', :action => 'bar', :via => :get }
m = Mapper::Mapping.new FakeSet.new, {}, '/store/:name(*rest)', options m = Mapper::Mapping.new({}, '/store/:name(*rest)', options)
_, _, requirements, _ = m.to_route _, _, requirements, _ = m.to_route
assert_equal(/.+?/, requirements[:rest]) assert_equal(/.+?/, requirements[:rest])
end end