alchemy: change file structure to modules for views and models

8 files changed, 31 insertions, 27 deletions

diff --git a/pyramid/scaffolds/alchemy/+package+/__init__.py b/pyramid/scaffolds/alchemy/+package+/__init__.py
index 116839351..06ca7580d 100644
--- a/pyramid/scaffolds/alchemy/+package+/__init__.py
+++ b/pyramid/scaffolds/alchemy/+package+/__init__.py
@@ -5,7 +5,7 @@ def main(global_config, **settings):
     """
     config = Configurator(settings=settings)
     config.include('pyramid_chameleon')
-    config.include('.models')
+    config.include('.models.meta')
     config.add_static_view('static', 'static', cache_max_age=3600)
     config.add_route('home', '/')
     config.scan()
diff --git a/pyramid/scaffolds/alchemy/+package+/models/__init__.py b/pyramid/scaffolds/alchemy/+package+/models/__init__.py
new file mode 100644
index 000000000..01c31e497
--- /dev/null
+++ b/pyramid/scaffolds/alchemy/+package+/models/__init__.py
@@ -0,0 +1,3 @@
+# import all models classes here for sqlalchemy mappers
+# to pick up
+from .mymodel import MyModel
diff --git a/pyramid/scaffolds/alchemy/+package+/models.py b/pyramid/scaffolds/alchemy/+package+/models/meta.py
index 832e67b37..f66d1e5ec 100644
--- a/pyramid/scaffolds/alchemy/+package+/models.py
+++ b/pyramid/scaffolds/alchemy/+package+/models/meta.py
@@ -1,10 +1,3 @@
-from sqlalchemy import (
-    Column,
-    Index,
-    Integer,
-    Text,
-    )
-
 from sqlalchemy import engine_from_config
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
@@ -52,11 +45,3 @@ def get_dbmaker(engine):
     return dbmaker
 
 
-class MyModel(Base):
-    __tablename__ = 'models'
-    id = Column(Integer, primary_key=True)
-    name = Column(Text)
-    value = Column(Integer)
-
-
-Index('my_index', MyModel.name, unique=True, mysql_length=255)
diff --git a/pyramid/scaffolds/alchemy/+package+/models/mymodel.py b/pyramid/scaffolds/alchemy/+package+/models/mymodel.py
new file mode 100644
index 000000000..b4191aa55
--- /dev/null
+++ b/pyramid/scaffolds/alchemy/+package+/models/mymodel.py
@@ -0,0 +1,16 @@
+from .meta import Base
+from sqlalchemy import (
+    Column,
+    Index,
+    Integer,
+    Text,
+)
+
+class MyModel(Base):
+    __tablename__ = 'models'
+    id = Column(Integer, primary_key=True)
+    name = Column(Text)
+    value = Column(Integer)
+
+
+Index('my_index', MyModel.name, unique=True, mysql_length=255)
diff --git a/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py b/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py
index 43e25bff8..f0d09729e 100644
--- a/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py
+++ b/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py
@@ -9,13 +9,13 @@ from pyramid.paster import (
 
 from pyramid.scripts.common import parse_vars
 
-from ..models import (
-    MyModel,
+from ..models.meta import (
     Base,
     get_session,
     get_engine,
     get_dbmaker,
     )
+from ..models.mymodel import MyModel
 
 
 def usage(argv):
diff --git a/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl b/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
index 4ce706077..074c7a773 100644
--- a/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
@@ -13,10 +13,10 @@ class BaseTest(unittest.TestCase):
         self.config = testing.setUp(settings={
             'sqlalchemy.url': 'sqlite:///:memory:'
         })
-        self.config.include('.models')
+        self.config.include('.models.meta')
         settings = self.config.get_settings()
 
-        from .models import (
+        from .models.meta import (
             get_session,
             get_engine,
             get_dbmaker,
@@ -28,11 +28,11 @@ class BaseTest(unittest.TestCase):
         self.session = get_session(transaction.manager, dbmaker)
 
     def init_database(self):
-        from .models import Base
+        from .models.meta import Base
         Base.metadata.create_all(self.engine)
 
     def tearDown(self):
-        from .models import Base
+        from .models.meta import Base
 
         testing.tearDown()
         transaction.abort()
@@ -45,13 +45,13 @@ class TestMyViewSuccessCondition(BaseTest):
         super(TestMyViewSuccessCondition, self).setUp()
         self.init_database()
 
-        from .models import MyModel
+        from .models.mymodel import MyModel
 
         model = MyModel(name='one', value=55)
         self.session.add(model)
 
     def test_passing_view(self):
-        from .views import my_view
+        from .views.default import my_view
         info = my_view(dummy_request(self.session))
         self.assertEqual(info['one'].name, 'one')
         self.assertEqual(info['project'], '{{project}}')
@@ -60,6 +60,6 @@ class TestMyViewSuccessCondition(BaseTest):
 class TestMyViewFailureCondition(BaseTest):
 
     def test_failing_view(self):
-        from .views import my_view
+        from .views.default import my_view
         info = my_view(dummy_request(self.session))
         self.assertEqual(info.status_int, 500)
diff --git a/pyramid/scaffolds/alchemy/+package+/views/__init__.py b/pyramid/scaffolds/alchemy/+package+/views/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/pyramid/scaffolds/alchemy/+package+/views/__init__.py
diff --git a/pyramid/scaffolds/alchemy/+package+/views.py_tmpl b/pyramid/scaffolds/alchemy/+package+/views/default.py_tmpl
index b559b31ce..9dc8e233f 100644
--- a/pyramid/scaffolds/alchemy/+package+/views.py_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/views/default.py_tmpl
@@ -3,10 +3,10 @@ from pyramid.view import view_config
 
 from sqlalchemy.exc import DBAPIError
 
-from .models import MyModel
+from ..models.mymodel import MyModel
 
 
-@view_config(route_name='home', renderer='templates/mytemplate.pt')
+@view_config(route_name='home', renderer='../templates/mytemplate.pt')
 def my_view(request):
     try:
         one = request.dbsession.query(MyModel).filter(MyModel.name == 'one').first()