@@ -4,16 +4,16 @@ module ActionController attr_accessor :separators, :optional_separators def initialize - self.separators = Routing::SEPARATORS - self.optional_separators = %w( / ) + @separators = Routing::SEPARATORS + @optional_separators = %w( / ) end def separator_pattern(inverted = false) - "[#{'^' if inverted}#{Regexp.escape(separators.join)}]" + "[#{'^' if inverted}#{Regexp.escape(@separators.join)}]" end def interval_regexp - Regexp.new "(.*?)(#{separators.source}|$)" + Regexp.new "(.*?)(#{@separators.source}|$)" end def multiline_regexp?(expression) @@ -54,7 +54,7 @@ module ActionController when /\A(#{separator_pattern(:inverted)}+)/ then StaticSegment.new($1) when Regexp.new(separator_pattern) then returning segment = DividerSegment.new($&) do - segment.is_optional = (optional_separators.include? $&) + segment.is_optional = (@optional_separators.include? $&) end end [segment, $~.post_match] actionpack/lib/action_controller/routing/builder.rb @@ -57,7 +57,7 @@ module ActionController # rather than triggering the expensive logic in +url_for+. class PositionalArguments < Optimiser def guard_condition - number_of_arguments = route.segment_keys.size + number_of_arguments = @route.segment_keys.size # if they're using foo_url(:id=>2) it's one # argument, but we don't want to generate /foos/id2 if number_of_arguments == 1 @@ -71,7 +71,7 @@ module ActionController elements = [] idx = 0 - if kind == :url + if @kind == :url elements << '#{request.protocol}' elements << '#{request.host_with_port}' end @@ -81,7 +81,7 @@ module ActionController # The last entry in <tt>route.segments</tt> appears to *always* be a # 'divider segment' for '/' but we have assertions to ensure that # we don't include the trailing slashes, so skip them. - (route.segments.size == 1 ? route.segments : route.segments[0..-2]).each do |segment| + (@route.segments.size == 1 ? @route.segments : @route.segments[0..-2]).each do |segment| if segment.is_a?(DynamicSegment) elements << segment.interpolation_chunk("args[#{idx}].to_param") idx += 1 @@ -98,7 +98,7 @@ module ActionController # argument class PositionalArgumentsWithAdditionalParams < PositionalArguments def guard_condition - "(!defined?(default_url_options) || default_url_options.blank?) && defined?(request) && request && args.size == #{route.segment_keys.size + 1} && !args.last.has_key?(:anchor) && !args.last.has_key?(:port) && !args.last.has_key?(:host)" + "(!defined?(default_url_options) || default_url_options.blank?) && defined?(request) && request && args.size == #{@route.segment_keys.size + 1} && !args.last.has_key?(:anchor) && !args.last.has_key?(:port) && !args.last.has_key?(:host)" end # This case uses almost the same code as positional arguments, @@ -110,7 +110,7 @@ module ActionController # To avoid generating "http://localhost/?host=foo.example.com" we # can't use this optimisation on routes without any segments def applicable? - super && route.segment_keys.size > 0 + super && @route.segment_keys.size > 0 end end actionpack/lib/action_controller/routing/optimisations.rb @@ -17,7 +17,7 @@ module ActionController end def segment_keys - segments.collect do |segment| + @segments.collect do |segment| segment.key if segment.respond_to? :key end.compact end @@ -52,7 +52,7 @@ module ActionController # Build several lines of code that extract values from the options hash. If any # of the values are missing or rejected then a return will be executed. def generation_extraction - segments.collect do |segment| + @segments.collect do |segment| segment.extraction_code end.compact * "\n" end @@ -60,7 +60,7 @@ module ActionController # Produce a condition expression that will check the requirements of this route # upon generation. def generation_requirements - requirement_conditions = requirements.collect do |key, req| + requirement_conditions = @requirements.collect do |key, req| if req.is_a? Regexp value_regexp = Regexp.new "\\A#{req.to_s}\\Z" "hash[:#{key}] && #{value_regexp.inspect} =~ options[:#{key}]" @@ -72,7 +72,7 @@ module ActionController end def generation_structure - segments.last.string_structure segments[0..-2] + @segments.last.string_structure @segments[0..-2] end # Write and compile a +recognize+ method for this Route. @@ -92,14 +92,14 @@ module ActionController # recognition, not generation. def recognition_conditions result = ["(match = #{Regexp.new(recognition_pattern).inspect}.match(path))"] - result << "conditions[:method] === env[:method]" if conditions[:method] + result << "@conditions[:method] === env[:method]" if @conditions[:method] result end # Build the regular expression pattern that will match this route. def recognition_pattern(wrap = true) pattern = '' - segments.reverse_each do |segment| + @segments.reverse_each do |segment| pattern = segment.build_pattern pattern end wrap ? ("\\A" + pattern + "\\Z") : pattern @@ -108,7 +108,7 @@ module ActionController # Write the code to extract the parameters from a matched route. def recognition_extraction next_capture = 1 - extraction = segments.collect do |segment| + extraction = @segments.collect do |segment| x = segment.match_extraction(next_capture) next_capture += Regexp.new(segment.regexp_chunk).number_of_captures x @@ -176,7 +176,7 @@ module ActionController # def parameter_shell @parameter_shell ||= returning({}) do |shell| - requirements.each do |key, requirement| + @requirements.each do |key, requirement| shell[key] = requirement unless requirement.is_a? Regexp end end @@ -187,8 +187,8 @@ module ActionController # placed upon them. def significant_keys @significant_keys ||= returning [] do |sk| - segments.each { |segment| sk << segment.key if segment.respond_to? :key } - sk.concat requirements.keys + @segments.each { |segment| sk << segment.key if segment.respond_to? :key } + sk.concat @requirements.keys sk.uniq! end end @@ -197,11 +197,11 @@ module ActionController # have defaults, or which are specified by non-regexp requirements. def defaults @defaults ||= returning({}) do |hash| - segments.each do |segment| + @segments.each do |segment| next unless segment.respond_to? :default hash[segment.key] = segment.default unless segment.default.nil? end - requirements.each do |key,req| + @requirements.each do |key,req| next if Regexp === req || req.nil? hash[key] = req end @@ -221,15 +221,15 @@ module ActionController def to_s @to_s ||= begin - segs = segments.inject("") { |str,s| str << s.to_s } - "%-6s %-40s %s" % [(conditions[:method] || :any).to_s.upcase, segs, requirements.inspect] + segs = @segments.inject("") { |str,s| str << s.to_s } + "%-6s %-40s %s" % [(@conditions[:method] || :any).to_s.upcase, segs, @requirements.inspect] end end protected def requirement_for(key) - return requirements[key] if requirements.key? key - segments.each do |segment| + return @requirements[key] if @requirements.key? key + @segments.each do |segment| return segment.regexp if segment.respond_to?(:key) && segment.key == key end nil actionpack/lib/action_controller/routing/route.rb @@ -79,12 +79,12 @@ module ActionController end def add(name, route) - routes[name.to_sym] = route + @routes[name.to_sym] = route define_named_route_methods(name, route) end def get(name) - routes[name.to_sym] + @routes[name.to_sym] end alias []= add @@ -92,20 +92,20 @@ module ActionController alias clear clear! def each - routes.each { |name, route| yield name, route } + @routes.each { |name, route| yield name, route } self end def names - routes.keys + @routes.keys end def length - routes.length + @routes.length end def reset! - old_routes = routes.dup + old_routes = @routes.dup clear! old_routes.each do |name, route| add(name, route) @@ -144,7 +144,7 @@ module ActionController end protected :#{selector} end_eval - helpers << selector + @helpers << selector end def define_url_helper(route, name, kind, options) @@ -185,15 +185,15 @@ module ActionController end protected :#{selector} end_eval - helpers << selector + @helpers << selector end end attr_accessor :routes, :named_routes, :configuration_file def initialize - self.routes = [] - self.named_routes = NamedRouteCollection.new + @routes = [] + @named_routes = NamedRouteCollection.new end # Subclasses and plugins may override this method to specify a different @@ -209,8 +209,8 @@ module ActionController end def clear! - routes.clear - named_routes.clear + @routes.clear + @named_routes.clear @combined_regexp = nil @routes_by_controller = nil # This will force routing/recognition_optimization.rb @@ -220,11 +220,11 @@ module ActionController def install_helpers(destinations = [ActionController::Base, ActionView::Base], regenerate_code = false) Array(destinations).each { |d| d.module_eval { include Helpers } } - named_routes.install(destinations, regenerate_code) + @named_routes.install(destinations, regenerate_code) end def empty? - routes.empty? + @routes.empty? end def load! @@ -238,8 +238,8 @@ module ActionController alias reload! load! def reload - if @routes_last_modified && configuration_file - mtime = File.stat(configuration_file).mtime + if @routes_last_modified && @configuration_file + mtime = File.stat(@configuration_file).mtime # if it hasn't been changed, then just return return if mtime == @routes_last_modified # if it has changed then record the new time and fall to the load! below @@ -249,9 +249,9 @@ module ActionController end def load_routes! - if configuration_file - load configuration_file - @routes_last_modified = File.stat(configuration_file).mtime + if @configuration_file + load @configuration_file + @routes_last_modified = File.stat(@configuration_file).mtime else add_route ":controller/:action/:id" end @@ -259,14 +259,14 @@ module ActionController def add_route(path, options = {}) route = builder.build(path, options) - routes << route + @routes << route route end def add_named_route(name, path, options = {}) # TODO - is options EVER used? name = options[:name_prefix] + name.to_s if options[:name_prefix] - named_routes[name.to_sym] = add_route(path, options) + @named_routes[name.to_sym] = add_route(path, options) end def options_as_params(options) @@ -308,7 +308,7 @@ module ActionController named_route_name = options.delete(:use_route) generate_all = options.delete(:generate_all) if named_route_name - named_route = named_routes[named_route_name] + named_route = @named_routes[named_route_name] options = named_route.parameter_shell.merge(options) end @@ -351,7 +351,7 @@ module ActionController if generate_all # Used by caching to expire all paths for a resource - return routes.collect do |route| + return @routes.collect do |route| route.send!(method, options, merged, expire_on) end.compact end @@ -410,14 +410,14 @@ module ActionController end def routes_for_controller_and_action(controller, action) - selected = routes.select do |route| + selected = @routes.select do |route| route.matches_controller_and_action? controller, action end - (selected.length == routes.length) ? routes : selected + (selected.length == @routes.length) ? @routes : selected end def routes_for_controller_and_action_and_keys(controller, action, keys) - selected = routes.select do |route| + selected = @routes.select do |route| route.matches_controller_and_action? controller, action end selected.sort_by do |route| actionpack/lib/action_controller/routing/route_set.rb @@ -8,7 +8,7 @@ module ActionController alias_method :optional?, :is_optional def initialize - self.is_optional = false + @is_optional = false end def extraction_code @@ -68,20 +68,20 @@ module ActionController def initialize(value = nil) super() - self.value = value + @value = value end def interpolation_chunk - raw? ? value : super + @raw ? @value : super end def regexp_chunk - chunk = Regexp.escape(value) + chunk = Regexp.escape(@value) optional? ? Regexp.optionalize(chunk) : chunk end def build_pattern(pattern) - escaped = Regexp.escape(value) + escaped = Regexp.escape(@value) if optional? && ! pattern.empty? "(?:#{Regexp.optionalize escaped}\\Z|#{escaped}#{Regexp.unoptionalize pattern})" elsif optional? @@ -92,15 +92,15 @@ module ActionController end def to_s - value + @value end end class DividerSegment < StaticSegment #:nodoc: def initialize(value = nil) super(value) - self.raw = true - self.is_optional = true + @raw = true + @is_optional = true end def optionality_implied? @@ -113,36 +113,36 @@ module ActionController def initialize(key = nil, options = {}) super() - self.key = key - self.default = options[:default] if options.key? :default - self.is_optional = true if options[:optional] || options.key?(:default) + @key = key + @default = options[:default] if options.key? :default + @is_optional = true if options[:optional] || options.key?(:default) end def to_s - ":#{key}" + ":#{@key}" end # The local variable name that the value of this segment will be extracted to. def local_name - "#{key}_value" + "#{@key}_value" end def extract_value - "#{local_name} = hash[:#{key}] && hash[:#{key}].to_param #{"|| #{default.inspect}" if default}" + "#{local_name} = hash[:#{@key}] && hash[:#{@key}].to_param #{"|| #{@default.inspect}" if @default}" end def value_check - if default # Then we know it won't be nil - "#{value_regexp.inspect} =~ #{local_name}" if regexp + if @default # Then we know it won't be nil + "#{value_regexp.inspect} =~ #{local_name}" if @regexp elsif optional? # If we have a regexp check that the value is not given, or that it matches. # If we have no regexp, return nil since we do not require a condition. - "#{local_name}.nil? || #{value_regexp.inspect} =~ #{local_name}" if regexp + "#{local_name}.nil? || #{value_regexp.inspect} =~ #{local_name}" if @regexp else # Then it must be present, and if we have a regexp, it must match too. - "#{local_name} #{"&& #{value_regexp.inspect} =~ #{local_name}" if regexp}" + "#{local_name} #{"&& #{value_regexp.inspect} =~ #{local_name}" if @regexp}" end end def expiry_statement - "expired, hash = true, options if !expired && expire_on[:#{key}]" + "expired, hash = true, options if !expired && expire_on[:#{@key}]" end def extraction_code @@ -161,7 +161,7 @@ module ActionController # If we should not appear in the url, just write the code for the prior # segments. This occurs if our value is the default value, or, if we are # optional, if we have nil as our value. - "if #{local_name} == #{default.inspect}\n" + + "if #{local_name} == #{@default.inspect}\n" + continue_string_structure(prior_segments) + "\nelse\n" + # Otherwise, write the code up to here "#{interpolation_statement(prior_segments)}\nend" @@ -171,15 +171,15 @@ module ActionController end def value_regexp - Regexp.new "\\A#{regexp.to_s}\\Z" if regexp + Regexp.new "\\A#{@regexp.to_s}\\Z" if @regexp end def regexp_chunk - if regexp + if @regexp if regexp_has_modifiers? - "(#{regexp.to_s})" + "(#{@regexp.to_s})" else - "(#{regexp.source})" + "(#{@regexp.source})" end else "([^#{Routing::SEPARATORS.join}]+)" @@ -196,19 +196,19 @@ module ActionController def match_extraction(next_capture) # All non code-related keys (such as :id, :slug) are URI-unescaped as # path parameters. - default_value = default ? default.inspect : nil + default_value = @default ? @default.inspect : nil %[ value = if (m = match[#{next_capture}]) URI.unescape(m) else #{default_value} end - params[:#{key}] = value if value + params[:#{@key}] = value if value ] end def optionality_implied? - [:action, :id].include? key + [:action, :id].include? @key end def regexp_has_modifiers? @@ -220,7 +220,7 @@ module ActionController class ControllerSegment < DynamicSegment #:nodoc: def regexp_chunk possible_names = Routing.possible_controllers.collect { |name| Regexp.escape name } - "(?i-:(#{(regexp || Regexp.union(*possible_names)).source}))" + "(?i-:(#{(@regexp || Regexp.union(*possible_names)).source}))" end # Don't URI.escape the controller name since it may contain slashes. @@ -231,29 +231,31 @@ module ActionController # Make sure controller names like Admin/Content are correctly normalized to # admin/content def extract_value - "#{local_name} = (hash[:#{key}] #{"|| #{default.inspect}" if default}).downcase" + "#{local_name} = (hash[:#{@key}] #{"|| #{@default.inspect}" if @default}).downcase" end def match_extraction(next_capture) - if default - "params[:#{key}] = match[#{next_capture}] ? match[#{next_capture}].downcase : '#{default}'" + if @default + "params[:#{@key}] = match[#{next_capture}] ? match[#{next_capture}].downcase : '#{@default}'" else - "params[:#{key}] = match[#{next_capture}].downcase if match[#{next_capture}]" + "params[:#{@key}] = match[#{next_capture}].downcase if match[#{next_capture}]" end end end class PathSegment < DynamicSegment #:nodoc: + + def initialize( *args ) + super( *args ) + @default = '' + end + def interpolation_chunk(value_code = "#{local_name}") "\#{#{value_code}}" end def extract_value - "#{local_name} = hash[:#{key}] && Array(hash[:#{key}]).collect { |path_component| URI.escape(path_component.to_param, ActionController::Routing::Segment::UNSAFE_PCHAR) }.to_param #{"|| #{default.inspect}" if default}" - end - - def default - '' + "#{local_name} = hash[:#{@key}] && Array(hash[:#{@key}]).collect { |path_component| URI.escape(path_component.to_param, ActionController::Routing::Segment::UNSAFE_PCHAR) }.to_param #{"|| #{@default.inspect}" if @default}" end def default=(path) @@ -261,11 +263,11 @@ module ActionController end def match_extraction(next_capture) - "params[:#{key}] = PathSegment::Result.new_escaped((match[#{next_capture}]#{" || " + default.inspect if default}).split('/'))#{" if match[" + next_capture + "]" if !default}" + "params[:#{@key}] = PathSegment::Result.new_escaped((match[#{next_capture}]#{" || " + @default.inspect if @default}).split('/'))#{" if match[" + next_capture + "]" if !@default}" end def regexp_chunk - regexp || "(.*)" + @regexp || "(.*)" end def optionality_implied? actionpack/lib/action_controller/routing/segments.rb 5e8a69acdfe96ff1ba445244e9aa05ad4d2e615d Lourens Naude lourens@methodmissing.com http://github.com/methodmissing/rails/commit/19bb60109f728d1b972077a1a0291d1a27d34d34 19bb60109f728d1b972077a1a0291d1a27d34d34 2008-07-10T05:18:29-07:00 2008-07-10T05:18:29-07:00 Avoid excessive AST traversal for Routing 50802275c10ac7fbdbd3092a5d64c1d0cb77ce29 Lourens Naude lourens@methodmissing.com