[Checkins] SVN: grokapps/rdbz3cformexample/trunk/ Sync with rdbexample application, it now uses a test.db sqlite database instead of sqlite://:memory:

[Vincent Fretin]

Log message for revision 104325:
  Sync with rdbexample application, it now uses a test.db sqlite database instead of sqlite://:memory:

Changed:
  _U  grokapps/rdbz3cformexample/trunk/
  U   grokapps/rdbz3cformexample/trunk/buildout.cfg
  U   grokapps/rdbz3cformexample/trunk/setup.py
  U   grokapps/rdbz3cformexample/trunk/src/rdbz3cformexample/app.py
  U   grokapps/rdbz3cformexample/trunk/src/rdbz3cformexample/app.txt

-=-

Property changes on: grokapps/rdbz3cformexample/trunk
___________________________________________________________________
Added: svn:ignore
   + develop-eggs
bin
parts
var
test.db
.installed.cfg


Modified: grokapps/rdbz3cformexample/trunk/buildout.cfg
===================================================================
--- grokapps/rdbz3cformexample/trunk/buildout.cfg	2009-09-18 12:47:40 UTC (rev 104324)
+++ grokapps/rdbz3cformexample/trunk/buildout.cfg	2009-09-18 12:48:52 UTC (rev 104325)
@@ -26,26 +26,12 @@
 versions = versions
 
 [versions]
-collective.recipe.template = 1.4
-docutils = 0.5
-elementtree = 1.2.7-20070827-preview
-grokcore.startup = 0.2
-megrok.rdb = 0.9.1
-mr.developer = 1.1
-Paste = 1.7.2
-PasteDeploy = 1.3.3
-PasteScript = 1.7.3
 SQLAlchemy = 0.5.6
+grokcore.startup = 0.2
 transaction = 1.0.0
-z3c.evalexception = 2.0
-z3c.recipe.dev = 0.5.4
-z3c.recipe.i18n = 0.5.0
-z3c.recipe.mkdir = 0.3.1
-z3c.saconfig = 0.9.1
-zc.buildout = 1.4.1
-zc.recipe.egg = 1.2.2
-zc.recipe.filestorage = 1.0.1
 zope.sqlalchemy = 0.4
+z3c.saconfig = 0.9.1
+megrok.rdb = 0.10
 
 [app]
 recipe = zc.recipe.egg

Modified: grokapps/rdbz3cformexample/trunk/setup.py
===================================================================
--- grokapps/rdbz3cformexample/trunk/setup.py	2009-09-18 12:47:40 UTC (rev 104324)
+++ grokapps/rdbz3cformexample/trunk/setup.py	2009-09-18 12:48:52 UTC (rev 104325)
@@ -13,7 +13,7 @@
       author="",
       author_email="",
       url="",
-      license="",
+      license="ZPL 2.1",
       package_dir={'': 'src'},
       packages=find_packages('src'),
       include_package_data=True,
@@ -23,7 +23,8 @@
                         'grokui.admin',
                         'z3c.testsetup',
                         'grokcore.startup',
-                        'megrok.rdb',
+                        'z3c.saconfig',
+                        'megrok.rdb >= 0.10',
                         # Add extra requirements here
                         ],
       entry_points = """

Modified: grokapps/rdbz3cformexample/trunk/src/rdbz3cformexample/app.py
===================================================================
--- grokapps/rdbz3cformexample/trunk/src/rdbz3cformexample/app.py	2009-09-18 12:47:40 UTC (rev 104324)
+++ grokapps/rdbz3cformexample/trunk/src/rdbz3cformexample/app.py	2009-09-18 12:48:52 UTC (rev 104325)
@@ -1,6 +1,5 @@
 import grok
 from megrok import rdb
-from megrok.rdb.schema import schema_from_model
 
 from zope.location.location import located
 
@@ -14,7 +13,8 @@
 # we set up the engine factory and the session
 # we set them up as global utilities here. It is also possible to
 # use a local engine factory and a special locally scoped session
-TEST_DSN = 'sqlite:///:memory:'
+# XXX for some reason it fails to work properly with a :memory: database
+TEST_DSN = 'sqlite:///test.db'
 
 engine_factory = EngineFactory(TEST_DSN)
 scoped_session = GloballyScopedSession()
@@ -70,8 +70,7 @@
 
     @property
     def form_fields(self):
-        return grok.Fields(schema_from_model(Faculty))
-        #return rdb.Fields(Faculty)
+        return grok.Fields(rdb.schema_from_model(Faculty))
 
     @grok.action('add')
     def handle_add(self, *args, **kw):
@@ -132,7 +131,7 @@
 
     @property
     def form_fields(self):
-        return rdb.Fields(Department)
+        return grok.Fields(rdb.schema_from_model(Department))
 
     @grok.action('add')
     def handle_add(self, *args, **kw):

Modified: grokapps/rdbz3cformexample/trunk/src/rdbz3cformexample/app.txt
===================================================================
--- grokapps/rdbz3cformexample/trunk/src/rdbz3cformexample/app.txt	2009-09-18 12:47:40 UTC (rev 104324)
+++ grokapps/rdbz3cformexample/trunk/src/rdbz3cformexample/app.txt	2009-09-18 12:48:52 UTC (rev 104325)
@@ -3,11 +3,11 @@
 
 :Test-Layer: functional
 
-Let's first create an instance of Rdbz3cformexample at the top level:
+Let's first create an instance of RDBExample at the top level:
 
-   >>> from rdbz3cformexample.app import Rdbz3cformexample
+   >>> from rdbz3cformexample.app import RDBExample
    >>> root = getRootFolder()
-   >>> root['app'] = Rdbz3cformexample()
+   >>> root['app'] = RDBExample()
 
 
 Run tests in the testbrowser