diff --git a/generator/__init__.py b/generator/__init__.py index 9ac0e4d..0279af2 100644 --- a/generator/__init__.py +++ b/generator/__init__.py @@ -1 +1 @@ -__all__ = ["file_parser","tree_parser","model"] +__all__ = ["file_parser","tree_parser","models","model"] diff --git a/generator/model.py b/generator/model.py index a2fac50..9c97a44 100644 --- a/generator/model.py +++ b/generator/model.py @@ -1,13 +1,13 @@ # Copyleft (c) 2016 Cocobug All Rights Reserved. # coding=utf-8 -import re,traceback +import re,traceback,os try: from tree_parser import * - from model import dual + from models import dual except: - from generator.model import dual + from generator.models import dual from generator import tree_parser def getDataType(name): diff --git a/generator/model/__init__.py b/generator/models/__init__.py similarity index 100% rename from generator/model/__init__.py rename to generator/models/__init__.py diff --git a/generator/model/dual.py b/generator/models/dual.py similarity index 99% rename from generator/model/dual.py rename to generator/models/dual.py index e75db64..ff4365c 100644 --- a/generator/model/dual.py +++ b/generator/models/dual.py @@ -1,3 +1,5 @@ +import os + def container(pagetitle="#_pagetitle_#",websitename="#_websitename_#",menu="\{menu\}",page="\{page\}"): "Return the global appearance of the website" return """ diff --git a/generator/model/dual_container.html b/generator/models/dual_container.html similarity index 100% rename from generator/model/dual_container.html rename to generator/models/dual_container.html diff --git a/generator/model/dual_menu.html b/generator/models/dual_menu.html similarity index 100% rename from generator/model/dual_menu.html rename to generator/models/dual_menu.html diff --git a/generator/model/dual_page.html b/generator/models/dual_page.html similarity index 100% rename from generator/model/dual_page.html rename to generator/models/dual_page.html diff --git a/test.py b/test.py index c90774a..6fc80b9 100644 --- a/test.py +++ b/test.py @@ -6,12 +6,14 @@ import types from blessings import Terminal from generator import * + #import vkyweb term=Terminal() unit=minitest.testUnit simple=minitest.simpleTestUnit group=minitest.testGroup +dual=models.dual class testParser(simple): """Testing the file parser""" @@ -181,6 +183,24 @@ class testTree(simple): #webt.print_webtree('en') +class testModel(simple): + """docstring for testModel.""" + def __init__(self,arg): + super(testModel, self).__init__(arg) + + def _testDual(self): + site=tree_parser.makeWebsite("sites/example_website") + + lang="fr" + current_node=site.tree.get_node("index",lang) + previous_node=site.tree.get_node("index",lang) + + menu=model.makeContainer(dual,site,current_node,previous_node,lang) + data=model.makeData(dual,current_node,lang) + + page=model.makePage(dual,site,lang,menu,data) + print(page) + testVky=group(name="vkyWeb_all",terminal=term,verbose=1,align=42) #testConfig=group(name="config",terminal=term,prefix="| ") #testParser=group(name="parser",terminal=term,prefix="| ") @@ -196,6 +216,7 @@ testVky=group(name="vkyWeb_all",terminal=term,verbose=1,align=42) testParser("file_parser").test() testVky.addTest(testParser("file_parser")) testVky.addTest(testTree("tree_parser")) +testVky.addTest(testModel("model")) #testVky.addTest(testConfig("testConfig",config)) test a config file testVky.test()