client_side_validations 3.2.0.beta.1 → 3.2.0.beta.2

data/client_side_validations.gemspec

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

data/lib/client_side_validations.rb

@@ -11,6 +11,7 @@ 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)
 if defined?(::Rails)
+  require 'client_side_validations/generators'
   require 'client_side_validations/middleware'
   require 'client_side_validations/engine'
 end

data/lib/client_side_validations/generators.rb

@@ -0,0 +1,12 @@
+module ClientSideValidations
+  module Generators
+    Assets = []
+
+    def self.register_assets(klass)
+      Assets.push(*klass.assets)
+    end
+  end
+end
+
+require 'client_side_validations/generators/rails_validations'
+

data/lib/client_side_validations/generators/rails_validations.rb

@@ -0,0 +1,15 @@
+module ClientSideValidations
+  module Generators
+    class RailsValidations
+      def self.assets
+        [{
+          :path => File.expand_path('../../../../vendor/assets/javascripts', __FILE__),
+          :file => 'rails.validations.js'
+        }]
+      end
+
+      Generators.register_assets(self)
+    end
+  end
+end
+

data/lib/client_side_validations/version.rb

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

data/lib/generators/client_side_validations/copy_assets_generator.rb

@@ -0,0 +1,56 @@
+module ClientSideValidations
+  module Generators
+    class CopyAssetsGenerator < Rails::Generators::Base
+
+      def copy_javascript_asset
+        if self.class == CopyAssetsGenerator || !asset_pipeline_enabled?
+          assets.each do |asset|
+            source_paths << asset[:path]
+            copy_file asset[:file], "#{asset_directory}/#{asset[:file]}"
+          end
+        end
+      end
+
+      private
+
+      def self.asset_directory
+        if asset_pipeline_enabled?
+          "app#{Rails.configuration.assets.prefix}/javascripts"
+        else
+          'public/javascripts'
+        end
+      end
+
+      def asset_directory
+        CopyAssetsGenerator.asset_directory
+      end
+
+      def self.assets
+        Assets
+      end
+
+      def assets
+        CopyAssetsGenerator.assets
+      end
+
+      def self.asset_file_names
+        assets.map { |asset| asset[:file] }.join(', ')
+      end
+
+      def self.asset_pipeline_enabled?
+        (Rails.configuration.respond_to?(:assets) ? (Rails.configuration.assets || {}) : {})[:enabled]
+      end
+
+      def asset_pipeline_enabled?
+        self.class.asset_pipeline_enabled?
+      end
+
+      def self.installation_message
+        "Copies #{asset_file_names} to #{asset_directory}"
+      end
+
+      desc installation_message
+    end
+  end
+end
+

data/lib/generators/client_side_validations/install_generator.rb

@@ -1,44 +1,21 @@
+require 'generators/client_side_validations/copy_assets_generator'
+
 module ClientSideValidations
   module Generators
-    class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path('../../templates/client_side_validations', __FILE__)
-
-      private
-
-      def self.asset_pipeline_enabled?
-        (Rails.configuration.respond_to?(:assets) ? (Rails.configuration.assets || {}) : {})[:enabled]
-      end
-
-      def asset_pipeline_enabled?
-        self.class.asset_pipeline_enabled?
-      end
-
-      public
-
-      if asset_pipeline_enabled?
-        desc 'Creates a ClientSideValidations initializer.'
-      else
-        desc 'Creates a ClientSideValidations initializer and copies rails.validations.js to public/javascripts.'
-      end
+    class InstallGenerator < CopyAssetsGenerator
 
       def copy_initializer
+        source_paths << File.expand_path('../../templates/client_side_validations', __FILE__)
         copy_file 'initializer.rb', 'config/initializers/client_side_validations.rb'
       end
 
-      def copy_javascript_asset
-        unless asset_pipeline_enabled?
-          copy_file '../../../../vendor/assets/javascripts/rails.validations.js', 'public/javascripts/rails.validations.js'
-        end
-      end
+      private
 
-      def show_readme
-        if Rails.version >= '3.1'
-          readme 'README.rails.3.1' if behavior == :invoke
-        else
-          readme 'README.rails.3.0' if behavior == :invoke
-        end
+      def self.installation_message
+        "Copies initializer into config/initializers and #{super.downcase}"
       end
 
+      desc installation_message
     end
   end
 end

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

@@ -1,74 +1,79 @@
-/*!
- * Rails 3 Client Side Validations - v3.2.0.beta.1
- * https://github.com/bcardarella/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 () {
-      var form = $(this),
-          settings = window['ClientSideValidations']['forms'][form.attr('id')],
-          addError = function (element, message) {
-            ClientSideValidations.formBuilders[settings.type].add(element, settings, message);
-          },
-          removeError = function (element) {
-            ClientSideValidations.formBuilders[settings.type].remove(element, settings);
-          };
+/*
+  Rails 3 Client Side Validations - v3.2.0.beta.2
+  https://github.com/bcardarella/client_side_validations
 
-      // Set up the events for the form
-      form
-        .submit(                      function ()          { return form.isValid(settings.validators); })
-        .bind('ajax:beforeSend',      function (eventData) { if(eventData.target == this) 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); } )
-        .bind('form:validate:fail',   function (eventData) { ClientSideValidations.callbacks.form.fail(  form, eventData); } )
-        .bind('form:validate:pass',   function (eventData) { ClientSideValidations.callbacks.form.pass(  form, eventData); } )
+  Copyright (c) 2012 Brian Cardarella
+  Licensed under the MIT license
+  http://www.opensource.org/licenses/mit-license.php
+*/
 
-        // Set up the events for each validatable form element
-        .find('[data-validate="true"]:input:enabled:not(:radio)')
-          .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); })
-          .live('element:validate:before', function (eventData) { ClientSideValidations.callbacks.element.before($(this), eventData); })
-          .live('element:validate:fail',   function (eventData, message) {
-            var element = $(this);
-            ClientSideValidations.callbacks.element.fail(element, message, function () {
-              addError(element, message);
-            }, eventData); })
-          .live('element:validate:pass',   function (eventData) {
-            var element = $(this);
-            ClientSideValidations.callbacks.element.pass(element, function () {
-              removeError(element);
-            }, eventData); })
-        // Checkboxes - Live events don't support filter
-        .end().find('[data-validate="true"]: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-validate="true"]:input');
+(function() {
+  var $, validateElement, validateForm;
 
-          if (element[0]) {
-            $('#' + confirmationElement.attr('id'))
-              .live('focusout', function () {
-                element.data('changed', true).isValid(settings.validators);
-              })
-              .live('keyup', function () {
-                element.data('changed', true).isValid(settings.validators);
-              });
-          }
-        });
+  $ = jQuery;
 
+  $.fn.validate = function() {
+    return this.filter('form[data-validate]').each(function() {
+      var addError, form, removeError, settings;
+      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);
+      };
+      return form.submit(function() {
+        return form.isValid(settings.validators);
+      }).bind('ajax:beforeSend', function(eventData) {
+        if (eventData.target === this) return form.isValid(settings.validators);
+      }).bind('form:validate:after', function(eventData) {
+        return ClientSideValidations.callbacks.form.after(form, eventData);
+      }).bind('form:validate:before', function(eventData) {
+        return ClientSideValidations.callbacks.form.before(form, eventData);
+      }).bind('form:validate:fail', function(eventData) {
+        return ClientSideValidations.callbacks.form.fail(form, eventData);
+      }).bind('form:validate:pass', function(eventData) {
+        return ClientSideValidations.callbacks.form.pass(form, eventData);
+      }).find('[data-validate="true"]:input:enabled:not(:radio)').live('focusout', function() {
+        return $(this).isValid(settings.validators);
+      }).live('change', function() {
+        return $(this).data('changed', true);
+      }).live('element:validate:after', function(eventData) {
+        return ClientSideValidations.callbacks.element.after($(this), eventData);
+      }).live('element:validate:before', function(eventData) {
+        return ClientSideValidations.callbacks.element.before($(this), eventData);
+      }).live('element:validate:fail', function(eventData, message) {
+        var element;
+        element = $(this);
+        return ClientSideValidations.callbacks.element.fail(element, message, function() {
+          return addError(element, message);
+        }, eventData);
+      }).live('element:validate:pass', function(eventData, message) {
+        var element;
+        element = $(this);
+        return ClientSideValidations.callbacks.element.pass(element, function() {
+          return removeError(element);
+        }, eventData);
+      }).end().find('[data-validate="true"]:checkbox').live('click', function() {
+        return $(this).isValid(settings.validators);
+      }).end().find('[id*=_confirmation]').each(function() {
+        var confirmationElement, element;
+        confirmationElement = $(this);
+        element = form.find("#" + (this.id.match(/(.+)_confirmation/)[1]) + "[data-validate='true']:input");
+        if (element[0]) {
+          return $("#" + (confirmationElement.attr('id'))).live('focusout', function() {
+            return element.data('changed', true).isValid(settings.validators);
+          }).live('keyup', function() {
+            return element.data('changed', true).isValid(settings.validators);
+          });
+        }
+      });
     });
   };
 
-  $.fn.isValid = function (validators) {
+  $.fn.isValid = function(validators) {
     if ($(this[0]).is('form')) {
       return validateForm($(this[0]), validators);
     } else {
@@ -76,300 +81,287 @@
     }
   };
 
-  var validateForm = function (form, validators) {
-    var valid = true;
-
+  validateForm = function(form, validators) {
+    var valid;
+    valid = true;
     form.trigger('form:validate:before').find('[data-validate="true"]:input:enabled').each(function() {
-      if (!$(this).isValid(validators)) { valid = false; }
+      if (!$(this).isValid(validators)) valid = false;
+      if (valid) {
+        form.trigger('form:validate:pass');
+      } else {
+        form.trigger('form:validate:fail');
+      }
+      return form.trigger('form:validate:after');
     });
-
-    if (valid) {
-      form.trigger('form:validate:pass');
-    } else {
-      form.trigger('form:validate:fail');
-    }
-
-    form.trigger('form:validate:after');
     return valid;
-  },
-    validateElement = function (element, validators) {
-      element.trigger('element:validate:before');
-
-      if (element.data('changed') !== false) {
-        var valid = true;
-        element.data('changed', false);
+  };
 
-        // Because 'length' is defined on the list of validators we cannot call jQuery.each on
-        for (kind in ClientSideValidations.validators.local) {
+  validateElement = function(element, validators) {
+    var kind, message, valid;
+    element.trigger('element:validate:before');
+    if (element.data('changed') !== false) {
+      valid = true;
+      element.data('changed', false);
+      for (kind in ClientSideValidations.validators.local) {
+        if (validators[kind] && (message = ClientSideValidations.validators.all()[kind](element, validators[kind]))) {
+          element.trigger('element:validate:fail', message).data('valid', false);
+          valid = false;
+          break;
+        }
+      }
+      if (valid) {
+        for (kind in ClientSideValidations.validators.remote) {
           if (validators[kind] && (message = ClientSideValidations.validators.all()[kind](element, validators[kind]))) {
             element.trigger('element:validate:fail', message).data('valid', false);
             valid = false;
             break;
           }
         }
-
-        if (valid) {
-          for (kind in ClientSideValidations.validators.remote) {
-            if (validators[kind] && (message = ClientSideValidations.validators.all()[kind](element, validators[kind]))) {
-              element.trigger('element:validate:fail', message).data('valid', false);
-              valid = false;
-              break;
-            }
-          }
-        }
-
-        if (valid) { element.data('valid', null); element.trigger('element:validate:pass'); }
       }
-
+      if (valid) {
+        element.data('valid', null);
+        element.trigger('element:validate:pass');
+      }
       element.trigger('element:validate:after');
-      return element.data('valid') === false ? false : true;
-    };
+      if (element.data('valid') === false) {
+        return false;
+      } else {
+        return true;
+      }
+    }
+  };
 
-  // Main hook
-  // If new forms are dynamically introduced into the DOM the .validate() method
-  // must be invoked on that form
-  $(function () { $('form[data-validate]').validate(); });
-})(jQuery);
+  $(function() {
+    return $('form[data-validate]').validate();
+  });
 
-var ClientSideValidations = {
-  forms: {},
-  validators: {
-    all: function() { return jQuery.extend({}, ClientSideValidations.validators.local, ClientSideValidations.validators.remote); },
-    local: {
-      presence: function (element, options) {
-        if (/^\s*$/.test(element.val() || "")) {
-          return options.message;
-        }
+  window.ClientSideValidations = {
+    forms: {},
+    validators: {
+      all: function() {
+        return $.extend({}, ClientSideValidations.validators.local, ClientSideValidations.validators.remote);
       },
-      acceptance: function (element, options) {
-        switch (element.attr('type')) {
-          case 'checkbox':
-            if (!element.attr('checked')) {
-              return options.message;
-            }
-            break;
-          case 'text':
-            if (element.val() != (options.accept || '1')) {
+      local: {
+        presence: function(element, options) {
+          if (/^\s*$/.test(element.val() || "")) return options.message;
+        },
+        acceptance: function(element, options) {
+          switch (element.attr('type')) {
+            case 'checkbox':
+              if (!element.attr('checked')) return options.message;
+              break;
+            case 'text':
+              if (element.val() !== (options.accept || '1').toString()) {
+                return options.message;
+              }
+          }
+        },
+        format: function(element, options) {
+          var message;
+          if ((message = this.presence(element, options)) && options.allow_blank === true) {} else if (message) {
+            return message;
+          } else {
+            if (options['with'] && !options['with'].test(element.val())) {
               return options.message;
             }
-            break;
-        }
-      },
-      format: function (element, options) {
-        if ((message = this.presence(element, options)) && options.allow_blank === true) {
-          return;
-        } else if (message) {
-          return message;
-        } else {
-          if (options['with'] && !options['with'].test(element.val())) {
-            return options.message;
-          } else if (options['without'] && options['without'].test(element.val())) {
-            return options.message;
           }
-        }
-      },
-      numericality: function (element, options) {
-        if (!/^-?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d*)?$/.test(element.val())) {
-          return options.messages.numericality;
-        }
-
-        if (options.only_integer && !/^[+-]?\d+$/.test(element.val())) {
-          return options.messages.only_integer;
-        }
-
-        var CHECKS = { greater_than: '>', greater_than_or_equal_to: '>=',
-          equal_to: '==', less_than: '<', less_than_or_equal_to: '<=' };
-
-        for (check in CHECKS) {
-          if (options[check] !== undefined && !(new Function("return " + element.val() + CHECKS[check] + options[check])())) {
-            return options.messages[check];
+        },
+        numericality: function(element, options) {
+          var CHECKS, check;
+          if (!/^-?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d*)?$/.test(element.val())) {
+            return options.messages.numericality;
           }
-        }
-
-        if (options.odd && !(parseInt(element.val(), 10) % 2)) {
-          return options.messages.odd;
-        }
-
-        if (options.even && (parseInt(element.val(), 10) % 2)) {
-          return options.messages.even;
-        }
-      },
-      length: function (element, options) {
-        var blankOptions = {},
-            CHECKS = { is: '==', minimum: '>=', maximum: '<=' },
-            tokenizer = options.js_tokenizer || "split('')",
-            tokenized_length = new Function("element", "return (element.val()." + tokenizer + " || '').length;")(element);
-        if (options.is) {
-          blankOptions.message = options.messages.is;
-        } else if (options.minimum) {
-          blankOptions.message = options.messages.minimum;
-        }
-        if ((message = this.presence(element, blankOptions)) && options.allow_blank === true) {
-          return;
-        } else if (message) {
-          return message;
-        } else {
+          if (options.only_integer && !/^[+-]?\d+$/.test(element.val())) {
+            return options.messages.only_integer;
+          }
+          CHECKS = {
+            greater_than: '>',
+            greater_than_or_equal_to: '>=',
+            equal_to: '==',
+            less_than: '<',
+            less_than_or_equal_to: '<='
+          };
           for (check in CHECKS) {
-            if (options[check] && !(new Function("return " + tokenized_length + CHECKS[check] + options[check])())) {
+            if (options[check] !== void 0 && !(new Function("return " + element.val() + CHECKS[check] + options[check])())) {
               return options.messages[check];
             }
           }
-        }
-      },
-      exclusion: function (element, options) {
-        var lower = null, upper = null;
-        if ((message = this.presence(element, options)) && options.allow_blank === true) {
-          return;
-        } else if (message) {
-          return message;
-        } else {
-          if (options['in']) {
-            for (i = 0; i < options['in'].length; i = i + 1) {
-              if (options['in'][i] == element.val()) {
+          if (options.odd && !(parseInt(element.val(), 10) % 2)) {
+            return options.messages.odd;
+          }
+          if (options.even && (parseInt(element.val(), 10) % 2)) {
+            return options.messages.even;
+          }
+        },
+        length: function(element, options) {
+          var CHECKS, blankOptions, check, message, tokenized_length, tokenizer;
+          blankOptions = {};
+          CHECKS = {
+            is: '==',
+            minimum: '>=',
+            maximum: '<='
+          };
+          tokenizer = options.js_tokenizer || "split('')";
+          tokenized_length = new Function("element", "return (element.val()." + tokenizer + " || '').length;")(element);
+          if (options.is) {
+            blankOptions.message = options.messages.is;
+          } else if (options.minimum) {
+            blankOptions.message = options.messages.minimum;
+          }
+          if ((message = this.presence(element, blankOptions)) && options.allow_blank === true) {} else if (message) {
+            return message;
+          } else {
+            for (check in CHECKS) {
+              if (options[check] && !(new Function("return " + tokenized_length + CHECKS[check] + options[check])())) {
+                return options.messages[check];
+              }
+            }
+          }
+        },
+        exclusion: function(element, options) {
+          var lower, message, upper, value;
+          lower = null;
+          upper = null;
+          if ((message = this.presence(element, options)) && options.allow_blank === true) {} else if (message) {
+            return message;
+          } else {
+            if (options['in']) {
+              for (value in options['in']) {
+                if (value.toString() === element.val()) return options.message;
+              }
+            } else if (options.range) {
+              lower = options.range[0];
+              upper = options.range[1];
+              if (element.val() >= lower && element.val() <= upper) {
                 return options.message;
               }
             }
-          } else if (options.range) {
-            lower = options.range[0];
-            upper = options.range[1];
-            if (element.val() >= lower && element.val() <= upper) {
+          }
+        },
+        inclusion: function(element, options) {
+          var lower, message, upper, value;
+          lower = null;
+          upper = null;
+          if ((message = this.presence(element, options)) && options.allow_blank === true) {} else if (message) {
+            return message;
+          } else {
+            if (options['in']) {
+              for (value in options['in']) {
+                if (value.toString() === element.val()) return;
+              }
               return options.message;
+            } else if (options.range) {
+              lower = options.range[0];
+              upper = options.range[1];
+              if (element.val() >= lower && element.val() <= upper) {} else {
+                return options.message;
+              }
             }
           }
+        },
+        confirmation: function(element, options) {
+          if (element.val() !== $("#" + (element.attr('id')) + "_confirmation").val()) {
+            return options.message;
+          }
         }
       },
-      inclusion: function (element, options) {
-        var lower = null, upper = null;
-        if ((message = this.presence(element, options)) && options.allow_blank === true) {
-          return;
-        } else if (message) {
-          return message;
-        } else {
-          if (options['in']) {
-            for (i = 0; i < options['in'].length; i = i + 1) {
-              if (options['in'][i] == element.val()) {
-                return;
+      remote: {
+        uniqueness: function(element, options) {
+          var data, key, message, name, scoped_element;
+          if ((message = ClientSideValidations.validators.local.presence(element, options)) && options.allow_blank === true) {} else if (message) {
+            return message;
+          } else {
+            data = {};
+            name = null;
+            data.case_sensitive = !!options.case_sensitive;
+            if (options.id) data.id = options.id;
+            if (options.scope) {
+              data.scope = {};
+              for (key in options.scope) {
+                scoped_element = $('[name="' + element.attr('name').replace(/\[\w+\]$/, '[' + key + ']' + '"]'));
+                if (scoped_element[0] && scoped_element.val() !== options.scope[key]) {
+                  data.scope[key] = scoped_element.val();
+                  scoped_element.unbind("change." + element.id).bind("change." + element.id, function() {
+                    element.trigger('change');
+                    return element.trigger('focusout');
+                  });
+                } else {
+                  data.scope[key] = options.scope[key];
+                }
               }
             }
-            return options.message;
-          } else if (options.range) {
-            lower = options.range[0];
-            upper = options.range[1];
-
-            if (element.val() >= lower && element.val() <= upper) {
-              return;
+            if (/_attributes\]/.test(element.attr('name'))) {
+              name = element.attr('name').match(/\[\w+_attributes\]/g).pop().match(/\[(\w+)_attributes\]/).pop();
+              name += /(\[\w+\])$/.exec(element.attr('name'))[1];
             } else {
+              name = element.attr('name');
+            }
+            if (options['class']) {
+              name = "" + options['class'] + "[" + (name.split('[')[1]);
+            }
+            data[name] = element.val();
+            if ($.ajax({
+              url: '/validators/uniqueness',
+              data: data,
+              async: false
+            }).status === 200) {
               return options.message;
             }
           }
         }
-      },
-      confirmation: function (element, options) {
-        if (element.val() !== jQuery('#' + element.attr('id') + '_confirmation').val()) {
-          return options.message;
-        }
       }
     },
-    remote: {
-      uniqueness: function (element, options) {
-        if ((message = ClientSideValidations.validators.local.presence(element, options)) && options.allow_blank === true) {
-          return;
-        } else if (message) {
-          return message;
-        } else {
-          var data = {},
-              name = null;
-          data.case_sensitive = !!options.case_sensitive;
-          if (options.id) {
-            data.id = options.id;
+    formBuilders: {
+      'ActionView::Helpers::FormBuilder': {
+        add: function(element, settings, message) {
+          var inputErrorField, label, labelErrorField;
+          if (element.data('valid') !== false && $("label.message[for='" + (element.attr('id')) + "']")[0] === void 0) {
+            inputErrorField = $(settings.input_tag);
+            labelErrorField = $(settings.label_tag);
+            label = $("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'));
+            labelErrorField.find('label.message').attr('for', element.attr('id'));
+            label.replaceWith(labelErrorField);
+            labelErrorField.find('label#label_tag').replaceWith(label);
           }
-
-          if (options.scope) {
-            data.scope = {};
-            for (key in options.scope) {
-              var scoped_element = jQuery('[name="' + element.attr('name').replace(/\[\w+\]$/, '[' + key + ']' + '"]'));
-              if (scoped_element[0] && scoped_element.val() !== options.scope[key]) {
-                data.scope[key] = scoped_element.val();
-                scoped_element.unbind('change.' + element.id).bind('change.' + element.id, function() { element.trigger('change'); element.trigger('focusout'); });
-              } else {
-                data.scope[key] = options.scope[key];
-              }
-            }
-          }
-
-          // Kind of a hack but this will isolate the resource name and attribute.
-          // e.g. user[records_attributes][0][title] => records[title]
-          // e.g. user[record_attributes][title] => record[title]
-          // Server side handles classifying the resource properly
-          if (/_attributes\]/.test(element.attr('name'))) {
-            name = element.attr('name').match(/\[\w+_attributes\]/g).pop().match(/\[(\w+)_attributes\]/).pop();
-            name += /(\[\w+\])$/.exec(element.attr('name'))[1];
-          } else {
-            name = element.attr('name');
-          }
-
-          // Override the name if a nested module class is passed
-          if (options['class']) {
-            name = options['class'] + '[' + name.split('[')[1];
-          }
-          data[name] = element.val();
-
-          if (jQuery.ajax({
-            url: '/validators/uniqueness',
-            data: data,
-            async: false
-          }).status === 200) {
-            return options.message;
+          return $("label.message[for='" + (element.attr('id')) + "']").text(message);
+        },
+        remove: function(element, settings) {
+          var errorFieldClass, inputErrorField, label, labelErrorField;
+          errorFieldClass = $(settings.input_tag).attr('class');
+          inputErrorField = element.closest("." + errorFieldClass);
+          label = $("label[for='" + (element.attr('id')) + "']:not(.message)");
+          labelErrorField = label.closest("." + errorFieldClass);
+          if (inputErrorField[0]) {
+            inputErrorField.find("#" + (element.attr('id'))).detach();
+            inputErrorField.replaceWith(element);
+            label.detach();
+            return labelErrorField.replaceWith(label);
           }
         }
       }
-    }
-  },
-  formBuilders: {
-    'ActionView::Helpers::FormBuilder': {
-      add: function (element, settings, message) {
-        if (element.data('valid') !== false && jQuery('label.message[for="' + element.attr('id') + '"]')[0] === undefined) {
-          var 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); }
-          element.before(inputErrorField);
-          inputErrorField.find('span#input_tag').replaceWith(element);
-          inputErrorField.find('label.message').attr('for', element.attr('id'));
-          labelErrorField.find('label.message').attr('for', element.attr('id'));
-          label.replaceWith(labelErrorField);
-          labelErrorField.find('label#label_tag').replaceWith(label);
+    },
+    callbacks: {
+      element: {
+        after: function(element, eventData) {},
+        before: function(element, eventData) {},
+        fail: function(element, message, addError, eventData) {
+          return addError();
+        },
+        pass: function(element, removeError, eventData) {
+          return removeError();
         }
-        jQuery('label.message[for="' + element.attr('id') + '"]').text(message);
       },
-      remove: function (element, settings) {
-        var errorFieldClass = jQuery(settings.input_tag).attr('class'),
-            inputErrorField = element.closest('.' + errorFieldClass),
-            label = jQuery('label[for="' + element.attr('id') + '"]:not(.message)'),
-            labelErrorField = label.closest('.' + errorFieldClass);
-
-        if (inputErrorField[0]) {
-          inputErrorField.find('#' + element.attr('id')).detach();
-          inputErrorField.replaceWith(element);
-          label.detach();
-          labelErrorField.replaceWith(label);
-        }
+      form: {
+        after: function(form, eventData) {},
+        before: function(form, eventData) {},
+        fail: function(form, eventData) {},
+        pass: function(form, eventData) {}
       }
-    },
-  },
-  callbacks: {
-    element: {
-      after:  function (element, eventData)                    { },
-      before: function (element, eventData)                    { },
-      fail:   function (element, message, addError, eventData) { addError(); },
-      pass:   function (element, removeError, eventData)       { removeError(); }
-    },
-    form: {
-      after:  function (form, eventData) { },
-      before: function (form, eventData) { },
-      fail:   function (form, eventData) { },
-      pass:   function (form, eventData) { }
     }
-  }
-};
+  };
+
+}).call(this);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: client_side_validations
 version: !ruby/object:Gem::Version
-  version: 3.2.0.beta.1
+  version: 3.2.0.beta.2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-22 00:00:00.000000000Z
+date: 2012-01-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70255205329720 !ruby/object:Gem::Requirement
+  requirement: &70281071642860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.0
   type: :development
   prerelease: false
-  version_requirements: *70255205329720
+  version_requirements: *70281071642860
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70255205329100 !ruby/object:Gem::Requirement
+  requirement: &70281071642120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70255205329100
+  version_requirements: *70281071642120
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70255205328360 !ruby/object:Gem::Requirement
+  requirement: &70281071641060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70255205328360
+  version_requirements: *70281071641060
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70255205327620 !ruby/object:Gem::Requirement
+  requirement: &70281071640160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70255205327620
+  version_requirements: *70281071640160
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &70255205326900 !ruby/object:Gem::Requirement
+  requirement: &70281071639680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70255205326900
+  version_requirements: *70281071639680
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70255205326360 !ruby/object:Gem::Requirement
+  requirement: &70281071639200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70255205326360
+  version_requirements: *70281071639200
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70255205325800 !ruby/object:Gem::Requirement
+  requirement: &70281071638700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70255205325800
+  version_requirements: *70281071638700
+- !ruby/object:Gem::Dependency
+  name: coffee-script
+  requirement: &70281071638160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70281071638160
 description: Client Side Validations
 email:
 - bcardarella@gmail.com
@@ -117,11 +128,12 @@ files:
 - lib/client_side_validations/core_ext/regexp.rb
 - lib/client_side_validations/engine.rb
 - lib/client_side_validations/files.rb
+- lib/client_side_validations/generators.rb
+- lib/client_side_validations/generators/rails_validations.rb
 - lib/client_side_validations/middleware.rb
 - lib/client_side_validations/version.rb
-- lib/generators/client_side_validations/copy_asset_generator.rb
+- lib/generators/client_side_validations/copy_assets_generator.rb
 - lib/generators/client_side_validations/install_generator.rb
-- lib/generators/templates/client_side_validations/README.rails.3.1
 - lib/generators/templates/client_side_validations/initializer.rb
 - vendor/assets/javascripts/rails.validations.js
 homepage: https://github.com/bcardarella/client_side_validations

data/lib/generators/client_side_validations/copy_asset_generator.rb

@@ -1,36 +0,0 @@
-module ClientSideValidations
-  module Generators
-    class CopyAssetGenerator < Rails::Generators::Base
-      source_root File.expand_path('../../../../vendor/assets/javascripts', __FILE__)
-
-      private
-
-      def self.asset_pipeline_enabled?
-        (Rails.configuration.respond_to?(:assets) ? (Rails.configuration.assets || {}) : {})[:enabled]
-      end
-
-      def asset_pipeline_enabled?
-        self.class.asset_pipeline_enabled?
-      end
-
-      public
-
-      if asset_pipeline_enabled?
-        desc 'Creates a ClientSideValidations initializer and copies rails.validations.js to app/assets/javascripts.'
-      else
-        desc 'Creates a ClientSideValidations initializer and copies rails.validations.js to public/javascripts.'
-      end
-
-      def copy_javascript_asset
-        if asset_pipeline_enabled?
-          destination = 'app/assets/javascripts'
-        else
-          destination = 'public/javascripts'
-        end
-
-        copy_file 'rails.validations.js', "#{destination}/rails.validations.js"
-      end
-    end
-  end
-end
-

data/lib/generators/templates/client_side_validations/README.rails.3.1

@@ -1,7 +0,0 @@
-*********************
-ClientSideValidations
-*********************
-
-In your app/assets/javascripts/application.js file add the following:
-
-//= require rails.validations