client_side_validations 3.2.0.rc.1 → 3.2.0.rc.2

data/client_side_validations.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'thin'
   s.add_development_dependency 'json'
   s.add_development_dependency 'coffee-script'
+  s.add_development_dependency 'jquery-rails'
 end

data/lib/client_side_validations.rb

@@ -1,12 +1,7 @@
 module ClientSideValidations
-  module Config
-    class << self
-      attr_accessor :uniqueness_validator_disabled
-      @uniqueness_validator_disabled = false
-    end
-  end
 end
 
+require 'client_side_validations/config'
 require 'client_side_validations/active_model'  if defined?(::ActiveModel)
 require 'client_side_validations/active_record' if defined?(::ActiveRecord)
 require 'client_side_validations/action_view'   if defined?(::ActionView)

data/lib/client_side_validations/action_view/form_builder.rb

@@ -34,6 +34,13 @@ module ClientSideValidations::ActionView::Helpers
       end
     end
 
+    def validate(*attrs)
+      attrs.each do |attr|
+        build_validation_options(attr)
+      end
+      nil
+    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] = { object => {} }
@@ -58,22 +65,26 @@ module ClientSideValidations::ActionView::Helpers
     end
 
     def select_with_client_side_validations(method, choices, options = {}, html_options = {})
-      build_validation_options(method, html_options.merge(:validate => options[:validate]))
+      build_validation_options(method, html_options.merge(:name => options[:name]))
+      html_options.delete(:validate)
       select_without_client_side_validations(method, choices, options, html_options)
     end
 
     def collection_select_with_client_side_validations(method, collection, value_method, text_method, options = {}, html_options = {})
-      build_validation_options(method, html_options.merge(:validate => options[:validate]))
+      build_validation_options(method, html_options.merge(:name => options[:name]))
+      html_options.delete(:validate)
       collection_select_without_client_side_validations(method, collection, value_method, text_method, options, html_options)
     end
 
     def grouped_collection_select_with_client_side_validations(method, collection, group_method, group_label_method, option_key_method, option_value_method, options = {}, html_options = {})
-      build_validation_options(method, html_options.merge(:validate => options[:validate]))
+      build_validation_options(method, html_options.merge(:name => options[:name]))
+      html_options.delete(:validate)
       grouped_collection_select_without_client_side_validations(method, collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options)
     end
 
     def time_zone_select_with_client_side_validations(method, priority_zones = nil, options = {}, html_options = {})
-      build_validation_options(method, html_options.merge(:validate => options[:validate]))
+      build_validation_options(method, html_options.merge(:name => options[:name]))
+      html_options.delete(:validate)
       time_zone_select_without_client_side_validations(method, priority_zones = nil, options, html_options)
     end
 

data/lib/client_side_validations/active_record/middleware.rb

@@ -6,6 +6,7 @@ module ClientSideValidations::ActiveRecord
     end
 
     def self.is_unique?(klass, attribute, value, params)
+      klass = find_topmost_superclass(klass)
       value = type_cast_value(klass, attribute, value)
       column = klass.columns_hash[attribute.to_s]
       value = column.limit ? value.to_s.mb_chars[0, column.limit] : value.to_s if column.text?
@@ -46,5 +47,13 @@ module ClientSideValidations::ActiveRecord
       klass.columns_hash[attribute].type_cast(value)
     end
 
+    def self.find_topmost_superclass(klass)
+      if is_class?(klass.superclass)
+        find_topmost_superclass(klass.superclass)
+      else
+        klass
+      end
+    end
+
   end
 end

data/lib/client_side_validations/config.rb

@@ -0,0 +1,8 @@
+module ClientSideValidations
+  module Config
+    class << self
+      attr_accessor :uniqueness_validator_disabled
+      @uniqueness_validator_disabled = false
+    end
+  end
+end

data/lib/client_side_validations/middleware.rb

@@ -43,14 +43,20 @@ module ClientSideValidations
     class Uniqueness < Base
       IGNORE_PARAMS = %w{case_sensitive id scope}
       REGISTERED_ORMS = []
+      class NotValidatable < StandardError; end
 
       def response
-        if is_unique?
-          self.status = 404
-          self.body   = 'true'
-        else
-          self.status = 200
-          self.body   = 'false'
+        begin
+          if is_unique?
+            self.status = 404
+            self.body   = 'true'
+          else
+            self.status = 200
+            self.body   = 'false'
+          end
+        rescue NotValidatable
+          self.status = 500
+          self.body = ''
         end
         super
       end
@@ -77,6 +83,10 @@ module ClientSideValidations
         value            = request.params[resource][attribute]
         middleware_class = nil
 
+        unless Array.wrap(klass._validators[attribute.to_sym]).find { |v| v.kind == :uniqueness }
+          raise NotValidatable
+        end
+
         registered_orms.each do |orm|
           if orm.is_class?(klass)
             middleware_class = orm

data/lib/client_side_validations/version.rb

@@ -1,3 +1,3 @@
 module ClientSideValidations
-  VERSION = '3.2.0.rc.1'
+  VERSION = '3.2.0.rc.2'
 end

data/lib/generators/templates/client_side_validations/initializer.rb

@@ -1,5 +1,8 @@
 # ClientSideValidations Initializer
 
+# Uncomment to disable uniqueness validator, possible security issue
+# ClientSideValidations::Config.uniqueness_validator_disabled = true
+
 # Uncomment the following block if you want each input field to have the validation messages attached.
 # ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
 #   unless html_tag =~ /^<label/

data/vendor/assets/javascripts/rails.validations.js

@@ -4,102 +4,28 @@
 
   $ = jQuery;
 
+  $.fn.disableClientSideValidations = function() {
+    return ClientSideValidations.disable(this);
+  };
+
+  $.fn.enableClientSideValidations = function() {
+    this.filter('form[data-validate]').each(function() {
+      return ClientSideValidations.enablers.form(this);
+    });
+    return this.filter(':input').each(function() {
+      return ClientSideValidations.enablers.input(this);
+    });
+  };
+
+  $.fn.resetClientSideValidations = function() {
+    return this.filter('form[data-validate]').each(function() {
+      return ClientSideValidations.reset(this);
+    });
+  };
+
   $.fn.validate = function() {
     return this.filter('form[data-validate]').each(function() {
-      var addError, binding, event, form, removeError, settings, _ref, _ref1;
-      form = $(this);
-      settings = window.ClientSideValidations.forms[form.attr('id')];
-      addError = function(element, message) {
-        return ClientSideValidations.formBuilders[settings.type].add(element, settings, message);
-      };
-      removeError = function(element) {
-        return ClientSideValidations.formBuilders[settings.type].remove(element, settings);
-      };
-      form.submit(function(eventData) {
-        if (!form.isValid(settings.validators)) {
-          return eventData.preventDefault();
-        }
-      });
-      _ref = {
-        'ajax:beforeSend': function(eventData) {
-          if (eventData.target === this) {
-            return form.isValid(settings.validators);
-          }
-        },
-        'form:validate:after': function(eventData) {
-          return ClientSideValidations.callbacks.form.after(form, eventData);
-        },
-        'form:validate:before': function(eventData) {
-          return ClientSideValidations.callbacks.form.before(form, eventData);
-        },
-        'form:validate:fail': function(eventData) {
-          return ClientSideValidations.callbacks.form.fail(form, eventData);
-        },
-        'form:validate:pass': function(eventData) {
-          return ClientSideValidations.callbacks.form.pass(form, eventData);
-        }
-      };
-      for (event in _ref) {
-        binding = _ref[event];
-        form.bind(event, binding);
-      }
-      _ref1 = {
-        'focusout': function() {
-          return $(this).isValid(settings.validators);
-        },
-        'change': function() {
-          return $(this).data('changed', true);
-        },
-        'element:validate:after': function(eventData) {
-          return ClientSideValidations.callbacks.element.after($(this), eventData);
-        },
-        'element:validate:before': function(eventData) {
-          return ClientSideValidations.callbacks.element.before($(this), eventData);
-        },
-        'element:validate:fail': function(eventData, message) {
-          var element;
-          element = $(this);
-          return ClientSideValidations.callbacks.element.fail(element, message, function() {
-            return addError(element, message);
-          }, eventData);
-        },
-        'element:validate:pass': function(eventData) {
-          var element;
-          element = $(this);
-          return ClientSideValidations.callbacks.element.pass(element, function() {
-            return removeError(element);
-          }, eventData);
-        }
-      };
-      for (event in _ref1) {
-        binding = _ref1[event];
-        form.find(':input:enabled:not(:radio):not([id$=_confirmation])').live(event, binding);
-      }
-      form.find(':checkbox').live('click', function() {
-        $(this).isValid(settings.validators);
-        return true;
-      });
-      return form.find('[id$=_confirmation]').each(function() {
-        var confirmationElement, element, _ref2, _results;
-        confirmationElement = $(this);
-        element = form.find("#" + (this.id.match(/(.+)_confirmation/)[1]) + ":input");
-        if (element[0]) {
-          _ref2 = {
-            'focusout': function() {
-              return element.data('changed', true).isValid(settings.validators);
-            },
-            'keyup': function() {
-              return element.data('changed', true).isValid(settings.validators);
-            }
-          };
-          _results = [];
-          for (event in _ref2) {
-            binding = _ref2[event];
-            _results.push($("#" + (confirmationElement.attr('id'))).live(event, binding));
-          }
-          return _results;
-        }
-      });
+      return $(this).enableClientSideValidations();
     });
   };
 
@@ -120,35 +46,35 @@
 
   validateForm = function(form, validators) {
     var valid;
-    form.trigger('form:validate:before');
+    form.trigger('form:validate:before.ClientSideValidations');
     valid = true;
-    form.find(':input:enabled').each(function() {
+    form.find(':input:enabled:visible[data-validate]').each(function() {
       if (!$(this).isValid(validators)) {
         valid = false;
       }
       return true;
     });
     if (valid) {
-      form.trigger('form:validate:pass');
+      form.trigger('form:validate:pass.ClientSideValidations');
     } else {
-      form.trigger('form:validate:fail');
+      form.trigger('form:validate:fail.ClientSideValidations');
     }
-    form.trigger('form:validate:after');
+    form.trigger('form:validate:after.ClientSideValidations');
     return valid;
   };
 
   validateElement = function(element, validators) {
     var afterValidate, destroyInputName, executeValidators, failElement, local, passElement, remote;
-    element.trigger('element:validate:before');
+    element.trigger('element:validate:before.ClientSideValidations');
     passElement = function() {
-      return element.trigger('element:validate:pass').data('valid', null);
+      return element.trigger('element:validate:pass.ClientSideValidations').data('valid', null);
     };
     failElement = function(message) {
-      element.trigger('element:validate:fail', message).data('valid', false);
+      element.trigger('element:validate:fail.ClientSideValidations', message).data('valid', false);
       return false;
     };
     afterValidate = function() {
-      return element.trigger('element:validate:after').data('valid') !== false;
+      return element.trigger('element:validate:after.ClientSideValidations').data('valid') !== false;
     };
     executeValidators = function(context) {
       var fn, kind, message, valid, validator, _i, _len, _ref;
@@ -200,6 +126,141 @@
     window.ClientSideValidations.forms = {};
   }
 
+  window.ClientSideValidations.reset = function(form) {
+    var $form, key;
+    $form = $(form);
+    ClientSideValidations.disable(form);
+    ClientSideValidations.disable($form.find(':input'));
+    for (key in form.ClientSideValidations.settings.validators) {
+      form.ClientSideValidations.removeError($form.find("[name='" + key + "']"));
+    }
+    return ClientSideValidations.enablers.form(form);
+  };
+
+  window.ClientSideValidations.disable = function(target) {
+    var $target;
+    $target = $(target);
+    $target.off('.ClientSideValidations');
+    $target.removeData('valid');
+    $target.removeData('changed');
+    return $target.filter(':input').each(function() {
+      return $(this).removeAttr('data-validate');
+    });
+  };
+
+  window.ClientSideValidations.enablers = {
+    form: function(form) {
+      var $form, binding, event, _ref;
+      $form = $(form);
+      form.ClientSideValidations = {
+        settings: window.ClientSideValidations.forms[$form.attr('id')],
+        addError: function(element, message) {
+          return ClientSideValidations.formBuilders[form.ClientSideValidations.settings.type].add(element, form.ClientSideValidations.settings, message);
+        },
+        removeError: function(element) {
+          return ClientSideValidations.formBuilders[form.ClientSideValidations.settings.type].remove(element, form.ClientSideValidations.settings);
+        }
+      };
+      _ref = {
+        'submit.ClientSideValidations': function(eventData) {
+          if (!$form.isValid(form.ClientSideValidations.settings.validators)) {
+            eventData.preventDefault();
+            return eventData.stopImmediatePropagation();
+          }
+        },
+        'ajax:beforeSend.ClientSideValidations': function(eventData) {
+          if (eventData.target === this) {
+            return $form.isValid(form.ClientSideValidations.settings.validators);
+          }
+        },
+        'form:validate:after.ClientSideValidations': function(eventData) {
+          return ClientSideValidations.callbacks.form.after($form, eventData);
+        },
+        'form:validate:before.ClientSideValidations': function(eventData) {
+          return ClientSideValidations.callbacks.form.before($form, eventData);
+        },
+        'form:validate:fail.ClientSideValidations': function(eventData) {
+          return ClientSideValidations.callbacks.form.fail($form, eventData);
+        },
+        'form:validate:pass.ClientSideValidations': function(eventData) {
+          return ClientSideValidations.callbacks.form.pass($form, eventData);
+        }
+      };
+      for (event in _ref) {
+        binding = _ref[event];
+        $form.on(event, binding);
+      }
+      return $form.find(':input').each(function() {
+        return ClientSideValidations.enablers.input(this);
+      });
+    },
+    input: function(input) {
+      var $form, $input, binding, event, form, _ref;
+      $input = $(input);
+      form = input.form;
+      $form = $(form);
+      _ref = {
+        'focusout.ClientSideValidations': function() {
+          return $(this).isValid(form.ClientSideValidations.settings.validators);
+        },
+        'change.ClientSideValidations': function() {
+          return $(this).data('changed', true);
+        },
+        'element:validate:after.ClientSideValidations': function(eventData) {
+          return ClientSideValidations.callbacks.element.after($(this), eventData);
+        },
+        'element:validate:before.ClientSideValidations': function(eventData) {
+          return ClientSideValidations.callbacks.element.before($(this), eventData);
+        },
+        'element:validate:fail.ClientSideValidations': function(eventData, message) {
+          var element;
+          element = $(this);
+          return ClientSideValidations.callbacks.element.fail(element, message, function() {
+            return form.ClientSideValidations.addError(element, message);
+          }, eventData);
+        },
+        'element:validate:pass.ClientSideValidations': function(eventData) {
+          var element;
+          element = $(this);
+          return ClientSideValidations.callbacks.element.pass(element, function() {
+            return form.ClientSideValidations.removeError(element);
+          }, eventData);
+        }
+      };
+      for (event in _ref) {
+        binding = _ref[event];
+        $input.filter(':enabled:not(:radio):not([id$=_confirmation]):visible').each(function() {
+          return $(this).attr('data-validate', true);
+        }).on(event, binding);
+      }
+      $input.filter(':checkbox:visible').on('click.ClientSideValidations', function() {
+        $(this).isValid(form.ClientSideValidations.settings.validators);
+        return true;
+      });
+      return $input.filter('[id$=_confirmation]:visible').each(function() {
+        var confirmationElement, element, _ref1, _results;
+        confirmationElement = $(this);
+        element = $form.find("#" + (this.id.match(/(.+)_confirmation/)[1]) + ":input");
+        if (element[0]) {
+          _ref1 = {
+            'focusout.ClientSideValidations': function() {
+              return element.data('changed', true).isValid(form.ClientSideValidations.settings.validators);
+            },
+            'keyup.ClientSideValidations': function() {
+              return element.data('changed', true).isValid(form.ClientSideValidations.settings.validators);
+            }
+          };
+          _results = [];
+          for (event in _ref1) {
+            binding = _ref1[event];
+            _results.push($("#" + (confirmationElement.attr('id'))).on(event, binding));
+          }
+          return _results;
+        }
+      });
+    }
+  };
+
   window.ClientSideValidations.validators = {
     all: function() {
       return jQuery.extend({}, ClientSideValidations.validators.local, ClientSideValidations.validators.remote);
@@ -314,7 +375,7 @@
         }
       },
       exclusion: function(element, options) {
-        var lower, message, o, upper, _ref;
+        var lower, message, option, upper, _ref;
         message = this.presence(element, options);
         if (message) {
           if (options.allow_blank === true) {
@@ -328,8 +389,8 @@
             _ref1 = options["in"];
             _results = [];
             for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
-              o = _ref1[_i];
-              _results.push(o.toString());
+              option = _ref1[_i];
+              _results.push(option.toString());
             }
             return _results;
           })(), _ref) >= 0) {
@@ -345,7 +406,7 @@
         }
       },
       inclusion: function(element, options) {
-        var lower, message, o, upper, _ref;
+        var lower, message, option, upper, _ref;
         message = this.presence(element, options);
         if (message) {
           if (options.allow_blank === true) {
@@ -359,8 +420,8 @@
             _ref1 = options["in"];
             _results = [];
             for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
-              o = _ref1[_i];
-              _results.push(o.toString());
+              option = _ref1[_i];
+              _results.push(option.toString());
             }
             return _results;
           })(), _ref) >= 0) {
@@ -442,8 +503,8 @@
             if (scoped_element[0] && scoped_element.val() !== scope_value) {
               data.scope[key] = scoped_element.val();
               scoped_element.unbind("change." + element.id).bind("change." + element.id, function() {
-                element.trigger('change');
-                return element.trigger('focusout');
+                element.trigger('change.ClientSideValidations');
+                return element.trigger('focusout.ClientSideValidations');
               });
             } else {
               data.scope[key] = scope_value;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: client_side_validations
 version: !ruby/object:Gem::Version
-  version: 3.2.0.rc.1
+  version: 3.2.0.rc.2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -155,6 +155,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Client Side Validations
 email:
 - bcardarella@gmail.com
@@ -179,6 +195,7 @@ files:
 - lib/client_side_validations/active_record.rb
 - lib/client_side_validations/active_record/middleware.rb
 - lib/client_side_validations/active_record/uniqueness.rb
+- lib/client_side_validations/config.rb
 - lib/client_side_validations/core_ext.rb
 - lib/client_side_validations/core_ext/range.rb
 - lib/client_side_validations/core_ext/regexp.rb
@@ -206,7 +223,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4549078949979817551
+      hash: -4404664315488432309
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: