Merge ac7a53b into fd7506c

MasoniteFramework · Aug 9, 2018 · dc28d21 · dc28d21
2 parents fd7506c + ac7a53b
commit dc28d21
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/masonite/routes.py b/masonite/routes.py
@@ -80,7 +80,7 @@ def compile_route_to_regex(self, route):
                     regex += r'([a-zA-Z]+)'
                 else:
                     # default
-                    regex += r'(\w+)'
+                    regex += r'([\w.-]+)'
                 regex += r'\/'
 
                 # append the variable name passed @(variable):int to a list

diff --git a/tests/providers/test_route_provider.py b/tests/providers/test_route_provider.py
@@ -82,6 +82,34 @@ def test_sets_request_params(self):
 
         assert self.app.make('Request').param('id') == '1'
 
+    def test_url_with_dots_finds_route(self):
+        self.app.make('Route').url = '/test/user.endpoint'
+        self.app.bind('WebRoutes', [get('/test/@endpoint', ControllerTest.show)])
+
+        self.provider.boot(
+            self.app.make('WebRoutes'),
+            self.app.make('Route'),
+            self.app.make('Request'),
+            self.app.make('Environ'),
+            self.app.make('Headers'),
+        )
+
+        assert self.app.make('Request').param('endpoint') == 'user.endpoint'
+
+    def test_url_with_dashes_finds_route(self):
+        self.app.make('Route').url = '/test/user-endpoint'
+        self.app.bind('WebRoutes', [get('/test/@endpoint', ControllerTest.show)])
+
+        self.provider.boot(
+            self.app.make('WebRoutes'),
+            self.app.make('Route'),
+            self.app.make('Request'),
+            self.app.make('Environ'),
+            self.app.make('Headers'),
+        )
+
+        assert self.app.make('Request').param('endpoint') == 'user-endpoint'
+
     def test_route_subdomain_ignores_routes(self):
         self.app.make('Route').url = '/test'
         self.app.make('Environ')['HTTP_HOST'] = 'subb.domain.com'

diff --git a/tests/test_routes.py b/tests/test_routes.py
@@ -33,7 +33,7 @@ def test_route_is_post(self):
     def test_compile_route_to_regex(self):
         assert self.route.compile_route_to_regex(Get().route('test/route', None)) == '^test\\/route\\/$'
         assert self.route.compile_route_to_regex(Get().route(
-            'test/@route', None)) == '^test\\/(\\w+)\\/$'
+            'test/@route', None)) == '^test\\/([\\w.-]+)\\/$'
 
         assert self.route.compile_route_to_regex(Get().route(
             'test/@route:int', None)) == '^test\\/(\\d+)\\/$'