[Checkins] SVN: zopyx.smartprintng.client/trunk/ updated

[Andreas Jung]

Log message for revision 104155:
  updated
  

Changed:
  U   zopyx.smartprintng.client/trunk/docs/HISTORY.txt
  U   zopyx.smartprintng.client/trunk/setup.py
  U   zopyx.smartprintng.client/trunk/zopyx/smartprintng/client/zip_client.py

-=-
Modified: zopyx.smartprintng.client/trunk/docs/HISTORY.txt
===================================================================
--- zopyx.smartprintng.client/trunk/docs/HISTORY.txt	2009-09-16 20:51:14 UTC (rev 104154)
+++ zopyx.smartprintng.client/trunk/docs/HISTORY.txt	2009-09-17 05:53:16 UTC (rev 104155)
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+0.5.1 (2007-09-17)
+------------------
+
+* restored old API by moving authentication  and authorization code into
+  the client API
+
 0.5.0 (2007-09-15)
 ------------------
 

Modified: zopyx.smartprintng.client/trunk/setup.py
===================================================================
--- zopyx.smartprintng.client/trunk/setup.py	2009-09-16 20:51:14 UTC (rev 104154)
+++ zopyx.smartprintng.client/trunk/setup.py	2009-09-17 05:53:16 UTC (rev 104155)
@@ -7,7 +7,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = '0.5.0'
+version = '0.5.1'
 
 setup(name='zopyx.smartprintng.client',
       version=version,

Modified: zopyx.smartprintng.client/trunk/zopyx/smartprintng/client/zip_client.py
===================================================================
--- zopyx.smartprintng.client/trunk/zopyx/smartprintng/client/zip_client.py	2009-09-16 20:51:14 UTC (rev 104154)
+++ zopyx.smartprintng.client/trunk/zopyx/smartprintng/client/zip_client.py	2009-09-17 05:53:16 UTC (rev 104155)
@@ -16,12 +16,14 @@
 
 class Proxy(object):
 
-    def __init__(self, host='localhost', port=6543):
+    def __init__(self, host='localhost', port=6543, username='', password=''):
         self.host = host
         self.port = port
+        self.username = username
+        self.password = password
 
     def _makeZipFromDirectory(self, directory):
-        """ Generate a ZIP file from a directory containing all its 
+        """ Generate a ZIP file from a directory containing all its
             contents. Returns the filename of the generated ZIP file.
         """
 
@@ -36,9 +38,9 @@
         ZF.close()
         return zip_filename
 
-    def authenticate(self, username, password):
+    def _authenticate(self):
         server = xmlrpclib.ServerProxy('http://%s:%d/authenticate' % (self.host, self.port))
-        return server(username, password)
+        return server(self.username, self.password)
 
     def ping(self):
         server = xmlrpclib.ServerProxy('http://%s:%d/ping' % (self.host, self.port))
@@ -48,9 +50,11 @@
         server = xmlrpclib.ServerProxy('http://%s:%d/availableConverters' % (self.host, self.port))
         return server()
 
-    def convertZIP(self, auth_token, dirname, converter_name='pdf-prince'):
+    def convertZIP(self, dirname, converter_name='pdf-prince'):
         """ XMLRPC client to SmartPrintNG server """
 
+        auth_token = self._authenticate()
+
         zip_filename = self._makeZipFromDirectory(dirname)
         server = xmlrpclib.ServerProxy('http://%s:%d/convertZIP' % (self.host, self.port))
         zip_data = server(auth_token,
@@ -70,9 +74,12 @@
         os.unlink(zip_temp)
         return output_filename
 
-    def convertZIPandRedirect(self, auth_token, dirname, converter_name='pdf-prince', prefix=None):
+    def convertZIPandRedirect(self, dirname, converter_name='pdf-prince', prefix=None):
         """ XMLRPC client to SmartPrintNG server """
 
+        # Authenticate first
+        auth_token = self._authenticate()
+
         zip_filename = self._makeZipFromDirectory(dirname)
         server = xmlrpclib.ServerProxy('http://%s:%d/convertZIPandRedirect' % (self.host, self.port))
         location = server(auth_token,
@@ -82,9 +89,12 @@
         os.unlink(zip_filename)
         return location
 
-    def convertZIPEmail(self, auth_token, dirname, converter_name='pdf-prince', 
+    def convertZIPEmail(self, dirname, converter_name='pdf-prince', 
                         sender=None, recipients=None, subject=None, body=None):
 
+        # Authenticate first
+        auth_token = self._authenticate()
+
         zip_filename = self._makeZipFromDirectory(dirname)
         server = xmlrpclib.ServerProxy('http://%s:%d/convertZIPEmail' % (self.host, self.port))
         result = server.convertZIPEmail(auth_token,
@@ -102,11 +112,9 @@
 
     proxy = Proxy(port=6543)
     print proxy.ping()
-    print proxy.authenticate('dummy', 'dummy')
     print proxy.availableConverters()
-    print proxy.convertZIP('', sys.argv[1])
-#    print proxy.convertZIPEmail('',
-#                                sys.argv[1], 
+    print proxy.convertZIP(sys.argv[1])
+#    print proxy.convertZIPEmail(sys.argv[1], 
 #                                sender='foo at bar.org', 
 #                                recipients='foo at bar.org', 
 #                                subject=unicode('üöä', 'latin1').encode('utf-8'),