Changeset 12030

Timestamp:

21 Nov 2014, 13:09:24 (10 years ago)

Author:

uli

Message:

Activate PayPal? SDK on instance startup.

Location:

main/waeup.ikoba/branches/uli-payments/src/waeup/ikoba

Files:

• tests/test_zcml.py (modified) (2 diffs)
• zcml.py (modified) (3 diffs)

main/waeup.ikoba/branches/uli-payments/src/waeup/ikoba/tests/test_zcml.py

@@ -56 +56 @@
         self.conf1_path = os.path.join(self.workdir, 'paypal1.conf')
         self.conf2_path = os.path.join(self.workdir, 'paypal2.conf')
-        open(self.conf1_path, 'w').write('Fake')
-        open(self.conf2_path, 'w').write('Fake')
+        open(self.conf1_path, 'w').write('[rest-client]\n')
+        open(self.conf2_path, 'w').write('[rest-client]\n')
 
     def test_datacenter_config_directive(self):
@@ -85 +85 @@
         zcstring(config)  # execute ZCML
         result = getUtility(IPayPalConfig)
-        assert result == {'path': self.conf1_path}
+        assert result == {
+            'path': self.conf1_path,
+            'client_id': None,
+            'client_secret': None,
+            'mode': 'sandbox'
+            }
 
     def test_paypal_config_singleton(self):

main/waeup.ikoba/branches/uli-payments/src/waeup/ikoba/zcml.py

@@ -20 +20 @@
 from zope.configuration.exceptions import ConfigurationError
 from waeup.ikoba.interfaces import IDataCenterConfig, IPayPalConfig
+from waeup.ikoba.payments.paypal import configure_sdk
 
 
@@ -59 +60 @@
     We expect paypal credentials written down in a config file. The
     path to this config file can be set with the ZCML `paypalconf`
-    directive, which is handled here.
+    directive, which is handled here and looks like this::
+
+      <ikoba:paypalconf path='/some/path/to/paypal.conf' />
 
     This handler requires the given path to exist and to be a file.
 
-    If the file exists and is readable, a dict with ``path`` set to
-    the given path is registered as a global unnamed utility for the
-    `IPayPalConfig` interface.
+    If the file exists and is readable, a dict with ``path`` and other
+    values read from the configuration file is registered as a global
+    unnamed utility for the `IPayPalConfig` interface.
 
-    We do not check more (syntax, etc. of a found config) as this is
-    beyond the scope of ZCML configuration. ZCML is responsible for
-    finding _some_ paypal configuration file, not for the values found
-    (or not found) within this file.
+    See :func:`waeup.ikoba.payments.paypal.configure_sdk for details
+    of the set dict.
     """
     if not os.path.exists(path):
@@ -76 +77 @@
     if not os.path.isfile(path):
         raise ConfigurationError("Not a regular file: %s" % path)
+    config_dict = configure_sdk(path)
     return handler(
-        'registerUtility', {'path': path}, IPayPalConfig, '')
+        'registerUtility', config_dict, IPayPalConfig, '')