Move ActionController::Routing.optimise_named_routes to ActionController::Base.optimise_named_routes. Now you can set it in the config.
ActionController::Routing::DynamicSegment#interpolation_chunk should call #to_s on all values before calling URI.escape. [Rick] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7724 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
b4ec9904c6
commit
904df818d6
|
@ -1,5 +1,11 @@
|
|||
*SVN*
|
||||
|
||||
* Move ActionController::Routing.optimise_named_routes to ActionController::Base.optimise_named_routes. Now you can set it in the config. [Rick]
|
||||
|
||||
config.action_controller.optimise_named_routes = false
|
||||
|
||||
* ActionController::Routing::DynamicSegment#interpolation_chunk should call #to_s on all values before calling URI.escape. [Rick]
|
||||
|
||||
* Only accept session ids from cookies, prevents session fixation attacks. [bradediger]
|
||||
|
||||
*2.0.0 [Preview Release]* (September 29th, 2007) [Includes duplicates of changes from 1.12.2 - 1.13.3]
|
||||
|
|
|
@ -329,7 +329,12 @@ module ActionController #:nodoc:
|
|||
|
||||
# Sets the token parameter name for RequestForgery. Calling #protect_from_forgery sets it to :authenticity_token by default
|
||||
cattr_accessor :request_forgery_protection_token
|
||||
|
||||
|
||||
# Indicates whether or not optimise the generated named
|
||||
# route helper methods
|
||||
cattr_accessor :optimise_named_routes
|
||||
self.optimise_named_routes = true
|
||||
|
||||
# Controls whether request forgergy protection is turned on or not. Turned off by default only in test mode.
|
||||
class_inheritable_accessor :allow_forgery_protection
|
||||
self.allow_forgery_protection = true
|
||||
|
|
|
@ -76,7 +76,7 @@ module ActionController
|
|||
# install the named routes in this session instance.
|
||||
# But we have to disable the optimisation code so that we can
|
||||
# generate routes without @request being initialized
|
||||
Routing.optimise_named_routes=false
|
||||
Base.optimise_named_routes=false
|
||||
Routing::Routes.reload!
|
||||
klass = class<<self; self; end
|
||||
Routing::Routes.install_helpers(klass)
|
||||
|
|
|
@ -256,11 +256,6 @@ module ActionController
|
|||
mattr_accessor :controller_paths
|
||||
self.controller_paths = []
|
||||
|
||||
# Indicates whether or not optimise the generated named
|
||||
# route helper methods
|
||||
mattr_accessor :optimise_named_routes
|
||||
self.optimise_named_routes = true
|
||||
|
||||
# A helper module to hold URL related helpers.
|
||||
module Helpers
|
||||
include PolymorphicRoutes
|
||||
|
@ -342,7 +337,7 @@ module ActionController
|
|||
# Indicates whether the routes should be optimised with the string interpolation
|
||||
# version of the named routes methods.
|
||||
def optimise?
|
||||
@optimise && ActionController::Routing::optimise_named_routes
|
||||
@optimise && ActionController::Base::optimise_named_routes
|
||||
end
|
||||
|
||||
def segment_keys
|
||||
|
@ -718,8 +713,8 @@ module ActionController
|
|||
s << "\n#{expiry_statement}"
|
||||
end
|
||||
|
||||
def interpolation_chunk(value_code = "#{local_name}.to_s")
|
||||
"\#{URI.escape(#{value_code}, ActionController::Routing::Segment::UNSAFE_PCHAR)}"
|
||||
def interpolation_chunk(value_code = "#{local_name}")
|
||||
"\#{URI.escape(#{value_code}.to_s, ActionController::Routing::Segment::UNSAFE_PCHAR)}"
|
||||
end
|
||||
|
||||
def string_structure(prior_segments)
|
||||
|
@ -776,8 +771,8 @@ module ActionController
|
|||
end
|
||||
|
||||
# Don't URI.escape the controller name since it may contain slashes.
|
||||
def interpolation_chunk(value_code = "#{local_name}.to_s")
|
||||
"\#{#{value_code}}"
|
||||
def interpolation_chunk(value_code = "#{local_name}")
|
||||
"\#{#{value_code}.to_s}"
|
||||
end
|
||||
|
||||
# Make sure controller names like Admin/Content are correctly normalized to
|
||||
|
@ -799,8 +794,8 @@ module ActionController
|
|||
RESERVED_PCHAR = "#{Segment::RESERVED_PCHAR}/"
|
||||
UNSAFE_PCHAR = Regexp.new("[^#{URI::REGEXP::PATTERN::UNRESERVED}#{RESERVED_PCHAR}]", false, 'N').freeze
|
||||
|
||||
def interpolation_chunk(value_code = "#{local_name}.to_s")
|
||||
"\#{URI.escape(#{value_code}, ActionController::Routing::PathSegment::UNSAFE_PCHAR)}"
|
||||
def interpolation_chunk(value_code = "#{local_name}")
|
||||
"\#{URI.escape(#{value_code}.to_s, ActionController::Routing::PathSegment::UNSAFE_PCHAR)}"
|
||||
end
|
||||
|
||||
def default
|
||||
|
|
|
@ -33,11 +33,11 @@ class ResourcesTest < Test::Unit::TestCase
|
|||
# The assertions in these tests are incompatible with the hash method
|
||||
# optimisation. This could indicate user level problems
|
||||
def setup
|
||||
ActionController::Routing.optimise_named_routes = false
|
||||
ActionController::Base.optimise_named_routes = false
|
||||
end
|
||||
|
||||
def tear_down
|
||||
ActionController::Routing.optimise_named_routes = true
|
||||
ActionController::Base.optimise_named_routes = true
|
||||
end
|
||||
|
||||
def test_should_arrange_actions
|
||||
|
|
|
@ -48,7 +48,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
|
|||
attr_reader :rs
|
||||
def setup
|
||||
# These tests assume optimisation is on, so re-enable it.
|
||||
ActionController::Routing.optimise_named_routes = true
|
||||
ActionController::Base.optimise_named_routes = true
|
||||
|
||||
@rs = ::ActionController::Routing::RouteSet.new
|
||||
@rs.draw {|m| m.connect ':controller/:action/:id' }
|
||||
|
@ -852,6 +852,11 @@ class DynamicSegmentTest < Test::Unit::TestCase
|
|||
assert_equal a_value, eval(%("#{segment.interpolation_chunk}"))
|
||||
end
|
||||
|
||||
def test_interpolation_chunk_should_accept_nil
|
||||
a_value = nil
|
||||
assert_equal '', eval(%("#{segment.interpolation_chunk('a_value')}"))
|
||||
end
|
||||
|
||||
def test_value_regexp_should_be_nil_without_regexp
|
||||
assert_equal nil, segment.value_regexp
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue