github-migration
/
rails_upgrade
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change options on upgraded routes to be more standard :key => value vs :key=>value

This commit is contained in:
Ryan Bigg 2011-04-08 08:11:43 +10:00
parent b3188a6a3d
commit 0fa6a78f62
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/routes_upgrader.rb
View File

@ -277,7 +277,9 @@ module Rails
def to_route_code def to_route_code
# preserve :only & :except options # preserve :only & :except options
copied_options = @options.reject { |k,v| ![:only, :except].member?(k) } copied_options = @options.reject { |k,v| ![:only, :except].member?(k) }
copied_options_str = copied_options.empty? ? '' : ', ' + copied_options.inspect.gsub(/\A\{|\}\z/, '') unless copied_options.empty?
copied_options_str = ", " + copied_options.map { |k, v| "#{k.inspect} => #{v.inspect}" }.join(",")
end
if !@children.empty? || @options.has_key?(:collection) || @options.has_key?(:member) if !@children.empty? || @options.has_key?(:collection) || @options.has_key?(:member)
prefix = ["#{route_method} :#{@name}#{copied_options_str} do"] prefix = ["#{route_method} :#{@name}#{copied_options_str} do"]

4
test/routes_upgrader_test.rb
View File

@ -142,11 +142,11 @@ end
def test_preserves_resources_except_option def test_preserves_resources_except_option
route = Rails::Upgrading::FakeResourceRoute.new("hats", :except => [:index]) route = Rails::Upgrading::FakeResourceRoute.new("hats", :except => [:index])
assert_equal "resources :hats, :except=>[:index]", route.to_route_code assert_equal "resources :hats, :except => [:index]", route.to_route_code
end end
def test_preserves_resources_only_option def test_preserves_resources_only_option
route = Rails::Upgrading::FakeResourceRoute.new("hats", :only => :show) route = Rails::Upgrading::FakeResourceRoute.new("hats", :only => :show)
assert_equal "resources :hats, :only=>:show", route.to_route_code assert_equal "resources :hats, :only => :show", route.to_route_code
end end
end end