actionpack 4.2.11.1 → 5.2.6

data/lib/action_dispatch/journey/nfa/transition_table.rb

@@ -1,4 +1,6 @@
-require 'action_dispatch/journey/nfa/dot'
+# frozen_string_literal: true
+
+require "action_dispatch/journey/nfa/dot"
 
 module ActionDispatch
   module Journey # :nodoc:
@@ -10,7 +12,7 @@ module ActionDispatch
         attr_reader :memos
 
         def initialize
-          @table     = Hash.new { |h,f| h[f] = {} }
+          @table     = Hash.new { |h, f| h[f] = {} }
           @memos     = {}
           @accepting = nil
           @inverted  = nil
@@ -45,51 +47,6 @@ module ActionDispatch
           (@table.keys + @table.values.flat_map(&:keys)).uniq
         end
 
-        # Returns a generalized transition graph with reduced states. The states
-        # are reduced like a DFA, but the table must be simulated like an NFA.
-        #
-        # Edges of the GTG are regular expressions.
-        def generalized_table
-          gt       = GTG::TransitionTable.new
-          marked   = {}
-          state_id = Hash.new { |h,k| h[k] = h.length }
-          alphabet = self.alphabet
-
-          stack = [eclosure(0)]
-
-          until stack.empty?
-            state = stack.pop
-            next if marked[state] || state.empty?
-
-            marked[state] = true
-
-            alphabet.each do |alpha|
-              next_state = eclosure(following_states(state, alpha))
-              next if next_state.empty?
-
-              gt[state_id[state], state_id[next_state]] = alpha
-              stack << next_state
-            end
-          end
-
-          final_groups = state_id.keys.find_all { |s|
-            s.sort.last == accepting
-          }
-
-          final_groups.each do |states|
-            id = state_id[states]
-
-            gt.add_accepting(id)
-            save = states.find { |s|
-              @memos.key?(s) && eclosure(s).sort.last == accepting
-            }
-
-            gt.add_memo(id, memo(save))
-          end
-
-          gt
-        end
-
         # Returns set of NFA states to which there is a transition on ast symbol
         # +a+ from some state +s+ in +t+.
         def following_states(t, a)
@@ -107,7 +64,7 @@ module ActionDispatch
         end
 
         def alphabet
-          inverted.values.flat_map(&:keys).compact.uniq.sort_by { |x| x.to_s }
+          inverted.values.flat_map(&:keys).compact.uniq.sort_by(&:to_s)
         end
 
         # Returns a set of NFA states reachable from some NFA state +s+ in set

data/lib/action_dispatch/journey/nodes/node.rb

@@ -1,4 +1,6 @@
-require 'action_dispatch/journey/visitors'
+# frozen_string_literal: true
+
+require "action_dispatch/journey/visitors"
 
 module ActionDispatch
   module Journey # :nodoc:
@@ -14,15 +16,15 @@ module ActionDispatch
         end
 
         def each(&block)
-          Visitors::Each.new(block).accept(self)
+          Visitors::Each::INSTANCE.accept(self, block)
         end
 
         def to_s
-          Visitors::String.new.accept(self)
+          Visitors::String::INSTANCE.accept(self, "")
         end
 
         def to_dot
-          Visitors::Dot.new.accept(self)
+          Visitors::Dot::INSTANCE.accept(self)
         end
 
         def to_sym
@@ -30,7 +32,7 @@ module ActionDispatch
         end
 
         def name
-          left.tr '*:', ''
+          left.tr "*:".freeze, "".freeze
         end
 
         def type
@@ -39,10 +41,15 @@ module ActionDispatch
 
         def symbol?; false; end
         def literal?; false; end
+        def terminal?; false; end
+        def star?; false; end
+        def cat?; false; end
+        def group?; false; end
       end
 
       class Terminal < Node # :nodoc:
         alias :symbol :left
+        def terminal?; true; end
       end
 
       class Literal < Terminal # :nodoc:
@@ -69,11 +76,13 @@ module ActionDispatch
       class Symbol < Terminal # :nodoc:
         attr_accessor :regexp
         alias :symbol :regexp
+        attr_reader :name
 
         DEFAULT_EXP = /[^\.\/\?]+/
         def initialize(left)
           super
           @regexp = DEFAULT_EXP
+          @name = left.tr "*:".freeze, "".freeze
         end
 
         def default_regexp?
@@ -89,13 +98,15 @@ module ActionDispatch
 
       class Group < Unary # :nodoc:
         def type; :GROUP; end
+        def group?; true; end
       end
 
       class Star < Unary # :nodoc:
+        def star?; true; end
         def type; :STAR; end
 
         def name
-          left.name.tr '*:', ''
+          left.name.tr "*:", ""
         end
       end
 
@@ -111,6 +122,7 @@ module ActionDispatch
       end
 
       class Cat < Binary # :nodoc:
+        def cat?; true; end
         def type; :CAT; end
       end
 

data/lib/action_dispatch/journey/parser.rb

@@ -1,32 +1,33 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.11
-# from Racc grammer file "".
+# This file is automatically generated by Racc 1.4.14
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
 
+# :stopdoc:
 
-require 'action_dispatch/journey/parser_extras'
+require "action_dispatch/journey/parser_extras"
 module ActionDispatch
   module Journey
     class Parser < Racc::Parser
 ##### State transition tables begin ###
 
 racc_action_table = [
-    13,    15,    14,     7,    21,    16,     8,    19,    13,    15,
-    14,     7,    17,    16,     8,    13,    15,    14,     7,    24,
-    16,     8,    13,    15,    14,     7,    19,    16,     8 ]
+    13,    15,    14,     7,    19,    16,     8,    19,    13,    15,
+    14,     7,    17,    16,     8,    13,    15,    14,     7,    21,
+    16,     8,    13,    15,    14,     7,    24,    16,     8 ]
 
 racc_action_check = [
-     2,     2,     2,     2,    17,     2,     2,     2,     0,     0,
-     0,     0,     1,     0,     0,    19,    19,    19,    19,    20,
-    19,    19,     7,     7,     7,     7,    22,     7,     7 ]
+     2,     2,     2,     2,    22,     2,     2,     2,    19,    19,
+    19,    19,     1,    19,    19,     7,     7,     7,     7,    17,
+     7,     7,     0,     0,     0,     0,    20,     0,     0 ]
 
 racc_action_pointer = [
-     6,    12,    -2,   nil,   nil,   nil,   nil,    20,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,     4,   nil,    13,
-    13,   nil,    17,   nil,   nil ]
+    20,    12,    -2,   nil,   nil,   nil,   nil,    13,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    19,   nil,     6,
+    20,   nil,    -5,   nil,   nil ]
 
 racc_action_default = [
    -19,   -19,    -2,    -3,    -4,    -5,    -6,   -19,   -10,   -11,
@@ -134,11 +135,11 @@ Racc_debug_parser = false
 # reduce 0 omitted
 
 def _reduce_1(val, _values)
- Cat.new(val.first, val.last)
+ Cat.new(val.first, val.last) 
 end
 
 def _reduce_2(val, _values)
- val.first
+ val.first 
 end
 
 # reduce 3 omitted
@@ -150,19 +151,19 @@ end
 # reduce 6 omitted
 
 def _reduce_7(val, _values)
- Group.new(val[1])
+ Group.new(val[1]) 
 end
 
 def _reduce_8(val, _values)
- Or.new([val.first, val.last])
+ Or.new([val.first, val.last]) 
 end
 
 def _reduce_9(val, _values)
- Or.new([val.first, val.last])
+ Or.new([val.first, val.last]) 
 end
 
 def _reduce_10(val, _values)
- Star.new(Symbol.new(val.last))
+ Star.new(Symbol.new(val.last)) 
 end
 
 # reduce 11 omitted
@@ -174,19 +175,19 @@ end
 # reduce 14 omitted
 
 def _reduce_15(val, _values)
- Slash.new('/')
+ Slash.new(val.first) 
 end
 
 def _reduce_16(val, _values)
- Symbol.new(val.first)
+ Symbol.new(val.first) 
 end
 
 def _reduce_17(val, _values)
- Literal.new(val.first)
+ Literal.new(val.first) 
 end
 
 def _reduce_18(val, _values)
- Dot.new(val.first)
+ Dot.new(val.first) 
 end
 
 def _reduce_none(val, _values)

data/lib/action_dispatch/journey/parser.y

@@ -30,7 +30,7 @@ rule
     | dot
     ;
   slash
-    : SLASH              { Slash.new('/') }
+    : SLASH              { Slash.new(val.first) }
     ;
   symbol
     : SYMBOL             { Symbol.new(val.first) }
@@ -45,5 +45,6 @@ rule
 end
 
 ---- header
+# :stopdoc:
 
-require 'action_dispatch/journey/parser_extras'
+require "action_dispatch/journey/parser_extras"

data/lib/action_dispatch/journey/parser_extras.rb

@@ -1,11 +1,18 @@
-require 'action_dispatch/journey/scanner'
-require 'action_dispatch/journey/nodes/node'
+# frozen_string_literal: true
+
+require "action_dispatch/journey/scanner"
+require "action_dispatch/journey/nodes/node"
 
 module ActionDispatch
-  module Journey # :nodoc:
-    class Parser < Racc::Parser # :nodoc:
+  # :stopdoc:
+  module Journey
+    class Parser < Racc::Parser
       include Journey::Nodes
 
+      def self.parse(string)
+        new.parse string
+      end
+
       def initialize
         @scanner = Scanner.new
       end
@@ -20,4 +27,5 @@ module ActionDispatch
       end
     end
   end
+  # :startdoc:
 end

data/lib/action_dispatch/journey/path/pattern.rb

@@ -1,4 +1,4 @@
-require 'action_dispatch/journey/router/strexp'
+# frozen_string_literal: true
 
 module ActionDispatch
   module Journey # :nodoc:
@@ -6,15 +6,21 @@ module ActionDispatch
       class Pattern # :nodoc:
         attr_reader :spec, :requirements, :anchored
 
-        def self.from_string string
-          new Journey::Router::Strexp.build(string, {}, ["/.?"], true)
+        def self.from_string(string)
+          build(string, {}, "/.?", true)
         end
 
-        def initialize(strexp)
-          @spec         = strexp.ast
-          @requirements = strexp.requirements
-          @separators   = strexp.separators.join
-          @anchored     = strexp.anchor
+        def self.build(path, requirements, separators, anchored)
+          parser = Journey::Parser.new
+          ast = parser.parse path
+          new ast, requirements, separators, anchored
+        end
+
+        def initialize(ast, requirements, separators, anchored)
+          @spec         = ast
+          @requirements = requirements
+          @separators   = separators
+          @anchored     = anchored
 
           @names          = nil
           @optional_names = nil
@@ -27,13 +33,20 @@ module ActionDispatch
           Visitors::FormatBuilder.new.accept(spec)
         end
 
+        def eager_load!
+          required_names
+          offsets
+          to_regexp
+          nil
+        end
+
         def ast
-          @spec.grep(Nodes::Symbol).each do |node|
+          @spec.find_all(&:symbol?).each do |node|
             re = @requirements[node.to_sym]
             node.regexp = re if re
           end
 
-          @spec.grep(Nodes::Star).each do |node|
+          @spec.find_all(&:star?).each do |node|
             node = node.left
             node.regexp = @requirements[node.to_sym] || /(.+)/
           end
@@ -42,7 +55,7 @@ module ActionDispatch
         end
 
         def names
-          @names ||= spec.grep(Nodes::Symbol).map { |n| n.name }
+          @names ||= spec.find_all(&:symbol?).map(&:name)
         end
 
         def required_names
@@ -50,34 +63,9 @@ module ActionDispatch
         end
 
         def optional_names
-          @optional_names ||= spec.grep(Nodes::Group).flat_map { |group|
-            group.grep(Nodes::Symbol)
-          }.map { |n| n.name }.uniq
-        end
-
-        class RegexpOffsets < Journey::Visitors::Visitor # :nodoc:
-          attr_reader :offsets
-
-          def initialize(matchers)
-            @matchers      = matchers
-            @capture_count = [0]
-          end
-
-          def visit(node)
-            super
-            @capture_count
-          end
-
-          def visit_SYMBOL(node)
-            node = node.to_sym
-
-            if @matchers.key?(node)
-              re = /#{@matchers[node]}|/
-              @capture_count.push((re.match('').length - 1) + (@capture_count.last || 0))
-            else
-              @capture_count << (@capture_count.last || 0)
-            end
-          end
+          @optional_names ||= spec.find_all(&:group?).flat_map { |group|
+            group.find_all(&:symbol?)
+          }.map(&:name).uniq
         end
 
         class AnchoredRegexp < Journey::Visitors::Visitor # :nodoc:
@@ -119,14 +107,20 @@ module ActionDispatch
           end
 
           def visit_STAR(node)
-            re = @matchers[node.left.to_sym] || '.+'
+            re = @matchers[node.left.to_sym] || ".+"
             "(#{re})"
           end
+
+          def visit_OR(node)
+            children = node.children.map { |n| visit n }
+            "(?:#{children.join(?|)})"
+          end
         end
 
         class UnanchoredRegexp < AnchoredRegexp # :nodoc:
           def accept(node)
-            %r{\A#{visit node}}
+            path = visit node
+            path == "/" ? %r{\A/} : %r{\A#{path}(?:\b|\Z|/)}
           end
         end
 
@@ -140,7 +134,7 @@ module ActionDispatch
           end
 
           def captures
-            (length - 1).times.map { |i| self[i + 1] }
+            Array.new(length - 1) { |i| self[i + 1] }
           end
 
           def [](x)
@@ -184,8 +178,20 @@ module ActionDispatch
           def offsets
             return @offsets if @offsets
 
-            viz = RegexpOffsets.new(@requirements)
-            @offsets = viz.accept(spec)
+            @offsets = [0]
+
+            spec.find_all(&:symbol?).each do |node|
+              node = node.to_sym
+
+              if @requirements.key?(node)
+                re = /#{@requirements[node]}|/
+                @offsets.push((re.match("").length - 1) + @offsets.last)
+              else
+                @offsets << @offsets.last
+              end
+            end
+
+            @offsets
           end
       end
     end

data/lib/action_dispatch/journey/route.rb

@@ -1,42 +1,106 @@
+# frozen_string_literal: true
+
 module ActionDispatch
-  module Journey # :nodoc:
-    class Route # :nodoc:
-      attr_reader :app, :path, :defaults, :name
+  # :stopdoc:
+  module Journey
+    class Route
+      attr_reader :app, :path, :defaults, :name, :precedence
 
-      attr_reader :constraints
+      attr_reader :constraints, :internal
       alias :conditions :constraints
 
-      attr_accessor :precedence
+      module VerbMatchers
+        VERBS = %w{ DELETE GET HEAD OPTIONS LINK PATCH POST PUT TRACE UNLINK }
+        VERBS.each do |v|
+          class_eval <<-eoc, __FILE__, __LINE__ + 1
+            class #{v}
+              def self.verb; name.split("::").last; end
+              def self.call(req); req.#{v.downcase}?; end
+            end
+          eoc
+        end
+
+        class Unknown
+          attr_reader :verb
+
+          def initialize(verb)
+            @verb = verb
+          end
+
+          def call(request); @verb === request.request_method; end
+        end
+
+        class All
+          def self.call(_); true; end
+          def self.verb; ""; end
+        end
+
+        VERB_TO_CLASS = VERBS.each_with_object(all: All) do |verb, hash|
+          klass = const_get verb
+          hash[verb]                 = klass
+          hash[verb.downcase]        = klass
+          hash[verb.downcase.to_sym] = klass
+        end
+      end
+
+      def self.verb_matcher(verb)
+        VerbMatchers::VERB_TO_CLASS.fetch(verb) do
+          VerbMatchers::Unknown.new verb.to_s.dasherize.upcase
+        end
+      end
+
+      def self.build(name, app, path, constraints, required_defaults, defaults)
+        request_method_match = verb_matcher(constraints.delete(:request_method))
+        new name, app, path, constraints, required_defaults, defaults, request_method_match, 0
+      end
 
       ##
       # +path+ is a path constraint.
       # +constraints+ is a hash of constraints to be applied to this route.
-      def initialize(name, app, path, constraints, defaults = {})
+      def initialize(name, app, path, constraints, required_defaults, defaults, request_method_match, precedence, internal = false)
         @name        = name
         @app         = app
         @path        = path
 
+        @request_method_match = request_method_match
         @constraints = constraints
         @defaults    = defaults
         @required_defaults = nil
+        @_required_defaults = required_defaults
         @required_parts    = nil
         @parts             = nil
         @decorated_ast     = nil
-        @precedence        = 0
+        @precedence        = precedence
         @path_formatter    = @path.build_formatter
+        @internal          = internal
+      end
+
+      def eager_load!
+        path.eager_load!
+        ast
+        parts
+        required_defaults
+        nil
       end
 
       def ast
         @decorated_ast ||= begin
           decorated_ast = path.ast
-          decorated_ast.grep(Nodes::Terminal).each { |n| n.memo = self }
+          decorated_ast.find_all(&:terminal?).each { |n| n.memo = self }
           decorated_ast
         end
       end
 
-      def requirements # :nodoc:
-        # needed for rails `rake routes`
-        @defaults.merge(path.requirements).delete_if { |_,v|
+      # Needed for `rails routes`. Picks up succinctly defined requirements
+      # for a route, for example route
+      #
+      #   get 'photo/:id', :controller => 'photos', :action => 'show',
+      #     :id => /[A-Z]\d{5}/
+      #
+      # will have {:controller=>"photos", :action=>"show", :id=>/[A-Z]\d{5}/}
+      # as requirements.
+      def requirements
+        @defaults.merge(path.requirements).delete_if { |_, v|
           /.+?/ == v
         }
       end
@@ -49,18 +113,23 @@ module ActionDispatch
         required_parts + required_defaults.keys
       end
 
-      def score(constraints)
+      def score(supplied_keys)
         required_keys = path.required_names
-        supplied_keys = constraints.map { |k,v| v && k.to_s }.compact
 
-        return -1 unless (required_keys - supplied_keys).empty?
+        required_keys.each do |k|
+          return -1 unless supplied_keys.include?(k)
+        end
+
+        score = 0
+        path.names.each do |k|
+          score += 1 if supplied_keys.include?(k)
+        end
 
-        score = (supplied_keys & path.names).length
         score + (required_defaults.length * 2)
       end
 
       def parts
-        @parts ||= segments.map { |n| n.to_sym }
+        @parts ||= segments.map(&:to_sym)
       end
       alias :segment_keys :parts
 
@@ -68,20 +137,16 @@ module ActionDispatch
         @path_formatter.evaluate path_options
       end
 
-      def optional_parts
-        path.optional_names.map { |n| n.to_sym }
-      end
-
       def required_parts
-        @required_parts ||= path.required_names.map { |n| n.to_sym }
+        @required_parts ||= path.required_names.map(&:to_sym)
       end
 
       def required_default?(key)
-        (constraints[:required_defaults] || []).include?(key)
+        @_required_defaults.include?(key)
       end
 
       def required_defaults
-        @required_defaults ||= @defaults.dup.delete_if do |k,_|
+        @required_defaults ||= @defaults.dup.delete_if do |k, _|
           parts.include?(k) || !required_default?(k)
         end
       end
@@ -95,9 +160,8 @@ module ActionDispatch
       end
 
       def matches?(request)
-        constraints.all? do |method, value|
-          next true unless request.respond_to?(method)
-
+        match_verb(request) &&
+        constraints.all? { |method, value|
           case value
           when Regexp, String
             value === request.send(method).to_s
@@ -110,16 +174,30 @@ module ActionDispatch
           else
             value === request.send(method)
           end
-        end
+        }
       end
 
       def ip
         constraints[:ip] || //
       end
 
+      def requires_matching_verb?
+        !@request_method_match.all? { |x| x == VerbMatchers::All }
+      end
+
       def verb
-        constraints[:request_method] || //
+        verbs.join("|")
       end
+
+      private
+        def verbs
+          @request_method_match.map(&:verb)
+        end
+
+        def match_verb(request)
+          @request_method_match.any? { |m| m.call request }
+        end
     end
   end
+  # :startdoc:
 end