Merge lp:~forrest-aldridge/methanal/verified-password-input into lp:methanal

[Forrest Aldridge]

[Jonathan Jacobs (jjacobs)]

  1. Some empty lines have trailing whitespace, please remove this.
  2. Can you align the second line of the 3rd point of "test_inputValidation"'s docstring with the first line?
  3. "test_inputValidation" tests a bunch of different cases, these probably don't need to be split into separate methods but if you could add a comment to indicate which condition is being tested, that would help.
  4. Some lines (excluding subclass lines) are wider than 80 columns.
  5. Please use braces for *ALL* blocks, regardless of the length of their body. "VerifiedPasswordInput.baseValidator" is one specific case I'm looking at.
  6. Replacing the template for things that inherit from "TextInput" makes me twitch, I really don't like this. Unfortunately in this case it doesn't seem to be easily avoidable. The template "methanal-verified-password-input.html" is missing a number of elements that TextInput could be expecting, can you copy "methanal-text-input.html" and modify whatever needs to be?

review: Needs Fixing

[Jonathan Jacobs (jjacobs)]

This looks good.

I've branched this to add some additional flexibility to the strength checking functionality.

lp:~jjacobs/methanal/verified-password-input

review: Approve

Unmerged revisions

=== modified file 'methanal/js/Methanal/Tests/TestView.js'
--- methanal/js/Methanal/Tests/TestView.js	2009-10-04 11:18:09 +0000
+++ methanal/js/Methanal/Tests/TestView.js	2009-10-09 15:30:24 +0000
@@ -754,6 +754,49 @@
 
 
 /**
+ * Tests for L{Methanal.View.VerifiedPasswordInput}.
+ */
+Methanal.Tests.TestView.BaseTestTextInput.subclass(Methanal.Tests.TestView, 'TestVerifiedPasswordInput').methods(
+    function setUp(self) {
+        self.controlType = Methanal.View.VerifiedPasswordInput;
+    },
+
+
+    function createControl(self, args) {
+        var control = Methanal.Tests.TestView.TestVerifiedPasswordInput.upcall(
+            self, 'createControl', args);
+        Methanal.Tests.TestView.makeWidgetChildNode(
+            control, 'input', 'confirmPassword');
+        return control;
+    },
+
+
+    /**
+     * Validation will fail under the following conditions:
+     *     1. The input and confirmPasswordNode node values don't match.
+     *     2. If either of the above node values have no length (are blank).
+     *     3. If the password value is not strong.  By default, 'strong' means
+     *        more than 4 characters long.
+     */
+    function test_inputValidation(self) {
+        self.testControl({value: null},
+            function (control) {
+                // Test condition 1
+                control._confirmPasswordNode.value = 'no match';
+                self.assertInvalidInput(control, 'match');
+                control._confirmPasswordNode.value = 'match';
+                self.assertValidInput(control, 'match');
+                // Test condition 2
+                control._confirmPasswordNode.value = '';
+                self.assertInvalidInput(control, '');
+                // Test condition 3
+                self.assertInvalidInput(control, '123');
+            });
+    });
+
+
+
+/**
  * Tests for L{Methanal.View.InputContainer}.
  */
 Methanal.Tests.TestView.BaseTestTextInput.subclass(Methanal.Tests.TestView, 'TestFormGroup').methods(
 
=== modified file 'methanal/js/Methanal/View.js'
--- methanal/js/Methanal/View.js	2009-10-05 00:15:43 +0000
+++ methanal/js/Methanal/View.js	2009-10-09 15:30:24 +0000
@@ -1793,3 +1793,38 @@
             return 'Percentage values must be between 0% and 100%'
         }
     });
+
+
+
+/**
+ * Password input with a verification field and strength checking.
+ */
+Methanal.View.TextInput.subclass(Methanal.View, 'VerifiedPasswordInput').methods(
+    function nodeInserted(self) {
+        self._confirmPasswordNode = self.nodeById('confirmPassword');
+        Methanal.View.VerifiedPasswordInput.upcall(self, 'nodeInserted');
+    },
+
+
+    /**
+     * Override this method to change the definition of a 'strong' password.
+     */
+    function passwordIsStrong(self, password) {
+        return password.length > 4;
+    },
+
+
+    /**
+     * This default validator ensures that the password is strong and that
+     * the password given in both fields have length > 0 and match exactly.
+     */
+    function baseValidator(self, value) {
+        if (value !== self._confirmPasswordNode.value || value === null ||
+            self._confirmPasswordNode.value === null) {
+            return 'Passwords do not match.';
+        }
+
+        if (!self.passwordIsStrong(value)) {
+            return 'Password is too weak.';
+        }
+    });
 
=== added file 'methanal/themes/methanal-base/methanal-verified-password-input.html'
--- methanal/themes/methanal-base/methanal-verified-password-input.html	1970-01-01 00:00:00 +0000
+++ methanal/themes/methanal-base/methanal-verified-password-input.html	2009-10-09 15:30:24 +0000
@@ -0,0 +1,15 @@
+<div xmlns:nevow="http://nevow.com/ns/nevow/0.1" xmlns:athena="http://divmod.org/ns/athena/0.7" nevow:render="liveElement">
+    <input class="methanal-input" type="password">
+        <nevow:attr name="value" nevow:render="value" />
+        <athena:handler event="onchange" handler="onChange" />
+        <athena:handler event="onkeyup" handler="onKeyUp" />
+        <athena:handler event="onblur" handler="onBlur" />
+        <athena:handler event="onfocus" handler="onFocus" />
+    </input>
+    <input class="methanal-input" type="password" id="confirmPassword">
+        <nevow:attr name="value" nevow:render="value" />
+        <athena:handler event="onchange" handler="onChange" />
+    </input>
+    <span style="display: none;" class="friendly-representation" id="displayValue" />
+    <span class="methanal-error" id="error" />
+</div>
 
=== modified file 'methanal/view.py'
--- methanal/view.py	2009-10-04 10:17:26 +0000
+++ methanal/view.py	2009-10-09 15:30:23 +0000
@@ -511,6 +511,15 @@
 
 
 
+class VerifiedPasswordInput(TextInput):
+    """
+    Password input with verification and strength checking.
+    """
+    fragmentName = 'methanal-verified-password-input'
+    jsClass = u'Methanal.View.VerifiedPasswordInput'
+
+
+
 class ChoiceInput(FormInput):
     """
     Abstract input with multiple options.