judge 0.4.3 → 0.5.0

data/Gemfile

@@ -1,12 +1,12 @@
 source "http://rubygems.org"
 
 group :development do
-  gem "bundler",       "~> 1.0.0"
+  gem "bundler",       "~> 1.0.18"
   gem "jeweler",       "~> 1.5.2"
   gem "jasmine",       "~> 1.0.2"
-  gem "rails",         "~> 3.0.3"
+  gem "rails",         "~> 3.0.10"
   gem "shoulda",       "~> 2.11.3"
   gem "sqlite3-ruby",  "~> 1.3.2"
-  gem "nokogiri",      "~> 1.4.4"
-  gem "json",          "~> 1.4.6"
+  gem "nokogiri",      "~> 1.4.7"
+  gem "json",          "~> 1.6.0"
 end

data/Gemfile.lock

@@ -2,33 +2,33 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    actionmailer (3.0.10)
+      actionpack (= 3.0.10)
+      mail (~> 2.2.19)
+    actionpack (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4)
+      i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      arel (~> 2.0.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+      arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    arel (2.0.9)
+    activeresource (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+    activesupport (3.0.10)
+    arel (2.0.10)
     builder (2.1.2)
     childprocess (0.1.8)
       ffi (~> 1.0.6)
@@ -48,35 +48,38 @@ GEM
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    json (1.4.6)
+    json (1.6.1)
     json_pure (1.5.1)
-    mail (2.2.15)
+    mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    nokogiri (1.4.4)
-    polyglot (0.3.1)
+    mime-types (1.17.1)
+    nokogiri (1.4.7)
+    polyglot (0.3.2)
     rack (1.2.2)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
+    rails (3.0.10)
+      actionmailer (= 3.0.10)
+      actionpack (= 3.0.10)
+      activerecord (= 3.0.10)
+      activeresource (= 3.0.10)
+      activesupport (= 3.0.10)
       bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
+      railties (= 3.0.10)
+    railties (3.0.10)
+      actionpack (= 3.0.10)
+      activesupport (= 3.0.10)
       rake (>= 0.8.7)
+      rdoc (~> 3.4)
       thor (~> 0.14.4)
     rake (0.8.7)
+    rdoc (3.11)
+      json (~> 1.4)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
@@ -94,19 +97,20 @@ GEM
     shoulda (2.11.3)
     sqlite3-ruby (1.3.2)
     thor (0.14.6)
-    treetop (1.4.9)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.26)
+    tzinfo (0.3.30)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  bundler (~> 1.0.18)
   jasmine (~> 1.0.2)
   jeweler (~> 1.5.2)
-  json (~> 1.4.6)
-  nokogiri (~> 1.4.4)
-  rails (~> 3.0.3)
+  json (~> 1.6.0)
+  nokogiri (~> 1.4.7)
+  rails (~> 3.0.10)
   shoulda (~> 2.11.3)
   sqlite3-ruby (~> 1.3.2)

data/Rakefile

@@ -2,9 +2,10 @@ require 'rubygems'
 require 'bundler'
 require 'rake'
 require 'jeweler'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'jasmine'
 require 'rake/testtask'
+
 load 'jasmine/tasks/jasmine.rake'
 load 'lib/tasks/js_tests.rake'
 
@@ -27,7 +28,7 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-Rake::RDocTask.new do |rdoc|
+RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
@@ -45,7 +46,7 @@ namespace :test do
   
   desc "Run javascript tests"
   task :js => ["jasmine:phantom"]
-
-  desc "Run all tests"
-  task :all => [:form, :js]
 end
+
+desc "Run all tests"
+task :test => ["test:form", "test:js"]

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.5.0

data/judge.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{judge}
-  s.version = "0.4.3"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joe Corcoran"]
-  s.date = %q{2011-08-16}
+  s.date = %q{2011-11-13}
   s.description = %q{Validate forms in-place using your model validations}
   s.email = %q{joe@tribesports.com}
   s.extra_rdoc_files = [
@@ -47,6 +47,8 @@ Gem::Specification.new do |s|
     "spec/javascripts/support/jasmine_config.rb",
     "spec/javascripts/support/jasmine_runner.rb",
     "spec/javascripts/support/phantomRunner.js",
+    "test/dummy/Gemfile",
+    "test/dummy/Gemfile.lock",
     "test/dummy/Rakefile",
     "test/dummy/app/controllers/application_controller.rb",
     "test/dummy/app/controllers/foos_controller.rb",
@@ -99,7 +101,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/joecorcoran/judge}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Simple client-side ActiveModel::Validators}
   s.test_files = [
     "spec/javascripts/support/jasmine_config.rb",
@@ -134,37 +136,36 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.18"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<jasmine>, ["~> 1.0.2"])
-      s.add_development_dependency(%q<rails>, ["~> 3.0.3"])
+      s.add_development_dependency(%q<rails>, ["~> 3.0.10"])
       s.add_development_dependency(%q<shoulda>, ["~> 2.11.3"])
       s.add_development_dependency(%q<sqlite3-ruby>, ["~> 1.3.2"])
-      s.add_development_dependency(%q<nokogiri>, ["~> 1.4.4"])
-      s.add_development_dependency(%q<json>, ["~> 1.4.6"])
+      s.add_development_dependency(%q<nokogiri>, ["~> 1.4.7"])
+      s.add_development_dependency(%q<json>, ["~> 1.6.0"])
     else
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.18"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<jasmine>, ["~> 1.0.2"])
-      s.add_dependency(%q<rails>, ["~> 3.0.3"])
+      s.add_dependency(%q<rails>, ["~> 3.0.10"])
       s.add_dependency(%q<shoulda>, ["~> 2.11.3"])
       s.add_dependency(%q<sqlite3-ruby>, ["~> 1.3.2"])
-      s.add_dependency(%q<nokogiri>, ["~> 1.4.4"])
-      s.add_dependency(%q<json>, ["~> 1.4.6"])
+      s.add_dependency(%q<nokogiri>, ["~> 1.4.7"])
+      s.add_dependency(%q<json>, ["~> 1.6.0"])
     end
   else
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.18"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<jasmine>, ["~> 1.0.2"])
-    s.add_dependency(%q<rails>, ["~> 3.0.3"])
+    s.add_dependency(%q<rails>, ["~> 3.0.10"])
     s.add_dependency(%q<shoulda>, ["~> 2.11.3"])
     s.add_dependency(%q<sqlite3-ruby>, ["~> 1.3.2"])
-    s.add_dependency(%q<nokogiri>, ["~> 1.4.4"])
-    s.add_dependency(%q<json>, ["~> 1.4.6"])
+    s.add_dependency(%q<nokogiri>, ["~> 1.4.7"])
+    s.add_dependency(%q<json>, ["~> 1.6.0"])
   end
 end
 

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

@@ -2,7 +2,7 @@
 // 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.
 
-/*jshint curly: true, evil: true, newcap: true, noarg: true */
+/*jshint curly: true, evil: true, newcap: true, noarg: true, strict: false */
 /*global _: false, JSON: false */  
 
 // The judge namespace.
@@ -10,24 +10,34 @@ var judge = judge || {};
 
 // A judge.Watcher is a DOM element wrapper that judge uses to store validation info and instance methods.
 judge.Watcher = function (element) {
-  
+
   // Throw dependency errors.
-  if (typeof window._ === "undefined") {
-    throw new ReferenceError('[judge] Underscore.js not found');
+  if (typeof window._ === 'undefined') {
+    throw {
+      name: 'ReferenceError',
+      message: '[judge][dependency] Underscore.js not found'
+    };
   }
-  if (typeof window.JSON === "undefined") {
-    throw new ReferenceError('[judge] JSON global object not found');
+  if (_(window.JSON).isUndefined()) {
+    throw {
+      name: 'ReferenceError',
+      message: '[judge][dependency] JSON global object not found'
+    };
   }
 
   // Throw some constructor usage errors.
   if (_(element).isUndefined()) {
-    throw new ReferenceError('[judge] No DOM element passed to constructor');
+    throw {
+      name: 'ReferenceError',
+      message: '[judge][constructor] No DOM element passed to constructor'
+    };
   }
+
   if (element.getAttribute('data-validate') === null) {
-    throw new ReferenceError('[judge] Cannot construct Watcher for this element, use judge form builders');
-  }
-  if (element.form.getAttribute('data-error-messages') === null) {
-    throw new ReferenceError('[judge] Parent form was not created using judge form helper, please amend');
+    throw {
+      name: 'ReferenceError',
+      message: '[judge][constructor] Cannot construct Watcher for this element, use judge form builders'
+    };
   }
 
   // Convenient access to this Watcher.
@@ -36,7 +46,6 @@ judge.Watcher = function (element) {
   // Watcher instance properties.
   this.element         = element;
   this.validators      = JSON.parse(this.element.getAttribute('data-validate'));
-  this.defaultMessages = JSON.parse(this.element.form.getAttribute('data-error-messages'));
   
   // The `validate` instance method returns the validity of the watched element, 
   // represented as an object containing the element itself and some validity information.
@@ -46,9 +55,10 @@ judge.Watcher = function (element) {
         validity   = true,
         messages   = [];
     _(validators).each(function(validator) {
-      var options = validator.options;
+      var options = validator.options,
+          msgs    = validator.messages;
       if (instance.element.value.length || options.allow_blank !== true) {
-        var result = instance.validates()[validator.kind](options);
+        var result = instance.validates()[validator.kind](options, msgs);
         if (!result.valid && result.hasOwnProperty('messages')) {
           validity = false;
           messages.push(result.messages);
@@ -72,17 +82,17 @@ judge.Watcher.prototype.validates = function() {
 
         // Presence validator ported as closely as possible
         // from [ActiveModel::Validations::PresenceValidator](http://api.rubyonrails.org/classes/ActiveModel/Validations/PresenceValidator.html).
-        presence: function(options) {
+        presence: function(options, messages) {
           if (instance.element.value.length) {
             return { valid:true };
           } else{
-            return { valid:false, messages:[options.message || instance.defaultMessages.blank] };
+            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) {
+        length: function(options, messages) {
           var msgs = [],
               length = instance.element.value.length,
               types = {
@@ -93,8 +103,7 @@ judge.Watcher.prototype.validates = function() {
           _(types).each(function(properties, type) {
             var invalid = judge.utils.operate(length, properties.operator, options[type]);
             if (options.hasOwnProperty(type) && invalid) {
-              var m = options[properties.message] || instance.defaultMessages[properties.message];
-              msgs.push(judge.utils.countMsg(m, options[type]));
+              msgs.push(messages[properties.message]);
             }
           });
           return msgs.length ? { valid:false, messages:msgs } : { valid:true };
@@ -102,12 +111,12 @@ judge.Watcher.prototype.validates = function() {
         
         // Exclusion validator ported as closely as possible
         // from [ActiveModel::Validations::ExclusionValidator](http://api.rubyonrails.org/classes/ActiveModel/Validations/ExclusionValidator.html).
-        exclusion: function(options) {
+        exclusion: function(options, messages) {
           var stringIn = _(options['in']).map(function(o) { return o.toString(); });
           if (_(stringIn).include(instance.element.value)) {
             return {
               valid:false,
-              messages:[options.message || instance.defaultMessages.exclusion]
+              messages:[messages.exclusion]
             };
           } else {
             return { valid:true };
@@ -116,12 +125,12 @@ judge.Watcher.prototype.validates = function() {
         
         // Inclusion validator ported as closely as possible
         // from [ActiveModel::Validations::InclusionValidator](http://api.rubyonrails.org/classes/ActiveModel/Validations/InclusionValidator.html).
-        inclusion: function(options) {
+        inclusion: function(options, messages) {
           var stringIn = _(options['in']).map(function(o) { return o.toString(); });
           if (!_(stringIn).include(instance.element.value)) {
             return {
               valid:false,
-              messages:[options.message || instance.defaultMessages.inclusion]
+              messages:[messages.inclusion]
             };
           } else {
             return { valid:true };
@@ -130,7 +139,7 @@ judge.Watcher.prototype.validates = function() {
         
         // Numericality validator ported as closely as possible
         // from [ActiveModel::Validations::NumericalityValidator](http://api.rubyonrails.org/classes/ActiveModel/Validations/NumericalityValidator.html).
-        numericality: function(options) {
+        numericality: function(options, messages) {
           var operators = {
                 greater_than: '>',
                 greater_than_or_equal_to: '>=',
@@ -143,22 +152,21 @@ judge.Watcher.prototype.validates = function() {
               parsedValue = parseFloat(value, 10); 
 
           if (isNaN(Number(value))) {
-            msgs.push(options.message || instance.defaultMessages.not_a_number);
+            msgs.push(messages.not_a_number);
           } else {
             if (options.odd && judge.utils.isEven(parsedValue)) {
-              msgs.push(instance.defaultMessages.odd);
+              msgs.push(messages.odd);
             }
             if (options.even && judge.utils.isOdd(parsedValue)) {
-              msgs.push(instance.defaultMessages.even);
+              msgs.push(messages.even);
             }
             if (options.only_integer && !judge.utils.isInt(parsedValue)) {
-              msgs.push(instance.defaultMessages.not_an_integer);
+              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) {
-                var m = options.message || instance.defaultMessages[key];
-                msgs.push(judge.utils.countMsg(m, options[key]));
+                msgs.push(messages[key]);
               }
             });
           }
@@ -167,19 +175,19 @@ judge.Watcher.prototype.validates = function() {
         
         // Format validator ported as closely as possible
         // from [ActiveModel::Validations::FormatValidator](http://api.rubyonrails.org/classes/ActiveModel/Validations/FormatValidator.html).
-        format: function(options) {
+        format: function(options, messages) {
           var msgs  = [],
               value = instance.element.value;
           if (options.hasOwnProperty('with')) {
             var withReg = judge.utils.convertRegExp(options['with']);
             if (!withReg.test(value)) {
-              msgs.push(options.message || instance.defaultMessages.invalid);
+              msgs.push(messages.invalid);
             }
           }
           if (options.hasOwnProperty('without')) {
             var withoutReg = judge.utils.convertRegExp(options.without);
             if (withoutReg.test(value)) {
-              msgs.push(options.message || instance.defaultMessages.invalid);
+              msgs.push(messages.invalid);
             }
           }
           return msgs.length ? { valid:false, messages:msgs } : { valid:true };
@@ -187,20 +195,20 @@ judge.Watcher.prototype.validates = function() {
         
         // Acceptance validator ported as closely as possible
         // from [ActiveModel::Validations::AcceptanceValidator](http://api.rubyonrails.org/classes/ActiveModel/Validations/AcceptanceValidator.html).
-        acceptance: function(options) {
+        acceptance: function(options, messages) {
           if (instance.element.checked === true) {
             return { valid:true };
           } else {
             return {
               valid:false,
-              messages:[options.message || instance.defaultMessages.accepted]
+              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) {
+        confirmation: function(options, messages) {
           var id       = instance.element.getAttribute('id'),
               confId   = id + '_confirmation',
               confElem = document.getElementById(confId);
@@ -209,7 +217,7 @@ judge.Watcher.prototype.validates = function() {
           } else {
             return {
               valid:false,
-              messages:[options.message || instance.defaultMessages.confirmation]
+              messages:[messages.confirmation]
             };
           }
         }
@@ -307,20 +315,27 @@ judge.utils = {
   
   // Determines whether an object is a DOM element of the types that judge can work with.
   isValidatable: function(object) {
-    var type = judge.utils.getObjectString(object);
-    return (
-      type === "HTMLInputElement"    || 
-      type === "HTMLTextAreaElement" || 
-      type === "HTMLSelectElement"
-    );
+    var type  = judge.utils.getObjectString(object),
+        types = [
+          'HTMLInputElement',
+          'HTMLTextAreaElement',
+          'HTMLSelectElement'
+        ];
+    return _(types).include(type);
   },
 
-  // A way of checking isArray but including NodeList.
+  // A way of checking isArray, but including weird object types that are returned from collection queries.
   isCollection: function(object) {
-    var type = judge.utils.getObjectString(object);
-    return (
-      type === "Array" || type === "NodeList"
-    );
+    var type  = judge.utils.getObjectString(object),
+        types = [
+          'Array',
+          'NodeList',
+          'StaticNodeList',
+          'HTMLCollection',
+          'HTMLFormElement',
+          'HTMLAllCollection'
+        ];
+    return _(types).include(type);
   },
 
   // Returns the object type as represented in `Object.prototype.toString`.
@@ -335,9 +350,6 @@ judge.utils = {
     return eval(input+' '+operator+' '+validInput);
   },
 
-  // Sub the expected value into an error message.
-  countMsg: function(message, count) { return message.replace(/\%\{count\}/, count); },
-
   // Some nifty numerical helpers.
   isInt: function(value) { return value === +value && value === (value|0); },
   isFloat: function(value) { return value === +value && value !== (value|0); },
@@ -367,3 +379,4 @@ judge.utils = {
   }
 };
 
+