client_side_validations 2.2.0 → 2.2.2

data/javascript/lib/client_side_validations.js

@@ -6,17 +6,22 @@ if (typeof(jQuery) != "undefined") {
   
   $.extend($.fn, {
     clientSideValidations: function() {
-      var form    = this;
-      var object  = form.attr('object-csv');
-      var url     = '/validations.json?model=' + object;
-      var id      = form[0].id;
+      var form         = this;
+      var object       = form.attr('object-csv');
+      var edit_pattern = new RegExp('^edit_' + object + '_(.+)', 'i');
+      var url          = '/validations.json?model=' + object;
+      var id           = form[0].id;
+      var object_id    = null;
+      if (edit_pattern.test(id)) {
+        object_id = Number(edit_pattern.exec(id)[1]);
+      }
       var adapter = 'jquery.validate';
       if (/new/.test(id)) {
         id = /new_(\w+)/.exec(id)[1]
       } else if (/edit/.test(id)) {
         id = /edit_(\w+)_\d+/.exec(id)[1]
       }
-      var client = new ClientSideValidations(id, adapter)
+      var client = new ClientSideValidations(id, adapter, object_id)
       $.getJSON(url, function(json) {
         var validations = client.adaptValidations(json);
         form.validate({
@@ -32,7 +37,7 @@ if (typeof(jQuery) != "undefined") {
   });
 }
 
-ClientSideValidations = function(id, adapter) {
+ClientSideValidations = function(id, adapter, object_id) {
   this.id                = id;
   this.adapter           = adapter;
   this.adaptValidations  = function(validations) {
@@ -70,7 +75,13 @@ ClientSideValidations = function(id, adapter) {
             case 'uniqueness':
               rule  = 'remote';
               value = {
-                url: '/validations/uniqueness.json'
+                url: '/validations/uniqueness.json',
+                data: {}
+              }
+              if(object_id) {
+                value['data'][this.id + '[id]'] = function() {
+                  return String(object_id);
+                }
               }
               break;
 

data/lib/client_side_validations.rb

@@ -8,7 +8,9 @@ class ClientSideValidations
   end
   
   def call(env)
-    params = CGI::parse(env['QUERY_STRING'])
+    # By default CGI::parse will instantize a hash that defaults nil elements to [].
+    # We need to override this
+    params = {}.merge!(CGI::parse(env['QUERY_STRING']))
     case env['PATH_INFO']
     when %r{^/validations.json}
       body = get_validations(params['model'][0])
@@ -17,7 +19,10 @@ class ClientSideValidations
       field               = params.keys.first
       resource, attribute = field.split(/[^\w]/)
       value               = params[field][0]
-      body                = is_unique?(resource, attribute, value).to_s
+      # Because params returns an array for each field value we want to always grab
+      # the first element of the array for id, even if it is nil
+      id                  = [params["#{resource}[id]"]].flatten.first
+      body                = is_unique?(resource, attribute, value, id).to_s
       [200, {'Content-Type' => 'application/json', 'Content-Length' => "#{body.length}"}, body]
     else
       @app.call(env)
@@ -30,8 +35,24 @@ class ClientSideValidations
     constantize_resource(resource).new.validations_to_json
   end
   
-  def is_unique?(resource, attribute, value)
-    constantize_resource(resource).send("find_by_#{attribute}", value) == nil
+  def is_unique?(resource, attribute, value, id = nil)
+    klass    = constantize_resource(resource)
+    instance = nil
+    if id
+      if instance = klass.find(id)
+        if instance.send(attribute) == value
+          return true
+        else
+          instance = nil
+        end
+      end
+    end
+    
+    unless instance
+      instance = klass.send("find_by_#{attribute}", value)
+    end
+    
+    instance == nil
   end
   
   def constantize_resource(resource)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 2
-  - 0
-  version: 2.2.0
+  - 2
+  version: 2.2.2
 platform: ruby
 authors: 
 - Brian Cardarella
@@ -45,7 +45,7 @@ dependencies:
         version: 1.4.3
   type: :runtime
   version_requirements: *id002
-description: ORM and Framework agnostic Client Side Validations
+description: Client Side Validations for Rails 2.x and 3.x
 email: cardarellab@dnc.org
 executables: []