Changeset 14181 for main/ikobacustom.uniben/trunk/src/ikobacustom/uniben/customers

Timestamp:

23 Sep 2016, 05:54:20 (8 years ago)

Author:

Henrik Bettermann

Message:

Renaming 2

Location:

main/ikobacustom.uniben/trunk/src/ikobacustom/uniben/customers

Files:

• batching.py (modified) (1 diff)
• contracts.py (modified) (1 diff)
• customer.py (modified) (2 diffs)
• documents.py (modified) (2 diffs)
• export.py (modified) (1 diff)
• fileviewlets.py (modified) (4 diffs)
• interfaces.py (modified) (6 diffs)
• tests/test_browser.py (modified) (9 diffs)
• tests/test_contract.py (modified) (2 diffs)
• tests/test_customer.py (modified) (3 diffs)
• tests/test_document.py (modified) (2 diffs)
• utils.py (modified) (3 diffs)

main/ikobacustom.uniben/trunk/src/ikobacustom/uniben/customers/batching.py

@@ -23 +23 @@
     CustomerDocumentProcessorBase, ContractProcessorBase)
 from ikobacustom.uniben.customers.interfaces import (
-    ISkeletonCustomer,
-    ISkeletonCustomerDocument, ISkeletonContract)
+    IUnibenCustomer,
+    IUnibenCustomerDocument, IUnibenContract)
 from ikobacustom.uniben.interfaces import MessageFactory as _
 
 
-class SkeletonCustomerProcessor(CustomerProcessor):
+class UnibenCustomerProcessor(CustomerProcessor):
     """A batch processor for ICustomer objects.
     """
     util_name = 'unibencustomerprocessor'
     grok.name(util_name)
-    name = _('Skeleton Customer Processor')
-    iface = ISkeletonCustomer
+    name = _('Uniben Customer Processor')
+    iface = IUnibenCustomer
 
 
-class SkeletonCustomerDocumentProcessor(CustomerDocumentProcessorBase):
-    """A batch processor for ISkeletonCustomerDocument objects.
+class UnibenCustomerDocumentProcessor(CustomerDocumentProcessorBase):
+    """A batch processor for IUnibenCustomerDocument objects.
     """
     util_name = 'unibencustomerdocumentprocessor'
     grok.name(util_name)
-    name = _('Skeleton Customer Document Processor')
-    iface = ISkeletonCustomerDocument
-    factory_name = 'waeup.SkeletonCustomerDocument'
+    name = _('Uniben Customer Document Processor')
+    iface = IUnibenCustomerDocument
+    factory_name = 'waeup.UnibenCustomerDocument'
 
 
-class SkeletonContractProcessor(ContractProcessorBase):
-    """A batch processor for ISkeletonContract objects.
+class UnibenContractProcessor(ContractProcessorBase):
+    """A batch processor for IUnibenContract objects.
     """
     util_name = 'unibencontractprocessor'
     grok.name(util_name)
-    name = _('Skeleton Customer Contract Processor')
-    iface = ISkeletonContract
-    factory_name = 'waeup.SkeletonContract'
+    name = _('Uniben Customer Contract Processor')
+    iface = IUnibenContract
+    factory_name = 'waeup.UnibenContract'

main/ikobacustom.uniben/trunk/src/ikobacustom/uniben/customers/contracts.py

@@ -28 +28 @@
 from ikobacustom.uniben.interfaces import MessageFactory as _
 from ikobacustom.uniben.customers.interfaces import (
-    ISkeletonContract, ISkeletonContractEdit, ISkeletonContractProcess,
-    ISkeletonContractOfficialUse)
+    IUnibenContract, IUnibenContractEdit, IUnibenContractProcess,
+    IUnibenContractOfficialUse)
 
 
-class SkeletonContract(ContractBase):
+class UnibenContract(ContractBase):
     """This is a sample contract.
     """
 
     grok.implements(
-        ISkeletonContractProcess,
-        ISkeletonContract,
-        ISkeletonContractEdit,
+        IUnibenContractProcess,
+        IUnibenContract,
+        IUnibenContractEdit,
         ICustomerNavigation)
 
     contract_category = 'sample'
 
-    form_fields_interface = ISkeletonContract
+    form_fields_interface = IUnibenContract
 
-    edit_form_fields_interface = ISkeletonContractEdit
+    edit_form_fields_interface = IUnibenContractEdit
 
-    ou_form_fields_interface = ISkeletonContractOfficialUse
+    ou_form_fields_interface = IUnibenContractOfficialUse
 
-    check_docs_interface = ISkeletonContract
+    check_docs_interface = IUnibenContract
 
-SkeletonContract = attrs_to_fields(SkeletonContract)
+UnibenContract = attrs_to_fields(UnibenContract)
 
 
 # Contracts must be importable. So we might need a factory.
-class SkeletonContractFactory(grok.GlobalUtility):
+class UnibenContractFactory(grok.GlobalUtility):
     """A factory for contracts.
     """
     grok.implements(IFactory)
-    grok.name(u'waeup.SkeletonContract')
+    grok.name(u'waeup.UnibenContract')
     title = u"Create a new contract.",
     description = u"This factory instantiates new sample contract instances."
 
     def __call__(self, *args, **kw):
-        return SkeletonContract(*args, **kw)
+        return UnibenContract(*args, **kw)
 
     def getInterfaces(self):
-        return implementedBy(SkeletonContract)
+        return implementedBy(UnibenContract)

main/ikobacustom.uniben/trunk/src/ikobacustom/uniben/customers/customer.py

@@ -25 +25 @@
 from waeup.ikoba.customers.customer import Customer
 from waeup.ikoba.customers.interfaces import ICustomerNavigation
-from ikobacustom.uniben.customers.interfaces import ISkeletonCustomer
+from ikobacustom.uniben.customers.interfaces import IUnibenCustomer
 from ikobacustom.uniben.interfaces import MessageFactory as _
 
 
-class SkeletonCustomer(Customer):
+class UnibenCustomer(Customer):
     """This is a customer container for the various objects
     owned by customers.
     """
-    grok.implements(ISkeletonCustomer, ICustomerNavigation)
-    grok.provides(ISkeletonCustomer)
+    grok.implements(IUnibenCustomer, ICustomerNavigation)
+    grok.provides(IUnibenCustomer)
 
-    form_fields_interface = ISkeletonCustomer
+    form_fields_interface = IUnibenCustomer
 
-SkeletonCustomer = attrs_to_fields(SkeletonCustomer)
+UnibenCustomer = attrs_to_fields(UnibenCustomer)
 
 
-class SkeletonCustomerFactory(grok.GlobalUtility):
+class UnibenCustomerFactory(grok.GlobalUtility):
     """A factory for customers.
     """
@@ -50 +50 @@
 
     def __call__(self, *args, **kw):
-        return SkeletonCustomer()
+        return UnibenCustomer()
 
     def getInterfaces(self):
-        return implementedBy(SkeletonCustomer)
+        return implementedBy(UnibenCustomer)

main/ikobacustom.uniben/trunk/src/ikobacustom/uniben/customers/documents.py

@@ -26 +26 @@
 from waeup.ikoba.customers.documents import CustomerDocumentBase
 from ikobacustom.uniben.interfaces import MessageFactory as _
-from ikobacustom.uniben.customers.interfaces import ISkeletonCustomerDocument
+from ikobacustom.uniben.customers.interfaces import IUnibenCustomerDocument
 
 
-class SkeletonCustomerDocument(CustomerDocumentBase):
+class UnibenCustomerDocument(CustomerDocumentBase):
     """This is a sample customer document.
     """
 
-    grok.implements(ISkeletonCustomerDocument, ICustomerNavigation)
-    grok.provides(ISkeletonCustomerDocument)
+    grok.implements(IUnibenCustomerDocument, ICustomerNavigation)
+    grok.provides(IUnibenCustomerDocument)
 
     # Ikoba can store any number of files per Document object.
@@ -42 +42 @@
     filenames = ('sample',)
 
-    form_fields_interface = ISkeletonCustomerDocument
+    form_fields_interface = IUnibenCustomerDocument
 
-SkeletonCustomerDocument = attrs_to_fields(SkeletonCustomerDocument)
+UnibenCustomerDocument = attrs_to_fields(UnibenCustomerDocument)
 
 
 # Customer documents must be importable. So we need a factory.
-class SkeletonCustomerDocumentFactory(grok.GlobalUtility):
+class UnibenCustomerDocumentFactory(grok.GlobalUtility):
     """A factory for customer documents.
     """
     grok.implements(IFactory)
-    grok.name(u'waeup.SkeletonCustomerDocument')
+    grok.name(u'waeup.UnibenCustomerDocument')
     title = u"Create a new document.",
     description = u"This factory instantiates new sample document instances."
 
     def __call__(self, *args, **kw):
-        return SkeletonCustomerDocument(*args, **kw)
+        return UnibenCustomerDocument(*args, **kw)
 
     def getInterfaces(self):
-        return implementedBy(SkeletonCustomerDocument)
+        return implementedBy(UnibenCustomerDocument)

main/ikobacustom.uniben/trunk/src/ikobacustom/uniben/customers/export.py

@@ -22 +22 @@
     CustomerExporter, CustomerDocumentExporterBase, ContractExporterBase)
 from ikobacustom.uniben.customers.interfaces import (
-    ISkeletonCustomer, ISkeletonCustomerDocument, ISkeletonContractProcess)
+    IUnibenCustomer, IUnibenCustomerDocument, IUnibenContractProcess)
 from ikobacustom.uniben.interfaces import MessageFactory as _
 
-class SkeletonCustomerExporter(CustomerExporter):
+class UnibenCustomerExporter(CustomerExporter):
     """Exporter for Customers.
     """
-    iface = ISkeletonCustomer
-    title = _(u'Skeleton Customers')
+    iface = IUnibenCustomer
+    title = _(u'Uniben Customers')
 
 
-class SkeletonCustomerDocumentExporter(CustomerDocumentExporterBase):
+class UnibenCustomerDocumentExporter(CustomerDocumentExporterBase):
     """Exporter for documents.
     """
     grok.name('unibencustomerdocuments')
-    iface = ISkeletonCustomerDocument
-    title = _(u'Skeleton Customer Documents')
-    class_name = 'SkeletonCustomerDocument'
+    iface = IUnibenCustomerDocument
+    title = _(u'Uniben Customer Documents')
+    class_name = 'UnibenCustomerDocument'
 
 
-class SkeletonContractExporter(ContractExporterBase):
+class UnibenContractExporter(ContractExporterBase):
     """Exporter for Contract instances.
     """
     grok.name('unibencontracts')
-    iface = ISkeletonContractProcess
-    title = _(u'Skeleton Customer Contracts')
-    class_name = 'SkeletonContract'
+    iface = IUnibenContractProcess
+    title = _(u'Uniben Customer Contracts')
+    class_name = 'UnibenContract'

main/ikobacustom.uniben/trunk/src/ikobacustom/uniben/customers/fileviewlets.py

@@ -23 +23 @@
     FileDisplay, FileUpload, Image)
 
-from ikobacustom.uniben.customers.documents import SkeletonCustomerDocument
+from ikobacustom.uniben.customers.documents import UnibenCustomerDocument
 
 from waeup.ikoba.customers.browser import (
@@ -39 +39 @@
     """
     grok.order(1)
-    grok.context(SkeletonCustomerDocument)
+    grok.context(UnibenCustomerDocument)
     grok.view(DocumentManageFormPage)
     grok.require('waeup.manageCustomer')
@@ -61 +61 @@
     """
     grok.order(1)
-    grok.context(SkeletonCustomerDocument)
+    grok.context(UnibenCustomerDocument)
     grok.require('waeup.viewCustomer')
     grok.view(DocumentDisplayFormPage)
@@ -74 +74 @@
     """
     grok.name('sample')
-    grok.context(SkeletonCustomerDocument)
+    grok.context(UnibenCustomerDocument)
     grok.require('waeup.viewCustomer')
     download_name = u'sample'

main/ikobacustom.uniben/trunk/src/ikobacustom/uniben/customers/interfaces.py

@@ -27 +27 @@
 
 
-class ISkeletonCustomer(ICustomer):
+class IUnibenCustomer(ICustomer):
     """Representation of a customer.
 
@@ -35 +35 @@
 
 
-class ISkeletonCustomerDocument(ICustomerDocument):
+class IUnibenCustomerDocument(ICustomerDocument):
     """A customer document.
 
@@ -42 +42 @@
 # Customer contract interfaces
 
-class ISkeletonContract(IContract):
+class IUnibenContract(IContract):
     """A customer contract sample with document attached.
 
@@ -53 +53 @@
         )
 
-class ISkeletonContractOfficialUse(IIkobaObject):
+class IUnibenContractOfficialUse(IIkobaObject):
     """Interface for editing official use data.
 
@@ -63 +63 @@
         )
 
-class ISkeletonContractProcess(ISkeletonContract, ISkeletonContractOfficialUse):
+class IUnibenContractProcess(IUnibenContract, IUnibenContractOfficialUse):
     """Interface for processing contract data.
     """
@@ -75 +75 @@
         )
 
-class ISkeletonContractEdit(ISkeletonContract):
+class IUnibenContractEdit(IUnibenContract):
     """Interface for editing sample contract data by customers.
 

main/ikobacustom.uniben/trunk/src/ikobacustom/uniben/customers/tests/test_browser.py

@@ -31 +31 @@
 from waeup.ikoba.customers.tests.test_browser import CustomersFullSetup
 from ikobacustom.uniben.customers.export import (
-    SkeletonCustomerExporter,
-    SkeletonCustomerDocumentExporter,
-    SkeletonContractExporter)
+    UnibenCustomerExporter,
+    UnibenCustomerDocumentExporter,
+    UnibenContractExporter)
 from ikobacustom.uniben.customers.batching import (
-    SkeletonCustomerProcessor,
-    SkeletonCustomerDocumentProcessor,
-    SkeletonContractProcessor)
+    UnibenCustomerProcessor,
+    UnibenCustomerDocumentProcessor,
+    UnibenContractProcessor)
 from ikobacustom.uniben.testing import FunctionalLayer, samples_dir
 
@@ -61 +61 @@
         IWorkflowState(customer).setState('started')
         self.app['customers'].addCustomer(customer)
-        document = createObject(u'waeup.SkeletonCustomerDocument')
+        document = createObject(u'waeup.UnibenCustomerDocument')
         document.title = u'My first document'
         customer['documents'].addDocument(document)
-        contract = createObject(u'waeup.SkeletonContract')
+        contract = createObject(u'waeup.UnibenContract')
         contract.tc_dict = {'en':u'Hello World'}
         customer['contracts'].addContract(contract)
@@ -77 +77 @@
         # set values we can expect in export file
         self.setup_for_export()
-        exporter = SkeletonCustomerExporter()
+        exporter = UnibenCustomerExporter()
         exporter.export_all(self.app, self.outfile)
         result = open(self.outfile, 'rb').read()
@@ -85 +85 @@
             'K1000000,aa@aa.aa,Beate,Mueller,,,123,f,0,,,started,[]\r\n')
         # We can reimport the file ...
-        processor = SkeletonCustomerProcessor()
+        processor = UnibenCustomerProcessor()
         result = processor.doImport(
             self.outfile,
@@ -118 +118 @@
         # set values we can expect in export file
         self.setup_for_export()
-        exporter = SkeletonCustomerDocumentExporter()
+        exporter = UnibenCustomerDocumentExporter()
         exporter.export_all(self.app, self.outfile)
         result = open(self.outfile, 'rb').read()
         self.assertMatches(result,
             'class_name,document_id,history,state,title,user_id\r\n'
-            'SkeletonCustomerDocument,%s,'
+            'UnibenCustomerDocument,%s,'
             '[u\'2014-12-21 17:00:36 WAT - Document created by system\'],'
             'created,My first document,K1000000\r\n'
             % self.document.document_id)
         # We can reimport the file if we change the header (user_id -> customer_id)
-        processor = SkeletonCustomerDocumentProcessor()
+        processor = UnibenCustomerDocumentProcessor()
         open(self.outfile, 'wb').write(
             'customer_id,class_name,document_id,state,title\r\n'
-            'K1000000,SkeletonCustomerDocument,%s,started,My first title\r\n'
+            'K1000000,UnibenCustomerDocument,%s,started,My first title\r\n'
             % self.document.document_id)
         result = processor.doImport(
@@ -162 +162 @@
         # set values we can expect in export file
         self.setup_for_export()
-        exporter = SkeletonContractExporter()
+        exporter = UnibenContractExporter()
         exporter.export_all(self.app, self.outfile)
         result = open(self.outfile, 'rb').read()
@@ -169 +169 @@
             'fee_based,history,last_product_id,product_object,product_options,'
             'state,tc_dict,title,user_id,valid_from,valid_to\r\n'
-            'SkeletonContract,,sample,%s,,0,'
+            'UnibenContract,,sample,%s,,0,'
             '[u\'2014-12-21 22:26:00 WAT - Contract created by system\']'
             ',,,[],created,{\'en\': u\'Hello World\'},,K1000000,,\r\n'
             % self.contract.contract_id)
         # We can reimport the file if we change the header (user_id -> customer_id)
-        processor = SkeletonContractProcessor()
+        processor = UnibenContractProcessor()
         open(self.outfile, 'wb').write(
             'class_name,contract_category,contract_id,document_object,'
             'history,last_product_id,product_object,product_options,'
             'state,tc_dict,title,user_id\r\n'
-            'SkeletonContract,sample,%s,,'
+            'UnibenContract,sample,%s,,'
             '[u\'2014-12-21 22:26:00 WAT - Contract created by system\']'
             ',,,[],created,{\'en\': u\'Hello World\'},,K1000000\r\n'
@@ -221 +221 @@
     def setup_customizable_params(self):
         self._contract_category = u'sample'
-        self._document_factory = 'waeup.SkeletonCustomerDocument'
-        self._contract_factory = 'waeup.SkeletonContract'
+        self._document_factory = 'waeup.UnibenCustomerDocument'
+        self._contract_factory = 'waeup.UnibenContract'
         return
 
@@ -304 +304 @@
     def setup_customizable_params(self):
         self._contract_category = u'sample'
-        self._document_factory = 'waeup.SkeletonCustomerDocument'
-        self._contract_factory = 'waeup.SkeletonContract'
+        self._document_factory = 'waeup.UnibenCustomerDocument'
+        self._contract_factory = 'waeup.UnibenContract'
         return
 

main/ikobacustom.uniben/trunk/src/ikobacustom/uniben/customers/tests/test_contract.py

@@ -29 +29 @@
 
 from ikobacustom.uniben.testing import (FunctionalLayer, FunctionalTestCase)
-from ikobacustom.uniben.customers.contracts import SkeletonContract
-from ikobacustom.uniben.customers.interfaces import ISkeletonContract
+from ikobacustom.uniben.customers.contracts import UnibenContract
+from ikobacustom.uniben.customers.interfaces import IUnibenContract
 
 
@@ -38 +38 @@
 
     def test_interfaces(self):
-        verify.verifyClass(ISkeletonContract, SkeletonContract)
-        verify.verifyClass(ICustomerNavigation, SkeletonContract)
-        verify.verifyObject(ISkeletonContract, SkeletonContract())
-        verify.verifyObject(ICustomerNavigation, SkeletonContract())
+        verify.verifyClass(IUnibenContract, UnibenContract)
+        verify.verifyClass(ICustomerNavigation, UnibenContract)
+        verify.verifyObject(IUnibenContract, UnibenContract())
+        verify.verifyObject(ICustomerNavigation, UnibenContract())
         return
 
     def test_addContract(self):
         container = ContractsContainer()
-        contract = createObject(u'waeup.SkeletonContract')
+        contract = createObject(u'waeup.UnibenContract')
         id = contract.contract_id
         container.addContract(contract)
         self.assertEqual(container[id], contract)
         self.assertRaises(TypeError, container.addContract, object())
-        self.assertEqual(contract.class_name, 'SkeletonContract')
+        self.assertEqual(contract.class_name, 'UnibenContract')
         return

main/ikobacustom.uniben/trunk/src/ikobacustom/uniben/customers/tests/test_customer.py

@@ -31 +31 @@
 
 from ikobacustom.uniben.testing import (FunctionalLayer, FunctionalTestCase)
-from ikobacustom.uniben.customers.customer import SkeletonCustomer
-from ikobacustom.uniben.customers.interfaces import ISkeletonCustomer
+from ikobacustom.uniben.customers.customer import UnibenCustomer
+from ikobacustom.uniben.customers.interfaces import IUnibenCustomer
 
-class SkeletonCustomerTestCase(FunctionalTestCase):
+class UnibenCustomerTestCase(FunctionalTestCase):
 
     layer = FunctionalLayer
 
     def setUp(self):
-        super(SkeletonCustomerTestCase, self).setUp()
+        super(UnibenCustomerTestCase, self).setUp()
 
         # Prepopulate ZODB
@@ -52 +52 @@
 
     def test_interfaces(self):
-        verify.verifyClass(ISkeletonCustomer, SkeletonCustomer)
-        verify.verifyClass(ICustomerNavigation, SkeletonCustomer)
-        verify.verifyObject(ISkeletonCustomer, SkeletonCustomer())
-        verify.verifyObject(ICustomerNavigation, SkeletonCustomer())
+        verify.verifyClass(IUnibenCustomer, UnibenCustomer)
+        verify.verifyClass(ICustomerNavigation, UnibenCustomer)
+        verify.verifyObject(IUnibenCustomer, UnibenCustomer())
+        verify.verifyObject(ICustomerNavigation, UnibenCustomer())
         return
 
-    def test_addSkeletonCustomer(self):
+    def test_addUnibenCustomer(self):
         customer = createObject(u'waeup.Customer')
-        verify.verifyObject(ISkeletonCustomer, customer)
+        verify.verifyObject(IUnibenCustomer, customer)
         self.app['customers'].addCustomer(customer)
         self.assertEqual(customer.customer_id, 'K1000000')
@@ -68 +68 @@
     def tearDown(self):
         shutil.rmtree(self.dc_root)
-        super(SkeletonCustomerTestCase, self).tearDown()
+        super(UnibenCustomerTestCase, self).tearDown()
         return

main/ikobacustom.uniben/trunk/src/ikobacustom/uniben/customers/tests/test_document.py

@@ -29 +29 @@
 
 from ikobacustom.uniben.testing import (FunctionalLayer, FunctionalTestCase)
-from ikobacustom.uniben.customers.documents import SkeletonCustomerDocument
-from ikobacustom.uniben.customers.interfaces import ISkeletonCustomerDocument
+from ikobacustom.uniben.customers.documents import UnibenCustomerDocument
+from ikobacustom.uniben.customers.interfaces import IUnibenCustomerDocument
 
 
@@ -38 +38 @@
 
     def test_interfaces(self):
-        verify.verifyClass(ISkeletonCustomerDocument, SkeletonCustomerDocument)
-        verify.verifyClass(ICustomerNavigation, SkeletonCustomerDocument)
-        verify.verifyObject(ISkeletonCustomerDocument, SkeletonCustomerDocument())
-        verify.verifyObject(ICustomerNavigation, SkeletonCustomerDocument())
+        verify.verifyClass(IUnibenCustomerDocument, UnibenCustomerDocument)
+        verify.verifyClass(ICustomerNavigation, UnibenCustomerDocument)
+        verify.verifyObject(IUnibenCustomerDocument, UnibenCustomerDocument())
+        verify.verifyObject(ICustomerNavigation, UnibenCustomerDocument())
         return
 
     def test_addDocument(self):
         container = CustomerDocumentsContainer()
-        document = createObject(u'waeup.SkeletonCustomerDocument')
+        document = createObject(u'waeup.UnibenCustomerDocument')
         id = document.document_id
         container.addDocument(document)
         self.assertEqual(container[id], document)
         self.assertRaises(TypeError, container.addDocument, object())
-        self.assertEqual(document.class_name, 'SkeletonCustomerDocument')
+        self.assertEqual(document.class_name, 'UnibenCustomerDocument')
         return

main/ikobacustom.uniben/trunk/src/ikobacustom/uniben/customers/utils.py

@@ -27 +27 @@
 from ikobacustom.uniben.interfaces import MessageFactory as _
 
-class SkeletonCustomersUtils(CustomersUtils):
+class UnibenCustomersUtils(CustomersUtils):
     """A collection of methods subject to customization.
     """
@@ -47 +47 @@
         #'CustomerPDFDocument': _('PDF Document'),
 
-        'SkeletonCustomerDocument': _('Skeleton Document'),
+        'UnibenCustomerDocument': _('Uniben Document'),
         }
 
@@ -53 +53 @@
         #'SampleContract': _('Sample Contract'),
 
-        'SkeletonContract': _('Skeleton Contract'),
+        'UnibenContract': _('Uniben Contract'),
         }