Remove unused journey code

Journey was integrated into Action Dispatch at 56fee39, but from that time, almost all NFA namespace code were not used.
rails · Apr 24, 2020 · 639f5fd · 639f5fd
1 parent 4175896
commit 639f5fd
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 437 deletions.
diff --git a/actionpack/lib/action_dispatch/journey.rb b/actionpack/lib/action_dispatch/journey.rb
@@ -3,5 +3,3 @@
 require "action_dispatch/journey/router"
 require "action_dispatch/journey/gtg/builder"
 require "action_dispatch/journey/gtg/simulator"
-require "action_dispatch/journey/nfa/builder"
-require "action_dispatch/journey/nfa/simulator"
diff --git a/actionpack/lib/action_dispatch/journey/nfa/builder.rb b/actionpack/lib/action_dispatch/journey/nfa/builder.rb
diff --git a/actionpack/lib/action_dispatch/journey/nfa/dot.rb b/actionpack/lib/action_dispatch/journey/nfa/dot.rb
@@ -9,17 +9,6 @@ def to_dot
             "  #{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
 digraph nfa {
   rankdir=LR;

diff --git a/actionpack/lib/action_dispatch/journey/nfa/simulator.rb b/actionpack/lib/action_dispatch/journey/nfa/simulator.rb
diff --git a/actionpack/lib/action_dispatch/journey/nfa/transition_table.rb b/actionpack/lib/action_dispatch/journey/nfa/transition_table.rb
diff --git a/actionpack/test/journey/gtg/builder_test.rb b/actionpack/test/journey/gtg/builder_test.rb
@@ -40,10 +40,10 @@ def test_match_data_ambiguous
             /articles/:id(.:format)
           }
 
-          sim = NFA::Simulator.new table
+          sim = Simulator.new table
 
-          match = sim.match "/articles/new"
-          assert_equal 2, match.memos.length
+          memos = sim.memos "/articles/new"
+          assert_equal 2, memos.length
         end
 
         ##
@@ -54,10 +54,10 @@ def test_match_same_paths
             /articles/new(.:format)
           }
 
-          sim = NFA::Simulator.new table
+          sim = Simulator.new table
 
-          match = sim.match "/articles/new"
-          assert_equal 2, match.memos.length
+          memos = sim.memos "/articles/new"
+          assert_equal 2, memos.length
         end
 
         private

diff --git a/actionpack/test/journey/nfa/simulator_test.rb b/actionpack/test/journey/nfa/simulator_test.rb