client_side_validations 3.2.0.beta.3 → 3.2.0.beta.4

data/lib/client_side_validations/action_view/form_builder.rb

@@ -24,9 +24,9 @@ module ClientSideValidations::ActionView::Helpers
         alias_method_chain :grouped_collection_select, :client_side_validations
         alias_method_chain :time_zone_select,          :client_side_validations
 
-        def self.client_side_form_settings(options, form_helper)
+        def client_side_form_settings(options, form_helper)
           {
-            :type => self.to_s,
+            :type => self.class.to_s,
             :input_tag => form_helper.class.field_error_proc.call(%{<span id="input_tag" />},  Struct.new(:error_message, :tag_id).new([], "")),
             :label_tag => form_helper.class.field_error_proc.call(%{<label id="label_tag" />}, Struct.new(:error_message, :tag_id).new([], ""))
           }
@@ -81,7 +81,8 @@ module ClientSideValidations::ActionView::Helpers
       if @options[:validate] && options[:validate] != false && validators = filter_validators(method, options[:validate])
         options.merge!("data-validate" => true)
         name = options[:name] || "#{@object_name}[#{method}]"
-
+        child_index = @options[:child_index] ? "(\\d+|#{Regexp.escape(@options[:child_index])})" : "\\d+"
+        name = name.gsub(/_attributes\]\[#{child_index}\]/, '_attributes][]')
         @options[:validators].merge!("#{name}#{options[:multiple] ? "[]" : nil}" => validators)
       end
     end
@@ -97,8 +98,24 @@ module ClientSideValidations::ActionView::Helpers
               unfiltered_validators.delete(validator.first)
             end
           else
-            if (conditional = (validator.last[:if] || validator.last[:unless])) && conditional.is_a?(Symbol) && !conditional_method_is_change_method?(conditional, method)
-              unfiltered_validators.delete(validator.first)
+            if (conditional = (validator.last[:if] || validator.last[:unless]))
+              result = case conditional
+                when Symbol
+                  if @object.respond_to?(conditional)
+                    @object.send(conditional)
+                  else
+                    raise(ArgumentError, "unknown method called '#{conditional}'")
+                  end
+                when String
+                  eval(conditional)
+                when Proc
+                  conditional.call(@object)
+                end
+
+              # :if was specified and result is false OR :unless was specified and result was true
+              if (validator.last[:if] && !result) || (validator.last[:unless] && result)
+                unfiltered_validators.delete(validator.first)
+              end
             end
           end
           unfiltered_validators[validator.first].delete(:if)     if unfiltered_validators[validator.first]

data/lib/client_side_validations/action_view/form_helper.rb

@@ -23,8 +23,10 @@ module ClientSideValidations::ActionView::Helpers
       @validators = {}
 
       # Order matters here. Rails mutates the options object
-      script = client_side_form_settings(object, options)
+      html_id = options[:html][:id] if options[:html]
       form   = super(record_or_name_or_array, *(args << options), &proc)
+      options[:id] = html_id if html_id
+      script = client_side_form_settings(object, options)
 
       # Because of the load order requirement above this sub is necessary
       # Would be nice to not do this
@@ -70,10 +72,10 @@ module ClientSideValidations::ActionView::Helpers
 
     def client_side_form_settings(object, options)
       if options[:validate]
-        builder = options[:builder] || ActionView::Base.default_form_builder
+        builder = options[:parent_builder]
 
-        if options[:html] && options[:html][:id]
-          var_name = options[:html][:id]
+        if options[:id]
+          var_name = options[:id]
         else
           if Rails.version >= '3.2.0'
             var_name = if object.respond_to?(:persisted?) && object.persisted?
@@ -90,14 +92,11 @@ module ClientSideValidations::ActionView::Helpers
               options[:as] ? "#{options[:as]}_new" : dom_id(object)
             end
           end
-          
-          
         end
 
         content_tag(:script) do
-          "window.ClientSideValidations.forms['#{var_name}'] = #{builder.client_side_form_settings(options, self).merge(:validators => 'validator_hash').to_json};".html_safe
+          "//<![CDATA[\nwindow.ClientSideValidations.forms['#{var_name}'] = #{builder.client_side_form_settings(options, self).merge(:validators => 'validator_hash').to_json};\n//]]>".html_safe
         end
-
       end
     end
 

data/lib/client_side_validations/active_model.rb

@@ -8,6 +8,10 @@ module ClientSideValidations::ActiveModel
       { :message => model.errors.generate_message(attribute, message_type, options) }.merge(options.except(*::ActiveModel::Errors::CALLBACKS_OPTIONS - [:allow_blank, :if, :unless]))
     end
 
+    def copy_conditional_attributes(to, from)
+      [:if, :unless].each { |key| to[key] = from[key] if from[key].present? }
+    end
+
     private
 
     def message_type

data/lib/client_side_validations/active_model/length.rb

@@ -16,6 +16,8 @@ module ClientSideValidations::ActiveModel
         end
       end
 
+      copy_conditional_attributes(hash, options)
+
       hash
     end
 

data/lib/client_side_validations/active_model/numericality.rb

@@ -23,6 +23,8 @@ module ClientSideValidations::ActiveModel
         end
       end
 
+      copy_conditional_attributes(hash, options)
+
       hash
     end
 

data/lib/client_side_validations/active_record/middleware.rb

@@ -30,7 +30,11 @@ module ClientSideValidations::ActiveRecord
 
       (params[:scope] || {}).each do |attribute, value|
         value    = type_cast_value(klass, attribute, value)
-        relation = relation.and(t[attribute].eq(value))
+        if relation.is_a?(Arel::Nodes::SqlLiteral)
+          relation =  Arel::Nodes::SqlLiteral.new("#{relation} AND #{t[attribute].eq(value).to_sql}")
+        else
+          relation = relation.and(t[attribute].eq(value))
+        end
       end
 
       !klass.where(relation).exists?

data/lib/client_side_validations/version.rb

@@ -1,3 +1,3 @@
 module ClientSideValidations
-  VERSION = '3.2.0.beta.3'
+  VERSION = '3.2.0.beta.4'
 end

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

@@ -1,12 +1,12 @@
 (function() {
-  var $, validateElement, validateForm,
-    __indexOf = Array.prototype.indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
+  var $, validateElement, validateForm, validatorsFor,
+    __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
   $ = jQuery;
 
   $.fn.validate = function() {
     return this.filter('form[data-validate]').each(function() {
-      var addError, binding, event, form, removeError, settings, _ref, _ref2;
+      var addError, binding, event, form, removeError, settings, _ref, _ref1;
       form = $(this);
       settings = window.ClientSideValidations.forms[form.attr('id')];
       addError = function(element, message) {
@@ -20,7 +20,9 @@
       });
       _ref = {
         'ajax:beforeSend': function(eventData) {
-          if (eventData.target === this) return form.isValid(settings.validators);
+          if (eventData.target === this) {
+            return form.isValid(settings.validators);
+          }
         },
         'form:validate:after': function(eventData) {
           return ClientSideValidations.callbacks.form.after(form, eventData);
@@ -39,7 +41,7 @@
         binding = _ref[event];
         form.bind(event, binding);
       }
-      _ref2 = {
+      _ref1 = {
         'focusout': function() {
           return $(this).isValid(settings.validators);
         },
@@ -67,19 +69,20 @@
           }, eventData);
         }
       };
-      for (event in _ref2) {
-        binding = _ref2[event];
+      for (event in _ref1) {
+        binding = _ref1[event];
         form.find('[data-validate="true"]:input:enabled:not(:radio)').live(event, binding);
       }
       form.find('[data-validate="true"]:checkbox').live('click', function() {
-        return $(this).isValid(settings.validators);
+        $(this).isValid(settings.validators);
+        return true;
       });
       return form.find('[id*=_confirmation]').each(function() {
-        var binding, confirmationElement, element, event, _ref3, _results;
+        var confirmationElement, element, _ref2, _results;
         confirmationElement = $(this);
         element = form.find("#" + (this.id.match(/(.+)_confirmation/)[1]) + "[data-validate='true']:input");
         if (element[0]) {
-          _ref3 = {
+          _ref2 = {
             'focusout': function() {
               return element.data('changed', true).isValid(settings.validators);
             },
@@ -88,8 +91,8 @@
             }
           };
           _results = [];
-          for (event in _ref3) {
-            binding = _ref3[event];
+          for (event in _ref2) {
+            binding = _ref2[event];
             _results.push($("#" + (confirmationElement.attr('id'))).live(event, binding));
           }
           return _results;
@@ -104,16 +107,23 @@
     if (obj.is('form')) {
       return validateForm(obj, validators);
     } else {
-      return validateElement(obj, validators[this[0].name]);
+      return validateElement(obj, validatorsFor(this[0].name, validators));
     }
   };
 
+  validatorsFor = function(name, validators) {
+    name = name.replace(/_attributes\]\[\d+\]/g, "_attributes][]");
+    return validators[name];
+  };
+
   validateForm = function(form, validators) {
     var valid;
     form.trigger('form:validate:before');
     valid = true;
     form.find('[data-validate="true"]:input:enabled').each(function() {
-      if ($(this).isValid(validators)) return valid = false;
+      if ($(this).isValid(validators)) {
+        return valid = false;
+      }
     });
     if (valid) {
       form.trigger('form:validate:pass');
@@ -173,13 +183,17 @@
       },
       local: {
         presence: function(element, options) {
-          if (/^\s*$/.test(element.val() || '')) return options.message;
+          if (/^\s*$/.test(element.val() || '')) {
+            return options.message;
+          }
         },
         acceptance: function(element, options) {
           var _ref;
           switch (element.attr('type')) {
             case 'checkbox':
-              if (!element.attr('checked')) return options.message;
+              if (!element.attr('checked')) {
+                return options.message;
+              }
               break;
             case 'text':
               if (element.val() !== (((_ref = options.accept) != null ? _ref.toString() : void 0) || '1')) {
@@ -191,7 +205,9 @@
           var message;
           message = this.presence(element, options);
           if (message) {
-            if (options.allow_blank === true) return;
+            if (options.allow_blank === true) {
+              return;
+            }
             return message;
           }
           if (options["with"] && !options["with"].test(element.val())) {
@@ -203,7 +219,7 @@
         },
         numericality: function(element, options) {
           var CHECKS, check, fn, operator;
-          if (!/^-?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d*)?$/.test(element.val())) {
+          if (!ClientSideValidations.patterns.numericality.test(element.val())) {
             return options.messages.numericality;
           }
           if (options.only_integer && !/^[+-]?\d+$/.test(element.val())) {
@@ -218,9 +234,13 @@
           };
           for (check in CHECKS) {
             operator = CHECKS[check];
-            if (!(options[check] != null)) continue;
+            if (!(options[check] != null)) {
+              continue;
+            }
             fn = new Function("return " + (element.val()) + " " + operator + " " + options[check]);
-            if (!fn()) return options.messages[check];
+            if (!fn()) {
+              return options.messages[check];
+            }
           }
           if (options.odd && !(parseInt(element.val(), 10) % 2)) {
             return options.messages.odd;
@@ -242,30 +262,38 @@
           blankOptions.message = options.is ? options.messages.is : options.minimum ? options.messages.minimum : void 0;
           message = this.presence(element, blankOptions);
           if (message) {
-            if (options.allow_blank === true) return;
+            if (options.allow_blank === true) {
+              return;
+            }
             return message;
           }
           for (check in CHECKS) {
             operator = CHECKS[check];
-            if (!options[check]) continue;
+            if (!options[check]) {
+              continue;
+            }
             fn = new Function("return " + tokenized_length + " " + operator + " " + options[check]);
-            if (!fn()) return options.messages[check];
+            if (!fn()) {
+              return options.messages[check];
+            }
           }
         },
         exclusion: function(element, options) {
           var lower, message, o, upper, _ref;
           message = this.presence(element, options);
           if (message) {
-            if (options.allow_blank === true) return;
+            if (options.allow_blank === true) {
+              return;
+            }
             return message;
           }
           if (options["in"]) {
             if (_ref = element.val(), __indexOf.call((function() {
-              var _i, _len, _ref2, _results;
-              _ref2 = options["in"];
+              var _i, _len, _ref1, _results;
+              _ref1 = options["in"];
               _results = [];
-              for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-                o = _ref2[_i];
+              for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
+                o = _ref1[_i];
                 _results.push(o.toString());
               }
               return _results;
@@ -285,16 +313,18 @@
           var lower, message, o, upper, _ref;
           message = this.presence(element, options);
           if (message) {
-            if (options.allow_blank === true) return;
+            if (options.allow_blank === true) {
+              return;
+            }
             return message;
           }
           if (options["in"]) {
             if (_ref = element.val(), __indexOf.call((function() {
-              var _i, _len, _ref2, _results;
-              _ref2 = options["in"];
+              var _i, _len, _ref1, _results;
+              _ref1 = options["in"];
               _results = [];
-              for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-                o = _ref2[_i];
+              for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
+                o = _ref1[_i];
                 _results.push(o.toString());
               }
               return _results;
@@ -306,7 +336,9 @@
           if (options.range) {
             lower = options.range[0];
             upper = options.range[1];
-            if (element.val() >= lower && element.val() <= upper) return;
+            if (element.val() >= lower && element.val() <= upper) {
+              return;
+            }
             return options.message;
           }
         },
@@ -321,12 +353,16 @@
           var data, key, message, name, scope_value, scoped_element, scoped_name, _ref;
           message = ClientSideValidations.validators.local.presence(element, options);
           if (message) {
-            if (options.allow_blank === true) return;
+            if (options.allow_blank === true) {
+              return;
+            }
             return message;
           }
           data = {};
           data.case_sensitive = !!options.case_sensitive;
-          if (options.id) data.id = options.id;
+          if (options.id) {
+            data.id = options.id;
+          }
           if (options.scope) {
             data.scope = {};
             _ref = options.scope;
@@ -351,7 +387,9 @@
           } else {
             name = element.attr('name');
           }
-          if (options['class']) name = options['class'] + '[' + name.split('[')[1];
+          if (options['class']) {
+            name = options['class'] + '[' + name.split('[')[1];
+          }
           data[name] = element.val();
           if (jQuery.ajax({
             url: '/validators/uniqueness',
@@ -371,7 +409,9 @@
             inputErrorField = jQuery(settings.input_tag);
             labelErrorField = jQuery(settings.label_tag);
             label = jQuery("label[for='" + (element.attr('id')) + "']:not(.message)");
-            if (element.attr('autofocus')) element.attr('autofocus', false);
+            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'));
@@ -384,7 +424,7 @@
         remove: function(element, settings) {
           var errorFieldClass, inputErrorField, label, labelErrorField;
           errorFieldClass = jQuery(settings.input_tag).attr('class');
-          inputErrorField = element.closest("." + errorFieldClass);
+          inputErrorField = element.closest("." + (errorFieldClass.replace(" ", ".")));
           label = jQuery("label[for='" + (element.attr('id')) + "']:not(.message)");
           labelErrorField = label.closest("." + errorFieldClass);
           if (inputErrorField[0]) {
@@ -396,6 +436,9 @@
         }
       }
     },
+    patterns: {
+      numericality: /^-?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d*)?$/
+    },
     callbacks: {
       element: {
         after: function(element, eventData) {},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: client_side_validations
 version: !ruby/object:Gem::Version
-  version: 3.2.0.beta.3
+  version: 3.2.0.beta.4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-04 00:00:00.000000000Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70115631263420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 3.2.0
   type: :development
   prerelease: false
-  version_requirements: *70115631263420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70115631263000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115631263000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70115631262540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115631262540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70115631262040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70115631262040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &70115631261620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115631261620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70115651537880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115651537880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70115651537460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115651537460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70115651537040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +133,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115651537040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Client Side Validations
 email:
 - bcardarella@gmail.com
@@ -156,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Client Side Validations