judge 1.1.0 → 1.2.0

data/.travis.yml

@@ -2,7 +2,11 @@ rvm:
   - 1.9.2
   - 1.9.3
 
-script: "bundle exec rake spec"
+before_script:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+
+script: "bundle exec rake"
 
 notifications:
   recipients:

data/README.md

@@ -1,6 +1,8 @@
 judge
 =====
 
+[![Build status](https://secure.travis-ci.org/joecorcoran/judge.png?branch=master)](http://travis-ci.org/joecorcoran/judge)
+
 Client-side form validation in Rails 3.
 
 Usage
@@ -8,12 +10,17 @@ Usage
 
 See http://judge.joecorcoran.co.uk for documentation.
 
+Extensions
+----------
+
+Use Judge with your favourite form building tool.
+
+* http://github.com/joecorcoran/judge-formtastic
+* http://github.com/joecorcoran/judge-simple_form
+
 License
 -------
 
 Released under an MIT license (see LICENSE.txt).
 
-http://tribesports.com
-http://blog.joecorcoran.co.uk
-
-
+http://blog.joecorcoran.co.uk

data/judge.gemspec

@@ -6,19 +6,18 @@ Gem::Specification.new do |s|
   s.name = "judge"
   s.version = Judge::VERSION
   s.homepage = "http://github.com/joecorcoran/judge"
-  s.license = "MIT"
-  s.summary = %Q{Simple client side ActiveModel::Validators}
-  s.description = %Q{Validate forms on the client side, cleanly}
+  s.summary = "Simple client side ActiveModel::Validators"
+  s.description = "Validate Rails 3 forms on the client side, cleanly"
   s.email = "joe@tribesports.com"
   s.authors = ["Joe Corcoran"]
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "jasmine",            "~> 1.0.2"
-  s.add_development_dependency "rails",              "~> 3.0.10"
-  s.add_development_dependency "rspec",              "~> 2.8.0"
-  s.add_development_dependency "sqlite3-ruby",       "~> 1.3.2"
-  s.add_development_dependency "factory_girl_rails", "~> 1.7.0"
+  s.add_development_dependency "jasmine",            "~> 1.1.2"
+  s.add_development_dependency "rails",              "~> 3.2"
+  s.add_development_dependency "rspec",              "~> 2.8"
+  s.add_development_dependency "sqlite3-ruby",       "~> 1.3.3"
+  s.add_development_dependency "factory_girl",       "~> 2.6"
 end

data/lib/generators/judge/templates/judge.js

@@ -1,14 +1,17 @@
+// Judge 1.2.0
+// (c) 2011–2012 Joe Corcoran
+// http://raw.github.com/joecorcoran/judge/master/LICENSE.txt
 // This is the JavaScript part of Judge, a client-side validation gem for Rails 3.
 // You can find a guide and some more traditional API documentation at <http://joecorcoran.github.com/judge/>.
-// Hopefully this page will help you understand what's happening under the hood.
-
-/* http://raw.github.com/joecorcoran/judge/master/LICENSE.txt */
+// Hopefully the comments here will help you understand what's happening under the hood.
 
 /*jshint curly: true, evil: true, newcap: true, noarg: true, strict: false */
 /*global _: false, JSON: false */  
 
 // The judge namespace.
-var judge = judge || {};
+var judge = {};
+
+judge.VERSION = '1.2.0';
 
 // A judge.Watcher is a DOM element wrapper that judge uses to store validation info and instance methods.
 judge.Watcher = function (element) {
@@ -34,7 +37,6 @@ judge.Watcher = function (element) {
       message: '[judge][constructor] No DOM element passed to constructor'
     };
   }
-
   if (element.getAttribute('data-validate') === null) {
     throw {
       name: 'ReferenceError',
@@ -42,199 +44,149 @@ judge.Watcher = function (element) {
     };
   }
 
-  // Convenient access to this Watcher.
-  var watcher = this;
-
   // Watcher instance properties.
   this.element         = element;
   this.validators      = JSON.parse(this.element.getAttribute('data-validate'));
-  
-  // The `validate` instance method returns the validity of the watched element, 
-  // represented as an object containing the element itself and some validity information.
-  this.validate = function() {
-    watcher.errorMessages = [];
-    var validators = watcher.validators,
-        validity   = true,
-        messages   = [];
-    _(validators).each(function(validator) {
-      var options = validator.options,
-          msgs    = validator.messages;
-      if (watcher.element.value.length || options.allow_blank !== true) {
-        var result = watcher.validates()[validator.kind](options, msgs);
-        if (!result.valid && result.hasOwnProperty('messages')) {
-          validity = false;
-          messages.push(result.messages);
-        }
+};
+
+// The `validate` method returns an object which describes the current validity of the
+// value of the watched element.
+judge.Watcher.prototype.validate = function() {
+  var allMessages = [];
+  _(this.validators).each(function(v) {
+    if (this.element.value.length || v.options.allow_blank !== true) {
+      var messages = this.validates()[v.kind](this.element.value, v.options, v.messages);
+      if (messages.length) {
+        allMessages.push(messages);
       }
-    });
-    return {
-      valid: validity, 
-      messages: _(messages).flatten(),
-      element: watcher.element
-    };
+    }
+  }, this);
+  allMessages = _(allMessages).flatten();
+  return {
+    valid: (allMessages.length < 1), 
+    messages: allMessages,
+    element: this.element
   };
-
 };
 
-// Watcher prototype methods.
-judge.Watcher.prototype.validates = function() {
-  var watcher         = this,
-      extendedMethods = judge.customValidators,
-      methods         = {
-
-        // Presence validator ported as closely as possible
-        // from [ActiveModel::Validations::PresenceValidator](http://api.rubyonrails.org/classes/ActiveModel/Validations/PresenceValidator.html).
-        presence: function(options, messages) {
-          if (watcher.element.value.length) {
-            return { valid:true };
-          } else{
-            return { valid:false, messages:[messages.blank] };
-          }
-        },
-        
-        // Length validator ported as closely as possible
-        // from [ActiveModel::Validations::LengthValidator](http://api.rubyonrails.org/classes/ActiveModel/Validations/LengthValidator.html).
-        length: function(options, messages) {
-          var msgs = [],
-              length = watcher.element.value.length,
-              types = {
-                minimum: { operator: '<',  message: 'too_short' },
-                maximum: { operator: '>',  message: 'too_long' },
-                is:      { operator: '!=', message: 'wrong_length' }
-              };
-          _(types).each(function(properties, type) {
-            var invalid = judge.utils.operate(length, properties.operator, options[type]);
-            if (options.hasOwnProperty(type) && invalid) {
-              msgs.push(messages[properties.message]);
-            }
-          });
-          return msgs.length ? { valid:false, messages:msgs } : { valid:true };
-        },
-        
-        // Exclusion validator ported as closely as possible
-        // from [ActiveModel::Validations::ExclusionValidator](http://api.rubyonrails.org/classes/ActiveModel/Validations/ExclusionValidator.html).
-        exclusion: function(options, messages) {
-          var stringIn = _(options['in']).map(function(o) { return o.toString(); });
-          if (_(stringIn).include(watcher.element.value)) {
-            return {
-              valid:false,
-              messages:[messages.exclusion]
-            };
-          } else {
-            return { valid:true };
-          }
-        },
-        
-        // Inclusion validator ported as closely as possible
-        // from [ActiveModel::Validations::InclusionValidator](http://api.rubyonrails.org/classes/ActiveModel/Validations/InclusionValidator.html).
-        inclusion: function(options, messages) {
-          var stringIn = _(options['in']).map(function(o) { return o.toString(); });
-          if (!_(stringIn).include(watcher.element.value)) {
-            return {
-              valid:false,
-              messages:[messages.inclusion]
-            };
-          } else {
-            return { valid:true };
-          }
-        },
-        
-        // Numericality validator ported as closely as possible
-        // from [ActiveModel::Validations::NumericalityValidator](http://api.rubyonrails.org/classes/ActiveModel/Validations/NumericalityValidator.html).
-        numericality: function(options, messages) {
-          var operators = {
-                greater_than: '>',
-                greater_than_or_equal_to: '>=',
-                equal_to: '==',
-                less_than: '<',
-                less_than_or_equal_to: '<='
-              },
-              msgs = [],
-              value = watcher.element.value,
-              parsedValue = parseFloat(value, 10); 
+// Ported ActiveModel validators.
+// See <http://api.rubyonrails.org/classes/ActiveModel/Validations.html> for the originals.
+judge.eachValidators = (function() {
+  return {
+    // ActiveModel::Validations::PresenceValidator
+    presence: function(value, options, messages) {
+      return (value.length) ? [] : [messages.blank];
+    },
+    
+    // ActiveModel::Validations::LengthValidator
+    length: function(value, options, messages) {
+      var msgs = [],
+          types = {
+            minimum: { operator: '<',  message: 'too_short' },
+            maximum: { operator: '>',  message: 'too_long' },
+            is:      { operator: '!=', message: 'wrong_length' }
+          };
+      _(types).each(function(properties, type) {
+        var invalid = judge.utils.operate(value.length, properties.operator, options[type]);
+        if (options.hasOwnProperty(type) && invalid) {
+          msgs.push(messages[properties.message]);
+        }
+      });
+      return msgs;
+    },
+    
+    // ActiveModel::Validations::ExclusionValidator
+    exclusion: function(value, options, messages) {
+      var stringIn = _(options['in']).map(function(o) { return o.toString(); });
+      return (_(stringIn).include(value)) ? [messages.exclusion] : [];
+    },
+    
+    // ActiveModel::Validations::InclusionValidator
+    inclusion: function(value, options, messages) {
+      var stringIn = _(options['in']).map(function(o) { return o.toString(); });
+      return (!_(stringIn).include(value)) ? [messages.inclusion] : [];
+    },
+    
+    // ActiveModel::Validations::NumericalityValidator
+    numericality: function(value, options, messages) {
+      var operators = {
+            greater_than: '>',
+            greater_than_or_equal_to: '>=',
+            equal_to: '==',
+            less_than: '<',
+            less_than_or_equal_to: '<='
+          },
+          msgs = [],
+          parsedValue = parseFloat(value, 10); 
 
-          if (isNaN(Number(value))) {
-            msgs.push(messages.not_a_number);
-          } else {
-            if (options.odd && judge.utils.isEven(parsedValue)) {
-              msgs.push(messages.odd);
-            }
-            if (options.even && judge.utils.isOdd(parsedValue)) {
-              msgs.push(messages.even);
-            }
-            if (options.only_integer && !judge.utils.isInt(parsedValue)) {
-              msgs.push(messages.not_an_integer);
-            }
-            _(operators).each(function(operator, key) {
-              var valid = judge.utils.operate(parsedValue, operators[key], parseFloat(options[key], 10));
-              if (options.hasOwnProperty(key) && !valid) {
-                msgs.push(messages[key]);
-              }
-            });
-          }
-          return msgs.length ? { valid:false, messages:msgs } : { valid:true };
-        },
-        
-        // Format validator ported as closely as possible
-        // from [ActiveModel::Validations::FormatValidator](http://api.rubyonrails.org/classes/ActiveModel/Validations/FormatValidator.html).
-        format: function(options, messages) {
-          var msgs  = [],
-              value = watcher.element.value;
-          if (options.hasOwnProperty('with')) {
-            var withReg = judge.utils.convertRegExp(options['with']);
-            if (!withReg.test(value)) {
-              msgs.push(messages.invalid);
-            }
-          }
-          if (options.hasOwnProperty('without')) {
-            var withoutReg = judge.utils.convertRegExp(options.without);
-            if (withoutReg.test(value)) {
-              msgs.push(messages.invalid);
-            }
-          }
-          return msgs.length ? { valid:false, messages:msgs } : { valid:true };
-        },
-        
-        // Acceptance validator ported as closely as possible
-        // from [ActiveModel::Validations::AcceptanceValidator](http://api.rubyonrails.org/classes/ActiveModel/Validations/AcceptanceValidator.html).
-        acceptance: function(options, messages) {
-          if (watcher.element.checked === true) {
-            return { valid:true };
-          } else {
-            return {
-              valid:false,
-              messages:[messages.accepted]
-            };
-          }
-        },
-        
-        // Confirmation validator ported as closely as possible
-        // from [ActiveModel::Validations::ConfirmationValidator](http://api.rubyonrails.org/classes/ActiveModel/Validations/ConfirmationValidator.html).
-        confirmation: function(options, messages) {
-          var id       = watcher.element.getAttribute('id'),
-              confId   = id + '_confirmation',
-              confElem = document.getElementById(confId);
-          if (watcher.element.value === confElem.value) {
-            return { valid:true };
-          } else {
-            return {
-              valid:false,
-              messages:[messages.confirmation]
-            };
+      if (isNaN(Number(value))) {
+        msgs.push(messages.not_a_number);
+      } else {
+        if (options.odd && judge.utils.isEven(parsedValue)) {
+          msgs.push(messages.odd);
+        }
+        if (options.even && judge.utils.isOdd(parsedValue)) {
+          msgs.push(messages.even);
+        }
+        if (options.only_integer && !judge.utils.isInt(parsedValue)) {
+          msgs.push(messages.not_an_integer);
+        }
+        _(operators).each(function(operator, key) {
+          var valid = judge.utils.operate(parsedValue, operators[key], parseFloat(options[key], 10));
+          if (options.hasOwnProperty(key) && !valid) {
+            msgs.push(messages[key]);
           }
+        });
+      }
+      return msgs;
+    },
+    
+    // ActiveModel::Validations::FormatValidator
+    format: function(value, options, messages) {
+      var msgs  = [];
+      if (options.hasOwnProperty('with')) {
+        var withReg = judge.utils.convertRegExp(options['with']);
+        if (!withReg.test(value)) {
+          msgs.push(messages.invalid);
         }
-      };
-  // Return all validation methods, including those found in judge.customValidators.
-  // If you name a custom validation method the same as a default one, for example
-  //   `judge.customValidators.presence = function() {};`
-  // then the custom method _will overwrite_ the default one, so be careful!
-  return _.extend(methods, extendedMethods);
-};
+      }
+      if (options.hasOwnProperty('without')) {
+        var withoutReg = judge.utils.convertRegExp(options.without);
+        if (withoutReg.test(value)) {
+          msgs.push(messages.invalid);
+        }
+      }
+      return msgs;
+    },
+    
+    // ActiveModel::Validations::AcceptanceValidator
+    acceptance: function(value, options, messages) {
+      return (this._element.checked === true) ? [] : [messages.accepted];
+    },
+    
+    // ActiveModel::Validations::ConfirmationValidator
+    confirmation: function(value, options, messages) {
+      var id       = this._element.getAttribute('id'),
+          confId   = id + '_confirmation',
+          confElem = document.getElementById(confId);
+      return (value === confElem.value) ? [] : [messages.confirmation];
+    }
+  };
+
+}());
 
 // This object should contain any judge validation methods
 // that correspond to custom validators used in the model.
 judge.customValidators = {};
 
+// Return all validation methods, including those found in judge.customValidators.
+// If you name a custom validation method the same as a default one, for example
+//   `judge.customValidators.presence = function() {};`
+// then the custom method _will overwrite_ the default one, so be careful!
+judge.Watcher.prototype.validates = function() {
+  return _.extend({_element: this.element}, judge.eachValidators, judge.customValidators);
+};
+
 // The judge store is now open :)
 judge.store = (function() {
   var store   = {};
@@ -365,19 +317,13 @@ judge.utils = {
   // If you know of a better way (or an existing library) to convert regular expressions 
   // from Ruby to JavaScript, I would really love to hear from you.
   convertRegExp: function(string) {
-    var p = string.slice(1, -1).split(':'),
-        o = p.shift(),
-        r = p.join(':').replace(/\\\\/g, '\\');
-    return new RegExp(r, judge.utils.convertFlags(o));
+    var parts  = string.slice(1, -1).split(':'),
+        flags  = parts.shift().replace('?', ''),
+        source = parts.join(':').replace(/\\\\/g, '\\');
+    return new RegExp(source, judge.utils.convertFlags(flags));
   },
   convertFlags: function(string) {
-    var off    = new RegExp('-'),
-        multi  = new RegExp('m');
-    string = string.replace('?', '');
-    if (off.test(string) || !multi.test(string)) {
-      return '';
-    } else {
-      return 'm';
-    }
+    var on = string.split('-')[0];
+    return (/m/.test(on)) ? 'm' : '';
   }
-};
+};