Merge pull request #497 from seemethere/increment_041

Increment version to 0.4.1

sanic/__init__.py

@@ -1,6 +1,6 @@
 from sanic.app import Sanic
 from sanic.blueprints import Blueprint
 
-__version__ = '0.4.0'
+__version__ = '0.4.1'
 
 __all__ = ['Sanic', 'Blueprint']

sanic/router.py

@@ -98,10 +98,15 @@ class Router:
     def add(self, uri, methods, handler, host=None):
         # add regular version
         self._add(uri, methods, handler, host)
-        slash_is_missing = (not uri[-1].endswith('/')
+        slash_is_missing = (
-                            and not self.routes_all.get(uri + '/', False))
+            not uri[-1] == '/'
-        without_slash_is_missing = (not self.routes_all.get(uri[:-1], False)
+            and not self.routes_all.get(uri + '/', False)
-                                    and uri is not '/')
+        )
+        without_slash_is_missing = (
+            uri[-1] == '/'
+            and not self.routes_all.get(uri[:-1], False)
+            and not uri == '/'
+        )
         # add version with trailing slash
         if slash_is_missing:
             self._add(uri + '/', methods, handler, host)

setup.py

@@ -15,6 +15,15 @@ with codecs.open(os.path.join(os.path.abspath(os.path.dirname(
     except IndexError:
         raise RuntimeError('Unable to determine version.')
 
+install_requires = [
+    'httptools>=0.0.9',
+    'ujson>=1.35',
+    'aiofiles>=0.3.0',
+]
+
+if os.name != 'nt':
+    install_requires.append('uvloop>=0.5.3')
+
 setup(
     name='sanic',
     version=version,
@@ -22,15 +31,11 @@ setup(
     license='MIT',
     author='Channel Cat',
     author_email='channelcat@gmail.com',
-    description='A microframework based on uvloop, httptools, and learnings of flask',
+    description=(
+        'A microframework based on uvloop, httptools, and learnings of flask'),
     packages=['sanic'],
     platforms='any',
-    install_requires=[
+    install_requires=install_requires,
-        'uvloop>=0.5.3;platform_system!="Windows"',
-        'httptools>=0.0.9',
-        'ujson>=1.35',
-        'aiofiles>=0.3.0',
-    ],
     classifiers=[
         'Development Status :: 2 - Pre-Alpha',
         'Environment :: Web Environment',

tests/test_routes.py

@@ -498,6 +498,19 @@ def test_remove_inexistent_route():
     with pytest.raises(RouteDoesNotExist):
         app.remove_route('/test')
 
+def test_removing_slash():
+    app = Sanic(__name__)
+
+    @app.get('/rest/<resource>')
+    def get(_):
+        pass
+
+    @app.post('/rest/<resource>')
+    def post(_):
+        pass
+
+    assert len(app.router.routes_all.keys()) == 2
+
 
 def test_remove_unhashable_route():
     app = Sanic('test_remove_unhashable_route')