Integrate Journey into Action Dispatch

Move the Journey code underneath the ActionDispatch namespace so
that we don't pollute the global namespace with names that may
be used for models.

Fixes rails/journey#49.

2 files changed, 53 insertions, 0 deletions

diff --git a/actionpack/test/journey/router/strexp_test.rb b/actionpack/test/journey/router/strexp_test.rb
new file mode 100644
index 0000000000..9e0337f144
--- /dev/null
+++ b/actionpack/test/journey/router/strexp_test.rb
@@ -0,0 +1,32 @@
+require 'abstract_unit'
+
+module ActionDispatch
+  module Journey
+    class Router
+      class TestStrexp < MiniTest::Unit::TestCase
+        def test_many_names
+          exp = Strexp.new(
+            "/:controller(/:action(/:id(.:format)))",
+            {:controller=>/.+?/},
+            ["/", ".", "?"],
+            true)
+
+          assert_equal ["controller", "action", "id", "format"], exp.names
+        end
+
+        def test_names
+          {
+            "/bar(.:format)"    => %w{ format },
+            ":format"           => %w{ format },
+            ":format-"          => %w{ format },
+            ":format0"          => %w{ format0 },
+            ":format1,:format2" => %w{ format1 format2 },
+          }.each do |string, expected|
+            exp = Strexp.new(string, {}, ["/", ".", "?"])
+            assert_equal expected, exp.names
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/test/journey/router/utils_test.rb b/actionpack/test/journey/router/utils_test.rb
new file mode 100644
index 0000000000..97a6449c99
--- /dev/null
+++ b/actionpack/test/journey/router/utils_test.rb
@@ -0,0 +1,21 @@
+require 'abstract_unit'
+
+module ActionDispatch
+  module Journey
+    class Router
+      class TestUtils < MiniTest::Unit::TestCase
+        def test_path_escape
+          assert_equal "a/b%20c+d", Utils.escape_path("a/b c+d")
+        end
+
+        def test_fragment_escape
+          assert_equal "a/b%20c+d?e", Utils.escape_fragment("a/b c+d?e")
+        end
+
+        def test_uri_unescape
+          assert_equal "a/b c+d", Utils.unescape_uri("a%2Fb%20c+d")
+        end
+      end
+    end
+  end
+end