From 58cff21cedefeefabb303870d3aea778a85d1e39 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Fri, 21 Sep 2012 22:12:17 -0500
Subject: [PATCH] moved entropy JS in PasswordWidget but the source should be
 moved in separate file

---
 VERSION                                      |  2 +-
 applications/welcome/views/default/user.html | 90 +-------------------
 gluon/sqlhtml.py                             | 90 +++++++++++++++++++-
 gluon/validators.py                          |  4 +
 4 files changed, 95 insertions(+), 91 deletions(-)

diff --git a/VERSION b/VERSION
index 486b127c..bf2638f2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.0.9 (2012-09-21 22:01:45) stable
+Version 2.0.9 (2012-09-21 22:12:11) stable
diff --git a/applications/welcome/views/default/user.html b/applications/welcome/views/default/user.html
index ef00c0e6..47acab1f 100644
--- a/applications/welcome/views/default/user.html
+++ b/applications/welcome/views/default/user.html
@@ -15,92 +15,4 @@ pass
 </div>
 <script language="javascript"><!--
 jQuery("#web2py_user_form input:visible:enabled:first").focus();
-
-
-function calc_entropy(mystring) {
-    /*" calculate a simple entropy for a given string "*/
-    var lowerset = 'abcdefghijklmnopqrstuvwxyz';
-    var upperset = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-    var numberset = '0123456789';
-    var sym1set = '!@#$%^&*()';
-    var sym2set = '~`-_=+[]{}\\|;:\'",.<>?/';
-    var otherset = '0123456789abcdefghijklmnopqrstuvwxyz' /*anything else*/
-    var alphabet = 0;
-    var other = {};
-    var seen = {};
-    var lastset = null;
-    var mystringlist = mystring.split('');
-    for (var i=0;i<mystringlist.length;i++) {
-        var c = mystringlist[i];
-        //console.log('we are at char', c);
-        /* classify this character*/
-        var inset = otherset;
-        while (1) {
-            /*lowerset*/
-            if (lowerset.indexOf(c) != -1) {
-                inset = lowerset;
-                break
-            };
-            /*upperset*/
-            if (upperset.indexOf(c) != -1) {
-                inset = upperset;
-                break
-            };
-            /*numberset*/
-            if (numberset.indexOf(c) != -1) {
-                inset = numberset;
-                break
-            };
-            /*sym1set*/
-            if (sym1set.indexOf(c) != -1) {
-                inset = sym1set;
-                break
-            };
-            /*sym2set*/
-            if (sym2set.indexOf(c) != -1) {
-                inset = sym2set;
-                break
-            } else {break};
-        }
-        //console.log('inset detected as', inset, seen);
-        /*calculate effect of character on alphabet size*/
-        if (!(inset in seen)) {
-            //console.log('credit for a new character set');
-            seen[inset] = 1;
-            alphabet += inset.length; /*credit for a new character set*/
-        }
-        else if (!(c in other)) {
-            //console.log('credit for unique characters');
-            alphabet += 1;
-            other[c] = 1;
-        }
-        if (inset != lastset) {
-            //console.log('credit for set transitions');
-            alphabet += 1;  /*credit for set transitions*/
-            lastset = inset;
-        }
-    }
-    var entropy = mystring.length / 1.0 * Math.log(alphabet) / 0.6931471805599453; /*math.log(2)*/
-    return Math.round(entropy*100)/100
-}
-
-function validate_entropy(myfield, midrange) {
-    var k = 256.0/midrange;
-    var validator = function () {
-            var value = calc_entropy(myfield.val());
-	    var color;
-            if(value<30) {
-                var c = Math.floor(value*k).toString(16);
-                color = '#ff'+((c.length==1)?'0':''+c)+'00';
-            } else {
-                var c = Math.floor(Math.max(0,255-(value-midrange)*k)).toString(16);
-                color = '#'+((c.length==1)?'0':'')+c+'ff00';
-	    }
-	    myfield.css('background-color',color);
-        }
-        myfield.on('keyup', validator);
-        myfield.on('keydown', validator);
-    }
-    validate_entropy(jQuery('#auth_user_password'),50);
-      //--></script>
-
+//--></script>
diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index 5e345f7c..f2382e04 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -433,6 +433,94 @@ class PasswordWidget(FormWidget):
 
     DEFAULT_PASSWORD_DISPLAY = 8*('*')
 
+    js = """
+    function calc_entropy(mystring) {
+      /*" calculate a simple entropy for a given string "*/
+      var lowerset = 'abcdefghijklmnopqrstuvwxyz';
+      var upperset = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+      var numberset = '0123456789';
+      var sym1set = '!@#$\%^&*()';
+      var sym2set = '~`-_=+[]{}\\|;:\\'",.<>?/';
+      var otherset = '0123456789abcdefghijklmnopqrstuvwxyz'
+      var alphabet = 0;
+      var other = {};
+      var seen = {};
+      var lastset = null;
+      var mystringlist = mystring.split('');
+      for (var i=0;i<mystringlist.length;i++) {
+        var c = mystringlist[i];
+        //console.log('we are at char', c);
+        /* classify this character*/
+        var inset = otherset;
+        while (1) {
+            /*lowerset*/
+            if (lowerset.indexOf(c) != -1) {
+                inset = lowerset;
+                break
+            };
+            /*upperset*/
+            if (upperset.indexOf(c) != -1) {
+                inset = upperset;
+                break
+            };
+            /*numberset*/
+            if (numberset.indexOf(c) != -1) {
+                inset = numberset;
+                break
+            };
+            /*sym1set*/
+            if (sym1set.indexOf(c) != -1) {
+                inset = sym1set;
+                break
+            };
+            /*sym2set*/
+            if (sym2set.indexOf(c) != -1) {
+                inset = sym2set;
+                break
+            } else {break};
+        }
+        //console.log('inset detected as', inset, seen);
+        /*calculate effect of character on alphabet size*/
+        if (!(inset in seen)) {
+            //console.log('credit for a new character set');
+            seen[inset] = 1;
+            // credit for a new character set
+            alphabet += inset.length; 
+        }
+        else if (!(c in other)) {
+            //console.log('credit for unique characters');
+            alphabet += 1;
+            other[c] = 1;
+        }
+        if (inset != lastset) {
+            //console.log('credit for set transitions');
+            alphabet += 1;  // credit for set transitions
+            lastset = inset;
+        }
+      }
+      var entropy = mystring.length / 1.0 * Math.log(alphabet) / 0.6931471805599453; /*math.log(2)*/
+      return Math.round(entropy*100)/100
+    }
+    function validate_entropy(myfield, midrange) {
+       var k = 256.0/midrange;
+       var validator = function () {
+            var value = calc_entropy(myfield.val());
+	    var color;
+            if(value<30) {
+                var c = Math.floor(value*k).toString(16);
+                color = '#ff'+((c.length==1)?'0':''+c)+'00';
+            } else {
+                var c = Math.floor(Math.max(0,255-(value-midrange)*k)).toString(16);
+                color = '#'+((c.length==1)?'0':'')+c+'ff00';
+	    }
+	    myfield.css('background-color',color);
+        }
+        myfield.on('keyup', validator);
+        myfield.on('keydown', validator);
+    }
+    validate_entropy(jQuery('#auth_user_password'),50);
+    """
+
     @classmethod
     def widget(cls, field, value, **attributes):
         """
@@ -449,7 +537,7 @@ class PasswordWidget(FormWidget):
             )
         attr = cls._attributes(field, default, **attributes)
 
-        return INPUT(**attr)
+        return CAT(INPUT(**attr),SCRIPT(PasswordWidget.js))
 
 
 class UploadWidget(FormWidget):
diff --git a/gluon/validators.py b/gluon/validators.py
index 457720a1..a105ff56 100644
--- a/gluon/validators.py
+++ b/gluon/validators.py
@@ -117,6 +117,10 @@ class Validator(object):
         """
         return value
 
+    def __call__(self,value):
+        raise NotImplementedError
+        return (value, None)
+
 
 class IS_MATCH(Validator):
     """