guardsjs-rails 1.2.1 → 1.3.0

data/app/assets/javascripts/guards.js

@@ -1,5 +1,5 @@
 /*!
- * Guards JavaScript jQuery Plugin v1.2.1
+ * Guards JavaScript jQuery Plugin v1.3.0
  * https://github.com/on-site/guards.js
  *
  * Copyright 2010-2014, On-Site.com, http://www.on-site.com/
@@ -8,7 +8,7 @@
  * Includes code for email and phone number validation from the jQuery
  * Validation plugin.  http://docs.jquery.com/Plugins/Validation
  *
- * Date: Wed Mar 12 12:25:31 2014 -0400
+ * Date: Wed Apr  9 15:06:00 2014 -0700
  */
 
 /**
@@ -48,7 +48,7 @@
         return $.guards.add(selector);
     };
 
-    $.guard.version = "1.2.1";
+    $.guard.version = "1.3.0";
 
     $.Guards = function() {
         var self = this;
@@ -255,7 +255,7 @@
          *   </div>
          * </div>
          */
-        this.name("dateUS").using(this.aggregate(this.isAllValid, this.isValidDateUS)).message("Please use: dd/mm/yyyy.")
+        this.name("dateUS").using(this.aggregate(this.isAllValid, this.isValidDateUS)).message("Please use: dd/mm/yyyy.");
 
         /**
          * @page Named Guards
@@ -280,7 +280,7 @@
          *   </div>
          * </div>
          */
-        this.name("timeUS").using(this.aggregate(this.isAllValid, this.isValidTimeUS)).message("Please use: hh:mm&nbsp;am/pm.")
+        this.name("timeUS").using(this.aggregate(this.isAllValid, this.isValidTimeUS)).message("Please use: hh:mm&nbsp;am/pm.");
 
         /**
          * @page Named Guards
@@ -674,7 +674,7 @@
      *   This version of guards.js library as a string, like <code>"1.0.0"</code>.
      * </p>
      */
-    $.Guards.prototype.version = "1.2.1";
+    $.Guards.prototype.version = "1.3.0";
 
     $.Guards.prototype.parentContext = function(element) {
         var $element = $(element);
@@ -719,7 +719,7 @@
      * </div>
      */
     $.Guards.prototype.name = function(name) {
-        var guard = new $.Guard(null, this, true);
+        var guard = new $.Guard({ guards: this, named: true, name: name });
         this.named[name] = guard;
         return guard;
     };
@@ -784,6 +784,11 @@
         };
     };
 
+    // Check if the name is valid as a data attribute based guard name
+    $.Guards.prototype.isValidDataName = function(name) {
+        return name && /^[a-zA-Z0-9_-]+$/.test(name);
+    };
+
     // Alias for console.log, but check that such a thing exists.
     $.Guards.prototype.log = function(message) {
         if (console && console.log) {
@@ -798,10 +803,8 @@
             $(document).on(event, selector, callback);
         } else if ($.fn.delegate) {
             $(document).delegate(selector, event, callback);
-        } else if ($.fn.live) {
-            $(selector).live(event, callback);
         } else {
-            this.log("Could not bind live handlers, probably because jQuery is too old.");
+            this.log("Could not bind event handlers, probably because jQuery is too old.");
         }
     };
 
@@ -812,10 +815,8 @@
             $(document).off(event, selector, callback);
         } else if ($.fn.undelegate) {
             $(document).undelegate(selector, event, callback);
-        } else if ($.fn.die) {
-            $(selector).die(event, callback);
         } else {
-            this.log("Could not unbind live handlers, probably because jQuery is too old.");
+            this.log("Could not unbind event handlers, probably because jQuery is too old.");
         }
     };
 
@@ -841,6 +842,14 @@
         this.off(selector, "change blur", this.defaults.liveCallback);
     };
 
+    $.Guards.prototype.camelize = function(word) {
+        // This code is from jQuery, but it is not a public function
+        // so let's juse reuse it.
+        return word.replace(/-([\da-z])/gi, function(all, letter) {
+            return letter.toUpperCase();
+        });
+    };
+
     /**
      * Format all arguments into the first argument.  This is a
      * convenience function similar to the C sprintf function, though
@@ -1231,7 +1240,7 @@
     /**
      * Validates for a valid US date.
      */
-    $.Guards.prototype.isValidDateUS = function(value, options) {
+    $.Guards.prototype.isValidDateUS = function(value) {
         value = $.trim(value);
 
         if (value === "") {
@@ -1244,7 +1253,7 @@
     /**
      * Validates for a valid US time.
      */
-    $.Guards.prototype.isValidTimeUS = function(value, options) {
+    $.Guards.prototype.isValidTimeUS = function(value) {
         value = $.trim(value);
 
         if (value === "") {
@@ -1345,7 +1354,7 @@
      *              .message("Don't use the keyword 'invalid'.");
      */
     $.Guards.prototype.add = function(selector) {
-        var guard = new $.Guard(selector, this);
+        var guard = new $.Guard({ selector: selector, guards: this });
         this._guards.push(guard);
         return guard;
     };
@@ -1381,6 +1390,14 @@
             }
         });
 
+        $.each(this.named, function(name, guard) {
+            var fields = callback(guard);
+
+            if (fields !== false && !self.test(guard, fields)) {
+                result = false;
+            }
+        });
+
         return result;
     };
 
@@ -1404,13 +1421,18 @@
         return result;
     };
 
-    $.Guard = function(selector, guards, named) {
-        this._named = named;
-        this._guards = guards || $.guards;
-        this._selector = selector;
+    $.Guard = function(options) {
+        this.name = options.name;
+        this._named = options.named;
+        this._guards = options.guards || $.guards;
+        this._selector = options.selector;
         this._guard = null;
 
-        if (!named) {
+        if (options.named && !options.selector && this._guards.isValidDataName(options.name)) {
+            this._selector = "[data-guard~='" + options.name + "']";
+        }
+
+        if (!options.named) {
             this.using(this._guards.defaults.guard);
         }
     };
@@ -1438,17 +1460,9 @@
         copyAttribute("_target");
         copyAttribute("_precondition");
         this._guard = namedGuard._guard;
+        this._guardArguments = args;
         this.name = guard;
-
-        if (this._guard.acceptsArguments) {
-            this._guard = this._guard.apply(this._guards, args);
-        }
-
-        if ($.isFunction(namedGuard._message)) {
-            return this.message(namedGuard._message.apply(this._guards, args));
-        } else {
-            return this.message(namedGuard._message);
-        }
+        return this.message(namedGuard._message);
     };
 
     /**
@@ -1787,8 +1801,17 @@
 
     $.Guard.prototype.resetMessageFn = function() {
         var self = this;
-        return this.messageFn(function() {
-            return $('<' + self.getTag() + ' class="' + self.getMessageClass() + '"/>').html(self._message);
+        return this.messageFn(function(elements) {
+            var msg = self._message;
+            var dataMsg = self.getGuardDataArguments(elements, "message", true);
+
+            if (dataMsg !== null) {
+                msg = dataMsg;
+            } else if ($.isFunction(msg)) {
+                msg = msg.apply(self, self.getGuardArguments(elements));
+            }
+
+            return $('<' + self.getTag() + ' class="' + self.getMessageClass() + '"/>').html(msg);
         });
     };
 
@@ -1797,8 +1820,8 @@
         return this;
     };
 
-    $.Guard.prototype.errorElement = function() {
-        var element = this._messageFn();
+    $.Guard.prototype.errorElement = function(elements) {
+        var element = this._messageFn(elements);
         element[0].isGuardError = true;
         return element;
     };
@@ -1903,11 +1926,107 @@
         return $(element).filter(this._selector).size() > 0;
     };
 
+    $.Guard.prototype.getGuardDataArguments = function(elements, attributeName, includeForm) {
+        if (this._guards.isNullOrUndefined(elements)) {
+            return null;
+        }
+
+        var $elements = $(elements);
+
+        if ($elements.size() === 0 || this._guards.isNullOrUndefined(this.name) || !this._guards.isValidDataName(this.name)) {
+            return null;
+        }
+
+        var dashedAttrPrefix = "guard-" + this.name + "-";
+
+        if (attributeName) {
+            dashedAttrPrefix = dashedAttrPrefix + attributeName;
+        }
+
+        var result = null;
+        var attrPrefix = this._guards.camelize(dashedAttrPrefix.replace(/-+$/, ""));
+        var data = $elements.data() || {};
+
+        if (includeForm) {
+            var formData = $elements.parents("form:first").data() || {};
+            data = $.extend({}, formData, data);
+        }
+
+        $.each(data, function(key, value) {
+            var isDashed = key.indexOf(dashedAttrPrefix) === 0;
+
+            if (key.indexOf(attrPrefix) !== 0 && !isDashed) {
+                return;
+            }
+
+            var attrName;
+
+            if (isDashed) {
+                attrName = key.substring(dashedAttrPrefix.length, key.length);
+            } else {
+                attrName = key.substring(attrPrefix.length, key.length);
+            }
+
+            if (!isDashed) {
+                // Un-capitalize the first letter
+                attrName = attrName.replace(/^(.)/, function(all, letter) {
+                    return letter.toLowerCase();
+                });
+            }
+
+            if (attributeName) {
+                // Grabbing just this attribute, so must be an exact
+                // match, and only 1 result
+                if (attrName === "") {
+                    result = value;
+                    return false;
+                } else {
+                    return;
+                }
+            }
+
+            if (result === null) {
+                result = {};
+            }
+
+            result[attrName] = value;
+        });
+
+        return result;
+    };
+
+    $.Guard.prototype.getGuardArguments = function(elements) {
+        var result = this._guardArguments;
+
+        if (this._guards.isNullOrUndefined(result)) {
+            result = [];
+        }
+
+        // Currently only support single argument hash types for data
+        // attribute arguments overriding javascript arguments
+        if (result.length > 1 || (result.length === 1 && $.type(result[0]) !== "object")) {
+            return result;
+        }
+
+        var dataArgs = this.getGuardDataArguments(elements);
+
+        if (!this._guards.isNullOrUndefined(dataArgs)) {
+            if (result.length === 1) {
+                result[0] = $.extend({}, result[0], dataArgs);
+            } else {
+                result.push(dataArgs);
+            }
+        }
+
+        return result;
+    };
+
     // Tests this guard against element(s).  Element(s) should be field elements.  Returns false
     // but doesn't apply guard if there are already errors detected.  Returns true if the selector
     // defined for this guard doesn't apply to this element(s).  Otherwise applies and adds an
     // error if it fails.
     $.Guard.prototype.test = function(element) {
+        var self = this;
         var $elements = $(element).filter(this._selector);
 
         if ($elements.size() === 0) {
@@ -1927,7 +2046,7 @@
             elements = [];
 
             $elements.each(function() {
-                values.push($(this).inputValue(this._guards));
+                values.push($(this).inputValue(self._guards));
                 elements.push(this);
             });
         } else {
@@ -1939,7 +2058,13 @@
             result = true;
         } else {
             try {
-                result = this._guard(values, elements);
+                var guardFn = this._guard;
+
+                if (guardFn.acceptsArguments) {
+                    guardFn = this._guard.apply(this._guards, this.getGuardArguments(elements));
+                }
+
+                result = guardFn(values, elements);
             } catch(e) {
                 this._guards.log("A guard threw an error: " + e);
                 result = false;
@@ -2193,7 +2318,7 @@
             return this;
         }
 
-        var element = guard.errorElement();
+        var element = guard.errorElement(this);
         guard.attachError(this, element);
         this.addClass(guard.getInvalidClass());
         var linked = [];
@@ -2609,4 +2734,8 @@
             $(this).clearErrors();
         }
     });
+
+    // Data driven guards
+    $.liveGuard("[data-live-guarded]");
+    $.enableGuards("[data-guarded]");
 })(jQuery);

data/lib/guardsjs-rails/version.rb

@@ -1,5 +1,5 @@
 module GuardsJS
   module Rails
-    VERSION = "1.2.1"
+    VERSION = "1.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guardsjs-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -59,7 +59,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1870834343649666414
+      hash: 986596030085484236
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: