backbone-validation-rails 0.6.2.1 → 0.7.1.1

data/README.md

@@ -5,7 +5,7 @@ A wrapper for the [Backbone.Validation](https://github.com/thedersen/backbone.va
 ## Version
 The version of this gem follows that of the associated Backbone.Validation version
 
-Currently: **0.6.2**
+Currently: **v0.7.1**
 
 ## Installation
 

data/lib/backbone-validation-rails/version.rb

@@ -1,7 +1,7 @@
 module Backbone
   module Validation
     module Rails
-      VERSION = "0.6.2.1"
+      VERSION = "0.7.1.1"
     end
   end
 end

data/vendor/assets/javascripts/backbone-validation.js

@@ -1,11 +1,10 @@
-// Backbone.Validation v0.6.2
+// Backbone.Validation v0.7.1
 //
 // Copyright (c) 2011-2012 Thomas Pedersen
 // Distributed under MIT License
 //
 // Documentation and full license available at:
 // http://thedersen.com/projects/backbone-validation
-
 Backbone.Validation = (function(_){
   'use strict';
 
@@ -13,13 +12,69 @@ Backbone.Validation = (function(_){
   // ---------------
 
   var defaultOptions = {
-      forceUpdate: false,
-      selector: 'name',
-      labelFormatter: 'sentenceCase',
-      valid: Function.prototype,
-      invalid: Function.prototype
+    forceUpdate: false,
+    selector: 'name',
+    labelFormatter: 'sentenceCase',
+    valid: Function.prototype,
+    invalid: Function.prototype
+  };
+
+
+  // Helper functions
+  // ----------------
+
+  // Formatting functions used for formatting error messages
+  var formatFunctions = {
+    // Uses the configured label formatter to format the attribute name
+    // to make it more readable for the user
+    formatLabel: function(attrName, model) {
+      return defaultLabelFormatters[defaultOptions.labelFormatter](attrName, model);
+    },
+
+    // Replaces nummeric placeholders like {0} in a string with arguments
+    // passed to the function
+    format: function() {
+      var args = Array.prototype.slice.call(arguments),
+          text = args.shift();
+      return text.replace(/\{(\d+)\}/g, function(match, number) {
+        return typeof args[number] !== 'undefined' ? args[number] : match;
+      });
+    }
   };
 
+  // Flattens an object
+  // eg:
+  //
+  //     var o = {
+  //       address: {
+  //         street: 'Street',
+  //         zip: 1234
+  //       }
+  //     };
+  //
+  // becomes:
+  //
+  //     var o = {
+  //       'address.street': 'Street',
+  //       'address.zip': 1234
+  //     };
+  var flatten = function (obj, into, prefix) {
+    into = into || {};
+    prefix = prefix || '';
+
+    _.each(obj, function(val, key) {
+      if(obj.hasOwnProperty(key)) {
+        if (val && typeof val === 'object' && !(val instanceof Date || val instanceof RegExp)) {
+          flatten(val, into, prefix + key + '.');
+        }
+        else {
+          into[prefix + key] = val;
+        }
+      }
+    });
+
+    return into;
+  };
 
   // Validation
   // ----------
@@ -78,7 +133,11 @@ Backbone.Validation = (function(_){
       // applying all the validators and returning the first error
       // message, if any.
       return _.reduce(getValidators(model, attr), function(memo, validator){
-        var result = validator.fn.call(defaultValidators, value, attr, validator.val, model, computed);
+        // Pass the format functions plus the default
+        // validators as the context to the validator
+        var ctx = _.extend({}, formatFunctions, defaultValidators),
+            result = validator.fn.call(ctx, value, attr, validator.val, model, computed);
+
         if(result === false || memo === false) {
           return false;
         }
@@ -93,18 +152,19 @@ Backbone.Validation = (function(_){
     // Returns and object containing names of invalid attributes
     // as well as error messages.
     var validateModel = function(model, attrs) {
-      var error, attr,
+      var error,
           invalidAttrs = {},
           isValid = true,
-          computed = _.clone(attrs);
+          computed = _.clone(attrs),
+          flattened = flatten(attrs);
 
-      for (attr in attrs) {
-        error = validateAttr(model, attr, attrs[attr], computed);
+      _.each(flattened, function(val, attr) {
+        error = validateAttr(model, attr, val, computed);
         if (error) {
           invalidAttrs[attr] = error;
           isValid = false;
         }
-      }
+      });
 
       return {
         invalidAttrs: invalidAttrs,
@@ -126,16 +186,15 @@ Backbone.Validation = (function(_){
         // entire model is valid. Passing true will force a validation
         // of the model.
         isValid: function(option) {
+          var flattened = flatten(this.attributes);
+
           if(_.isString(option)){
-            return !validateAttr(this, option, this.get(option), _.extend({}, this.attributes));
+            return !validateAttr(this, option, flattened[option], _.extend({}, this.attributes));
           }
           if(_.isArray(option)){
-            for (var i = 0; i < option.length; i++) {
-              if(validateAttr(this, option[i], this.get(option[i]), _.extend({}, this.attributes))){
-                return false;
-              }
-            }
-            return true;
+            return _.reduce(option, function(memo, attr) {
+              return memo && !validateAttr(this, attr, flattened[attr], _.extend({}, this.attributes));
+            }, true, this);
           }
           if(option === true) {
             this.validate();
@@ -150,24 +209,33 @@ Backbone.Validation = (function(_){
           var model = this,
               validateAll = !attrs,
               opt = _.extend({}, options, setOptions),
-              allAttrs = _.extend(getValidatedAttrs(model), model.attributes, attrs),
-              changedAttrs = attrs || allAttrs,
+              validatedAttrs = getValidatedAttrs(model),
+              allAttrs = _.extend({}, validatedAttrs, model.attributes, attrs),
+              changedAttrs = flatten(attrs || allAttrs),
+
               result = validateModel(model, allAttrs);
 
           model._isValid = result.isValid;
 
           // After validation is performed, loop through all changed attributes
-          // and call either the valid or invalid callback so the view is updated.
-          for(var attr in allAttrs) {
+          // and call the valid callbacks so the view is updated.
+          _.each(validatedAttrs, function(val, attr){
+            var invalid = result.invalidAttrs.hasOwnProperty(attr);
+            if(!invalid){
+              opt.valid(view, attr, opt.selector);
+            }
+          });
+
+          // After validation is performed, loop through all changed attributes
+          // and call the invalid callback so the view is updated.
+          _.each(validatedAttrs, function(val, attr){
             var invalid = result.invalidAttrs.hasOwnProperty(attr),
                 changed = changedAttrs.hasOwnProperty(attr);
+
             if(invalid && (changed || validateAll)){
               opt.invalid(view, attr, result.invalidAttrs[attr], opt.selector);
             }
-            if(!invalid){
-              opt.valid(view, attr, opt.selector);
-            }
-          }
+          });
 
           // Trigger validated events.
           // Need to defer this so the model is actually updated before
@@ -215,7 +283,7 @@ Backbone.Validation = (function(_){
     return {
 
       // Current version of the library
-      version: '0.6.2',
+      version: '0.7.1',
 
       // Called to configure the default options
       configure: function(options) {
@@ -227,6 +295,7 @@ Backbone.Validation = (function(_){
       bind: function(view, options) {
         var model = view.model,
             collection = view.collection;
+
         options = _.extend({}, defaultOptions, defaultCallbacks, options);
 
         if(typeof model === 'undefined' && typeof collection === 'undefined'){
@@ -237,7 +306,7 @@ Backbone.Validation = (function(_){
         if(model) {
           bindModel(view, model, options);
         }
-        if(collection) {
+        else if(collection) {
           collection.each(function(model){
             bindModel(view, model, options);
           });
@@ -280,7 +349,7 @@ Backbone.Validation = (function(_){
     // view becomes valid. Removes any error message.
     // Should be overridden with custom functionality.
     valid: function(view, attr, selector) {
-      view.$('[' + selector + '~=' + attr + ']')
+      view.$('[' + selector + '~="' + attr + '"]')
           .removeClass('invalid')
           .removeAttr('data-error');
     },
@@ -289,7 +358,7 @@ Backbone.Validation = (function(_){
     // Adds a error message.
     // Should be overridden with custom functionality.
     invalid: function(view, attr, error, selector) {
-      view.$('[' + selector + '~=' + attr + ']')
+      view.$('[' + selector + '~="' + attr + '"]')
           .addClass('invalid')
           .attr('data-error', error);
     }
@@ -373,41 +442,26 @@ Backbone.Validation = (function(_){
     //        }
     //      });
     label: function(attrName, model) {
-      return model.labels[attrName] || defaultLabelFormatters.sentenceCase(attrName, model);
+      return (model.labels && model.labels[attrName]) || defaultLabelFormatters.sentenceCase(attrName, model);
     }
   };
 
+
   // Built in validators
   // -------------------
 
   var defaultValidators = Validation.validators = (function(){
     // Use native trim when defined
     var trim = String.prototype.trim ?
-        function(text) {
-            return text === null ? '' : String.prototype.trim.call(text);
-        } :
-        function(text) {
-            var trimLeft = /^\s+/,
-                trimRight = /\s+$/;
-
-            return text === null ? '' : text.toString().replace(trimLeft, '').replace(trimRight, '');
-        };
-
-    // Uses the configured label formatter to format the attribute name
-    // to make it more readable for the user
-    var formatLabel = function(attrName, model) {
-      return defaultLabelFormatters[defaultOptions.labelFormatter](attrName, model);
-    };
-
-    // Replaces nummeric placeholders like {0} in a string with arguments
-    // passed to the function
-    var format = function() {
-      var args = Array.prototype.slice.call(arguments);
-      var text = args.shift();
-      return text.replace(/\{(\d+)\}/g, function(match, number) {
-        return typeof args[number] !== 'undefined' ? args[number] : match;
-      });
-    };
+      function(text) {
+        return text === null ? '' : String.prototype.trim.call(text);
+      } :
+      function(text) {
+        var trimLeft = /^\s+/,
+            trimRight = /\s+$/;
+
+        return text === null ? '' : text.toString().replace(trimLeft, '').replace(trimRight, '');
+      };
 
     // Determines whether or not a value is a number
     var isNumber = function(value){
@@ -437,7 +491,7 @@ Backbone.Validation = (function(_){
           return false; // overrides all other validators
         }
         if (isRequired && !hasValue(value)) {
-          return format(defaultMessages.required, formatLabel(attr, model));
+          return this.format(defaultMessages.required, this.formatLabel(attr, model));
         }
       },
 
@@ -446,7 +500,7 @@ Backbone.Validation = (function(_){
       // `true` or 'true' are valid
       acceptance: function(value, attr, accept, model) {
         if(value !== 'true' && (!_.isBoolean(value) || value === false)) {
-          return format(defaultMessages.acceptance, formatLabel(attr, model));
+          return this.format(defaultMessages.acceptance, this.formatLabel(attr, model));
         }
       },
 
@@ -455,7 +509,7 @@ Backbone.Validation = (function(_){
       // the min value specified
       min: function(value, attr, minValue, model) {
         if (!isNumber(value) || value < minValue) {
-          return format(defaultMessages.min, formatLabel(attr, model), minValue);
+          return this.format(defaultMessages.min, this.formatLabel(attr, model), minValue);
         }
       },
 
@@ -464,7 +518,7 @@ Backbone.Validation = (function(_){
       // the max value specified
       max: function(value, attr, maxValue, model) {
         if (!isNumber(value) || value > maxValue) {
-          return format(defaultMessages.max, formatLabel(attr, model), maxValue);
+          return this.format(defaultMessages.max, this.formatLabel(attr, model), maxValue);
         }
       },
 
@@ -473,7 +527,7 @@ Backbone.Validation = (function(_){
       // the two numbers specified
       range: function(value, attr, range, model) {
         if(!isNumber(value) || value < range[0] || value > range[1]) {
-          return format(defaultMessages.range, formatLabel(attr, model), range[0], range[1]);
+          return this.format(defaultMessages.range, this.formatLabel(attr, model), range[0], range[1]);
         }
       },
 
@@ -482,7 +536,7 @@ Backbone.Validation = (function(_){
       // the length value specified
       length: function(value, attr, length, model) {
         if (!hasValue(value) || trim(value).length !== length) {
-          return format(defaultMessages.length, formatLabel(attr, model), length);
+          return this.format(defaultMessages.length, this.formatLabel(attr, model), length);
         }
       },
 
@@ -491,7 +545,7 @@ Backbone.Validation = (function(_){
       // the min length value specified
       minLength: function(value, attr, minLength, model) {
         if (!hasValue(value) || trim(value).length < minLength) {
-          return format(defaultMessages.minLength, formatLabel(attr, model), minLength);
+          return this.format(defaultMessages.minLength, this.formatLabel(attr, model), minLength);
         }
       },
 
@@ -500,7 +554,7 @@ Backbone.Validation = (function(_){
       // the max length value specified
       maxLength: function(value, attr, maxLength, model) {
         if (!hasValue(value) || trim(value).length > maxLength) {
-          return format(defaultMessages.maxLength, formatLabel(attr, model), maxLength);
+          return this.format(defaultMessages.maxLength, this.formatLabel(attr, model), maxLength);
         }
       },
 
@@ -509,7 +563,7 @@ Backbone.Validation = (function(_){
       // the two numbers specified
       rangeLength: function(value, attr, range, model) {
         if(!hasValue(value) || trim(value).length < range[0] || trim(value).length > range[1]) {
-          return format(defaultMessages.rangeLength, formatLabel(attr, model), range[0], range[1]);
+          return this.format(defaultMessages.rangeLength, this.formatLabel(attr, model), range[0], range[1]);
         }
       },
 
@@ -518,7 +572,7 @@ Backbone.Validation = (function(_){
       // the specified array. Case sensitive matching
       oneOf: function(value, attr, values, model) {
         if(!_.include(values, value)){
-          return format(defaultMessages.oneOf, formatLabel(attr, model), values.join(', '));
+          return this.format(defaultMessages.oneOf, this.formatLabel(attr, model), values.join(', '));
         }
       },
 
@@ -527,7 +581,7 @@ Backbone.Validation = (function(_){
       // with the name specified
       equalTo: function(value, attr, equalTo, model, computed) {
         if(value !== computed[equalTo]) {
-          return format(defaultMessages.equalTo, formatLabel(attr, model), formatLabel(equalTo, model));
+          return this.format(defaultMessages.equalTo, this.formatLabel(attr, model), this.formatLabel(equalTo, model));
         }
       },
 
@@ -536,11 +590,11 @@ Backbone.Validation = (function(_){
       // Can be a regular expression or the name of one of the built in patterns
       pattern: function(value, attr, pattern, model) {
         if (!hasValue(value) || !value.toString().match(defaultPatterns[pattern] || pattern)) {
-          return format(defaultMessages.pattern, formatLabel(attr, model), pattern);
+          return this.format(defaultMessages.pattern, this.formatLabel(attr, model), pattern);
         }
       }
     };
   }());
 
   return Validation;
-}(_));
+}(_));

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backbone-validation-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.2.1
+  version: 0.7.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2013-01-29 00:00:00.000000000 Z
 dependencies: []
 description: A wrapper for backbone.validation in the Rails asset pipeline
 email:
@@ -43,7 +43,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Backbone Validation for Rails >= 3.1