client_side_validations 3.0.0 → 3.0.1

data/javascript/rails.validations.js

@@ -1,3 +1,12 @@
+/*!
+ * Rails 3 Client Side Validations - v3.0.1
+ * https://github.com/bcardarlela/client_side_validations
+ *
+ * Copyright (c) 2011 Brian Cardarella
+ * Licensed under the MIT license
+ * http://www.opensource.org/licenses/mit-license.php
+ */
+
 (function($) {
   $.fn.validate = function() {
     return this.filter('form[data-validate]').each(function() {
@@ -6,8 +15,8 @@
 
       // Set up the events for the form
       form
-        .submit(function() { return form.isValid(); })
-        .bind('ajax:beforeSend',      function()          { return form.isValid(); })
+        .submit(function() { return form.isValid(settings.validators); })
+        .bind('ajax:beforeSend',      function()          { return form.isValid(settings.validators); })
         // Callbacks
         .bind('form:validate:after',  function(eventData) { clientSideValidations.callbacks.form.after( form, eventData); })
         .bind('form:validate:before', function(eventData) { clientSideValidations.callbacks.form.before(form, eventData); })
@@ -15,8 +24,8 @@
         .bind('form:validate:pass',   function(eventData) { clientSideValidations.callbacks.form.pass(  form, eventData); })
 
         // Set up the events for each validatable form element
-        .find('[data-validators]:input')
-          .live('focusout',                function()          { $(this).isValid(); })
+        .find('[data-validate]:input')
+          .live('focusout',                function()          { $(this).isValid(settings.validators); })
           .live('change',                  function()          { $(this).data('changed', true); })
           // Callbacks
           .live('element:validate:after',  function(eventData) { clientSideValidations.callbacks.element.after( $(this), eventData); })
@@ -32,19 +41,19 @@
               removeError(element);
             }, eventData) })
         // Checkboxes - Live events don't support filter
-        .end().find('[data-validators]:checkbox')
-          .live('click', function() { $(this).isValid(); })
+        .end().find('[data-validate]:checkbox')
+          .live('click', function() { $(this).isValid(settings.validators); })
         // Inputs for confirmations
         .end().find('[id*=_confirmation]').each(function() {
           var confirmationElement = $(this),
-              element = form.find('#' + this.id.match(/(.+)_confirmation/)[1] + '[data-validators]:input');
+              element = form.find('#' + this.id.match(/(.+)_confirmation/)[1] + '[data-validate]:input');
 
           $('#' + confirmationElement.attr('id'))
             .live('focusout', function() {
-              element.data('changed', true).isValid();
+              element.data('changed', true).isValid(settings.validators);
             })
             .live('keyup', function() {
-              element.data('changed', true).isValid();
+              element.data('changed', true).isValid(settings.validators);
             })
         });
 
@@ -58,19 +67,19 @@
     });
   }
 
-  $.fn.isValid = function() {
+  $.fn.isValid = function(validators) {
     if ($(this[0]).is('form')) {
-      return validateForm($(this[0]));
+      return validateForm($(this[0]), validators);
     } else {
-      return validateElement($(this[0]));
+      return validateElement($(this[0]), validators[this[0].name]);
     }
   }
 
-  var validateForm = function(form) {
+  var validateForm = function(form, validators) {
     var valid = true;
 
-    form.trigger('form:validate:before').find('[data-validators]:input').each(function() {
-      if (!validateElement($(this))) { valid = false; }
+    form.trigger('form:validate:before').find('[data-validate]:input').each(function() {
+      if (!$(this).isValid(validators)) { valid = false; }
     });
 
     if (valid) {
@@ -83,12 +92,11 @@
     return valid;
   }
 
-  var validateElement = function(element) {
+  var validateElement = function(element, validators) {
     element.trigger('element:validate:before');
 
     if (element.data('changed') !== false) {
-      var valid = true,
-          validators = new Function("return " + element.attr('data-validators'))();
+      var valid = true;
       element.data('changed', false);
 
       // Because 'length' is defined on the list of validators we cannot call jQuery.each on
@@ -302,6 +310,7 @@ var clientSideValidations = {
               labelErrorField = jQuery(settings.label_tag),
               label = jQuery('label[for="' + element.attr('id') + '"]:not(.message)');
 
+          if (element.attr('autofocus')) { element.attr('autofocus', false) };
           element.before(inputErrorField);
           inputErrorField.find('span#input_tag').replaceWith(element);
           inputErrorField.find('label.message').attr('for', element.attr('id'));

data/lib/client_side_validations/action_view/form_builder.rb

@@ -15,11 +15,12 @@ module ClientSideValidations::ActionView::Helpers
       end
 
       base.class_eval do
-        alias_method_chain :fields_for, :client_side_validations
-        alias_method_chain :check_box, :client_side_validations
+        alias_method_chain :initialize,   :client_side_validations
+        alias_method_chain :fields_for,   :client_side_validations
+        alias_method_chain :check_box,    :client_side_validations
         alias_method_chain :radio_button, :client_side_validations
 
-        def self.client_side_form_js_hash(options, form_helper)
+        def self.client_side_form_settings(options, form_helper)
           {
             :type => self.to_s,
             :input_tag => form_helper.class.field_error_proc.call(%{<span id="input_tag" />}, Struct.new(:error_message, :tag_id).new([], "")),
@@ -29,6 +30,11 @@ module ClientSideValidations::ActionView::Helpers
       end
     end
 
+    def initialize_with_client_side_validations(object_name, object, template, options, proc)
+      initialize_without_client_side_validations(object_name, object, template, options, proc)
+      @options[:validators] = {}
+    end
+
     def fields_for_with_client_side_validations(record_or_name_or_array, *args, &block)
       options = args.extract_options!
       options[:validate] ||= @options[:validate] if @options[:validate] && !options.key?(:validate)
@@ -49,7 +55,8 @@ module ClientSideValidations::ActionView::Helpers
 
     def apply_client_side_validators(method, options = {})
       if @options[:validate] && options[:validate] != false && validators = @object.client_side_validation_hash[method]
-        options.merge!("data-validators" => validators.to_json)
+        options.merge!("data-validate" => true)
+        @options[:validators].merge!("#{@object_name}[#{method}]" => validators)
       end
     end
 

data/lib/client_side_validations/action_view/form_helper.rb

@@ -21,8 +21,13 @@ module ClientSideValidations::ActionView::Helpers
         end
       end
 
-      script_tag = client_side_form_js_variable(object, options)
-      "#{super(record_or_name_or_array, *(args << options), &proc)}#{script_tag}".html_safe
+      @validators = {}
+      # Order matters here. Rails mutates the options object
+      script = client_side_form_settings(object, options)
+      form   = super(record_or_name_or_array, *(args << options), &proc)
+      # Because of the load order requirement above this sub is necessary
+      # Would be nice to not do this
+      "#{form}#{script ? script.sub('"validator_hash"', @validators.to_json) : nil}".html_safe
     end
 
     def apply_form_for_options!(object_or_array, options)
@@ -30,9 +35,15 @@ module ClientSideValidations::ActionView::Helpers
       options[:html][:validate] = true if options[:validate]
     end
 
+    def fields_for(record_or_name_or_array, *args, &block)
+      output = super
+      @validators.merge!(args.last[:validators])
+      output
+    end
+
     private
 
-    def client_side_form_js_variable(object, options)
+    def client_side_form_settings(object, options)
       if options[:validate]
         builder = options[:builder] || ActionView::Base.default_form_builder
 
@@ -47,7 +58,7 @@ module ClientSideValidations::ActionView::Helpers
         end
 
         content_tag(:script) do
-          "var #{var_name} = #{builder.client_side_form_js_hash(options, self).to_json};".html_safe
+          "var #{var_name} = #{builder.client_side_form_settings(options, self).merge(:validators => 'validator_hash').to_json};".html_safe
         end
 
       end

data/lib/client_side_validations/active_model.rb

@@ -17,7 +17,7 @@ module ClientSideValidations::ActiveModel
 
   module Validations
     def client_side_validation_hash
-      _validators.inject({}) do |attr_hash, attr|
+      _validators.except(nil).inject({}) do |attr_hash, attr|
 
         validator_hash = attr[1].inject({}) do |kind_hash, validator|
           client_side_hash = validator.client_side_hash(self, attr[0])

data/lib/client_side_validations/active_record/uniqueness.rb

@@ -5,10 +5,12 @@ module ClientSideValidations::ActiveRecord
       hash = { :message => model.errors.generate_message(attribute, message_type, extra_options.except(:case_sensitive, :scope)) }
       hash = hash.merge(extra_options).merge(model.new_record? ? {} : { :id => model.id })
 
-      if hash[:scope]
-        hash[:scope] = hash[:scope].inject({}) do |scope_hash, scope_item|
+      if hash[:scope].present?
+        hash[:scope] = Array.wrap(hash[:scope]).inject({}) do |scope_hash, scope_item|
           scope_hash.merge!(scope_item => model.send(scope_item))
         end
+      else
+        hash.delete(:scope)
       end
 
       hash

data/lib/client_side_validations/formtastic.rb

@@ -4,7 +4,7 @@ module ClientSideValidations
 
       def self.included(base)
         base.class_eval do
-          def self.client_side_form_js_hash(options, form_helper)
+          def self.client_side_form_settings(options, form_helper)
             {
               :type => self.to_s,
               :inline_error_class => ::Formtastic::SemanticFormBuilder.default_inline_error_class

data/lib/client_side_validations/mongoid/uniqueness.rb

@@ -5,10 +5,12 @@ module ClientSideValidations::Mongoid
       hash = { :message => model.errors.generate_message(attribute, message_type, extra_options.except(:case_sensitive, :scope)) }
       hash = hash.merge(extra_options).merge(model.new_record? ? {} : { :id => model.id })
 
-      if hash[:scope]
-        hash[:scope] = hash[:scope].inject({}) do |scope_hash, scope_item|
+      if hash[:scope].present?
+        hash[:scope] = Array.wrap(hash[:scope]).inject({}) do |scope_hash, scope_item|
           scope_hash.merge!(scope_item => model.send(scope_item))
         end
+      else
+        hash.delete(:scope)
       end
 
       hash

data/lib/client_side_validations/simple_form.rb

@@ -4,7 +4,7 @@ module ClientSideValidations
 
       def self.included(base)
         base.class_eval do
-          def self.client_side_form_js_hash(options, form_helper)
+          def self.client_side_form_settings(options, form_helper)
             {
               :type => self.to_s,
               :error_class => ::SimpleForm.error_class,

data/lib/client_side_validations/version.rb

@@ -1,3 +1,3 @@
 module ClientSideValidations
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/test/action_view/cases/helper.rb

@@ -85,11 +85,11 @@ module ActionViewTestSetup
     txt << %{</div>}
   end
 
-  def form_text(action = "http://www.example.com", id = nil, html_class = nil, remote = nil, validate = nil)
+  def form_text(action = "http://www.example.com", id = nil, html_class = nil, remote = nil, validators = nil)
     txt =  %{<form accept-charset="UTF-8" action="#{action}"}
     txt << %{ data-remote="true"} if remote
     txt << %{ class="#{html_class}"} if html_class
-    txt << %{ data-validate="true"} if validate
+    txt << %{ data-validate="true"} if validators
     txt << %{ id="#{id}"} if id
     txt << %{ method="post">}
   end
@@ -98,15 +98,15 @@ module ActionViewTestSetup
     contents = block_given? ? yield : ""
 
     if options.is_a?(Hash)
-      method, remote, validate = options.values_at(:method, :remote, :validate)
+      method, remote, validators = options.values_at(:method, :remote, :validators)
     else
       method = options
     end
 
-    html = form_text(action, id, html_class, remote, validate) + snowman(method) + (contents || "") + "</form>"
+    html = form_text(action, id, html_class, remote, validators) + snowman(method) + (contents || "") + "</form>"
 
-    if options.is_a?(Hash) && options[:validate]
-      html + %Q{<script>var #{id} = #{client_side_form_js_variable_helper};</script>}
+    if options.is_a?(Hash) && options[:validators]
+      html + %Q{<script>var #{id} = #{client_side_form_settings_helper.merge(:validators => validators).to_json};</script>}
     else
       html
     end

data/test/action_view/cases/test_helpers.rb

@@ -6,12 +6,12 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
   cattr_accessor :field_error_proc
   @@field_error_proc = Proc.new { |html_tag, instance| html_tag }
 
-  def client_side_form_js_variable_helper
-    json = {
+  def client_side_form_settings_helper
+    {
       :type => "ActionView::Helpers::FormBuilder",
       :input_tag => %{<span id="input_tag" />},
       :label_tag => %{<label id="label_tag" />}
-    }.to_json
+    }
   end
 
   def test_text_field
@@ -19,8 +19,9 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
       concat f.text_field(:cost)
     end
 
-    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validate => true) do
-      %{<input data-validators="{&quot;presence&quot;:{&quot;message&quot;:&quot;can't be blank&quot;}}" id="post_cost" name="post[cost]" size="30" type="text" />}
+    validators = {'post[cost]' => {:presence => {:message => "can't be blank"}}}
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+      %{<input data-validate="true" id="post_cost" name="post[cost]" size="30" type="text" />}
     end
     assert_equal expected, output_buffer
   end
@@ -30,8 +31,9 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
       concat f.password_field(:cost)
     end
 
-    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validate => true) do
-      %{<input data-validators="{&quot;presence&quot;:{&quot;message&quot;:&quot;can't be blank&quot;}}" id="post_cost" name="post[cost]" size="30" type="password" />}
+    validators = {'post[cost]' => {:presence => {:message => "can't be blank"}}}
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+      %{<input data-validate="true" id="post_cost" name="post[cost]" size="30" type="password" />}
     end
     assert_equal expected, output_buffer
   end
@@ -41,8 +43,9 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
       concat f.file_field(:cost)
     end
 
-    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validate => true) do
-      %{<input data-validators="{&quot;presence&quot;:{&quot;message&quot;:&quot;can't be blank&quot;}}" id="post_cost" name="post[cost]" type="file" />}
+    validators = {'post[cost]' => {:presence => {:message => "can't be blank"}}}
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+      %{<input data-validate="true" id="post_cost" name="post[cost]" type="file" />}
     end
     assert_equal expected, output_buffer
   end
@@ -52,8 +55,9 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
       concat f.text_area(:cost)
     end
 
-    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validate => true) do
-      %{<textarea cols="40" data-validators="{&quot;presence&quot;:{&quot;message&quot;:&quot;can't be blank&quot;}}" id="post_cost" name="post[cost]" rows="20"></textarea>}
+    validators = {'post[cost]' => {:presence => {:message => "can't be blank"}}}
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+      %{<textarea cols="40" data-validate="true" id="post_cost" name="post[cost]" rows="20"></textarea>}
     end
     assert_equal expected, output_buffer
   end
@@ -63,8 +67,9 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
       concat f.search_field(:cost)
     end
 
-    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validate => true) do
-      %{<input data-validators="{&quot;presence&quot;:{&quot;message&quot;:&quot;can't be blank&quot;}}" id="post_cost" name="post[cost]" size="30" type="search" />}
+    validators = {'post[cost]' => {:presence => {:message => "can't be blank"}}}
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+      %{<input data-validate="true" id="post_cost" name="post[cost]" size="30" type="search" />}
     end
     assert_equal expected, output_buffer
   end
@@ -74,8 +79,9 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
       concat f.telephone_field(:cost)
     end
 
-    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validate => true) do
-      %{<input data-validators="{&quot;presence&quot;:{&quot;message&quot;:&quot;can't be blank&quot;}}" id="post_cost" name="post[cost]" size="30" type="tel" />}
+    validators = {'post[cost]' => {:presence => {:message => "can't be blank"}}}
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+      %{<input data-validate="true" id="post_cost" name="post[cost]" size="30" type="tel" />}
     end
     assert_equal expected, output_buffer
   end
@@ -85,8 +91,9 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
       concat f.phone_field(:cost)
     end
 
-    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validate => true) do
-      %{<input data-validators="{&quot;presence&quot;:{&quot;message&quot;:&quot;can't be blank&quot;}}" id="post_cost" name="post[cost]" size="30" type="tel" />}
+    validators = {'post[cost]' => {:presence => {:message => "can't be blank"}}}
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+      %{<input data-validate="true" id="post_cost" name="post[cost]" size="30" type="tel" />}
     end
     assert_equal expected, output_buffer
   end
@@ -96,8 +103,9 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
       concat f.url_field(:cost)
     end
 
-    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validate => true) do
-      %{<input data-validators="{&quot;presence&quot;:{&quot;message&quot;:&quot;can't be blank&quot;}}" id="post_cost" name="post[cost]" size="30" type="url" />}
+    validators = {'post[cost]' => {:presence => {:message => "can't be blank"}}}
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+      %{<input data-validate="true" id="post_cost" name="post[cost]" size="30" type="url" />}
     end
     assert_equal expected, output_buffer
   end
@@ -107,8 +115,9 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
       concat f.email_field(:cost)
     end
 
-    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validate => true) do
-      %{<input data-validators="{&quot;presence&quot;:{&quot;message&quot;:&quot;can't be blank&quot;}}" id="post_cost" name="post[cost]" size="30" type="email" />}
+    validators = {'post[cost]' => {:presence => {:message => "can't be blank"}}}
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+      %{<input data-validate="true" id="post_cost" name="post[cost]" size="30" type="email" />}
     end
     assert_equal expected, output_buffer
   end
@@ -118,8 +127,9 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
       concat f.number_field(:cost)
     end
 
-    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validate => true) do
-      %{<input data-validators="{&quot;presence&quot;:{&quot;message&quot;:&quot;can't be blank&quot;}}" id="post_cost" name="post[cost]" size="30" type="number" />}
+    validators = {'post[cost]' => {:presence => {:message => "can't be blank"}}}
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+      %{<input data-validate="true" id="post_cost" name="post[cost]" size="30" type="number" />}
     end
     assert_equal expected, output_buffer
   end
@@ -129,8 +139,9 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
       concat f.range_field(:cost)
     end
 
-    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validate => true) do
-      %{<input data-validators="{&quot;presence&quot;:{&quot;message&quot;:&quot;can't be blank&quot;}}" id="post_cost" name="post[cost]" size="30" type="range" />}
+    validators = {'post[cost]' => {:presence => {:message => "can't be blank"}}}
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+      %{<input data-validate="true" id="post_cost" name="post[cost]" size="30" type="range" />}
     end
     assert_equal expected, output_buffer
   end
@@ -140,9 +151,10 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
       concat f.check_box(:cost)
     end
 
-    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validate => true) do
+    validators = {'post[cost]' => {:presence => {:message => "can't be blank"}}}
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
       %{<input name="post[cost]" type="hidden" value="0" />} +
-      %{<input data-validators="{&quot;presence&quot;:{&quot;message&quot;:&quot;can't be blank&quot;}}" id="post_cost" name="post[cost]" type="checkbox" value="1" />}
+      %{<input data-validate="true" id="post_cost" name="post[cost]" type="checkbox" value="1" />}
     end
     assert_equal expected, output_buffer
   end
@@ -152,8 +164,9 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
       concat f.radio_button(:cost, "10")
     end
 
-    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validate => true) do
-      %{<input data-validators="{&quot;presence&quot;:{&quot;message&quot;:&quot;can't be blank&quot;}}" id="post_cost_10" name="post[cost]" type="radio" value="10" />}
+    validators = {'post[cost]' => {:presence => {:message => "can't be blank"}}}
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+      %{<input data-validate="true" id="post_cost_10" name="post[cost]" type="radio" value="10" />}
     end
     assert_equal expected, output_buffer
   end
@@ -163,7 +176,7 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
       concat f.text_field(:title)
     end
 
-    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validate => true) do
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => {}) do
       %{<input id="post_title" name="post[title]" size="30" type="text" value="Hello World" />}
     end
     assert_equal expected, output_buffer
@@ -174,7 +187,7 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
       concat f.text_field(:cost, :validate => false)
     end
 
-    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validate => true) do
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => {}) do
       %{<input id="post_cost" name="post[cost]" size="30" type="text" />}
     end
     assert_equal expected, output_buffer
@@ -187,8 +200,9 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
       }
     end
 
-    expected =  whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validate => true) do
-      %{<input data-validators="{&quot;presence&quot;:{&quot;message&quot;:&quot;can't be blank&quot;}}" id="post_comment_title" name="post[comment][title]" size="30" type="text" />}
+    validators = {'post[comment][title]' => {:presence => {:message => "can't be blank"}}}
+    expected =  whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+      %{<input data-validate="true" id="post_comment_title" name="post[comment][title]" size="30" type="text" />}
     end
 
     assert_equal expected, output_buffer
@@ -201,7 +215,7 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
       }
     end
 
-    expected =  whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validate => true) do
+    expected =  whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => {}) do
       %{<input id="post_comment_title" name="post[comment][title]" size="30" type="text" />}
     end
 
@@ -213,8 +227,9 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
       concat f.text_field(:cost)
     end
 
-    expected = whole_form("/posts/123", "some_form", "edit_post", :method => "put", :validate => true) do
-      %{<input data-validators="{&quot;presence&quot;:{&quot;message&quot;:&quot;can't be blank&quot;}}" id="post_cost" name="post[cost]" size="30" type="text" />}
+    validators = {'post[cost]' => {:presence => {:message => "can't be blank"}}}
+    expected = whole_form("/posts/123", "some_form", "edit_post", :method => "put", :validators => validators) do
+      %{<input data-validate="true" id="post_cost" name="post[cost]" size="30" type="text" />}
     end
     assert_equal expected, output_buffer
   end

data/test/active_model/cases/test_validations.rb

@@ -128,5 +128,14 @@ class ActiveModel::ValidationsTest < ClientSideValidations::ActiveModelTestBase
     }
     assert_equal expected_hash, person.client_side_validation_hash
   end
+
+  def test_validates_with_should_be_ignored
+    person = new_person do |p|
+      p.validates_with PersonValidator
+    end
+
+    expected_hash = {}
+    assert_equal expected_hash, person.client_side_validation_hash
+  end
 end
 

data/test/active_model/models/person.rb

@@ -1,3 +1,8 @@
+class PersonValidator < ActiveModel::Validator
+  def validate(record)
+  end
+end
+
 class Person
   include ActiveModel::Validations
 

data/test/active_record/cases/test_uniqueness_validator.rb

@@ -19,7 +19,15 @@ class ActiveRecord::UniquenessValidatorTest < ClientSideValidations::ActiveRecor
     assert_equal expected_hash, UniquenessValidator.new(:attributes => [:name]).client_side_hash(@user, :name)
   end
 
-  def test_uniqueness_client_side_hash_with_scope
+  def test_uniqueness_client_side_hash_with_single_scope_item
+    @user.stubs(:age).returns(30)
+    @user.stubs(:title).returns("test title")
+    expected_hash = { :message => "has already been taken", :case_sensitive => true, :scope => {:title => "test title"} }
+    result_hash = UniquenessValidator.new(:attributes => [:name], :scope => :title).client_side_hash(@user, :name)
+    assert_equal expected_hash, result_hash
+  end
+
+  def test_uniqueness_client_side_hash_with_multiple_scope_items
     @user.stubs(:age).returns(30)
     @user.stubs(:title).returns("test title")
     expected_hash = { :message => "has already been taken", :case_sensitive => true, :scope => {:age => 30, :title => "test title"} }
@@ -27,5 +35,11 @@ class ActiveRecord::UniquenessValidatorTest < ClientSideValidations::ActiveRecor
     assert_equal expected_hash, result_hash
   end
 
+  def test_uniqueness_client_side_hash_with_empty_scope_array
+    expected_hash = { :message => "has already been taken", :case_sensitive => true }
+    result_hash = UniquenessValidator.new(:attributes => [:name], :scope => []).client_side_hash(@user, :name)
+    assert_equal expected_hash, result_hash
+  end
+
 end
 

data/test/formtastic/cases/test_form_builder.rb

@@ -6,6 +6,6 @@ class ClientSideValidations::Formtastic::SemanticFormBuilderTest < Test::Unit::T
       :type => 'Formtastic::SemanticFormBuilder',
       :inline_error_class => 'inline-errors'
     }
-    assert_equal expected, Formtastic::SemanticFormBuilder.client_side_form_js_hash(nil, nil)
+    assert_equal expected, Formtastic::SemanticFormBuilder.client_side_form_settings(nil, nil)
   end
 end

data/test/formtastic/cases/test_form_helper.rb

@@ -5,7 +5,7 @@ class ClientSideValidations::Formtastic::FormHelperTest < ActionView::TestCase
   include ActionViewTestSetup
   include Formtastic::SemanticFormHelper
 
-  def client_side_form_js_variable_helper
+  def client_side_form_settings_helper
     ""
   end
 
@@ -14,8 +14,8 @@ class ClientSideValidations::Formtastic::FormHelperTest < ActionView::TestCase
       concat f.input(:cost)
     end
 
-    expected = %{<form accept-charset="UTF-8" action="/posts/123" class="formtastic post" data-validate="true" id="edit_post_123" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /><input name="_method" type="hidden" value="put" /></div><li class="string required" id="post_cost_input"><label for="post_cost">Cost<abbr title="required">*</abbr></label><input data-validators="{&quot;presence&quot;:{&quot;message&quot;:&quot;can't be blank&quot;}}" id="post_cost" name="post[cost]" type="text" /></li></form><script>var edit_post_123 = {"type":"Formtastic::SemanticFormBuilder","inline_error_class":"inline-errors"};</script>}
-    assert_equal expected, output_buffer
+    expected = %{<form accept-charset="UTF-8" action="/posts/123" class="formtastic post" data-validate="true" id="edit_post_123" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /><input name="_method" type="hidden" value="put" /></div><li class="string required" id="post_cost_input"><label for="post_cost">Cost<abbr title="required">*</abbr></label><input data-validate="true" id="post_cost" name="post[cost]" type="text" /></li></form><script>var edit_post_123 = {"type":"Formtastic::SemanticFormBuilder","inline_error_class":"inline-errors","validators":{"post[cost]":{"presence":{"message":"can't be blank"}}}};</script>}
+    assert_equal expected, output_buffer, "\n\n *** If you're running Ruby 1.8 and this test fails is is most likely due to 1.8's lack of insertion order persistence with Hashes ***\n"
   end
 
 end

data/test/javascript/public/test/callbacks/elementAfter.js

@@ -3,7 +3,8 @@ module('Element Validate After Callback', {
     new_user = {
       type: 'ActionView::Helpers::FormBuilder',
       input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
-      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>'
+      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
+      validators: {"user[name]":{"presence":{"message": "must be present"}}}
     }
 
     $('#qunit-fixture')
@@ -18,7 +19,7 @@ module('Element Validate After Callback', {
         .append($('<input />', {
           name: 'user[name]',
           id: 'user_name',
-          'data-validators': '{presence:{message: "must be present"}}',
+          'data-validate': 'true',
           type: 'text'
         }))
         .append($('<label for="user_name">Name</label>'));

data/test/javascript/public/test/callbacks/elementBefore.js

@@ -3,7 +3,8 @@ module('Element Validate Before Callback', {
     new_user = {
       type: 'ActionView::Helpers::FormBuilder',
       input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
-      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>'
+      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
+      validators: {"user[name]":{"{presence":{"message": "must be present"}}}
     }
 
     $('#qunit-fixture')
@@ -18,7 +19,7 @@ module('Element Validate Before Callback', {
         .append($('<input />', {
           name: 'user[name]',
           id: 'user_name',
-          'data-validators': '{presence:{message: "must be present"}}',
+          'data-validate': 'true',
           type: 'text'
         }))
         .append($('<label for="user_name">Name</label>'));

data/test/javascript/public/test/callbacks/elementFail.js

@@ -3,7 +3,8 @@ module('Element Validate Fail Callback', {
     new_user = {
       type: 'ActionView::Helpers::FormBuilder',
       input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
-      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>'
+      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
+      validators: {"user[name]":{"presence":{"message": "must be present"}}}
     }
 
     $('#qunit-fixture')
@@ -18,7 +19,7 @@ module('Element Validate Fail Callback', {
         .append($('<input />', {
           name: 'user[name]',
           id: 'user_name',
-          'data-validators': '{presence:{message: "must be present"}}',
+          'data-validate': 'true',
           type: 'text'
         }))
         .append($('<label for="user_name">Name</label>'));

data/test/javascript/public/test/callbacks/elementPass.js

@@ -3,7 +3,8 @@ module('Element Validate Pass Callback', {
     new_user = {
       type: 'ActionView::Helpers::FormBuilder',
       input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
-      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>'
+      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
+      validators: {"user[name]":{"presence":{"message": "must be present"}}}
     }
 
     $('#qunit-fixture')
@@ -18,7 +19,7 @@ module('Element Validate Pass Callback', {
         .append($('<input />', {
           name: 'user[name]',
           id: 'user_name',
-          'data-validators': '{presence:{message: "must be present"}}',
+          'data-validate': 'true',
           type: 'text'
         }))
         .append($('<label for="user_name">Name</label>'));

data/test/javascript/public/test/callbacks/formAfter.js

@@ -3,7 +3,8 @@ module('Form Validate After Callback', {
     new_user = {
       type: 'ActionView::Helpers::FormBuilder',
       input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
-      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>'
+      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
+      validators: {"user[name]":{"presence":{"message": "must be present"}}}
     }
 
     $('#qunit-fixture')
@@ -18,7 +19,7 @@ module('Form Validate After Callback', {
         .append($('<input />', {
           name: 'user[name]',
           id: 'user_name',
-          'data-validators': '{presence:{message: "must be present"}}',
+          'data-validate': 'true',
           type: 'text'
         }))
         .append($('<label for="user_name">Name</label>'));

data/test/javascript/public/test/callbacks/formBefore.js

@@ -3,7 +3,8 @@ module('Form Validate Before Callback', {
     new_user = {
       type: 'ActionView::Helpers::FormBuilder',
       input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
-      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>'
+      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
+      validators: {"user[name]":{"presence":{"message": "must be present"}}}
     }
 
     $('#qunit-fixture')
@@ -18,7 +19,7 @@ module('Form Validate Before Callback', {
         .append($('<input />', {
           name: 'user[name]',
           id: 'user_name',
-          'data-validators': '{presence:{message: "must be present"}}',
+          'data-validate': 'true',
           type: 'text'
         }))
         .append($('<label for="user_name">Name</label>'));

data/test/javascript/public/test/callbacks/formFail.js

@@ -3,7 +3,8 @@ module('Form Validate Fail Callback', {
     new_user = {
       type: 'ActionView::Helpers::FormBuilder',
       input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
-      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>'
+      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
+      validators: {"user[name]":{"presence":{"message": "must be present"}}}
     }
 
     $('#qunit-fixture')
@@ -18,7 +19,7 @@ module('Form Validate Fail Callback', {
         .append($('<input />', {
           name: 'user[name]',
           id: 'user_name',
-          'data-validators': '{presence:{message: "must be present"}}',
+          'data-validate': 'true',
           type: 'text'
         }))
         .append($('<label for="user_name">Name</label>'));

data/test/javascript/public/test/callbacks/formPass.js

@@ -3,7 +3,8 @@ module('Form Validate Pass Callback', {
     new_user = {
       type: 'ActionView::Helpers::FormBuilder',
       input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
-      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>'
+      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
+      validators: {"user[name]":{"presence":{"message": "must be present"}}}
     }
 
     $('#qunit-fixture')
@@ -18,7 +19,7 @@ module('Form Validate Pass Callback', {
         .append($('<input />', {
           name: 'user[name]',
           id: 'user_name',
-          'data-validators': '{presence:{message: "must be present"}}',
+          'data-validate': 'true',
           type: 'text'
         }))
         .append($('<label for="user_name">Name</label>'));

data/test/javascript/public/test/form_builders/validateForm.js

@@ -3,7 +3,8 @@ module('Validate Form', {
     new_user = {
       type: 'ActionView::Helpers::FormBuilder',
       input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
-      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>'
+      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
+      validators: {'user[name]':{"presence":{"message": "must be present"}}}
     }
 
     $('#qunit-fixture')
@@ -17,7 +18,7 @@ module('Validate Form', {
         .append($('<input />', {
           name: 'user[name]',
           id: 'user_name',
-          'data-validators': '{presence:{message: "must be present"}}',
+          'data-validate': 'true',
           type: 'text'
         }))
         .append($('<label for="user_name">Name</label>'));

data/test/javascript/public/test/form_builders/validateFormtastic.js

@@ -2,7 +2,10 @@ module('Validate Formtastic', {
   setup: function() {
     new_user = {
       type: 'Formtastic::SemanticFormBuilder',
-      inline_error_class: 'inline-errors'
+      inline_error_class: 'inline-errors',
+      validators: {
+        "user[name]":{"presence":{"message": "must be present"}, "format":{"message":"is invalid","with":/\d+/}}
+      }
     }
 
     $('#qunit-fixture')
@@ -17,7 +20,7 @@ module('Validate Formtastic', {
           .append($('<input />', {
             name: 'user[name]',
             id: 'user_name',
-            'data-validators': '{"presence":{"message": "must be present"}, "format":{"message":"is invalid","with":/\\d+/}}',
+            'data-validate': 'true',
             type: 'text'
           }))
           .append($('<label for="user_name">Name</label>'));

data/test/javascript/public/test/form_builders/validateSimpleForm.js

@@ -5,7 +5,10 @@ module('Validate SimpleForm', {
       error_class: 'error',
       error_tag: 'span',
       wrapper_error_class: 'field_with_errors',
-      wrapper_tag: 'div'
+      wrapper_tag: 'div',
+      validators: {
+        "user[name]":{"presence":{"message": "must be present"}, "format":{"message":"is invalid","with":/\d+/}}
+      }
     }
 
     $('#qunit-fixture')
@@ -20,7 +23,7 @@ module('Validate SimpleForm', {
           .append($('<input />', {
             name: 'user[name]',
             id: 'user_name',
-            'data-validators': '{"presence":{"message": "must be present"}, "format":{"message":"is invalid","with":/\\d+/}}',
+            'data-validate': 'true',
             type: 'text'
           }))
           .append($('<label for="user_name">Name</label>'));

data/test/javascript/public/test/validateElement.js

@@ -3,7 +3,13 @@ module('Validate Element', {
     new_user = {
       type: 'ActionView::Helpers::FormBuilder',
       input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
-      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>'
+      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
+      validators: {
+        'user[name]':{"presence":{"message": "must be present"}, "format":{"message":"is invalid","with":/\d+/}},
+        'user[password]':{"confirmation":{"message": "must match confirmation"}},
+        'user[agree]':{"acceptance": {"message": "must be accepted"}},
+        'user[email]':{"uniqueness":{"message": "must be unique"},"presence":{"message": "must be present"}}
+      }
     }
 
     $('#qunit-fixture')
@@ -18,14 +24,14 @@ module('Validate Element', {
         .append($('<input />', {
           name: 'user[name]',
           id: 'user_name',
-          'data-validators': '{"presence":{"message": "must be present"}, "format":{"message":"is invalid","with":/\\d+/}}',
+          'data-validate': 'true',
           type: 'text'
         }))
         .append($('<label for="user_password">Password</label>'))
         .append($('<input />', {
           name: 'user[password]',
           id: 'user_password',
-          'data-validators': '{"confirmation":{"message": "must match confirmation"}}',
+          'data-validate': 'true',
           type: 'password'
         }))
         .append($('<label for="user_password_confirmation">Password Confirmation</label>'))
@@ -38,14 +44,14 @@ module('Validate Element', {
         .append($('<input />', {
           name: 'user[agree]',
           id: 'user_agree',
-          'data-validators': '{"acceptance": {"message": "must be accepted"}}',
+          'data-validate': 'true',
           type: 'checkbox',
           value: 1
         }))
         .append($('<input />', {
           name: 'user[email]',
           id: 'user_email',
-          'data-validators': '{"uniqueness":{"message": "must be unique"},"presence":{"message": "must be present"}}',
+          'data-validate': 'true',
           type: 'text'
         }))
 

data/test/javascript/public/test/validators/uniqueness.js

@@ -3,7 +3,8 @@ module('Uniqueness options', {
     new_user = {
       type: 'ActionView::Helpers::FormBuilder',
       input_tag: '<div class="field_with_errors"><span id="input_tag" /><label class="message"></label></div>',
-      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>'
+      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
+      validators: {'user[email]':{"uniqueness":{"message": "must be unique", "scope":{name:"pass"}},"presence":{"message": "must be present"}}}
     }
 
     $('#qunit-fixture')
@@ -22,7 +23,7 @@ module('Uniqueness options', {
         .append($('<input />', {
           name: 'user[email]',
           id: 'user_email',
-          'data-validators': '{"uniqueness":{"message": "must be unique", "scope":{name:"pass"}},"presence":{"message": "must be present"}}',
+          'data-validate': 'true',
           type: 'text'
         }))
 

data/test/mongoid/cases/test_uniqueness_validator.rb

@@ -19,7 +19,14 @@ class Mongoid::UniqunessValidatorTest < ClientSideValidations::MongoidTestBase
     assert_equal expected_hash, UniquenessValidator.new(:attributes => [:name]).client_side_hash(@book, :age)
   end
 
-  def test_uniqueness_client_side_hash_with_scope
+  def test_uniqueness_client_side_hash_with_single_scope_item
+    @book.stubs(:author_email).returns("test@test.com")
+    expected_hash = { :message => "is already taken", :scope => {:author_email => "test@test.com"} }
+    result_hash = UniquenessValidator.new(:attributes => [:author_name], :scope => :author_email).client_side_hash(@book, :author_name)
+    assert_equal expected_hash, result_hash
+  end
+
+  def test_uniqueness_client_side_hash_with_multiple_scope_items
     @book.stubs(:age).returns(30)
     @book.stubs(:author_email).returns("test@test.com")
     expected_hash = { :message => "is already taken", :scope => {:age => 30, :author_email => "test@test.com"} }
@@ -27,5 +34,11 @@ class Mongoid::UniqunessValidatorTest < ClientSideValidations::MongoidTestBase
     assert_equal expected_hash, result_hash
   end
 
+  def test_uniqueness_client_side_hash_with_empty_scope_array
+    expected_hash = { :message => "is already taken" }
+    result_hash = UniquenessValidator.new(:attributes => [:author_name], :scope => []).client_side_hash(@book, :author_name)
+    assert_equal expected_hash, result_hash
+  end
+
 end
 

data/test/simple_form/cases/test_form_builder.rb

@@ -9,6 +9,6 @@ class ClientSideValidations::SimpleForm::FormBuilderTest < Test::Unit::TestCase
       :wrapper_error_class => :field_with_errors,
       :wrapper_tag => :div
     }
-    assert_equal expected, SimpleForm::FormBuilder.client_side_form_js_hash(nil, nil)
+    assert_equal expected, SimpleForm::FormBuilder.client_side_form_settings(nil, nil)
   end
 end

data/test/simple_form/cases/test_form_helper.rb

@@ -5,7 +5,7 @@ class ClientSideValidations::SimpleForm::FormHelperTest < ActionView::TestCase
   include ActionViewTestSetup
   include SimpleForm::ActionViewExtensions::FormHelper
 
-  def client_side_form_js_variable_helper
+  def client_side_form_settings_helper
     ""
   end
 
@@ -14,7 +14,7 @@ class ClientSideValidations::SimpleForm::FormHelperTest < ActionView::TestCase
       concat f.input(:cost)
     end
 
-    expected = %{<form accept-charset="UTF-8" action="/posts/123" class="simple_form post" data-validate="true" id="edit_post_123" method="post" novalidate="novalidate"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /><input name="_method" type="hidden" value="put" /></div><div class="input string required"><label class="string required" for="post_cost"><abbr title="required">*</abbr> Cost</label><input class="string required" data-validators="{&quot;presence&quot;:{&quot;message&quot;:&quot;can't be blank&quot;}}" id="post_cost" name="post[cost]" required="required" size="50" type="text" /></div></form><script>var edit_post_123 = {"type":"SimpleForm::FormBuilder","error_class":"error","error_tag":"span","wrapper_error_class":"field_with_errors","wrapper_tag":"div"};</script>}
+    expected = %{<form accept-charset="UTF-8" action="/posts/123" class="simple_form post" data-validate="true" id="edit_post_123" method="post" novalidate="novalidate"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /><input name="_method" type="hidden" value="put" /></div><div class="input string required"><label class="string required" for="post_cost"><abbr title="required">*</abbr> Cost</label><input class="string required" data-validate="true" id="post_cost" name="post[cost]" required="required" size="50" type="text" /></div></form><script>var edit_post_123 = {"type":"SimpleForm::FormBuilder","error_class":"error","error_tag":"span","wrapper_error_class":"field_with_errors","wrapper_tag":"div","validators":{"post[cost]":{"presence":{"message":"can't be blank"}}}};</script>}
     assert_equal expected, output_buffer, "\n\n *** If you're running Ruby 1.8 and this test fails is is most likely due to 1.8's lack of insertion order persistence with Hashes ***\n"
   end
 

metadata

@@ -2,7 +2,7 @@
 name: client_side_validations
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors: 
 - Brian Cardarella
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 -04:00
+date: 2011-04-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency