actionpack 4.2.10 → 6.1.3.2

data/lib/action_dispatch/journey/gtg/builder.rb

@@ -1,4 +1,6 @@
-require 'action_dispatch/journey/gtg/transition_table'
+# frozen_string_literal: true
+
+require "action_dispatch/journey/gtg/transition_table"
 
 module ActionDispatch
   module Journey # :nodoc:
@@ -11,45 +13,44 @@ module ActionDispatch
         def initialize(root)
           @root      = root
           @ast       = Nodes::Cat.new root, DUMMY
-          @followpos = nil
+          @followpos = build_followpos
         end
 
         def transition_table
           dtrans   = TransitionTable.new
-          marked   = {}
-          state_id = Hash.new { |h,k| h[k] = h.length }
+          marked   = {}.compare_by_identity
+          state_id = Hash.new { |h, k| h[k] = h.length }.compare_by_identity
+          dstates  = [firstpos(root)]
 
-          start   = firstpos(root)
-          dstates = [start]
           until dstates.empty?
             s = dstates.shift
             next if marked[s]
             marked[s] = true # mark s
 
             s.group_by { |state| symbol(state) }.each do |sym, ps|
-              u = ps.flat_map { |l| followpos(l) }
+              u = ps.flat_map { |l| @followpos[l] }
               next if u.empty?
 
-              if u.uniq == [DUMMY]
-                from = state_id[s]
-                to   = state_id[Object.new]
-                dtrans[from, to] = sym
+              from = state_id[s]
 
+              if u.all? { |pos| pos == DUMMY }
+                to = state_id[Object.new]
+                dtrans[from, to] = sym
                 dtrans.add_accepting(to)
+
                 ps.each { |state| dtrans.add_memo(to, state.memo) }
               else
-                dtrans[state_id[s], state_id[u]] = sym
+                to = state_id[u]
+                dtrans[from, to] = sym
 
                 if u.include?(DUMMY)
-                  to = state_id[u]
-
-                  accepting = ps.find_all { |l| followpos(l).include?(DUMMY) }
-
-                  accepting.each { |accepting_state|
-                    dtrans.add_memo(to, accepting_state.memo)
-                  }
+                  ps.each do |state|
+                    if @followpos[state].include?(DUMMY)
+                      dtrans.add_memo(to, state.memo)
+                    end
+                  end
 
-                  dtrans.add_accepting(state_id[u])
+                  dtrans.add_accepting(to)
                 end
               end
 
@@ -75,7 +76,7 @@ module ActionDispatch
           when Nodes::Unary
             nullable?(node.left)
           else
-            raise ArgumentError, 'unknown nullable: %s' % node.class.name
+            raise ArgumentError, "unknown nullable: %s" % node.class.name
           end
         end
 
@@ -90,13 +91,13 @@ module ActionDispatch
               firstpos(node.left)
             end
           when Nodes::Or
-            node.children.flat_map { |c| firstpos(c) }.uniq
+            node.children.flat_map { |c| firstpos(c) }.tap(&:uniq!)
           when Nodes::Unary
             firstpos(node.left)
           when Nodes::Terminal
             nullable?(node) ? [] : [node]
           else
-            raise ArgumentError, 'unknown firstpos: %s' % node.class.name
+            raise ArgumentError, "unknown firstpos: %s" % node.class.name
           end
         end
 
@@ -105,7 +106,7 @@ module ActionDispatch
           when Nodes::Star
             firstpos(node.left)
           when Nodes::Or
-            node.children.flat_map { |c| lastpos(c) }.uniq
+            node.children.flat_map { |c| lastpos(c) }.tap(&:uniq!)
           when Nodes::Cat
             if nullable?(node.right)
               lastpos(node.left) | lastpos(node.right)
@@ -117,22 +118,13 @@ module ActionDispatch
           when Nodes::Unary
             lastpos(node.left)
           else
-            raise ArgumentError, 'unknown lastpos: %s' % node.class.name
+            raise ArgumentError, "unknown lastpos: %s" % node.class.name
           end
         end
 
-        def followpos(node)
-          followpos_table[node]
-        end
-
         private
-
-          def followpos_table
-            @followpos ||= build_followpos
-          end
-
           def build_followpos
-            table = Hash.new { |h, k| h[k] = [] }
+            table = Hash.new { |h, k| h[k] = [] }.compare_by_identity
             @ast.each do |n|
               case n
               when Nodes::Cat
@@ -149,12 +141,7 @@ module ActionDispatch
           end
 
           def symbol(edge)
-            case edge
-            when Journey::Nodes::Symbol
-              edge.regexp
-            else
-              edge.left
-            end
+            edge.symbol? ? edge.regexp : edge.left
           end
       end
     end

data/lib/action_dispatch/journey/gtg/simulator.rb

@@ -1,4 +1,6 @@
-require 'strscan'
+# frozen_string_literal: true
+
+require "strscan"
 
 module ActionDispatch
   module Journey # :nodoc:
@@ -12,34 +14,27 @@ module ActionDispatch
       end
 
       class Simulator # :nodoc:
+        INITIAL_STATE = [0].freeze
+
         attr_reader :tt
 
         def initialize(transition_table)
           @tt = transition_table
         end
 
-        def simulate(string)
-          ms = memos(string) { return }
-          MatchData.new(ms)
-        end
-
-        alias :=~    :simulate
-        alias :match :simulate
-
         def memos(string)
           input = StringScanner.new(string)
-          state = [0]
+          state = INITIAL_STATE
+
           while sym = input.scan(%r([/.?]|[^/.?]+))
             state = tt.move(state, sym)
           end
 
-          acceptance_states = state.find_all { |s|
-            tt.accepting? s
-          }
-
-          return yield if acceptance_states.empty?
+          acceptance_states = state.each_with_object([]) do |s, memos|
+            memos.concat(tt.memo(s)) if tt.accepting?(s)
+          end
 
-          acceptance_states.flat_map { |x| tt.memo(x) }.compact
+          acceptance_states.empty? ? yield : acceptance_states
         end
       end
     end

data/lib/action_dispatch/journey/gtg/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:
@@ -12,7 +14,7 @@ module ActionDispatch
           @regexp_states = {}
           @string_states = {}
           @accepting     = {}
-          @memos         = Hash.new { |h,k| h[k] = [] }
+          @memos         = Hash.new { |h, k| h[k] = [] }
         end
 
         def add_accepting(state)
@@ -43,20 +45,22 @@ module ActionDispatch
           return [] if t.empty?
 
           regexps = []
+          strings = []
 
-          t.map { |s|
+          t.each { |s|
             if states = @regexp_states[s]
-              regexps.concat states.map { |re, v| re === a ? v : nil }
+              states.each { |re, v| regexps << v if re.match?(a) && !v.nil? }
             end
 
             if states = @string_states[s]
-              states[a]
+              strings << states[a] unless states[a].nil?
             end
-          }.compact.concat regexps
+          }
+          strings.concat regexps
         end
 
         def as_json(options = nil)
-          simple_regexp = Hash.new { |h,k| h[k] = {} }
+          simple_regexp = Hash.new { |h, k| h[k] = {} }
 
           @regexp_states.each do |from, hash|
             hash.each do |re, to|
@@ -72,20 +76,20 @@ module ActionDispatch
         end
 
         def to_svg
-          svg = IO.popen('dot -Tsvg', 'w+') { |f|
+          svg = IO.popen("dot -Tsvg", "w+") { |f|
             f.write(to_dot)
             f.close_write
             f.readlines
           }
           3.times { svg.shift }
-          svg.join.sub(/width="[^"]*"/, '').sub(/height="[^"]*"/, '')
+          svg.join.sub(/width="[^"]*"/, "").sub(/height="[^"]*"/, "")
         end
 
-        def visualizer(paths, title = 'FSM')
-          viz_dir   = File.join File.dirname(__FILE__), '..', 'visualizer'
-          fsm_js    = File.read File.join(viz_dir, 'fsm.js')
-          fsm_css   = File.read File.join(viz_dir, 'fsm.css')
-          erb       = File.read File.join(viz_dir, 'index.html.erb')
+        def visualizer(paths, title = "FSM")
+          viz_dir   = File.join __dir__, "..", "visualizer"
+          fsm_js    = File.read File.join(viz_dir, "fsm.js")
+          fsm_css   = File.read File.join(viz_dir, "fsm.css")
+          erb       = File.read File.join(viz_dir, "index.html.erb")
           states    = "function tt() { return #{to_json}; }"
 
           fun_routes = paths.sample(3).map do |ast|
@@ -93,10 +97,10 @@ module ActionDispatch
               case n
               when Nodes::Symbol
                 case n.left
-                when ':id' then rand(100).to_s
-                when ':format' then %w{ xml json }.sample
+                when ":id" then rand(100).to_s
+                when ":format" then %w{ xml json }.sample
                 else
-                  'omg'
+                  "omg"
                 end
               when Nodes::Terminal then n.symbol
               else
@@ -109,13 +113,12 @@ module ActionDispatch
           svg         = to_svg
           javascripts = [states, fsm_js]
 
-          # Annoying hack for 1.9 warnings
           fun_routes  = fun_routes
           stylesheets = stylesheets
           svg         = svg
           javascripts = javascripts
 
-          require 'erb'
+          require "erb"
           template = ERB.new erb
           template.result(binding)
         end
@@ -140,7 +143,6 @@ module ActionDispatch
         end
 
         private
-
           def states_hash_for(sym)
             case sym
             when String
@@ -148,7 +150,7 @@ module ActionDispatch
             when Regexp
               @regexp_states
             else
-              raise ArgumentError, 'unknown symbol: %s' % sym.class
+              raise ArgumentError, "unknown symbol: %s" % sym.class
             end
           end
       end

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

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module ActionDispatch
   module Journey # :nodoc:
@@ -9,18 +9,7 @@ module ActionDispatch
             "  #{from} -> #{to} [label=\"#{sym || 'ε'}\"];"
           }
 
-          #memo_nodes = memos.values.flatten.map { |n|
-          #  label = n
-          #  if Journey::Route === n
-          #    label = "#{n.verb.source} #{n.path.spec}"
-          #  end
-          #  "  #{n.object_id} [label=\"#{label}\", shape=box];"
-          #}
-          #memo_edges = memos.flat_map { |k, memos|
-          #  (memos || []).map { |v| "  #{k} -> #{v.object_id};" }
-          #}.uniq
-
-        <<-eodot
+          <<-eodot
 digraph nfa {
   rankdir=LR;
   node [shape = doublecircle];
@@ -28,7 +17,7 @@ digraph nfa {
   node [shape = circle];
 #{edges.join "\n"}
 }
-        eodot
+          eodot
         end
       end
     end

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("*:", "")
         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:
@@ -58,28 +65,32 @@ module ActionDispatch
         def literal?; false; end
       end
 
-      %w{ Symbol Slash Dot }.each do |t|
-        class_eval <<-eoruby, __FILE__, __LINE__ + 1
-          class #{t} < Terminal;
-            def type; :#{t.upcase}; end
-          end
-        eoruby
+      class Slash < Terminal # :nodoc:
+        def type; :SLASH; end
+      end
+
+      class Dot < Terminal # :nodoc:
+        def type; :DOT; end
       end
 
       class Symbol < Terminal # :nodoc:
         attr_accessor :regexp
         alias :symbol :regexp
+        attr_reader :name
 
         DEFAULT_EXP = /[^\.\/\?]+/
-        def initialize(left)
-          super
-          @regexp = DEFAULT_EXP
+        GREEDY_EXP = /(.+)/
+        def initialize(left, regexp = DEFAULT_EXP)
+          super(left)
+          @regexp = regexp
+          @name = -left.tr("*:", "")
         end
 
         def default_regexp?
           regexp == DEFAULT_EXP
         end
 
+        def type; :SYMBOL; end
         def symbol?; true; end
       end
 
@@ -89,13 +100,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 +124,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.16
+# 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,
@@ -162,7 +163,7 @@ def _reduce_9(val, _values)
 end
 
 def _reduce_10(val, _values)
- Star.new(Symbol.new(val.last))
+ Star.new(Symbol.new(val.last, Symbol::GREEDY_EXP))
 end
 
 # reduce 11 omitted
@@ -174,7 +175,7 @@ end
 # reduce 14 omitted
 
 def _reduce_15(val, _values)
- Slash.new('/')
+ Slash.new(val.first)
 end
 
 def _reduce_16(val, _values)
@@ -194,5 +195,5 @@ def _reduce_none(val, _values)
 end
 
     end   # class Parser
-    end   # module Journey
-  end   # module ActionDispatch
+  end   # module Journey
+end   # module ActionDispatch

data/lib/action_dispatch/journey/parser.y

@@ -21,7 +21,7 @@ rule
     | expression OR or { Or.new([val.first, val.last]) }
     ;
   star
-    : STAR       { Star.new(Symbol.new(val.last)) }
+    : STAR       { Star.new(Symbol.new(val.last, Symbol::GREEDY_EXP)) }
     ;
   terminal
     : symbol
@@ -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