small change to cinfig.py base_url => protocol + host + port

Author: khz

pythononwheels/start/application.py

@@ -5,6 +5,7 @@
 import os
 import os.path
 import sys
+from werkzeug.routing import Rule, Map, _rule_re
 
 import {{appname}}.config as cfg
 from {{appname}}.powlib import merge_two_dicts
@@ -277,6 +278,21 @@ def decorator(cls):
                 pattern = r._regex.pattern.replace('^\\|', "")
                 print("r1: " +  str(pattern))
                 fin_route = pattern
+                route_tuple = (fin_route,cls, dispatch)
+                handlers.append((route_tuple,pos))
+                # now add the route for the optional format parameter
+                
+                # r=Rule(route+r".<format>", endpoint=cls_name)
+                # m = Map()
+                # m.add(r)
+                # c=m.bind(cfg.server_settings["host"]+":"+cfg.server_settings["host"], "/")
+                # r.compile()
+                # print("r1: " +  str(r._regex.pattern))
+                # pattern = r._regex.pattern.replace('^\\|', "")
+                # print("r1: " +  str(pattern))
+                # fin_route = pattern
+                # route_tuple = (fin_route,cls, dispatch)
+                # handlers.append((route_tuple,pos))
             else:
                 # BETA: this regex is added to every route to make 
                 # 1.the slash at the end optional
@@ -288,8 +304,8 @@ def decorator(cls):
                 else:
                     fin_route = route
 
-            route_tuple = (fin_route,cls, dispatch)
-            handlers.append((route_tuple,pos))
+                route_tuple = (fin_route,cls, dispatch)
+                handlers.append((route_tuple,pos))
             #print("handlers: " + str(self.handlers))
             print("ROUTING: added route for: " + cls.__name__ +  ": " + route + " -> " + fin_route)
             return cls

pythononwheels/start/config.py

@@ -9,7 +9,8 @@
 import datetime
 
 server_settings = {
-    "base_url"          :   "http://localhost",
+    "protocol"          :   "http://",
+    "host"              :   "localhost",
     "port"              :   8080,
     "debug"             :   True,
     "https"             :   False,

pythononwheels/start/tests/pow_tests.py

@@ -31,7 +31,7 @@ def test_server(self):
         import time
         p = Process(target={{appname}}.server.main)
         p.start()
-        testurl=cfg.server_settings["base_url"] + ":" + str(cfg.server_settings["port"]) + "/test/12"  
+        testurl=cfg.server_settings["protocol"] + cfg.server_settings["host"] + ":" + str(cfg.server_settings["port"]) + "/test/12"  
 
         r = requests.get(testurl)
         p.terminate()