judge 0.5.0 → 1.0.0

data/lib/judge.rb

@@ -1,4 +1,6 @@
-require File.dirname(__FILE__) + '/judge/utils'
-require File.dirname(__FILE__) + '/judge/form'
-
-::ActionView::Helpers::FormBuilder.send(:include, Judge::FormBuilder)
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "judge"))
+require "version"
+require "validator"
+require "validator_collection"
+require "message_collection"
+require "form_builder"

data/lib/judge/form_builder.rb

@@ -0,0 +1,75 @@
+module Judge
+
+  class FormBuilder < ActionView::Helpers::FormBuilder
+
+    #include ActionView::Helpers::TagHelper
+    
+    %w{text_field text_area password_field}.each do |type|
+      helper = <<-END
+        def #{type}(method, options = {})
+          if options.delete(:validate).present?
+            options = { "data-validate" => Judge::ValidatorCollection.new(self.object, method).to_json }.merge(options)
+          end
+          @template.#{type}(self.object_name, method, options)
+        end
+      END
+      class_eval helper, __FILE__, __LINE__
+    end
+
+    def radio_button(method, tag_value, options = {})
+      if options.delete(:validate).present?
+        options = { "data-validate" => Judge::ValidatorCollection.new(self.object, method).to_json }.merge(options)
+      end
+      @template.radio_button(@object_name, method, tag_value, objectify_options(options))
+    end
+    
+    def check_box(method, options = {}, checked_value = "1", unchecked_value = "0")
+      if options.delete(:validate).present?
+        options = { "data-validate" => Judge::ValidatorCollection.new(self.object, method).to_json }.merge(options)
+      end
+      @template.check_box(self.object_name, method, objectify_options(options), checked_value, unchecked_value)
+    end
+
+    def select(method, choices, options = {}, html_options = {})
+      if options.delete(:validate).present?
+        html_options = { "data-validate" => Judge::ValidatorCollection.new(self.object, method).to_json }.merge(html_options)
+      end
+      @template.select(self.object_name, method, choices, objectify_options(options), @default_options.merge(html_options))
+    end
+
+    def collection_select(method, collection, value_method, text_method, options = {}, html_options = {})
+      if options.delete(:validate).present?
+        html_options = { "data-validate" => Judge::ValidatorCollection.new(self.object, method).to_json }.merge(html_options)
+      end
+      @template.collection_select(self.object_name, method, collection, value_method, text_method, objectify_options(options), @default_options.merge(html_options))
+    end
+
+    def grouped_collection_select(method, collection, group_method, group_label_method, option_key_method, option_value_method, options = {}, html_options = {})
+      if options.delete(:validate).present?
+        html_options = { "data-validate" => Judge::ValidatorCollection.new(self.object, method).to_json }.merge(html_options)
+      end
+      @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 #{type}(method, options = {}, html_options = {})
+          if options.delete(:validate).present?
+            html_options = { "data-validate" => Judge::ValidatorCollection.new(self.object, method).to_json }.merge(html_options)
+          end
+          @template.#{type}(self.object_name, method, objectify_options(options), html_options)
+        end
+      END
+      class_eval helper, __FILE__, __LINE__
+    end
+
+    def time_zone_select(method, priority_zones = nil, options = {}, html_options = {})
+      if options.delete(:validate).present?
+        html_options = { "data-validate" => Judge::ValidatorCollection.new(self.object, method).to_json }.merge(html_options)
+      end
+      @template.time_zone_select(@object_name, method, priority_zones, objectify_options(options), @default_options.merge(html_options))
+    end
+    
+  end
+
+end

data/lib/judge/{utils.rb → message_collection.rb}

@@ -1,8 +1,6 @@
 module Judge
-  
-  module Utils
 
-    extend self
+  class MessageCollection
 
     MESSAGE_MAP = {
       :confirmation => { :base => :confirmation },
@@ -33,48 +31,67 @@ module Judge
 
     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)
+    DEFAULT_OPTS = { :generate => true }
+
+    attr_reader   :object, :method, :kind, :options, :mm
+    attr_accessor :messages
+
+    def initialize(object, method, amv, opts = {})
+      opts = DEFAULT_OPTS.merge(opts)
+      @object   = object
+      @method   = method
+      @kind     = amv.kind
+      @options  = amv.options.dup
+      @mm       = MESSAGE_MAP
+      @messages = {}
+      generate_messages! unless opts[:generate] == false
+    end
+
+    def generate_messages!
+      if messages.blank?
+        %w{base options blank integer}.each do |type|
+          self.send(:"generate_#{type}!")
+        end
       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 = {}
+    def to_hash
+      messages
+    end
+
+    private
+
+    def generate_base!
       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)
+        messages[base_message] = object.errors.generate_message(method, base_message, options)
       end
+    end
+
+    def generate_options!
       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)
+          if options.has_key?(opt)
+            options_for_interpolation = { :count => options[opt] }.merge(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?
+    end
+
+    def generate_blank!
+      if ALLOW_BLANK.include?(kind) && options[:allow_blank].blank? && messages[:blank].blank?
         messages[:blank] = object.errors.generate_message(method, :blank)
       end
-      if kind == :numericality && validator_options[:only_integer].present?
+    end
+
+    def generate_integer!
+      if kind == :numericality && 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
-end
+
+end

data/lib/judge/validator.rb

@@ -0,0 +1,21 @@
+module Judge
+
+  class Validator
+
+    attr_reader :active_model_validator, :kind, :options, :method, :messages
+
+    def initialize(amv, method, message_collection)
+      @active_model_validator = amv
+      @kind = @active_model_validator.kind
+      @options = @active_model_validator.options.reject { |key| [:if, :on, :unless, :tokenizer].include?(key)  }
+      @method = method
+      @messages = message_collection
+    end
+
+    def to_hash
+      { :kind => kind, :options => options, :messages => messages.to_hash }
+    end
+
+  end
+
+end

data/lib/judge/validator_collection.rb

@@ -0,0 +1,28 @@
+module Judge
+
+  class ValidatorCollection
+
+    include Enumerable
+
+    attr_reader :validators
+    
+    def initialize(object, method)
+      active_model_validators = object.class.validators_on(method).reject { |amv| amv.kind == :uniqueness }
+      @validators = active_model_validators.map do |amv|
+        Judge::Validator.new(amv, method, Judge::MessageCollection.new(object, method, amv))
+      end
+    end
+
+    def each
+      validators.each do |v|
+        yield v
+      end
+    end
+
+    def to_json
+      validators.map { |v| v.to_hash }.to_json
+    end
+
+  end
+
+end

data/lib/judge/version.rb

@@ -0,0 +1,3 @@
+module Judge
+  VERSION = "1.0.0"
+end

data/spec/javascripts/JudgeSpec.js

@@ -114,7 +114,6 @@ describe('judge', function() {
         judge.store.save('mykey', document.getElementById('foo_two_foobar'));
         var d = judge.store.getDOM('mykey');
         expect(d.length).toEqual(2);
-        console.log(d);
         expect(Object.prototype.toString.call(d[0])).toEqual('[object HTMLSelectElement]');
       });
 
@@ -134,12 +133,33 @@ describe('judge', function() {
 
     });
 
+    describe('validate', function() {
+      
+      it('validates all elements stored against key', function() {
+        judge.store.save('mykey', e);
+        var results = judge.store.validate('mykey');
+        expect(_(results).first()).toBeInstanceOf(Object);
+        expect(_(results).first().element).toEqual(e);
+      });
+
+      it('returns null if no elements found', function() {
+        var results = judge.store.validate('mykey');
+        expect(results).toBe(null);
+      });
+
+      it('returns null if key is not passed', function() {
+        var results = judge.store.validate();
+        expect(results).toBe(null);
+      });
+
+    });
+
     describe('remove', function() {
       
       it('removes Watcher from store', function() {
         judge.store.save('mykey', e);
-        expect(judge.store.remove('mykey', e)).not.toEqual(null);
-        expect(judge.store.get('mykey').length).toEqual(0);
+        expect(_(judge.store.remove('mykey', e)).isUndefined()).toEqual(true);
+        expect(judge.store.get('mykey')).toBe(null);
       });
 
       it('returns null if key not found', function() {
@@ -161,12 +181,12 @@ describe('judge', function() {
         judge.store.save('mykey', e);
         judge.store.save('mykey2', e);
         judge.store.clear('mykey');
-        expect(judge.store.get('mykey')).toEqual([]);
+        expect(judge.store.get('mykey')).toBe(null);
         expect(judge.store.get('mykey2').length).toEqual(1);
       });
 
       it('returns null if key not found', function() {
-        expect(judge.store.clear('notakey')).toEqual(null);
+        expect(judge.store.clear('notakey')).toBe(null);
       });
 
     });
@@ -509,24 +529,6 @@ describe('judge', function() {
 
   describe('utils', function() {
 
-    describe('isValidatable', function() {
-      
-      it('returns true if judge can validate object', function() {
-        var i = document.createElement('input'),
-            s = document.createElement('select'),
-            t = document.createElement('textarea');
-        expect(judge.utils.isValidatable(i)).toEqual(true);
-        expect(judge.utils.isValidatable(s)).toEqual(true);
-        expect(judge.utils.isValidatable(t)).toEqual(true);
-      });
-
-      it('returns false otherwise', function() {
-        var p = document.createElement('p');
-        expect(judge.utils.isValidatable(p)).toEqual(false);
-      });
-
-    });
-
     describe('isCollection', function() {
       
       beforeEach(function() {

data/test/expected_elements.rb

@@ -0,0 +1,235 @@
+module ExpectedElements
+  
+  def expected_text_field
+   %Q{<input data-validate="[{&quot;kind&quot;:&quot;presence&quot;,&quot;options&quot;:{},&quot;messages&quot;:{&quot;blank&quot;:&quot;can't be blank&quot;}}]" id="user_name" name="user[name]" size="30" type="text" />}
+  end
+
+  def expected_text_area
+    %Q{<textarea cols="40" data-validate="[{&quot;kind&quot;:&quot;presence&quot;,&quot;options&quot;:{},&quot;messages&quot;:{&quot;blank&quot;:&quot;can't be blank&quot;}}]" id="user_bio" name="user[bio]" rows="20"></textarea>}
+  end
+
+  def expected_password_field
+    %Q{<input data-validate="[{&quot;kind&quot;:&quot;format&quot;,&quot;options&quot;:{&quot;with&quot;:&quot;(?-mix:.+)&quot;},&quot;messages&quot;:{&quot;invalid&quot;:&quot;is invalid&quot;,&quot;blank&quot;:&quot;can't be blank&quot;}},{&quot;kind&quot;:&quot;confirmation&quot;,&quot;options&quot;:{},&quot;messages&quot;:{&quot;confirmation&quot;:&quot;doesn't match confirmation&quot;}}]" id="user_password" name="user[password]" size="30" type="password" />}
+  end
+
+  def expected_check_box
+    %Q{<input data-validate="[{&quot;kind&quot;:&quot;acceptance&quot;,&quot;options&quot;:{&quot;allow_nil&quot;:true,&quot;accept&quot;:&quot;1&quot;},&quot;messages&quot;:{&quot;accepted&quot;:&quot;must be accepted&quot;}}]" id="user_accepted" name="user[accepted]" size="30" type="password" />}
+  end
+
+  def expected_radio_button
+    %Q{<input data-validate="[{&quot;kind&quot;:&quot;inclusion&quot;,&quot;options&quot;:{&quot;in&quot;:[&quot;male&quot;,&quot;female&quot;,&quot;other&quot;,&quot;withheld&quot;]},&quot;messages&quot;:{&quot;inclusion&quot;:&quot;is not included in the list&quot;,&quot;blank&quot;:&quot;can't be blank&quot;}}]" id="user_gender_female" name="user[gender]" type="radio" value="female" />}
+  end
+
+  def expected_select
+    %Q{<select data-validate="[{&quot;kind&quot;:&quot;format&quot;,&quot;options&quot;:{&quot;with&quot;:&quot;(?-mix:[A-Za-z])&quot;,&quot;allow_blank&quot;:true},&quot;messages&quot;:{&quot;invalid&quot;:&quot;is invalid&quot;}}]" id="user_country" name="user[country]"><option value="US">US</option>
+<option value="GB">GB</option></select>}
+  end
+
+  def expected_collection_select
+    %Q{<select data-validate="[{&quot;kind&quot;:&quot;presence&quot;,&quot;options&quot;:{},&quot;messages&quot;:{&quot;blank&quot;:&quot;can't be blank&quot;}}]" id="user_team_id" name="user[team_id]"><option value="1">Team 1</option>
+<option value="2">Team 2</option>
+<option value="3">Team 3</option>
+<option value="4">Team 4</option>
+<option value="5">Team 5</option></select>}
+  end
+
+  def expected_grouped_collection_select
+    %Q{<select data-validate="[{&quot;kind&quot;:&quot;presence&quot;,&quot;options&quot;:{},&quot;messages&quot;:{&quot;blank&quot;:&quot;can't be blank&quot;}}]" id="user_discipline_id" name="user[discipline_id]"><optgroup label="Category 1"><option value="">Sport 1</option></optgroup></select>}
+  end
+
+  def expected_date_select
+    %Q{<select data-validate="[{&quot;kind&quot;:&quot;presence&quot;,&quot;options&quot;:{},&quot;messages&quot;:{&quot;blank&quot;:&quot;can't be blank&quot;}}]" id="user_dob_1i" name="user[dob(1i)]">
+<option value="2006">2006</option>
+<option value="2007">2007</option>
+<option value="2008">2008</option>
+<option value="2009">2009</option>
+<option value="2010">2010</option>
+<option selected="selected" value="2011">2011</option>
+<option value="2012">2012</option>
+<option value="2013">2013</option>
+<option value="2014">2014</option>
+<option value="2015">2015</option>
+<option value="2016">2016</option>
+</select>
+<select data-validate="[{&quot;kind&quot;:&quot;presence&quot;,&quot;options&quot;:{},&quot;messages&quot;:{&quot;blank&quot;:&quot;can't be blank&quot;}}]" id="user_dob_2i" name="user[dob(2i)]">
+<option value="1">January</option>
+<option value="2">February</option>
+<option value="3">March</option>
+<option value="4">April</option>
+<option value="5">May</option>
+<option value="6">June</option>
+<option value="7">July</option>
+<option value="8">August</option>
+<option value="9">September</option>
+<option value="10">October</option>
+<option selected="selected" value="11">November</option>
+<option value="12">December</option>
+</select>
+<select data-validate="[{&quot;kind&quot;:&quot;presence&quot;,&quot;options&quot;:{},&quot;messages&quot;:{&quot;blank&quot;:&quot;can't be blank&quot;}}]" id="user_dob_3i" name="user[dob(3i)]">
+<option value="1">1</option>
+<option value="2">2</option>
+<option value="3">3</option>
+<option value="4">4</option>
+<option selected="selected" value="5">5</option>
+<option value="6">6</option>
+<option value="7">7</option>
+<option value="8">8</option>
+<option value="9">9</option>
+<option value="10">10</option>
+<option value="11">11</option>
+<option value="12">12</option>
+<option value="13">13</option>
+<option value="14">14</option>
+<option value="15">15</option>
+<option value="16">16</option>
+<option value="17">17</option>
+<option value="18">18</option>
+<option value="19">19</option>
+<option value="20">20</option>
+<option value="21">21</option>
+<option value="22">22</option>
+<option value="23">23</option>
+<option value="24">24</option>
+<option value="25">25</option>
+<option value="26">26</option>
+<option value="27">27</option>
+<option value="28">28</option>
+<option value="29">29</option>
+<option value="30">30</option>
+<option value="31">31</option>
+</select>
+}
+  end
+
+  def expected_datetime_select
+    %Q{<select data-validate="[{&quot;kind&quot;:&quot;presence&quot;,&quot;options&quot;:{},&quot;messages&quot;:{&quot;blank&quot;:&quot;can't be blank&quot;}}]" id="user_dob_1i" name="user[dob(1i)]">
+<option value="2006">2006</option>
+<option value="2007">2007</option>
+<option value="2008">2008</option>
+<option value="2009">2009</option>
+<option value="2010">2010</option>
+<option selected="selected" value="2011">2011</option>
+<option value="2012">2012</option>
+<option value="2013">2013</option>
+<option value="2014">2014</option>
+<option value="2015">2015</option>
+<option value="2016">2016</option>
+</select>
+<select data-validate="[{&quot;kind&quot;:&quot;presence&quot;,&quot;options&quot;:{},&quot;messages&quot;:{&quot;blank&quot;:&quot;can't be blank&quot;}}]" id="user_dob_2i" name="user[dob(2i)]">
+<option value="1">January</option>
+<option value="2">February</option>
+<option value="3">March</option>
+<option value="4">April</option>
+<option value="5">May</option>
+<option value="6">June</option>
+<option value="7">July</option>
+<option value="8">August</option>
+<option value="9">September</option>
+<option value="10">October</option>
+<option selected="selected" value="11">November</option>
+<option value="12">December</option>
+</select>
+<select data-validate="[{&quot;kind&quot;:&quot;presence&quot;,&quot;options&quot;:{},&quot;messages&quot;:{&quot;blank&quot;:&quot;can't be blank&quot;}}]" id="user_dob_3i" name="user[dob(3i)]">
+<option value="1">1</option>
+<option value="2">2</option>
+<option value="3">3</option>
+<option value="4">4</option>
+<option selected="selected" value="5">5</option>
+<option value="6">6</option>
+<option value="7">7</option>
+<option value="8">8</option>
+<option value="9">9</option>
+<option value="10">10</option>
+<option value="11">11</option>
+<option value="12">12</option>
+<option value="13">13</option>
+<option value="14">14</option>
+<option value="15">15</option>
+<option value="16">16</option>
+<option value="17">17</option>
+<option value="18">18</option>
+<option value="19">19</option>
+<option value="20">20</option>
+<option value="21">21</option>
+<option value="22">22</option>
+<option value="23">23</option>
+<option value="24">24</option>
+<option value="25">25</option>
+<option value="26">26</option>
+<option value="27">27</option>
+<option value="28">28</option>
+<option value="29">29</option>
+<option value="30">30</option>
+<option value="31">31</option>
+</select>
+ &mdash; <select data-validate="[{&quot;kind&quot;:&quot;presence&quot;,&quot;options&quot;:{},&quot;messages&quot;:{&quot;blank&quot;:&quot;can't be blank&quot;}}]" id="user_dob_4i" name="user[dob(4i)]">
+<option value="00">00</option>
+<option value="01">01</option>
+<option value="02">02</option>
+<option value="03">03</option>
+<option value="04">04</option>
+<option value="05">05</option>
+<option value="06">06</option>
+<option value="07">07</option>
+<option value="08">08</option>
+<option value="09">09</option>
+<option value="10">10</option>
+<option value="11">11</option>
+<option value="12">12</option>
+<option value="13">13</option>
+<option value="14">14</option>
+<option value="15">15</option>
+<option value="16">16</option>
+<option selected="selected" value="17">17</option>
+<option value="18">18</option>
+<option value="19">19</option>
+<option value="20">20</option>
+<option value="21">21</option>
+<option value="22">22</option>
+<option value="23">23</option>
+</select>
+ : <select data-validate="[{&quot;kind&quot;:&quot;presence&quot;,&quot;options&quot;:{},&quot;messages&quot;:{&quot;blank&quot;:&quot;can't be blank&quot;}}]" id="user_dob_5i" name="user[dob(5i)]">
+<option selected="selected" value="00">00</option>
+<option value="30">30</option>
+</select>
+}
+  end
+
+  def expected_time_select
+    %Q{<input id="user_dob_1i" name="user[dob(1i)]" type="hidden" value="2011" />
+<input id="user_dob_2i" name="user[dob(2i)]" type="hidden" value="11" />
+<input id="user_dob_3i" name="user[dob(3i)]" type="hidden" value="5" />
+<select data-validate="[{&quot;kind&quot;:&quot;presence&quot;,&quot;options&quot;:{},&quot;messages&quot;:{&quot;blank&quot;:&quot;can't be blank&quot;}}]" id="user_dob_4i" name="user[dob(4i)]">
+<option value="00">00</option>
+<option value="01">01</option>
+<option value="02">02</option>
+<option value="03">03</option>
+<option value="04">04</option>
+<option value="05">05</option>
+<option value="06">06</option>
+<option value="07">07</option>
+<option value="08">08</option>
+<option value="09">09</option>
+<option value="10">10</option>
+<option value="11">11</option>
+<option value="12">12</option>
+<option value="13">13</option>
+<option value="14">14</option>
+<option value="15">15</option>
+<option value="16">16</option>
+<option selected="selected" value="17">17</option>
+<option value="18">18</option>
+<option value="19">19</option>
+<option value="20">20</option>
+<option value="21">21</option>
+<option value="22">22</option>
+<option value="23">23</option>
+</select>
+ : <select data-validate="[{&quot;kind&quot;:&quot;presence&quot;,&quot;options&quot;:{},&quot;messages&quot;:{&quot;blank&quot;:&quot;can't be blank&quot;}}]" id="user_dob_5i" name="user[dob(5i)]">
+<option selected="selected" value="00">00</option>
+<option value="30">30</option>
+</select>
+}
+  end
+
+end