Release v2.1.1

Author: ablanco

CHANGES.md

@@ -1,6 +1,6 @@
 # CHANGELOG
 
-## 2.1.1dev
+## 2.1.1
 
 - Add missing rule, needed by the `ruleIsMet` method.
 - Add `wordMaxLength` and `wordInvalidChar` optional rules to the engine.

bower.json

@@ -1,14 +1,14 @@
 {
   "name": "pwstrength-bootstrap",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "homepage": "https://github.com/ablanco/jquery.pwstrength.bootstrap",
   "authors": [
     "Alejandro Blanco <alejandro.b.e@gmail.com>"
   ],
   "description": "jQuery plugin for Twitter Bootstrap that provides rulesets for visualy displaying the quality of a users typed in password.",
   "main": "dist/pwstrength-bootstrap.js",
   "dependencies": {
-    "jquery": ">=1.7.0",
+    "jquery": ">=3.0.0",
     "bootstrap": ">=2.0.0",
     "zxcvbn": ">=4.2.0",
     "i18next": ">=2.4.0"

dist/pwstrength-bootstrap.js

@@ -1,6 +1,6 @@
 /*!
 * jQuery Password Strength plugin for Twitter Bootstrap
-* Version: 2.0.8
+* Version: 2.1.1
 *
 * Copyright (c) 2008-2013 Tane Piper
 * Copyright (c) 2013 Alejandro Blanco
@@ -105,7 +105,11 @@ try {
             return score;
         }
         return 0;
-    },
+    };
+
+    validation.wordLengthStaticScore = function (options, word, score) {
+        return word.length < options.common.minChar ? 0 : score;
+    };
 
     validation.wordSimilarToUsername = function (options, word, score) {
         var username = $(options.common.usernameField).val();
@@ -279,7 +283,7 @@ defaultOptions.rules.activated = {
     wordNotEmail: true,
     wordMinLength: true,
     wordMaxLength: false,
-    wordInvalidChar: true,
+    wordInvalidChar: false,
     wordSimilarToUsername: true,
     wordSequences: true,
     wordTwoCharacterClasses: false,
@@ -707,7 +711,9 @@ var methods = {};
         verdictLevel = verdictText[1];
         verdictText = verdictText[0];
 
-        if (options.common.debug) { console.log(score + ' - ' + verdictText); }
+        if (options.common.debug) {
+            console.log(score + ' - ' + verdictText);
+        }
 
         if ($.isFunction(options.common.onKeyUp)) {
             options.common.onKeyUp(event, {
@@ -728,7 +734,7 @@ var methods = {};
             callback;
 
         callback = function () {
-            var newWord =  $el.val();
+            var newWord = $el.val();
 
             if (newWord !== word) {
                 onKeyUp(event);
@@ -811,6 +817,26 @@ var methods = {};
         applyToAll.call(this, rule, "activated", active);
     };
 
+    methods.ruleIsMet = function (rule) {
+        if ($.isFunction(rulesEngine.validation[rule])) {
+            if (rule === "wordLength") {
+                rule = "wordLengthStaticScore";
+            }
+
+            var rulesMetCnt = 0;
+
+            this.each(function (idx, el) {
+                var options = $(el).data("pwstrength-bootstrap");
+
+                rulesMetCnt += rulesEngine.validation[rule](options, $(el).val(), 1);
+            });
+
+            return (rulesMetCnt === this.length);
+        }
+
+        $.error("Rule " + rule + " does not exist on jQuery.pwstrength-bootstrap.validation");
+    };
+
     $.fn.pwstrength = function (method) {
         var result;
 

dist/pwstrength-bootstrap.min.js

@@ -1,6 +1,6 @@
 /*!
 * jQuery Password Strength plugin for Twitter Bootstrap
-* Version: 2.0.8
+* Version: 2.1.1
 *
 * Copyright (c) 2008-2013 Tane Piper
 * Copyright (c) 2013 Alejandro Blanco
@@ -19,7 +19,9 @@ var i18n = {};
     'use strict';
 
     i18n.fallback = {
-        "wordLength": "Your password is too short",
+        "wordMinLength": "Your password is too short",
+        "wordMaxLength": "Your password is too long",
+        "wordInvalidChar": "Your password contains an invalid character",
         "wordNotEmail": "Do not use your email as your password",
         "wordSimilarToUsername": "Your password cannot contain your username",
         "wordTwoCharacterClasses": "Use different character classes",
@@ -80,7 +82,7 @@ try {
         return 0;
     };
 
-    validation.wordLength = function (options, word, score) {
+    validation.wordMinLength = function (options, word, score) {
         var wordlen = word.length,
             lenScore = Math.pow(wordlen, options.rules.raisePower);
         if (wordlen < options.common.minChar) {
@@ -89,6 +91,26 @@ try {
         return lenScore;
     };
 
+    validation.wordMaxLength = function (options, word, score) {
+        var wordlen = word.length,
+            lenScore = Math.pow(wordlen, options.rules.raisePower);
+        if (wordlen > options.common.maxChar) {
+            return score;
+        }
+        return lenScore;
+    };
+
+    validation.wordInvalidChar = function (options, word, score) {
+        if (word.match(/[\s,',"]/)) {
+            return score;
+        }
+        return 0;
+    };
+
+    validation.wordLengthStaticScore = function (options, word, score) {
+        return word.length < options.common.minChar ? 0 : score;
+    };
+
     validation.wordSimilarToUsername = function (options, word, score) {
         var username = $(options.common.usernameField).val();
         if (username && word.toLowerCase().match(username.replace(/[\-\[\]\/\{\}\(\)\*\+\=\?\:\.\\\^\$\|\!\,]/g, "\\$&").toLowerCase())) {
@@ -221,6 +243,7 @@ var defaultOptions = {};
 
 defaultOptions.common = {};
 defaultOptions.common.minChar = 6;
+defaultOptions.common.maxChar = 20;
 defaultOptions.common.usernameField = "#username";
 defaultOptions.common.userInputs = [
     // Selectors for input fields with user input
@@ -239,7 +262,9 @@ defaultOptions.rules = {};
 defaultOptions.rules.extra = {};
 defaultOptions.rules.scores = {
     wordNotEmail: -100,
-    wordLength: -50,
+    wordMinLength: -50,
+    wordMaxLength: -50,
+    wordInvalidChar: -100,
     wordSimilarToUsername: -100,
     wordSequences: -20,
     wordTwoCharacterClasses: 2,
@@ -256,7 +281,9 @@ defaultOptions.rules.scores = {
 };
 defaultOptions.rules.activated = {
     wordNotEmail: true,
-    wordLength: true,
+    wordMinLength: true,
+    wordMaxLength: false,
+    wordInvalidChar: false,
     wordSimilarToUsername: true,
     wordSequences: true,
     wordTwoCharacterClasses: false,
@@ -684,7 +711,9 @@ var methods = {};
         verdictLevel = verdictText[1];
         verdictText = verdictText[0];
 
-        if (options.common.debug) { console.log(score + ' - ' + verdictText); }
+        if (options.common.debug) {
+            console.log(score + ' - ' + verdictText);
+        }
 
         if ($.isFunction(options.common.onKeyUp)) {
             options.common.onKeyUp(event, {
@@ -705,7 +734,7 @@ var methods = {};
             callback;
 
         callback = function () {
-            var newWord =  $el.val();
+            var newWord = $el.val();
 
             if (newWord !== word) {
                 onKeyUp(event);
@@ -788,6 +817,26 @@ var methods = {};
         applyToAll.call(this, rule, "activated", active);
     };
 
+    methods.ruleIsMet = function (rule) {
+        if ($.isFunction(rulesEngine.validation[rule])) {
+            if (rule === "wordLength") {
+                rule = "wordLengthStaticScore";
+            }
+
+            var rulesMetCnt = 0;
+
+            this.each(function (idx, el) {
+                var options = $(el).data("pwstrength-bootstrap");
+
+                rulesMetCnt += rulesEngine.validation[rule](options, $(el).val(), 1);
+            });
+
+            return (rulesMetCnt === this.length);
+        }
+
+        $.error("Rule " + rule + " does not exist on jQuery.pwstrength-bootstrap.validation");
+    };
+
     $.fn.pwstrength = function (method) {
         var result;
 

dist/pwstrength-bootstrap.min.map

@@ -1,6 +1,6 @@
 {
     "name": "pwstrength-bootstrap",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "description": "jQuery plugin for Twitter Bootstrap that provides rulesets for visualy displaying the quality of a users typed in password.",
     "author": "Alejandro Blanco <alejandro.b.e@gmail.com>",
     "homepage": "https://github.com/ablanco/jquery.pwstrength.bootstrap",