[Checkins] SVN: grokapps/rdbexample/trunk/ Fix this up so it works with released versions of megrok.rdb.

[Martijn Faassen]

Log message for revision 104313:
  Fix this up so it works with released versions of megrok.rdb.
  
  For some reason the sqlite://:memory: database failed to work with
  this example. Instead use a test.db database which seems to make it
  work.
  

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

-=-

Property changes on: grokapps/rdbexample/trunk
___________________________________________________________________
Modified: svn:ignore
   - develop-eggs
bin
parts
.installed.cfg

   + develop-eggs
bin
parts
var
test.db
.installed.cfg


Modified: grokapps/rdbexample/trunk/buildout.cfg
===================================================================
--- grokapps/rdbexample/trunk/buildout.cfg	2009-09-18 12:00:12 UTC (rev 104312)
+++ grokapps/rdbexample/trunk/buildout.cfg	2009-09-18 12:05:29 UTC (rev 104313)
@@ -26,6 +26,8 @@
 grokcore.startup = 0.2
 transaction = 1.0.0
 zope.sqlalchemy = 0.4
+z3c.saconfig = 0.9.1
+megrok.rdb = 0.10
 
 [app]
 recipe = zc.recipe.egg

Modified: grokapps/rdbexample/trunk/setup.py
===================================================================
--- grokapps/rdbexample/trunk/setup.py	2009-09-18 12:00:12 UTC (rev 104312)
+++ grokapps/rdbexample/trunk/setup.py	2009-09-18 12:05:29 UTC (rev 104313)
@@ -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/rdbexample/trunk/src/rdbexample/app.py
===================================================================
--- grokapps/rdbexample/trunk/src/rdbexample/app.py	2009-09-18 12:00:12 UTC (rev 104312)
+++ grokapps/rdbexample/trunk/src/rdbexample/app.py	2009-09-18 12:05:29 UTC (rev 104313)
@@ -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/rdbexample/trunk/src/rdbexample/app.txt
===================================================================
--- grokapps/rdbexample/trunk/src/rdbexample/app.txt	2009-09-18 12:00:12 UTC (rev 104312)
+++ grokapps/rdbexample/trunk/src/rdbexample/app.txt	2009-09-18 12:05:29 UTC (rev 104313)
@@ -3,11 +3,11 @@
 
 :Test-Layer: functional
 
-Let's first create an instance of Rdbexample at the top level:
+Let's first create an instance of RDBExample at the top level:
 
-   >>> from rdbexample.app import Rdbexample
+   >>> from rdbexample.app import RDBExample
    >>> root = getRootFolder()
-   >>> root['app'] = Rdbexample()
+   >>> root['app'] = RDBExample()
 
 
 Run tests in the testbrowser