Skip to content

Commit aa6ce3f

Browse files
author
khz
committed
sql tests run now
1 parent 4c7a1f1 commit aa6ce3f

30 files changed

+115
-162
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ lib64/
2525
parts/
2626
sdist/
2727
var/
28+
man/
2829
*.egg-info/
2930
.installed.cfg
3031
*.egg

pythononwheels/generate_app.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,9 @@ def generate_app(appname, force=False, outpath="..", dbtype="sql", update_only=F
169169
print("preparing app for view_type: " + str(view_type))
170170
print(50*"-")
171171
if view_type == "bs4":
172+
folder = os.path.normpath(os.path.join( outdir, "views"))
173+
#rename_extensions(folder, ".tmpl", ".bs4")
174+
rename_extensions(folder, "." + view_type, ".tmpl", files=["index", "error", "404"])
172175
print(" ... Done. Bootstrap4 is the default")
173176
# nothing else to do since everything is already prepared for bs4 (default)
174177
else:
@@ -178,24 +181,26 @@ def generate_app(appname, force=False, outpath="..", dbtype="sql", update_only=F
178181
print("outdir: " + outdir)
179182
import os,sys
180183
folder = os.path.normpath(os.path.join( outdir, "views"))
181-
rename_extensions(folder, ".tmpl", ".bs4")
182-
rename_extensions(folder, "." + view_type, ".tmpl")
184+
#rename_extensions(folder, ".tmpl", ".bs4")
185+
rename_extensions(folder, "." + view_type, ".tmpl", files=["index", "error", "404"])
183186
else:
184187
print("Error: viewtype not set and apparantly no Default set either!")
185188

186-
def rename_extensions(folder, old_ext, new_ext):
189+
def rename_extensions(folder, old_ext, new_ext, files=None):
187190
"""
188191
renames all file extension in the givben folder
189192
from *.old_ext to *.new_ext
190193
"""
191194
for filename in os.listdir(folder):
192195
infilename = os.path.join(folder,filename)
196+
# rename all file extensions
193197
if not os.path.isfile(infilename): continue
194198
oldbase, ext = os.path.splitext(filename)
199+
if files and oldbase not in files: continue
195200
#print(" ... found a: " + str(ext) + " file")
196201
if not ext == old_ext: continue
197202
#newname = infilename.replace( old_ext, + new_ext)
198-
newname = oldbase + new_ext
203+
newname = os.path.join(folder, oldbase + new_ext)
199204
print(" ... renaming: " + infilename + " -> " + newname)
200205
#output = os.rename(infilename, newname)
201206
output = shutil.move(infilename, newname)

pythononwheels/start/config.py

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"login_url" : "/login",
1919
"xsrf_cookies" : False,
2020
#"log_function" : you can give your own log function here.
21-
"cookie_secret" : "7afe45ff-e5c2-4afe-ab5a-a943c5602583"
21+
"cookie_secret" : "{{cookie_secret}}"
2222
}
2323

2424
templates = {
@@ -30,13 +30,13 @@
3030
}
3131

3232
myapp = {
33-
"app_name" : "testapp",
33+
"app_name" : "{{appname}}",
3434
"default_format" : "json",
3535
"supported_formats" : ["json", "csv", "xml", "html"],
3636
"encoder" : {
3737
"json" : json,
38-
"csv" : testapp.encoders.JsonToCsv(),
39-
"xml" : testapp.encoders.JsonToXml()
38+
"csv" : {{appname}}.encoders.JsonToCsv(),
39+
"xml" : {{appname}}.encoders.JsonToXml()
4040
},
4141
"page_size" : 5,
4242
"enable_authentication" : False, # False, simple or custom
@@ -52,19 +52,19 @@
5252
#"environment" : "development" # set the current environment (also see the db section)
5353
}
5454

55-
db_base_path = r"//Users/khz/development/testapp"
55+
db_base_path = r"{{db_base_path}}"
5656
database = {
5757
"sql" : {
5858
"type" : "sqlite",
59-
"dbname" : r"//Users/khz/development/testapp/db.sqlite", # better leave the r to enable absolute paths with backslashes
59+
"dbname" : r"{{sqlite_path}}", # better leave the r to enable absolute paths with backslashes
6060
"host" : None,
6161
"port" : None,
6262
"user" : None,
6363
"passwd" : None,
6464
"enabled" : True # switch currently unused
6565
},
6666
"tinydb" : {
67-
"dbname" : r"//Users/khz/development/testapp/tiny.db", # better leave the r to enable absolute paths with backslashes
67+
"dbname" : r"{{tinydb_path}}", # better leave the r to enable absolute paths with backslashes
6868
"host" : None,
6969
"port" : None,
7070
"user" : None,
@@ -73,9 +73,7 @@
7373
},
7474
"mongodb" : {
7575
"dbname" : "testdb",
76-
"host" : "localhost",
77-
"atlas" : False, # turn on if you use mongoDB atlas
78-
"atlas_conn_str" : "mongodb+srv://USER:[email protected]/test",
76+
"host" : "localhost",
7977
"port" : 27017,
8078
"user" : None,
8179
"passwd" : None,
@@ -102,4 +100,4 @@
102100
#from handlers.very_raw_own_handler import VeryRawOwnHandler
103101
routes = [
104102
#(r'.*', VeryRawOwnHandler)
105-
]
103+
]

pythononwheels/start/generate_scaffold.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def main():
7777
#print("all args: ", args)
7878
#print(dir(args))
7979
print("CamelCased handler name: ", camel_case(args.handler_name))
80-
generate_scaffold(args.handler_name, appname="testapp", view_type=args.view_type)
80+
generate_scaffold(args.handler_name, appname="{{appname}}", view_type=args.view_type)
8181

8282
if __name__ == "__main__":
8383
main()

pythononwheels/start/handlers/shorties.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
# (r"/([^/]+)/(.+)", ObjectHandler),
88
# any regex goes. any group () will be handed to the handler
99
#
10-
@app.add_route("/dash/*")
11-
class DashboardHandler(BaseHandler):
12-
def get(self):
13-
self.render("dash.tmpl")
1410

1511
# if you specify a method, this method will be called for this route
1612
@app.add_route("/thanks/*", dispatch={"get": "_get"} )
@@ -46,7 +42,7 @@ def test(self, index=None):
4642

4743
@app.add_rest_routes("rest")
4844
class RestHandler(BaseHandler):
49-
# on HTTP GET this method will be called. See dispatch parameter.
45+
# on HTTP GET this method will be called. See config.py "default_rest_route"
5046
def list(self):
5147
self.write("REST")
5248

pythononwheels/start/models/modelobject.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def init_from_dict(self, d, ignore=True, simple_conversion=False):
115115
for example "a b c" will be model.attribute = "a b c".split(myapp["list_separator"])
116116
Mainly used for handling request from simple html form scaffolding
117117
"""
118-
from testapp.decoders import pow_init_from_dict_deserializer
118+
from {{appname}}.decoders import pow_init_from_dict_deserializer
119119
#print("init from dict")
120120
#print(d)
121121
d=pow_init_from_dict_deserializer(d,self.schema, simple_conversion)

pythononwheels/start/models/sql/basemodel.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,10 @@ def find_all(self, *criterion, raw=False, limit=None, offset=None):
374374
res = session.query(self.__class__).filter(*criterion).limit(limit).offset(offset).all()
375375
return res
376376

377+
def get_all(self):
378+
""" returns all elements without any filters"""
379+
return self.find_all()
380+
377381
def find_one(self, *criterion):
378382
"""
379383
returns one or none

pythononwheels/start/stubs/scaffold_edit_view.bs4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends "base.tmpl" %}
1+
{% extends "base.bs4" %}
22

33
{% block include_js %}
44
<script

pythononwheels/start/stubs/scaffold_edit_view.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends "base_semanticui.tmpl" %}
1+
{% extends "base.sui" %}
22

33
{% block include_css %}
44
<link rel="stylesheet" href="{{ static_url("css/calendar.css")}}" />

pythononwheels/start/stubs/scaffold_list_view.bs4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends "base.tmpl" %}
1+
{% extends "base.bs4" %}
22

33
{% block include_js %}
44
<script

0 commit comments

Comments
 (0)