Webware for Python

Update of /cvsroot/webware/Webware/WebKit/Experimental
In directory usw-pr-cvs1:/tmp/cvs-serv4996/WebKit/Experimental

Modified Files:
	HTTPAdapter.py 
Log Message:
always read input if Content-Length header was provided

Index: HTTPAdapter.py
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/Experimental/HTTPAdapter.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HTTPAdapter.py	18 May 2002 16:13:56 -0000	1.1
--- HTTPAdapter.py	19 May 2002 15:04:27 -0000	1.2
***************
*** 107,116 ****
          env['PATH_INFO'] = env['REQUEST_URI']
          myInput = ''
!         if self.requestMethod == 'POST':
!             if self.headers.has_key('Content-Length'):
!                 myInput = self.rfile.read(int(self.headers['Content-Length']))
!             else:
!                 # Treat this as no input
!                 myInput = ''
          self.transactWithAppServer(env, myInput, host, port)
  
--- 107,112 ----
          env['PATH_INFO'] = env['REQUEST_URI']
          myInput = ''
!         if self.headers.has_key('Content-Length'):
!             myInput = self.rfile.read(int(self.headers['Content-Length']))
          self.transactWithAppServer(env, myInput, host, port)

Update of /cvsroot/webware/Webware/WebKit/Examples
In directory usw-pr-cvs1:/tmp/cvs-serv3300/WebKit/Examples

Modified Files:
	RequestInformation.py 
Log Message:
improving formatting in example servlet RequestInformation

Index: RequestInformation.py
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/Examples/RequestInformation.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RequestInformation.py	4 Aug 2001 21:59:28 -0000	1.1
--- RequestInformation.py	18 May 2002 16:14:35 -0000	1.2
***************
*** 30,34 ****
  		keys.sort()
  		for name in keys:
! 			self.writeln('<tr valign=top><td>%s</td><td>%s</td></tr>' % (name, dict[name]))
  
  		
--- 30,35 ----
  		keys.sort()
  		for name in keys:
! 			self.writeln('<tr valign=top><td>%s</td><td>%s</td></tr>'
! 				 % (name, string.replace(self.htmlEncode(str(dict[name])), '\n', '<br>')))

Update of /cvsroot/webware/Webware/WebKit/Experimental
In directory usw-pr-cvs1:/tmp/cvs-serv2875/WebKit/Experimental

Added Files:
	HTTPAdapter.py 
Log Message:
Adding Ian Bicking's HTTPAdapter.py to an Experimental directory.  It has been modified to be multithreaded based on a technique I found in an old comp.lang.python post.

--- NEW FILE: HTTPAdapter.py ---
#!/usr/bin/env python
## HTTPAdapter 0.0
## Serves HTTP, connecting to the Webware AppServer
## Ian Bicking <ianb@...>, 10 Apr 2002
##
## Modified by gtalvola 18 May 2002 to add multi-threading
## and to disallow a missing content-length on a POST
## request

# If the Webware installation is located somewhere else,
# then set the WebwareDir variable to point to it.
# For example, WebwareDir = '/Servers/Webware'
WebwareDir = '/home/gtalvola/cvs_staging/Webware'

# If you used the MakeAppWorkDir.py script to make a separate
# application working directory, specify it here.
AppWorkDir = None

# The address (?) and port that the server will serve
ServerAddress = ('', 8080)

try:
	import os, sys, string
	if WebwareDir:
		sys.path.insert(1, WebwareDir)
	else:
		WebwareDir = os.path.dirname(os.getcwd())
	webKitDir = os.path.join(WebwareDir, 'WebKit')
	if AppWorkDir is None:
		AppWorkDir = webKitDir
	else:
		sys.path.insert(1, AppWorkDir)

	from WebKit import Adapter
        (host, port) = string.split(open(os.path.join(webKitDir, 'address.text')).read(), ':')
        if os.name=='nt' and host=='': # MS Windows doesn't like a blank host name
            host = 'localhost'
        port = int(port)
except 0:
    ## @@: Is there something we should do with exceptions here?
    ## I'm apt to just let them print to stderr and quit like normal,
    ## but I'm not sure.
    pass


import BaseHTTPServer, mimetools
try:
    from cStringIO import StringIO
except ImportError:
    from StringIO import StringIO
import threading, socket

class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler, Adapter.Adapter):
    """Handles incoming requests.  Recreated with every request."""

    ## This sends certain CGI variables.  These are some that
    ## should be sent, but aren't:
    ## SERVER_ADDR
    ## SERVER_PORT
    ## SERVER_SOFTWARE
    ## SERVER_NAME
    ## HTTP_CONNECTION
    ## SERVER_PROTOCOL
    ## HTTP_KEEP_ALIVE

    ## These I don't think are needed:
    ## DOCUMENT_ROOT
    ## PATH_TRANSLATED
    ## GATEWAY_INTERFACE
    ## PATH
    ## SERVER_SIGNATURE
    ## SCRIPT_NAME (?)
    ## SCRIPT_FILENAME (?)
    ## SERVER_ADMIN (?)

    def __init__(self, *vars):
        Adapter.Adapter.__init__(self, webKitDir)
        BaseHTTPServer.BaseHTTPRequestHandler.__init__(self, *vars)

    def do_GET(self):
        self.requestMethod = 'GET'
        self.doRequest()

    def do_POST(self):
        self.requestMethod = 'POST'
        self.doRequest()

    def do_HEAD(self):
        self.requestMethod = 'HEAD'
        self.doRequest()

    def doRequest(self):
        self.server_version = 'Webware/0.0'
        env = {}
        if self.headers.has_key('Content-Type'):
            env['CONTENT_TYPE'] = self.headers['Content-Type']
            del self.headers['Content-Type']
        self.headersToEnviron(self.headers, env)
        env['REMOTE_ADDR'], env['REMOTE_PORT'] = map(str, self.client_address)
        env['REQUEST_METHOD'] = self.requestMethod
        path = self.path
        if path.find('?') != -1:
            env['REQUEST_URI'], env['QUERY_STRING'] = path.split('?', 1)
        else:
            env['REQUEST_URI'] = path
            env['QUERY_STRING'] = ''
        env['PATH_INFO'] = env['REQUEST_URI']
        myInput = ''
        if self.requestMethod == 'POST':
            if self.headers.has_key('Content-Length'):
                myInput = self.rfile.read(int(self.headers['Content-Length']))
            else:
                # Treat this as no input
                myInput = ''
        self.transactWithAppServer(env, myInput, host, port)

    def headersToEnviron(self, headers, env):
        """Use a simple heuristic to convert all the headers to
        environmental variables..."""
        for header, value in headers.items():
            env['HTTP_%s' % (header.upper().replace('-', '_'))] = value
        return env

    def processResponse(self, data):
        s = StringIO(data)
        headers = mimetools.Message(s)
        self.doLocation(headers)
        self.sendStatus(headers)
        self.sendHeaders(headers)
        self.sendBody(s)

    def doLocation(self, headers):
        """If there's a Location header and no Status header,
        we need to add a Status header ourselves."""
        if headers.has_key('Location'):
            if not headers.has_key('Status'):
                ## @@: is this the right status header?
                headers['Status'] = '301 Moved Temporarily'

    def sendStatus(self, headers):
        if not headers.has_key('Status'):
            status = "200 OK"
        else:
            status = headers['Status']
            del headers['Status']
        pos = status.find(' ')
        if pos == -1:
            code = int(status)
            message = ''
        else:
            code = int(status[:pos])
            message = status[pos:].strip()
        self.send_response(code, message)

    def sendHeaders(self, headers):
        for header, value in headers.items():
            self.send_header(header, value)
        self.end_headers()

    def sendBody(self, bodyFile):
        self.wfile.write(bodyFile.read())
        bodyFile.close()


class ThreadedHTTPServer(BaseHTTPServer.HTTPServer):
    """
    Stolen from a 2001 comp.lang.python post by Michael Abbott.
    """
    def handle_request(self):
        try:
            request, client_address = self.get_request()
        except socket.error:
            return
        threading.Thread(target=self.handle_request_body,
                         args=(request, client_address)).start()

    # This part of the processing is run in its own thread
    def handle_request_body(self, request, client_address):
        if self.verify_request(request, client_address):
            try:
                self.process_request(request, client_address)
            except:
                self.handle_error(request, client_address)
        self.close_request(request)

def run():
    httpd = ThreadedHTTPServer(ServerAddress, HTTPHandler)
    httpd.serve_forever()

if __name__ == '__main__':
    if len(sys.argv) > 1 and \
       sys.argv[1] == 'daemon':
        if os.fork() or os.fork():
            sys.exit(0)
    run()

Update of /cvsroot/webware/Webware/WebKit/Docs
In directory usw-pr-cvs1:/tmp/cvs-serv2875/WebKit/Docs

Modified Files:
	RelNotes-0.8.html 
Log Message:
Adding Ian Bicking's HTTPAdapter.py to an Experimental directory.  It has been modified to be multithreaded based on a technique I found in an old comp.lang.python post.

Index: RelNotes-0.8.html
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/Docs/RelNotes-0.8.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** RelNotes-0.8.html	24 Apr 2002 23:09:46 -0000	1.8
--- RelNotes-0.8.html	18 May 2002 16:13:55 -0000	1.9
***************
*** 38,45 ****
  
  <ul>
! 	<li> *
! 
! </ul>
! 
  </ul>
  
--- 38,42 ----
  
  <ul>
! 	<li> Added experimental HTTPAdapter.py written by Ian Bicking.  This is an adapter that serves HTTP directly, eliminating the need for a separate web server.  <b>Note that this is experimental!  Please do not use this to serve a production web site!</b>
  </ul>
  
***************
*** 75,79 ****
  				in a database, for example.
  		</ul>
! 	
  	<li> New setting 'MaxValueLengthInExceptionReport'.  If set to an integer, it truncates values in the exception report to the specified length.  If set to None, no truncation happens.  Defaults to 500.
  </ul>
--- 72,76 ----
  				in a database, for example.
  		</ul>
! 
  	<li> New setting 'MaxValueLengthInExceptionReport'.  If set to an integer, it truncates values in the exception report to the specified length.  If set to None, no truncation happens.  Defaults to 500.
  </ul>

Update of /cvsroot/webware/Webware/WebKit/Experimental
In directory usw-pr-cvs1:/tmp/cvs-serv31372/Experimental

Log Message:
Directory /cvsroot/webware/Webware/WebKit/Experimental added to the repository

Update of /cvsroot/webware/Webware/MiscUtils
In directory usw-pr-cvs1:/tmp/cvs-serv18915/MiscUtils

Modified Files:
	NamedValueAccess.py 
Log Message:
give more info on attribute errors in valueForName()

Index: NamedValueAccess.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiscUtils/NamedValueAccess.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** NamedValueAccess.py	23 Apr 2001 02:40:20 -0000	1.5
--- NamedValueAccess.py	10 May 2002 11:03:54 -0000	1.6
***************
*** 483,487 ****
  			return obj.get(key, default)
  	else:
! 		klass    = obj.__class__
  		method   = getattr(klass, key, None)
  		if not method:
--- 483,490 ----
  			return obj.get(key, default)
  	else:
! 		try:
! 			klass    = obj.__class__
! 		except AttributeError:
! 			raise AttributeError, '__class__ obj type=%r, obj=%r' % (type(obj), obj)
  		method   = getattr(klass, key, None)
  		if not method:

Update of /cvsroot/webware/Webware/MiddleKit/Run
In directory usw-pr-cvs1:/tmp/cvs-serv26823/Run

Modified Files:
	MiddleObject.py 
Log Message:
use an identity comparsion rather than equality where that was what was really intended

Index: MiddleObject.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Run/MiddleObject.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** MiddleObject.py	4 May 2002 03:54:56 -0000	1.22
--- MiddleObject.py	9 May 2002 03:47:32 -0000	1.23
***************
*** 178,182 ****
  			objects = self.store().fetchObjectsOfClass(backObjRefAttr.klass(), **self.referencingObjectsAndAttrsFetchKeywordArgs(backObjRefAttr))
  			for object in objects:
! 				assert object.valueForAttr(backObjRefAttr)==self
  				referencingObjectsAndAttrs.append((object, backObjRefAttr))
  		return referencingObjectsAndAttrs
--- 178,182 ----
  			objects = self.store().fetchObjectsOfClass(backObjRefAttr.klass(), **self.referencingObjectsAndAttrsFetchKeywordArgs(backObjRefAttr))
  			for object in objects:
! 				assert object.valueForAttr(backObjRefAttr) is self
  				referencingObjectsAndAttrs.append((object, backObjRefAttr))
  		return referencingObjectsAndAttrs

Update of /cvsroot/webware/Webware/MiddleKit/Design
In directory usw-pr-cvs1:/tmp/cvs-serv783/Design

Modified Files:
	PythonGenerator.py 
Log Message:
very minor optimization

Index: PythonGenerator.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Design/PythonGenerator.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** PythonGenerator.py	4 May 2002 03:54:56 -0000	1.19
--- PythonGenerator.py	7 May 2002 06:42:07 -0000	1.20
***************
*** 479,483 ****
  		from %(package)s%(targetClassName)s import %(targetClassName)s
  		assert isinstance(value, %(targetClassName)s)
! 		assert value.%(lowerSourceClassName)s()==None
  		self.%(pyGetName)s().append(value)
  		value.set%(sourceClassName)s(self)
--- 479,483 ----
  		from %(package)s%(targetClassName)s import %(targetClassName)s
  		assert isinstance(value, %(targetClassName)s)
! 		assert value.%(lowerSourceClassName)s() is None
  		self.%(pyGetName)s().append(value)
  		value.set%(sourceClassName)s(self)

Update of /cvsroot/webware/Webware/MiddleKit/Run
In directory usw-pr-cvs1:/tmp/cvs-serv23630/Run

Modified Files:
	MiddleObject.py SQLObjectStore.py 
Log Message:
renamed initFromStore(self, row) to readStoreData(self, store, row)

Index: MiddleObject.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Run/MiddleObject.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** MiddleObject.py	3 May 2002 14:26:28 -0000	1.21
--- MiddleObject.py	4 May 2002 03:54:56 -0000	1.22
***************
*** 49,53 ****
  	_mk_setCache = {}    # cache the various setFoo methods first by qualified class name
  
! 	def initFromRow(self, row):
  		fullClassName = self.__class__.__module__ + '.' + self.__class__.__name__
  		cache = self._mk_setCache.setdefault(fullClassName, [])
--- 49,63 ----
  	_mk_setCache = {}    # cache the various setFoo methods first by qualified class name
  
! 	def readStoreData(self, store, row):
! 		"""
! 		Invoked by the store in order for this object to read data
! 		from the persistent store. Could be invoked multiple times
! 		for the same object in order to "refresh the attributes"
! 		from the persistent store.
! 		"""
! 		if self._mk_store:
! 			assert self._mk_store is store, 'Cannot refresh data from a different store.'
! 		else:
! 			self.setStore(store)
  		fullClassName = self.__class__.__module__ + '.' + self.__class__.__name__
  		cache = self._mk_setCache.setdefault(fullClassName, [])

Index: SQLObjectStore.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Run/SQLObjectStore.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** SQLObjectStore.py	3 May 2002 14:26:29 -0000	1.44
--- SQLObjectStore.py	4 May 2002 03:54:56 -0000	1.45
***************
*** 285,291 ****
  					obj = pyClass()
  					assert isinstance(obj, MiddleObject), 'Not a MiddleObject. obj = %r, type = %r, MiddleObject = %r' % (obj, type(obj), MiddleObject)
! 					obj.initFromRow(row)  # @@ 2002-05-03 ce: should be redone as readStoreData(store, row) and then remove next if stmt
! 					if obj._mk_store is not self:
! 						obj.setStore(self)
  					obj.setKey(key)
  					self._objects[key] = obj
--- 285,289 ----
  					obj = pyClass()
  					assert isinstance(obj, MiddleObject), 'Not a MiddleObject. obj = %r, type = %r, MiddleObject = %r' % (obj, type(obj), MiddleObject)
! 					obj.readStoreData(self, row)
  					obj.setKey(key)
  					self._objects[key] = obj
***************
*** 293,297 ****
  					# Existing object
  					if refreshAttrs:
! 						obj.initFromRow(row)
  				objs.append(obj)
  		objs.extend(deepObjs)
--- 291,295 ----
  					# Existing object
  					if refreshAttrs:
! 						obj.readStoreData(self, row)
  				objs.append(obj)
  		objs.extend(deepObjs)

Update of /cvsroot/webware/Webware/MiddleKit/Design
In directory usw-pr-cvs1:/tmp/cvs-serv23630/Design

Modified Files:
	PythonGenerator.py 
Log Message:
renamed initFromStore(self, row) to readStoreData(self, store, row)

Index: PythonGenerator.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Design/PythonGenerator.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** PythonGenerator.py	31 Mar 2002 11:02:07 -0000	1.18
--- PythonGenerator.py	4 May 2002 03:54:56 -0000	1.19
***************
*** 132,136 ****
  		wr('\n\nclass Gen%s(%s):\n' % (self.name(), self.supername()))
  		self.writePyInit()
! 		self.writePyInitFromRow()
  		self.writePyAccessors()
  		wr('\n')
--- 132,136 ----
  		wr('\n\nclass Gen%s(%s):\n' % (self.name(), self.supername()))
  		self.writePyInit()
! 		self.writePyReadStoreData()
  		self.writePyAccessors()
  		wr('\n')
***************
*** 153,168 ****
  		wr('\n')
  
! 	def writePyInitFromRow(self):
  		wr = self._pyOut.write
! 		statements = [attr.pyInitFromRowStatement() for attr in self.attrs()]
  		statements = [s for s in statements if s]
  		if statements:
  			wr('''
! 	def initFromRow(self, row):
  		if not self._mk_inStore:
  ''')
  			for s in statements:
  				wr(s)
! 			wr('\t\t%s.initFromRow(self, row)\n\n' % self.supername())
  
  	def writePyAccessors(self):
--- 153,168 ----
  		wr('\n')
  
! 	def writePyReadStoreData(self):
  		wr = self._pyOut.write
! 		statements = [attr.pyReadStoreDataStatement() for attr in self.attrs()]
  		statements = [s for s in statements if s]
  		if statements:
  			wr('''
! 	def readStoreData(self, store, row):
  		if not self._mk_inStore:
  ''')
  			for s in statements:
  				wr(s)
! 			wr('\t\t%s.readStoreData(self, store, row)\n\n' % self.supername())
  
  	def writePyAccessors(self):
***************
*** 198,202 ****
  		raise SubclassResponsibilityError
  
! 	def pyInitFromRowStatement(self):
  		return None
  
--- 198,202 ----
  		raise SubclassResponsibilityError
  
! 	def pyReadStoreDataStatement(self):
  		return None
  
***************
*** 442,446 ****
  		return []
  
! 	def pyInitFromRowStatement(self):
  		# Set the lists to None on the very first read from the store
  		# so the list get methods will fetch the lists from the store.
--- 442,446 ----
  		return []
  
! 	def pyReadStoreDataStatement(self):
  		# Set the lists to None on the very first read from the store
  		# so the list get methods will fetch the lists from the store.

Update of /cvsroot/webware/Webware/MiddleKit/Tests/MKDateTime.mkmodel
In directory usw-pr-cvs1:/tmp/cvs-serv11738/Tests/MKDateTime.mkmodel

Modified Files:
	TestEmpty.py TestSamples.py 
Log Message:
- Remove ObjectStore.Store var which referred to the first store that happened to be created.
- Remove the store arg to MiddleObject.__init__(store) which was little used and confusing.
- Test suite clean ups.
- Make MKMultipleStores test having 2 different stores. This works now.
- Can now have two WebKit contexts that use MiddleKit without problems.
- Add MKMultipleStores to default set of test suites.


Index: TestEmpty.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Tests/MKDateTime.mkmodel/TestEmpty.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestEmpty.py	12 Jul 2001 03:16:55 -0000	1.3
--- TestEmpty.py	3 May 2002 14:26:29 -0000	1.4
***************
*** 1,16 ****
  from Foo import Foo
- from MiddleKit.Run.ObjectStore import Store as store
  
  
! def test():
  	try:
  		from mx import DateTime
! 		testObjects()
  	except ImportError:
! 		testStrings()
! 		testNone()
  
  
! def testStrings():
  	print 'Testing with strings.'
  
--- 1,15 ----
  from Foo import Foo
  
  
! def test(store):
  	try:
  		from mx import DateTime
! 		testObjects(store)
  	except ImportError:
! 		testStrings(store)
! 		testNone(store)
  
  
! def testStrings(store):
  	print 'Testing with strings.'
  
***************
*** 20,24 ****
  	f.setDt('2001-06-07 12:42')
  
! 	storeFoo(f)
  
  	f.setD('2002-11-11')
--- 19,23 ----
  	f.setDt('2001-06-07 12:42')
  
! 	storeFoo(store, f)
  
  	f.setD('2002-11-11')
***************
*** 29,33 ****
  
  
! def testObjects():
  	import mx
  	from mx.DateTime import DateTimeFrom, TimeFrom
--- 28,32 ----
  
  
! def testObjects(store):
  	import mx
  	from mx.DateTime import DateTimeFrom, TimeFrom
***************
*** 43,47 ****
  	f.setDt(dt)
  
! 	storeFoo(f)
  
  	d  = DateTimeFrom('2002-11-11')
--- 42,46 ----
  	f.setDt(dt)
  
! 	storeFoo(store, f)
  
  	d  = DateTimeFrom('2002-11-11')
***************
*** 56,60 ****
  
  
! def storeFoo(f):
  	store.addObject(f)
  	store.saveChanges()
--- 55,59 ----
  
  
! def storeFoo(store, f):
  	store.addObject(f)
  	store.saveChanges()
***************
*** 67,71 ****
  
  
! def testNone():
  	print 'Testing None.'
  
--- 66,70 ----
  
  
! def testNone(store):
  	print 'Testing None.'
  

Index: TestSamples.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Tests/MKDateTime.mkmodel/TestSamples.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestSamples.py	1 Apr 2001 23:39:19 -0000	1.2
--- TestSamples.py	3 May 2002 14:26:29 -0000	1.3
***************
*** 1,5 ****
! def test():
  	from Foo import Foo
- 	from MiddleKit.Run.ObjectStore import Store as store
  
  	f = store.fetchObjectsOfClass(Foo)[0]
--- 1,4 ----
! def test(store):
  	from Foo import Foo
  
  	f = store.fetchObjectsOfClass(Foo)[0]

Update of /cvsroot/webware/Webware/MiddleKit/Tests/MKBasic.mkmodel
In directory usw-pr-cvs1:/tmp/cvs-serv11738/Tests/MKBasic.mkmodel

Modified Files:
	TestEmpty.py 
Log Message:
- Remove ObjectStore.Store var which referred to the first store that happened to be created.
- Remove the store arg to MiddleObject.__init__(store) which was little used and confusing.
- Test suite clean ups.
- Make MKMultipleStores test having 2 different stores. This works now.
- Can now have two WebKit contexts that use MiddleKit without problems.
- Add MKMultipleStores to default set of test suites.


Index: TestEmpty.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Tests/MKBasic.mkmodel/TestEmpty.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestEmpty.py	22 Jun 2001 01:00:35 -0000	1.4
--- TestEmpty.py	3 May 2002 14:26:29 -0000	1.5
***************
*** 1,6 ****
! def test():
  	from Thing import Thing
  	from Person import Person
- 	from MiddleKit.Run.ObjectStore import Store as store
  	from MiscUtils.DataTable import DataTable
  
--- 1,5 ----
! def test(store):
  	from Thing import Thing
  	from Person import Person
  	from MiscUtils.DataTable import DataTable

Update of /cvsroot/webware/Webware/MiddleKit/Tests
In directory usw-pr-cvs1:/tmp/cvs-serv11738/Tests

Modified Files:
	Test.py TestCommon.py TestDesign.py TestRun.py 
Log Message:
- Remove ObjectStore.Store var which referred to the first store that happened to be created.
- Remove the store arg to MiddleObject.__init__(store) which was little used and confusing.
- Test suite clean ups.
- Make MKMultipleStores test having 2 different stores. This works now.
- Can now have two WebKit contexts that use MiddleKit without problems.
- Add MKMultipleStores to default set of test suites.


Index: Test.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Tests/Test.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Test.py	3 May 2002 01:13:08 -0000	1.11
--- Test.py	3 May 2002 14:26:29 -0000	1.12
***************
*** 36,40 ****
  			self.insertSamples()
  			self.testSamples()
! 			self.removeGenFiles(self._modelName)
  			print '\n'
  
--- 36,40 ----
  			self.insertSamples()
  			self.testSamples()
! 			rmdir(workDir)
  			print '\n'
  
***************
*** 47,50 ****
--- 47,51 ----
  				MKTypeValueChecking MKInheritance MKInheritanceAbstract
  				MKList MKObjRef MKObjRefReuse MKDelete MKDeleteMark
+ 				MKMultipleStores
  				MKModelInh1 MKModelInh2 MKModelInh3
  			'''.split()
***************
*** 62,66 ****
  		else:
  			self.createDatabase()
! 			
  	def testSamples(self):
  		self.testRun('TestSamples.py', deleteData=0)
--- 63,67 ----
  		else:
  			self.createDatabase()
! 
  	def testSamples(self):
  		self.testRun('TestSamples.py', deleteData=0)
***************
*** 77,81 ****
  
  	def createDatabase(self):
! 		filename = 'GeneratedSQL/Create.sql'
  		filename = os.path.normpath(filename)
  		cmd = '%s < %s' % (self.cmdLineDB(), filename)
--- 78,82 ----
  
  	def createDatabase(self):
! 		filename = workDir + '/GeneratedSQL/Create.sql'
  		filename = os.path.normpath(filename)
  		cmd = '%s < %s' % (self.cmdLineDB(), filename)
***************
*** 84,88 ****
  	def insertSamples(self):
  		self.createDatabase()
! 		filename = 'GeneratedSQL/InsertSamples.sql'
  		filename = os.path.normpath(filename)
  		if os.path.exists(filename):
--- 85,89 ----
  	def insertSamples(self):
  		self.createDatabase()
! 		filename = workDir + '/GeneratedSQL/InsertSamples.sql'
  		filename = os.path.normpath(filename)
  		if os.path.exists(filename):
***************
*** 90,99 ****
  			self.run(cmd)
  
- 	def removeGenFiles(self, modelName):
- 		from TestDesign import removeGenFiles
- 		from MiddleKit.Core.Model import Model
- 		model = Model(modelName)
- 		removeGenFiles(model.klasses())
- 
  
  	## Self utility ##
--- 91,94 ----
***************
*** 101,106 ****
  	def run(self, cmd):
  		''' Self utility method to run a system command. '''
! 		print 'cmd>', cmd
  		returnCode = os.system(cmd)
  		# @@ 2001-02-02 ce: we have a problem, at least on Windows ME,
  		# that the return code of os.system() is always 0, even if
--- 96,106 ----
  	def run(self, cmd):
  		''' Self utility method to run a system command. '''
! 		print '<cmd>', cmd
! 		sys.stdout.flush()
! 		sys.stderr.flush()
  		returnCode = os.system(cmd)
+ 		sys.stdout.flush()
+ 		sys.stderr.flush()
+ 
  		# @@ 2001-02-02 ce: we have a problem, at least on Windows ME,
  		# that the return code of os.system() is always 0, even if

Index: TestCommon.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Tests/TestCommon.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestCommon.py	3 May 2002 00:34:56 -0000	1.3
--- TestCommon.py	3 May 2002 14:26:29 -0000	1.4
***************
*** 11,12 ****
--- 11,29 ----
  import MiddleKit
  from MiddleKit.Core.Klasses import Klasses
+ 
+ workDir = 'WorkDir'
+ 
+ def rmdir(dirname, shouldPrint=1):
+ 	''' Really remove the directory, even if it has files (and directories) in it. '''
+ 	if shouldPrint:
+ 		print 'Removing %s...' % dirname
+ 	if os.path.exists(dirname):
+ 		exceptions = (os.curdir, os.pardir)
+ 		for name in os.listdir(dirname):
+ 			if name not in exceptions:
+ 				fullName = os.path.join(dirname, name)
+ 				if os.path.isdir(fullName):
+ 					rmdir(fullName, shouldPrint=0)
+ 				else:
+ 					os.remove(fullName)
+ 		os.rmdir(dirname)

Index: TestDesign.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Tests/TestDesign.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestDesign.py	3 May 2002 02:56:23 -0000	1.2
--- TestDesign.py	3 May 2002 14:26:29 -0000	1.3
***************
*** 5,47 ****
  
  from TestCommon import *
- 
  from MiddleKit.Design.Generate import Generate
  from MiddleKit.Core.Model import Model
- import sys
- 
- 
- def rmdir(dirname):
- 	''' Really remove the directory, even if it has files (and directories) in it. '''
- 	exceptions = (os.curdir, os.pardir)
- 	for name in os.listdir(dirname):
- 		if name not in exceptions:
- 			fullName = os.path.join(dirname, name)
- 			if os.path.isdir(fullName):
- 				rmdir(fullName)
- 			else:
- 				os.remove(fullName)
- 	os.rmdir(dirname)
- 
- 
- def removeGenFiles(klasses):
- 	genFilenames = ['GeneratedPy', 'GeneratedSQL']
- 	genFilenames.extend([name+'.py' for name in klasses.keys()])
- 	genFilenames.extend([name+'.pyc' for name in klasses.keys()])
- 	stdout = sys.stdout
- 	first = 1
- 	for filename in genFilenames:
- 		if os.path.exists(filename):
- 			if first:
- 				stdout.write('Removing')
- 				first = 0
- 			stdout.write(' ' + filename)
- 			stdout.flush()
- 			if os.path.isdir(filename):
- 				rmdir(filename)
- 			else:
- 				os.remove(filename)
- 	if not first:
- 		sys.stdout.write('\n')
- 		stdout.flush()
  
  
--- 5,10 ----
***************
*** 57,67 ****
  
  
! def test(modelFilename):
! 	model = Model(modelFilename)
! 	klasses = model.klasses()
! 	removeGenFiles(klasses)
! 	Generate().main('Generate.py --db MySQL --model '+modelFilename)
! 	importPyClasses(klasses)
! 	return model
  
  
--- 20,48 ----
  
  
! def test(modelFilename, workDir=workDir, toTestDir='../'):
! 	"""
! 	modelFilename: the correct filename to the existing model
! 	workDir:       the directory to remove and create and then put the
! 	               generated files in
! 	toTestDir:     a relative path to get from inside the workDir back
! 	               to the MiddleKit/Tests dir
! 
! 	In most cases, the defaults for workDir and toTestDir are
! 	sufficient.	In funkalicious cases, like the MKMultipleStores test,
! 	overriding these defaults comes in handy.
! 	"""
! 	rmdir(workDir)     # get rid of files from previous runs
! 	os.mkdir(workDir)  # make a space for the files from this run
! 
! 	# Run generate, load the model, and import some classes
! 	Generate().main('Generate.py --outdir %s --db MySQL --model %s' % (workDir, modelFilename))
! 	curDir = os.getcwd()
! 	os.chdir(workDir)
! 	try:
! 		model = Model(toTestDir+modelFilename)
! 		importPyClasses(model.klasses())
! 		return model
! 	finally:
! 		os.chdir(curDir)
  
  

Index: TestRun.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Tests/TestRun.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestRun.py	13 Feb 2001 05:54:16 -0000	1.2
--- TestRun.py	3 May 2002 14:26:29 -0000	1.3
***************
*** 1,15 ****
  #!/usr/bin/env python
! from FixPath import *
! 
! try:
! 	import MiddleKit
! except ImportError:
! 	FixPathForMiddleKit()
! 	import MiddleKit
! 
! import MiscUtils
! 
! 
! import os, sys
  from MiddleKit.Run.MySQLObjectStore import MySQLObjectStore
  import MiddleKit.Run.ObjectStore as ObjectStore
--- 1,4 ----
  #!/usr/bin/env python
! from TestCommon import *
  from MiddleKit.Run.MySQLObjectStore import MySQLObjectStore
  import MiddleKit.Run.ObjectStore as ObjectStore
***************
*** 17,46 ****
  
  def test(filename, pyFilename, deleteData):
! 	if os.path.splitext(filename)[1]=='':
! 		filename += '.mkmodel'
! 	pyFilename = os.path.join(filename, pyFilename)
! 	if not os.path.exists(pyFilename):
! 		print 'No such file', pyFilename
! 		return
  
! 	print 'Testing %s...' % filename
  
! 	# Set up the store
! 	store = MySQLObjectStore()
! 	store.readModelFileNamed(filename)
  
! 	# Clear the database
! 	if deleteData:
! 		print 'Deleting all database records for test...'
! 		for klass in store.model().klasses().values():
! 			if not klass.isAbstract():
! 				ObjectStore.Store.executeSQL('delete from %s;' % klass.name())
  
! 	# Run the test
! 	results = {}
! 	execfile(pyFilename, results)
! 	assert results.has_key('test'), 'No test defined in %s.' % filename
! 	results['test']()
  
  
  def usage():
--- 6,42 ----
  
  def test(filename, pyFilename, deleteData):
! 	curDir = os.getcwd()
! 	os.chdir(workDir)
! 	try:
! 		filename = '../'+filename
  
! 		if os.path.splitext(filename)[1]=='':
! 			filename += '.mkmodel'
! 		pyFilename = os.path.join(filename, pyFilename)
! 		if not os.path.exists(pyFilename):
! 			print 'No such file', pyFilename
! 			return
  
! 		print 'Testing %s...' % filename
  
! 		# Set up the store
! 		store = MySQLObjectStore()
! 		store.readModelFileNamed(filename)
! 		assert store.model()._havePythonClasses # @@@@@@
  
! 		# Clear the database
! 		if deleteData:
! 			print 'Deleting all database records for test...'
! 			for klass in store.model().klasses().values():
! 				if not klass.isAbstract():
! 					ObjectStore.Store.executeSQL('delete from %s;' % klass.name())
  
+ 		# Run the test
+ 		results = {}
+ 		execfile(pyFilename, results)
+ 		assert results.has_key('test'), 'No test defined in %s.' % filename
+ 		results['test'](store)
+ 	finally:
+ 		os.chdir(curDir)
  
  def usage():

Update of /cvsroot/webware/Webware/MiddleKit/Run
In directory usw-pr-cvs1:/tmp/cvs-serv11738/Run

Modified Files:
	MiddleObject.py ObjectStore.py SQLObjectStore.py 
Log Message:
- Remove ObjectStore.Store var which referred to the first store that happened to be created.
- Remove the store arg to MiddleObject.__init__(store) which was little used and confusing.
- Test suite clean ups.
- Make MKMultipleStores test having 2 different stores. This works now.
- Can now have two WebKit contexts that use MiddleKit without problems.
- Add MKMultipleStores to default set of test suites.


Index: MiddleObject.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Run/MiddleObject.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** MiddleObject.py	2 May 2002 23:58:39 -0000	1.20
--- MiddleObject.py	3 May 2002 14:26:28 -0000	1.21
***************
*** 37,47 ****
  	## Init ##
  
! 	def __init__(self, store=None): # @@ 2000-09-21 ce: do we really need the store here?
  		self.__dict__['_mk_initing'] = 1
! 		if store is None:
! 			self._mk_store = ObjectStore.Store
! 		else:
! 			self._mk_store = store
! 		self._mk_klass           = None  # Our class model
  		self._mk_changedAttrs    = None
  		self._mk_serialNum       = 0
--- 37,43 ----
  	## Init ##
  
! 	def __init__(self):
  		self.__dict__['_mk_initing'] = 1
! 		self._mk_store           = None
  		self._mk_changedAttrs    = None
  		self._mk_serialNum       = 0
***************
*** 114,117 ****
--- 110,114 ----
  		self._mk_changed = flag
  
+ 
  	## In Store ##
  
***************
*** 119,125 ****
  		return self._mk_inStore
  
- 	def setInStore(self, flag):
- 		self._mk_inStore = flag
- 
  
  	## Keys ##
--- 116,119 ----
***************
*** 216,229 ****
  		return self._mk_store
  
  
  	## Sneaky MiddleKit stuff ##
  
  	def klass(self):
! 		if self._mk_klass is None:
! 			self._mk_klass = self._mk_store.model().klass(self.__class__.__name__)
! 		return self._mk_klass
  
  	def addReferencedObjectsToStore(self, store):
  		""" Adds all MK objects referenced by this object to the store """
  		values = [self.valueForAttr(attr) for attr in self.klass().allDataRefAttrs()]
  		for value in values:
--- 210,233 ----
  		return self._mk_store
  
+ 	def setStore(self, store):
+ 		assert not self._mk_store, 'The store was previously set and cannot be set twice.'
+ 		self._mk_store = store
+ 		self._mk_inStore = 1
+ 
  
  	## Sneaky MiddleKit stuff ##
  
  	def klass(self):
! 		"""
! 		Return the MiddleKit class definition for this object.
! 		These definitions are instances of MiddleKit.Core.Klass and
! 		come from the MiddleKit model. Be sure the MiddleKit model
! 		is loaded. See the docs for more details.
! 		"""
! 		return self._mk_klass  # If you get AttributeError, then the MK model wasn't loaded.
  
  	def addReferencedObjectsToStore(self, store):
  		""" Adds all MK objects referenced by this object to the store """
+ 		assert store
  		values = [self.valueForAttr(attr) for attr in self.klass().allDataRefAttrs()]
  		for value in values:

Index: ObjectStore.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Run/ObjectStore.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ObjectStore.py	31 Mar 2002 08:46:25 -0000	1.22
--- ObjectStore.py	3 May 2002 14:26:28 -0000	1.23
***************
*** 69,75 ****
  
  	def __init__(self):
- 		global Store
- 		if Store is None:
- 			Store = self
  		self._model          = None
  		self._hasChanges     = 0
--- 69,72 ----
***************
*** 123,127 ****
  			self._hasChanges = 1
  			self._newObjects.append(object)
! 			object.setInStore(1)
  			if not noRecurse:
  				# Recursively add referenced objects to the store
--- 120,124 ----
  			self._hasChanges = 1
  			self._newObjects.append(object)
! 			object.setStore(self)
  			if not noRecurse:
  				# Recursively add referenced objects to the store
***************
*** 380,389 ****
  				raise ValueError, 'Invalid class parameter. Pass a Klass, a name or a Python class. Type of aClass is %s. aClass is %s.' % (type(aClass), aClass)
  		return aClass
- 
- 
- # The singleton instance used by MiddleObject by default.
- # This gets set by __init__ if it is None, so ordinarily
- # you don't need to think about it.
- Store = None
  
  
--- 377,380 ----

Index: SQLObjectStore.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Run/SQLObjectStore.py,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** SQLObjectStore.py	2 May 2002 23:58:39 -0000	1.43
--- SQLObjectStore.py	3 May 2002 14:26:29 -0000	1.44
***************
*** 285,292 ****
  					obj = pyClass()
  					assert isinstance(obj, MiddleObject), 'Not a MiddleObject. obj = %r, type = %r, MiddleObject = %r' % (obj, type(obj), MiddleObject)
! 					obj._mk_store = self
! 					# ^^^ a store is the only outsider that is allowed
! 					# to directly set a MiddleObject's store like this
! 					obj.initFromRow(row)
  					obj.setKey(key)
  					self._objects[key] = obj
--- 285,291 ----
  					obj = pyClass()
  					assert isinstance(obj, MiddleObject), 'Not a MiddleObject. obj = %r, type = %r, MiddleObject = %r' % (obj, type(obj), MiddleObject)
! 					obj.initFromRow(row)  # @@ 2002-05-03 ce: should be redone as readStoreData(store, row) and then remove next if stmt
! 					if obj._mk_store is not self:
! 						obj.setStore(self)
  					obj.setKey(key)
  					self._objects[key] = obj

Update of /cvsroot/webware/Webware/MiddleKit/Core
In directory usw-pr-cvs1:/tmp/cvs-serv11738/Core

Modified Files:
	Klass.py Model.py ModelUser.py 
Log Message:
- Remove ObjectStore.Store var which referred to the first store that happened to be created.
- Remove the store arg to MiddleObject.__init__(store) which was little used and confusing.
- Test suite clean ups.
- Make MKMultipleStores test having 2 different stores. This works now.
- Can now have two WebKit contexts that use MiddleKit without problems.
- Add MKMultipleStores to default set of test suites.


Index: Klass.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Core/Klass.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Klass.py	31 Mar 2002 12:46:05 -0000	1.15
--- Klass.py	3 May 2002 14:26:28 -0000	1.16
***************
*** 22,26 ****
  		self._superklass = None
  		self._subklasses = []
! 		self._pyClass = None
  		self._backObjRefAttrs = None
  
--- 22,26 ----
  		self._superklass = None
  		self._subklasses = []
! 		self._pyClass = 0   # 0 means never computed. None would mean computed, but not found.
  		self._backObjRefAttrs = None
  
***************
*** 61,66 ****
  
  	def awakeFromRead(self):
! 		''' Performs further initialization. Invoked by Klasses after all basic Klass definitions have been read. '''
  		self._makeAllAttrs()
  
  	def _makeAllAttrs(self):
--- 61,73 ----
  
  	def awakeFromRead(self):
! 		"""
! 		Performs further initialization. Invoked by Klasses after all
! 		basic Klass definitions have been read.
! 		"""
  		self._makeAllAttrs()
+ 		# Python classes need to know their MiddleKit classes in
+ 		# order for MiddleKit.Run.MiddleObject methods to work.
+ 		# Invoking pyClass() makes that happen.
+ 		self.pyClass()
  
  	def _makeAllAttrs(self):
***************
*** 246,253 ****
  		Returns the Python class that corresponds to this class. This
  		request will even result in the Python class' module being
! 		imported if necessary.
  		"""
! 		if self._pyClass is None:
! 			self._pyClass = self._klassContainer._model.pyClassForName(self.name())
  		return self._pyClass
  
--- 253,266 ----
  		Returns the Python class that corresponds to this class. This
  		request will even result in the Python class' module being
! 		imported if necessary. It will also set the Python class
! 		attribute _mk_klass which is used by MiddleKit.Run.MiddleObject.
! 
  		"""
! 		if self._pyClass==0:
! 			if self._klassContainer._model._havePythonClasses:
! 				self._pyClass = self._klassContainer._model.pyClassForName(self.name())
! 				self._pyClass._mk_klass = self
! 			else:
! 				self._pyClass = None
  		return self._pyClass
  

Index: Model.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Core/Model.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Model.py	31 Mar 2002 08:33:22 -0000	1.9
--- Model.py	3 May 2002 14:26:28 -0000	1.10
***************
*** 12,17 ****
  	'''
  
! 	def __init__(self, filename=None, customCoreClasses={}, rootModel=None):
  		Configurable.__init__(self)
  		self._filename = None
  		self._coreClasses = customCoreClasses
--- 12,18 ----
  	'''
  
! 	def __init__(self, filename=None, customCoreClasses={}, rootModel=None, havePythonClasses=1):
  		Configurable.__init__(self)
+ 		self._havePythonClasses = havePythonClasses
  		self._filename = None
  		self._coreClasses = customCoreClasses
***************
*** 97,101 ****
  				assert model!=self._rootModel
  			else:
! 				model = self.__class__(filename, self._coreClasses, self)
  				self._allModelsByFilename[filename] = model
  			self._parents.append(model)
--- 98,102 ----
  				assert model!=self._rootModel
  			else:
! 				model = self.__class__(filename, customCoreClasses=self._coreClasses, rootModel=self, havePythonClasses=self._havePythonClasses)
  				self._allModelsByFilename[filename] = model
  			self._parents.append(model)

Index: ModelUser.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Core/ModelUser.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ModelUser.py	3 May 2002 12:44:44 -0000	1.2
--- ModelUser.py	3 May 2002 14:26:28 -0000	1.3
***************
*** 29,32 ****
--- 29,33 ----
  
  	def setModel(self, model):
+ 		assert model
  		assert self._model is None, 'Can only set model once.'
  		self._model = model

Update of /cvsroot/webware/Webware/MiddleKit/Design
In directory usw-pr-cvs1:/tmp/cvs-serv11738/Design

Modified Files:
	Generate.py 
Log Message:
- Remove ObjectStore.Store var which referred to the first store that happened to be created.
- Remove the store arg to MiddleObject.__init__(store) which was little used and confusing.
- Test suite clean ups.
- Make MKMultipleStores test having 2 different stores. This works now.
- Can now have two WebKit contexts that use MiddleKit without problems.
- Add MKMultipleStores to default set of test suites.


Index: Generate.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Design/Generate.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Generate.py	31 Jul 2001 14:38:25 -0000	1.5
--- Generate.py	3 May 2002 14:26:28 -0000	1.6
***************
*** 141,145 ****
  		generator = pyClass()
  		if type(model) is types.StringType:
! 			generator.readModelFileNamed(model)
  		else:
  			generator.setModel(model)
--- 141,145 ----
  		generator = pyClass()
  		if type(model) is types.StringType:
! 			generator.readModelFileNamed(model, havePythonClasses=0)
  		else:
  			generator.setModel(model)

Update of /cvsroot/webware/Webware/MiddleKit/Tests/MKString.mkmodel
In directory usw-pr-cvs1:/tmp/cvs-serv11738/Tests/MKString.mkmodel

Modified Files:
	TestEmpty.py 
Log Message:
- Remove ObjectStore.Store var which referred to the first store that happened to be created.
- Remove the store arg to MiddleObject.__init__(store) which was little used and confusing.
- Test suite clean ups.
- Make MKMultipleStores test having 2 different stores. This works now.
- Can now have two WebKit contexts that use MiddleKit without problems.
- Add MKMultipleStores to default set of test suites.


Index: TestEmpty.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Tests/MKString.mkmodel/TestEmpty.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestEmpty.py	5 May 2001 16:53:12 -0000	1.2
--- TestEmpty.py	3 May 2002 14:26:31 -0000	1.3
***************
*** 1,5 ****
! def test():
  	from Foo import Foo
- 	from MiddleKit.Run.ObjectStore import Store as store
  
  	a100 = 'a'*100
--- 1,4 ----
! def test(store):
  	from Foo import Foo
  
  	a100 = 'a'*100

Update of /cvsroot/webware/Webware/MiddleKit/Tests/MKTypeValueChecking.mkmodel
In directory usw-pr-cvs1:/tmp/cvs-serv11738/Tests/MKTypeValueChecking.mkmodel

Modified Files:
	TestEmpty.py 
Log Message:
- Remove ObjectStore.Store var which referred to the first store that happened to be created.
- Remove the store arg to MiddleObject.__init__(store) which was little used and confusing.
- Test suite clean ups.
- Make MKMultipleStores test having 2 different stores. This works now.
- Can now have two WebKit contexts that use MiddleKit without problems.
- Add MKMultipleStores to default set of test suites.


Index: TestEmpty.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Tests/MKTypeValueChecking.mkmodel/TestEmpty.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestEmpty.py	12 Jul 2001 03:16:55 -0000	1.1
--- TestEmpty.py	3 May 2002 14:26:31 -0000	1.2
***************
*** 17,24 ****
  
  
! def test():
  	from Foo import Foo
  	from Bar import Bar
- 	from MiddleKit.Run.ObjectStore import Store as store
  	from MiscUtils.DataTable import DataTable
  	import sys
--- 17,23 ----
  
  
! def test(store):
  	from Foo import Foo
  	from Bar import Bar
  	from MiscUtils.DataTable import DataTable
  	import sys

Update of /cvsroot/webware/Webware/MiddleKit/Tests/MKObjRef.mkmodel
In directory usw-pr-cvs1:/tmp/cvs-serv11738/Tests/MKObjRef.mkmodel

Modified Files:
	TestEmpty1.py TestEmpty2.py TestSamples.py 
Log Message:
- Remove ObjectStore.Store var which referred to the first store that happened to be created.
- Remove the store arg to MiddleObject.__init__(store) which was little used and confusing.
- Test suite clean ups.
- Make MKMultipleStores test having 2 different stores. This works now.
- Can now have two WebKit contexts that use MiddleKit without problems.
- Add MKMultipleStores to default set of test suites.


Index: TestEmpty1.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Tests/MKObjRef.mkmodel/TestEmpty1.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestEmpty1.py	9 Dec 2001 15:21:24 -0000	1.1
--- TestEmpty1.py	3 May 2002 14:26:31 -0000	1.2
***************
*** 1,7 ****
! def test():
  	from Foo import Foo
  	from Bar import Bar
  	from BarReq import BarReq
- 	from MiddleKit.Run.ObjectStore import Store as store
  
  	# Create a Foo and a Bar that refers to it
--- 1,6 ----
! def test(store):
  	from Foo import Foo
  	from Bar import Bar
  	from BarReq import BarReq
  
  	# Create a Foo and a Bar that refers to it

Index: TestEmpty2.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Tests/MKObjRef.mkmodel/TestEmpty2.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestEmpty2.py	9 Dec 2001 15:21:24 -0000	1.1
--- TestEmpty2.py	3 May 2002 14:26:31 -0000	1.2
***************
*** 1,3 ****
! def test():
  	'''
  	Bug report from Stefan Karlsson <stefan@...> on Dec 3 2001.
--- 1,3 ----
! def test(store):
  	'''
  	Bug report from Stefan Karlsson <stefan@...> on Dec 3 2001.
***************
*** 8,12 ****
  	from Foo import Foo
  	from BarReq import BarReq
- 	from MiddleKit.Run.ObjectStore import Store as store
  
  	# Since we're the second empty test, double check that the db is really empty
--- 8,11 ----
***************
*** 25,30 ****
  	assert len(bars)==1
  	bar2 = bars[0]
- 	print '>> bar._foo = %r' % bar._foo
- 	print '>> bar.foo() = %r' % bar.foo()
  	assert bar2 is bar
  	assert bar.foo() is not None  # the sign of the bug in question
--- 24,27 ----

Index: TestSamples.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Tests/MKObjRef.mkmodel/TestSamples.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestSamples.py	25 Mar 2002 13:02:53 -0000	1.3
--- TestSamples.py	3 May 2002 14:26:31 -0000	1.4
***************
*** 1,6 ****
! def test():
  	from Foo import Foo
  	from Bar import Bar
- 	from MiddleKit.Run.ObjectStore import Store as store
  	
  	bar = store.fetchObjectsOfClass(Bar)[0]
--- 1,5 ----
! def test(store):
  	from Foo import Foo
  	from Bar import Bar
  	
  	bar = store.fetchObjectsOfClass(Bar)[0]

Update of /cvsroot/webware/Webware/MiddleKit/Tests/MKObjRefReuse.mkmodel
In directory usw-pr-cvs1:/tmp/cvs-serv11738/Tests/MKObjRefReuse.mkmodel

Modified Files:
	TestSamples.py 
Log Message:
- Remove ObjectStore.Store var which referred to the first store that happened to be created.
- Remove the store arg to MiddleObject.__init__(store) which was little used and confusing.
- Test suite clean ups.
- Make MKMultipleStores test having 2 different stores. This works now.
- Can now have two WebKit contexts that use MiddleKit without problems.
- Add MKMultipleStores to default set of test suites.


Index: TestSamples.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Tests/MKObjRefReuse.mkmodel/TestSamples.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestSamples.py	19 Feb 2001 03:30:00 -0000	1.1
--- TestSamples.py	3 May 2002 14:26:31 -0000	1.2
***************
*** 6,12 ****
  		'bazAttr=%r, type(bazAttr)=%r' % (bazAttr, type(bazAttr))
  
! def test():
! 	from MiddleKit.Run.ObjectStore import Store as store
! 
  	foos = store.fetchObjectsOfClass('Foo')
  	assert len(foos)==2
--- 6,10 ----
  		'bazAttr=%r, type(bazAttr)=%r' % (bazAttr, type(bazAttr))
  
! def test(store):
  	foos = store.fetchObjectsOfClass('Foo')
  	assert len(foos)==2

Update of /cvsroot/webware/Webware/MiddleKit/Tests/MKMultipleStores.mkmodel
In directory usw-pr-cvs1:/tmp/cvs-serv11738/Tests/MKMultipleStores.mkmodel

Modified Files:
	TestEmpty.py TestSamples.py 
Log Message:
- Remove ObjectStore.Store var which referred to the first store that happened to be created.
- Remove the store arg to MiddleObject.__init__(store) which was little used and confusing.
- Test suite clean ups.
- Make MKMultipleStores test having 2 different stores. This works now.
- Can now have two WebKit contexts that use MiddleKit without problems.
- Add MKMultipleStores to default set of test suites.


Index: TestEmpty.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Tests/MKMultipleStores.mkmodel/TestEmpty.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestEmpty.py	21 Feb 2001 03:42:18 -0000	1.1
--- TestEmpty.py	3 May 2002 14:26:30 -0000	1.2
***************
*** 1,5 ****
! def test():
  	from Thing import Thing
! 	from MiddleKit.Run.ObjectStore import Store as store
! 
! 	# nothing to do here
--- 1,3 ----
! def test(store):
  	from Thing import Thing
! 	# nothing more to do here

Index: TestSamples.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Tests/MKMultipleStores.mkmodel/TestSamples.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestSamples.py	25 Mar 2002 13:02:53 -0000	1.2
--- TestSamples.py	3 May 2002 14:26:30 -0000	1.3
***************
*** 1,5 ****
! def test():
  	from Thing import Thing
- 	from MiddleKit.Run.ObjectStore import Store as store
  
  	things = store.fetchObjectsOfClass('Thing')
--- 1,4 ----
! def test(store):
  	from Thing import Thing
  
  	things = store.fetchObjectsOfClass('Thing')
***************
*** 18,20 ****
  		assert thing.store()==newStore
  
! 	
--- 17,43 ----
  		assert thing.store()==newStore
  
! 
! 	# and now for an entirely different store
! 	import os, sys
! 	sys.path.insert(1, os.path.abspath(os.pardir))
! 	try:
! 		from TestDesign import test as generate
! 		model = generate('../MKBasic.mkmodel', workDir='WorkDir2') # toTestDir='../../', 
! 
! 		diffStore = store.__class__(**dbArgs)
! 		diffStore.setModel(model)
! 		assert diffStore.model() is model
! 		personClass = model.klass('Person').pyClass()
! 		person = personClass()
! 		person.setFirstName('Chuck')
! 		assert person.firstName()=='Chuck'
! 		diffStore.addObject(person)
! 		assert person.store() is diffStore, 'store=%r' % person.store()
! 		diffStore.saveChanges()
! 		assert person.store() is diffStore, 'store=%r' % person.store()
! 		assert diffStore is not newStore
! 		
! 		from TestCommon import rmdir
! 		rmdir('WorkDir2')
! 	finally:
! 		del sys.path[1]

Update of /cvsroot/webware/Webware/MiddleKit/Tests/MKNone.mkmodel
In directory usw-pr-cvs1:/tmp/cvs-serv11738/Tests/MKNone.mkmodel

Modified Files:
	TestEmpty.py 
Log Message:
- Remove ObjectStore.Store var which referred to the first store that happened to be created.
- Remove the store arg to MiddleObject.__init__(store) which was little used and confusing.
- Test suite clean ups.
- Make MKMultipleStores test having 2 different stores. This works now.
- Can now have two WebKit contexts that use MiddleKit without problems.
- Add MKMultipleStores to default set of test suites.


Index: TestEmpty.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Tests/MKNone.mkmodel/TestEmpty.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestEmpty.py	13 Feb 2001 04:51:58 -0000	1.1
--- TestEmpty.py	3 May 2002 14:26:30 -0000	1.2
***************
*** 1,5 ****
! def test():
  	from Foo import Foo
- 	from MiddleKit.Run.ObjectStore import Store as store
  
  	f = Foo()
--- 1,4 ----
! def test(store):
  	from Foo import Foo
  
  	f = Foo()

Update of /cvsroot/webware/Webware/MiddleKit/Tests/MKModelInh3.mkmodel
In directory usw-pr-cvs1:/tmp/cvs-serv11738/Tests/MKModelInh3.mkmodel

Modified Files:
	TestEmpty.py 
Log Message:
- Remove ObjectStore.Store var which referred to the first store that happened to be created.
- Remove the store arg to MiddleObject.__init__(store) which was little used and confusing.
- Test suite clean ups.
- Make MKMultipleStores test having 2 different stores. This works now.
- Can now have two WebKit contexts that use MiddleKit without problems.
- Add MKMultipleStores to default set of test suites.


Index: TestEmpty.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Tests/MKModelInh3.mkmodel/TestEmpty.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestEmpty.py	26 Jan 2002 02:13:29 -0000	1.1
--- TestEmpty.py	3 May 2002 14:26:30 -0000	1.2
***************
*** 1,5 ****
! def test():
  	from Foo import Foo
- 	from MiddleKit.Run.ObjectStore import Store as store
  	from MiscUtils.DataTable import DataTable
  
--- 1,4 ----
! def test(store):
  	from Foo import Foo
  	from MiscUtils.DataTable import DataTable

Update of /cvsroot/webware/Webware/MiddleKit/Tests/MKModelInh2.mkmodel
In directory usw-pr-cvs1:/tmp/cvs-serv11738/Tests/MKModelInh2.mkmodel

Modified Files:
	TestEmpty.py 
Log Message:
- Remove ObjectStore.Store var which referred to the first store that happened to be created.
- Remove the store arg to MiddleObject.__init__(store) which was little used and confusing.
- Test suite clean ups.
- Make MKMultipleStores test having 2 different stores. This works now.
- Can now have two WebKit contexts that use MiddleKit without problems.
- Add MKMultipleStores to default set of test suites.


Index: TestEmpty.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Tests/MKModelInh2.mkmodel/TestEmpty.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestEmpty.py	26 Jan 2002 02:13:29 -0000	1.1
--- TestEmpty.py	3 May 2002 14:26:30 -0000	1.2
***************
*** 1,5 ****
! def test():
  	from Foo import Foo
- 	from MiddleKit.Run.ObjectStore import Store as store
  	from MiscUtils.DataTable import DataTable
  
--- 1,4 ----
! def test(store):
  	from Foo import Foo
  	from MiscUtils.DataTable import DataTable

Update of /cvsroot/webware/Webware/MiddleKit/Tests/MKList.mkmodel
In directory usw-pr-cvs1:/tmp/cvs-serv11738/Tests/MKList.mkmodel

Modified Files:
	TestEmpty.py TestSamples.py 
Log Message:
- Remove ObjectStore.Store var which referred to the first store that happened to be created.
- Remove the store arg to MiddleObject.__init__(store) which was little used and confusing.
- Test suite clean ups.
- Make MKMultipleStores test having 2 different stores. This works now.
- Can now have two WebKit contexts that use MiddleKit without problems.
- Add MKMultipleStores to default set of test suites.


Index: TestEmpty.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Tests/MKList.mkmodel/TestEmpty.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestEmpty.py	13 Feb 2001 04:51:58 -0000	1.1
--- TestEmpty.py	3 May 2002 14:26:29 -0000	1.2
***************
*** 1,14 ****
  from Foo import Foo
  from Bar import Bar
- from MiddleKit.Run.ObjectStore import Store as store
  from types import *
  
  
! def reset():
  	store.clear()
  	store.executeSQL('delete from Foo;')
  	store.executeSQL('delete from Bar;')
  
! def testAddToBars():
  	# Test 1: Use addToBars()
  	f = Foo()
--- 1,13 ----
  from Foo import Foo
  from Bar import Bar
  from types import *
  
  
! def reset(store):
  	store.clear()
  	store.executeSQL('delete from Foo;')
  	store.executeSQL('delete from Bar;')
  
! def testAddToBars(store):
  	# Test 1: Use addToBars()
  	f = Foo()
***************
*** 23,35 ****
  	f = store.fetchObjectsOfClass(Foo)[0]
  	bars = f.bars()
! 	assert len(bars)==1
  	assert bars[0].foo()==f
! 	reset()
  
! def test():
  	# We invoke testAddToBars twice on purpose, just to see that
  	# the second time around, things are stable enough to pass again
! 	testAddToBars()
! 	testAddToBars()
  
  	# Test 2: do not use addToBars()
--- 22,34 ----
  	f = store.fetchObjectsOfClass(Foo)[0]
  	bars = f.bars()
! 	assert len(bars)==1, 'bars=%r' % bars
  	assert bars[0].foo()==f
! 	reset(store)
  
! def test(store):
  	# We invoke testAddToBars twice on purpose, just to see that
  	# the second time around, things are stable enough to pass again
! 	testAddToBars(store)
! 	testAddToBars(store)
  
  	# Test 2: do not use addToBars()
***************
*** 46,52 ****
  
  	f = store.fetchObjectsOfClass(Foo)[0]
  	bars = f.bars()
  	assert type(bars) is ListType
! 	assert len(bars)==1
  	assert bars[0].x()==7
  
--- 45,53 ----
  
  	f = store.fetchObjectsOfClass(Foo)[0]
+ 	assert f._mk_store
+ 	assert f._mk_inStore
  	bars = f.bars()
  	assert type(bars) is ListType
! 	assert len(bars)==1, 'bars=%r' % bars
  	assert bars[0].x()==7
  
***************
*** 62,66 ****
  	bars = f.bars()
  	assert type(bars) is ListType
! 	assert len(bars)==2
  	assert bars[0].x()==7
  	assert bars[1].x()==7
--- 63,67 ----
  	bars = f.bars()
  	assert type(bars) is ListType
! 	assert len(bars)==2, 'bars=%r' % bars
  	assert bars[0].x()==7
  	assert bars[1].x()==7

Index: TestSamples.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Tests/MKList.mkmodel/TestSamples.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestSamples.py	25 Mar 2002 13:02:53 -0000	1.3
--- TestSamples.py	3 May 2002 14:26:29 -0000	1.4
***************
*** 1,11 ****
! def test():
  	from Foo import Foo
  	from Bar import Bar
- 	from MiddleKit.Run.ObjectStore import Store as store
  
  	foos = store.fetchObjectsOfClass(Foo)
  	assert len(foos)==2
  	f1, f2 = foos
! 	assert len(f1.bars())==2
! 	assert len(f2.bars())==3
! 	
--- 1,9 ----
! def test(store):
  	from Foo import Foo
  	from Bar import Bar
  
  	foos = store.fetchObjectsOfClass(Foo)
  	assert len(foos)==2
  	f1, f2 = foos
! 	assert len(f1.bars())==2, 'bars=%r' % f1.bars()
! 	assert len(f2.bars())==3
\ No newline at end of file