Changeset 6278 for main

Timestamp:

4 Jun 2011, 12:23:23 (14 years ago)

Author:

uli

Message:

Add extended bools widget. This one accepts also '1', 'true', 'yes' as True values, which is handy when importing CSV
files. We have to register this new widget overriding the default. Maybe a bit overkill?

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• configure.zcml (modified) (1 diff)
• ftesting.zcml (modified) (1 diff)
• utils/converters.py (modified) (2 diffs)
• utils/overrides.zcml (added)
• utils/tests/test_converters.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/configure.zcml

@@ -5 +5 @@
   <includeDependencies package="." />
   <grok:grok package="." />
+  <includeOverrides package="waeup.sirp.utils" file="overrides.zcml" />
 </configure>

main/waeup.sirp/trunk/src/waeup/sirp/ftesting.zcml

@@ -6 +6 @@
 
   <include package="grok" />
-  <include package="waeup.sirp" />
+  <includeOverrides package="waeup.sirp" />
 
   <!-- Typical functional testing security setup -->

main/waeup.sirp/trunk/src/waeup/sirp/utils/converters.py

@@ -4 +4 @@
 from zope.component import createObject
 from zope.formlib import form
+from zope.formlib.boolwidgets import CheckBoxWidget
 from zope.formlib.form import (
     _widgetKey, WidgetInputError, ValidationError, InputErrors, expandPrefix)
-from zope.formlib.interfaces import IInputWidget
+from zope.formlib.interfaces import IInputWidget, ISimpleInputWidget
 from zope.interface import Interface
 from zope.publisher.browser import TestRequest
 from waeup.sirp.interfaces import IObjectConverter
+
+class ExtendedCheckBoxWidget(CheckBoxWidget):
+    """A checkbox widget that supports more input values as True/False
+       markers.
+
+    The default bool widget expects the string 'on' as only valid
+    ``True`` value in HTML forms for bool fields.
+
+    This widget also accepts '1', 'true' and 'yes' for that. Also all
+    uppercase/lowecase combinations of these strings are accepted.
+
+    The widget still renders ``True`` to ``'on'`` when a form is
+    generated.
+    """
+    true_markers = ['1', 'true', 'on', 'yes']
+
+    def _toFieldValue(self, input):
+        """Convert from HTML presentation to Python bool."""
+        if not isinstance(input, basestring):
+            return False
+        return input.lower() in self.true_markers
+
+    def _getFormInput(self):
+        """Returns the form input used by `_toFieldValue`.
+
+        Return values:
+
+          ``'on'``  checkbox is checked
+          ``''``    checkbox is not checked
+          ``None``  form input was not provided
+
+        """
+        value = self.request.get(self.name)
+        if isinstance(value, basestring):
+            value = value.lower()
+        if value in self.true_markers:
+            return 'on'
+        elif self.name + '.used' in self.request:
+            return ''
+        else:
+            return None
 
 def getWidgetsData(widgets, form_prefix, data):
@@ -48 +90 @@
 
     return errors
+
 
 class DefaultObjectConverter(grok.Adapter):

main/waeup.sirp/trunk/src/waeup/sirp/utils/tests/test_converters.py

@@ -171 +171 @@
         assert data2['vip'] is False
 
+    def test_bool_nonstandard_values1(self):
+        # We accept 'true', 'True', 'tRuE', 'faLSE' and similar.
+        contact1 = Contact()
+        contact2 = Contact()
+        input_data1 = dict(vip='True')
+        input_data2 = dict(vip='false')
+        converter = IObjectConverter(IContact) # a converter to IContact
+        err1, inv_err1, data1 = converter.fromStringDict(
+            input_data1, contact1)
+        err2, inv_err2, data2 = converter.fromStringDict(
+            input_data2, contact2)
+        assert data1['vip'] is True
+        assert data2['vip'] is False
+
+    def test_bool_nonstandard_values2(self):
+        # We accept '1' and '0' as bool values.
+        contact1 = Contact()
+        contact2 = Contact()
+        input_data1 = dict(vip='1')
+        input_data2 = dict(vip='0')
+        converter = IObjectConverter(IContact) # a converter to IContact
+        err1, inv_err1, data1 = converter.fromStringDict(
+            input_data1, contact1)
+        err2, inv_err2, data2 = converter.fromStringDict(
+            input_data2, contact2)
+        assert data1['vip'] is True
+        assert data2['vip'] is False
+
+    def test_bool_nonstandard_values3(self):
+        # We accept 'yEs', 'no' and similar as bool values.
+        contact1 = Contact()
+        contact2 = Contact()
+        input_data1 = dict(vip='Yes')
+        input_data2 = dict(vip='no')
+        converter = IObjectConverter(IContact) # a converter to IContact
+        err1, inv_err1, data1 = converter.fromStringDict(
+            input_data1, contact1)
+        err2, inv_err2, data2 = converter.fromStringDict(
+            input_data2, contact2)
+        assert data1['vip'] is True
+        assert data2['vip'] is False
+
     def test_int(self):
         contact = Contact()