Merge branch 'hotfix/2014.05.19.1'

CHANGELOG.rst

@@ -1,6 +1,11 @@
 Change Log
 ==========
 
+2014.05.19.1
+------------
+* Hotfix: Fixed issue where routes would be reregistered with an app
+  incorrectly in the event of multiple app creations
+
 2014.05.19
 ----------
 * Feature: ``Include`` now supports ``endpoint`` prefixing

REQS.TESTING.txt

@@ -4,6 +4,6 @@
 
 pytest==2.5.2
 pytest-cov==1.6
-pytest_spec==0.2.17
+pytest_spec==0.2.22
 
 Flask-Testing

VERSION

@@ -1 +1 @@
-2014.05.19
+2014.05.19.1

flask_via/__init__.py

@@ -143,5 +143,7 @@ def init_app(
         # Get the routes
         routes = self.include(routes_module, routes_name)
 
+        print routes
+
         # Load the routes
         self.load(app, routes, **kwargs)

flask_via/examples/include/app.py

@@ -17,4 +17,4 @@
 via.init_app(app)
 
 if __name__ == '__main__':
-    app.run(debug=True)
+    app.run(debug=False)

flask_via/routers/default.py

@@ -88,19 +88,26 @@ def add_to_app(self, app, **kwargs):
             Arbitrary keyword arguments passed in to ``init_app``
         """
 
+        url = self.url
+        endpoint = self.endpoint
+
         #: If this route was included a url preifx may have been passed
         #: to the route
         if 'url_prefix' in kwargs:
-            self.url = kwargs['url_prefix'] + self.url
+            url = kwargs['url_prefix'] + url
 
         #: If this route was included a endpoint prefix may have been passed
         #: to the route
         if 'endpoint' in kwargs:
-            if self.endpoint is None:
-                self.endpoint = self.func.__name__
-            self.endpoint = kwargs['endpoint'] + self.endpoint
+            if endpoint is None:
+                endpoint = self.func.__name__
+            endpoint = kwargs['endpoint'] + endpoint
 
-        app.add_url_rule(self.url, self.endpoint, self.func)
+        try:
+            app.add_url_rule(url, endpoint, self.func)
+        except AssertionError:
+            # TODO: Log / Warn
+            pass
 
 
 class Basic(Functional):
@@ -183,20 +190,27 @@ def add_to_app(self, app, **kwargs):
             Arbitrary keyword arguments passed in to ``init_app``
         """
 
+        url = self.url
+        endpoint = self.endpoint
+
         #: If this route was included a url preifx may have been passed
         #: to the route
         if 'url_prefix' in kwargs:
-            self.url = kwargs['url_prefix'] + self.url
+            url = kwargs['url_prefix'] + url
 
         #: If this route was included a endpoint prefix may have been passed
         #: to the route
         if 'endpoint' in kwargs:
-            self.endpoint = kwargs['endpoint'] + self.endpoint
+            endpoint = kwargs['endpoint'] + endpoint
 
-        app.add_url_rule(
-            self.url,
-            view_func=self.view.as_view(self.endpoint),
-            **self.kwargs)
+        try:
+            app.add_url_rule(
+                url,
+                view_func=self.view.as_view(endpoint),
+                **self.kwargs)
+        except AssertionError:
+            # TODO: Log / Warn
+            pass
 
 
 class Blueprint(BaseRouter, RoutesImporter):