judge 0.4.3 → 0.5.0

data/lib/judge.rb

@@ -2,7 +2,3 @@ require File.dirname(__FILE__) + '/judge/utils'
 require File.dirname(__FILE__) + '/judge/form'
 
 ::ActionView::Helpers::FormBuilder.send(:include, Judge::FormBuilder)
-
-module ApplicationHelper
-  include Judge::FormHelper
-end

data/lib/judge/form.rb

@@ -7,7 +7,7 @@ module Judge
     %w{text_field text_area password_field}.each do |type|
       helper = <<-END
         def validated_#{type}(method, options = {})
-          options = { "data-validate" => Judge::Utils.jsonify_validators(self.object, method) }.merge(options)
+          options = { "data-validate" => Judge::Utils.validators_to_json(self.object, method) }.merge(options)
           @template.#{type}(self.object_name, method, options)
         end
       END
@@ -15,34 +15,34 @@ module Judge
     end
 
     def validated_radio_button(method, tag_value, options = {})
-      options = { "data-validate" => Judge::Utils.jsonify_validators(self.object, method) }.merge(options)
+      options = { "data-validate" => Judge::Utils.validators_to_json(self.object, method) }.merge(options)
       @template.radio_button(@object_name, method, tag_value, objectify_options(options))
     end
     
     def validated_check_box(method, options = {}, checked_value = "1", unchecked_value = "0")
-      options = { "data-validate" => Judge::Utils.jsonify_validators(self.object, method) }.merge(options)
+      options = { "data-validate" => Judge::Utils.validators_to_json(self.object, method) }.merge(options)
       @template.check_box(self.object_name, method, objectify_options(options), checked_value, unchecked_value)
     end
 
     def validated_select(method, choices, options = {}, html_options = {})
-      html_options = { "data-validate" => Judge::Utils.jsonify_validators(self.object, method) }.merge(html_options)
+      html_options = { "data-validate" => Judge::Utils.validators_to_json(self.object, method) }.merge(html_options)
       @template.select(self.object_name, method, choices, objectify_options(options), @default_options.merge(html_options))
     end
 
     def validated_collection_select(method, collection, value_method, text_method, options = {}, html_options = {})
-      html_options = { "data-validate" => Judge::Utils.jsonify_validators(self.object, method) }.merge(html_options)
+      html_options = { "data-validate" => Judge::Utils.validators_to_json(self.object, method) }.merge(html_options)
       @template.collection_select(self.object_name, method, collection, value_method, text_method, objectify_options(options), @default_options.merge(html_options))
     end
 
     def validated_grouped_collection_select(method, collection, group_method, group_label_method, option_key_method, option_value_method, options = {}, html_options = {})
-      html_options = { "data-validate" => Judge::Utils.jsonify_validators(self.object, method) }.merge(html_options)
+      html_options = { "data-validate" => Judge::Utils.validators_to_json(self.object, method) }.merge(html_options)
       @template.grouped_collection_select(self.object_name, method, collection, group_method, group_label_method, option_key_method, option_value_method, objectify_options(options), @default_options.merge(html_options))
     end
 
     %w{date_select datetime_select time_select}.each do |type|
       helper = <<-END
         def validated_#{type}(method, options = {}, html_options = {})
-          html_options = { "data-validate" => Judge::Utils.jsonify_validators(self.object, method) }.merge(html_options)
+          html_options = { "data-validate" => Judge::Utils.validators_to_json(self.object, method) }.merge(html_options)
           @template.#{type}(self.object_name, method, objectify_options(options), html_options)
         end
       END
@@ -50,22 +50,10 @@ module Judge
     end
 
     def validated_time_zone_select(method, priority_zones = nil, options = {}, html_options = {})
-      html_options = { "data-validate" => Judge::Utils.jsonify_validators(self.object, method) }.merge(html_options)
+      html_options = { "data-validate" => Judge::Utils.validators_to_json(self.object, method) }.merge(html_options)
       @template.time_zone_select(@object_name, method, priority_zones, objectify_options(options), @default_options.merge(html_options))
     end
     
-    
-  end
-
-  module FormHelper
-  
-    def validated_form_for(record_or_name_or_array, *args, &proc)
-      options = args.extract_options!
-      options[:html] ||= {}
-      options[:html]["data-error-messages"] = I18n.t("errors.messages").to_json
-      form_for(record_or_name_or_array, *(args << options), &proc)
-    end
-
   end
 
 end

data/lib/judge/utils.rb

@@ -1,15 +1,79 @@
 module Judge
+  
   module Utils
 
-    def self.jsonify_validators(object, method)
-      validators = object.class.validators_on(method)
-      validators = validators.collect do |validator|
-        {
-          :kind => validator.kind.to_s, 
-          :options => validator.options.reject{ |key| [:if, :on, :unless, :tokenizer].include?(key)  }
-        }
+    extend self
+
+    MESSAGE_MAP = {
+      :confirmation => { :base => :confirmation },
+      :acceptance   => { :base => :accepted },
+      :presence     => { :base => :blank },
+      :length       => { :base => nil,
+                         :options => {
+                           :minimum => :too_short,
+                           :maximum => :too_long,
+                           :is      => :wrong_length    
+                         }
+                       },
+      :format       => { :base => :invalid },
+      :inclusion    => { :base => :inclusion },
+      :exclusion    => { :base => :exclusion },
+      :numericality => { :base => :not_a_number,
+                         :options => {
+                           :greater_than             => :greater_than, 
+                           :greater_than_or_equal_to => :greater_than_or_equal_to, 
+                           :equal_to                 => :equal_to, 
+                           :less_than                => :less_than, 
+                           :less_than_or_equal_to    => :less_than_or_equal_to,
+                           :odd                      => :odd,
+                           :even                     => :even
+                         }
+                       }
+    }
+
+    ALLOW_BLANK = [:format, :exclusion, :inclusion, :length]
+
+    # Returns all decorated validators for an object's method, as JSON
+    #   Judge::Utils.validators_to_json(@user, :name)
+    def validators_to_json(object, method)
+      validators = object.class.validators_on(method).reject { |validator| validator.kind == :uniqueness }
+      validators.collect! do |validator| 
+        Judge::Utils.decorate_validator(validator, object, method)
+      end
+      validators.to_json
+    end
+    
+    # Convert validator to hash, removing all parts we don't support and adding all possible error messages
+    #   Judge::Utils.decorate_validator(validator_instance, @user, :name)
+    def decorate_validator(validator, object, method)
+      kind = validator.kind
+      mm = MESSAGE_MAP
+
+      # remove callbacks and tokenizer, which we don't support
+      validator_options = validator.options.reject { |key| [:if, :on, :unless, :tokenizer].include?(key)  }
+      
+      messages = {}
+      if mm.has_key?(kind) && mm[kind][:base].present?
+        base_message = mm[kind][:base]
+        messages[base_message] = object.errors.generate_message(method, base_message, validator_options)
+      end
+      if mm.has_key?(kind) && mm[kind][:options].present?
+        opt_messages = mm[kind][:options]
+        opt_messages.each do |opt, opt_message|
+          if validator_options.has_key?(opt)
+            options_for_interpolation = { :count => validator_options[opt] }.merge(validator_options)
+            messages[opt_message] = object.errors.generate_message(method, opt_message, options_for_interpolation)
+          end
+        end
+      end
+      if ALLOW_BLANK.include?(kind) && validator_options[:allow_blank].blank? && messages[:blank].blank?
+        messages[:blank] = object.errors.generate_message(method, :blank)
       end
-      validators.reject{ |validator| validator[:kind] == "uniqueness" }.to_json
+      if kind == :numericality && validator_options[:only_integer].present?
+        messages[:not_an_integer] = object.errors.generate_message(method, :not_an_integer)
+      end
+
+      { :kind => kind, :options => validator_options, :messages => messages }
     end
 
   end

data/spec/javascripts/JudgeSpec.js

@@ -17,9 +17,9 @@ describe('judge', function() {
     });
 
     it('validates a collection of elements', function() {
-      var e = document.querySelectorAll('.field input'),
+      var e = document.querySelectorAll('input[type=radio]'),
           v = judge.validate(e);
-      expect(v.length).toBeGreaterThan(1);
+      expect(v.length).toEqual(1);
     });
 
   });
@@ -47,8 +47,9 @@ describe('judge', function() {
       expect(_(j.validators).isEmpty()).toEqual(false);
     });
 
-    it('holds default messages', function() {
-      expect(j.defaultMessages).toBeInstanceOf(Object);
+    it('holds messages inside validators', function() {
+      expect(_(j.validators).first().hasOwnProperty('messages')).toBe(true);
+      expect(_(j.validators).first().messages).toBeInstanceOf(Object);
     });
 
     it('has validation methods in prototype', function() {
@@ -67,14 +68,6 @@ describe('judge', function() {
       expect(function() { new judge.Watcher(e); }).toThrow();
     });
 
-    it('throws error if element.form has no data-error-messages attribute', function() {
-      var e = document.createElement('input'),
-          f = document.createElement('form');
-      e.type = 'text';
-      f.appendChild(e);
-      expect(function() { new judge.Watcher(e); }).toThrow();
-    });
-
     it('throws error if no element is passed', function() {
       expect(function() { new judge.Watcher(); }).toThrow();
     });
@@ -118,20 +111,21 @@ describe('judge', function() {
       
       it('returns DOM elements from stored Watchers', function() {
         judge.store.save('mykey', e);
-        judge.store.save('mykey', document.getElementById('foo_two'));
+        judge.store.save('mykey', document.getElementById('foo_two_foobar'));
         var d = judge.store.getDOM('mykey');
         expect(d.length).toEqual(2);
-        expect(Object.prototype.toString.call(d[0])).toEqual('[object HTMLInputElement]');
+        console.log(d);
+        expect(Object.prototype.toString.call(d[0])).toEqual('[object HTMLSelectElement]');
       });
 
       it('returns store object with watchers converted to elements if no key given', function() {
         judge.store.save('mykey', e);
-        judge.store.save('mykey2', document.getElementById('foo_two'));
+        judge.store.save('mykey2', document.getElementById('foo_two_foobar'));
         judge.store.save('mykey2', document.getElementById('foo_three'));
         var d = judge.store.getDOM();
         expect(d.mykey.length).toEqual(1);
         expect(d.mykey2.length).toEqual(2);
-        expect(Object.prototype.toString.call(d.mykey[0])).toEqual('[object HTMLInputElement]');
+        expect(Object.prototype.toString.call(d.mykey[0])).toEqual('[object HTMLSelectElement]');
       });
 
       it('returns null if key not found', function() {
@@ -220,17 +214,12 @@ describe('judge', function() {
         expect(j.validate().valid).toEqual(false);
       });
 
-      it('returns custom message when present', function() {
-        _(j.validators).first().options.message = 'hello';
-        expect(j.validate().messages).toContain('hello');
-      });
-
-      it('returns default message', function() {
-        expect(j.validate().messages).toContain(j.defaultMessages.blank);
+      it('returns message', function() {
+        expect(j.validate().messages).not.toBeEmpty();
       });
 
       it('validates non-empty input', function() {
-        j.element.value = 'abcde';
+        j.element.children[1].selected = true;
         expect(j.validate().valid).toEqual(true);
       });
 
@@ -238,11 +227,10 @@ describe('judge', function() {
 
     describe('length', function() {
 
-      var j, jIs;
+      var j;
 
       beforeEach(function() {
-        j = new judge.Watcher(document.getElementById('foo_two'));
-        jIs = new judge.Watcher(document.getElementById('foo_two_is'));
+        j = new judge.Watcher(document.getElementById('foo_two_foobar'));
       });
 
       it('validates valid input', function() {
@@ -255,15 +243,9 @@ describe('judge', function() {
         expect(j.validate().valid).toEqual(true);
       });
 
-      it('returns custom message when present', function() {
-        j.element.value = 'abc';
-        _(j.validators).first().options.too_short = 'oh dear';
-        expect(j.validate().messages).toContain('oh dear');
-      });
-
-      it('returns default message', function() {
+      it('returns message', function() {
         j.element.value = 'abc';
-        expect(j.validate().messages).toContain(judge.utils.countMsg(j.defaultMessages.too_short, 5));
+        expect(j.validate().messages).not.toBeEmpty();
       });
 
       it('invalidates when value is under minimum', function() {
@@ -276,10 +258,10 @@ describe('judge', function() {
         expect(j.validate().valid).toEqual(false);
       });
 
-      it('invalidates when value is not equal to is', function() {
-        jIs.element.value = 'abc';
-        expect(jIs.validate().valid).toEqual(false);
-      });
+      //it('invalidates when value is not equal to is', function() {
+      //  jIs.element.value = 'abc';
+      //  expect(jIs.validate().valid).toEqual(false);
+      //});
     });
 
     describe('exclusion', function() {
@@ -291,24 +273,16 @@ describe('judge', function() {
       });
       
       it('validates when value is not in array', function() {
-        j.element.value = 'abc';
         expect(j.validate().valid).toEqual(true);
       });
 
       it('invalidates when value is in array', function() {
-        j.element.value = 'foo';
+        j.element.children[1].selected = true;
         expect(j.validate().valid).toEqual(false);
-      });
-
-      it('returns default message', function() {
-        j.element.value = 'foo';
-        expect(j.validate().messages).toContain(j.defaultMessages.exclusion);
-      });
+      }); 
 
-      it('returns default message', function() {
-        _(j.validators).first().options.message = 'restricted';
-        j.element.value = 'foo';
-        expect(j.validate().messages).toContain('restricted');
+      it('returns message', function() {
+        expect(j.validate().messages).not.toBeEmpty();
       });
 
     });
@@ -322,24 +296,16 @@ describe('judge', function() {
       });
       
       it('validates when value is in array', function() {
-        j.element.value = '3';
+        j.element.children[1].selected = true;
         expect(j.validate().valid).toEqual(true);
       });
 
       it('invalidates when value is not in array', function() {
-        j.element.value = '10';
         expect(j.validate().valid).toEqual(false);
       });
 
-      it('returns default message', function() {
-        j.element.value = '10';
-        expect(j.validate().messages).toContain(j.defaultMessages.inclusion);
-      });
-
-      it('returns default message', function() {
-        _(j.validators).first().options.message = 'must be one of defined values';
-        j.element.value = 'foo';
-        expect(j.validate().messages).toContain('must be one of defined values');
+      it('returns message', function() {
+        expect(j.validate().messages).not.toBeEmpty();
       });
 
     });
@@ -358,13 +324,13 @@ describe('judge', function() {
       it('invalidates when value is not a number', function() {
         j.element.value = 'foo bar';
         expect(j.validate().valid).toEqual(false);
-        expect(j.validate().messages).toContain(j.defaultMessages.not_a_number);
+        expect(j.validate().messages).not.toBeEmpty();
       });
 
       it('validates odd / invalidates not odd', function() {
         j.element.value = '2';
         expect(j.validate().valid).toEqual(false);
-        expect(j.validate().messages).toContain(j.defaultMessages.odd);
+        expect(j.validate().messages).not.toBeEmpty();
         j.element.value = '1';
         expect(j.validate().valid).toEqual(true);
       });
@@ -372,7 +338,7 @@ describe('judge', function() {
       it('validates even / invalidates not even', function() {
         jEven.element.value = '1';
         expect(jEven.validate().valid).toEqual(false);
-        expect(jEven.validate().messages).toContain(jEven.defaultMessages.even);
+        expect(jEven.validate().messages).not.toBeEmpty();
         jEven.element.value = '2';
         expect(jEven.validate().valid).toEqual(true);
       });
@@ -387,7 +353,7 @@ describe('judge', function() {
         it('invalidates float', function() {
           j.element.value = '1.1';
           expect(j.validate().valid).toEqual(false);
-          expect(j.validate().messages).toContain(j.defaultMessages.not_an_integer);
+          expect(j.validate().messages).not.toBeEmpty();
         });
 
       });
@@ -397,10 +363,10 @@ describe('judge', function() {
         it('invalidates not greater than', function() {
           jGt.element.value = '6';
           expect(jGt.validate().valid).toEqual(false);
-          expect(jGt.validate().messages).toContain(judge.utils.countMsg(jGt.defaultMessages.greater_than, 7));
+          expect(jGt.validate().messages).not.toBeEmpty();
           jGt.element.value = '7';
           expect(jGt.validate().valid).toEqual(false);
-          expect(jGt.validate().messages).toContain(judge.utils.countMsg(jGt.defaultMessages.greater_than, 7));
+          expect(jGt.validate().messages).not.toBeEmpty();
         });
 
         it('validates greater than', function() {
@@ -426,30 +392,30 @@ describe('judge', function() {
 
       });
 
-      it('validates equal to', function() {
-        jLt.element.value = '5';
-        expect(jLt.validate().valid).toEqual(false);
-        jLt.element.value = '6';
-        expect(jLt.validate().valid).toEqual(true);
-      });
+      //it('validates equal to', function() {
+      //  jLt.element.value = '5';
+      //  expect(jLt.validate().valid).toEqual(false);
+      //  jLt.element.value = '6';
+      //  expect(jLt.validate().valid).toEqual(true);
+      //});
 
-      it('validates less than or equal to', function() {
-        j.element.value = '5';
-        expect(j.validate().valid).toEqual(true);
-        j.element.value = '7';
-        expect(j.validate().valid).toEqual(true);
-        j.element.value = '9';
-        expect(j.validate().valid).toEqual(false);
-      });
+      //it('validates less than or equal to', function() {
+      //  j.element.value = '5';
+      //  expect(j.validate().valid).toEqual(true);
+      //  j.element.value = '7';
+      //  expect(j.validate().valid).toEqual(true);
+      //  j.element.value = '9';
+      //  expect(j.validate().valid).toEqual(false);
+      //});
 
-      it('validates greater than or equal to', function() {
-        jEven.element.value = '20';
-        expect(jEven.validate().valid).toEqual(true);
-        jEven.element.value = '2';
-        expect(jEven.validate().valid).toEqual(true);
-        jEven.element.value = '1';
-        expect(jEven.validate().valid).toEqual(false);
-      });
+      //it('validates greater than or equal to', function() {
+      //  jEven.element.value = '20';
+      //  expect(jEven.validate().valid).toEqual(true);
+      //  jEven.element.value = '2';
+      //  expect(jEven.validate().valid).toEqual(true);
+      //  jEven.element.value = '1';
+      //  expect(jEven.validate().valid).toEqual(false);
+      //});
 
     });
 
@@ -460,18 +426,17 @@ describe('judge', function() {
         var j;
 
         beforeEach(function() {
-          j = new judge.Watcher(document.getElementById('foo_five'));
+          j = new judge.Watcher(document.getElementById('foo_five_wi'));
         });
 
-        it('validates value matching with', function() {
-          j.element.value = 'ABCabc123';
-          expect(j.validate().valid).toEqual(true);
+        it('invalidates value matching with', function() {
+          expect(j.validate().valid).toEqual(false);
+          expect(j.validate().messages).not.toBeEmpty();
         });
 
         it('invalidates value not matching with', function() {
-          j.element.value = '123';
-          expect(j.validate().valid).toEqual(false);
-          expect(j.validate().messages).toContain(j.defaultMessages.invalid);
+          j.element.children[1].selected = true;
+          expect(j.validate().valid).toEqual(true);
         });
 
       });
@@ -484,15 +449,14 @@ describe('judge', function() {
           j = new judge.Watcher(document.getElementById('foo_five_wo'));
         });
 
-        it('validates value matching with', function() {
-          j.element.value = '12345';
+        it('validates value not matching with', function() {
           expect(j.validate().valid).toEqual(true);
         });
 
-        it('invalidates value not matching with', function() {
-          j.element.value = 'AbC123';
+        it('invalidates value matching with', function() {
+          j.element.children[1].selected = true;
           expect(j.validate().valid).toEqual(false);
-          expect(j.validate().messages).toContain(j.defaultMessages.invalid);
+          expect(j.validate().messages).not.toBeEmpty();
         });
 
       });
@@ -516,11 +480,6 @@ describe('judge', function() {
         expect(j.validate().valid).toEqual(false);
       });
 
-      it('invalidates with custom message when present', function() {
-        _(j.validators).first().options.message = 'must be ticked';
-        expect(j.validate().messages).toContain('must be ticked');
-      });
-
     });
 
     describe('confirmation', function() {
@@ -544,13 +503,6 @@ describe('judge', function() {
         expect(j.validate().valid).toEqual(false);
       });
 
-      it('invalidates with custom message when present', function() {
-        _(j.validators).first().options.message = 'must be same';
-        j.element.value = 'password';
-        c.value = 'wrongpassword';
-        expect(j.validate().messages).toContain('must be same');
-      });
-
     });
 
   });
@@ -605,14 +557,6 @@ describe('judge', function() {
       });
 
     });
-
-    describe('countMsg', function() {
-      
-      it('subs string', function() {
-        expect(judge.utils.countMsg('should be less than %{count}', 5)).toEqual('should be less than 5');
-      });
-
-    });
     
     describe('isInt', function() {