client_side_validations 2.3.0 → 2.4.0

data/README.markdown

@@ -44,7 +44,7 @@ This will copy client_side_validations.js to "public/javascripts"
 Currently only [jquery.validate](http://bassistance.de/jquery-plugins/jquery-plugin-validation/) is supported so you will need to download [jQuery](http://docs.jquery.com/Downloading_jQuery) and the jQuery Validate plugin to "public/javascripts"
 
 ### Rack
-If you want to validate_uniqueness_of a call to the server must be made. You can do this by simply drop in the ClidenSideValidations Rack middleware.
+If you want to validate_uniqueness_of a call to the server must be made. You can do this with the ClidenSideValidations::Uniqueness middleware.
 
 The following route will be reserved for client side validations:
 
@@ -91,6 +91,20 @@ That should be it!
 
 ## Advanced Options
 
+### Initialization
+[jquery.validate can be customized by setting various options](http://docs.jquery.com/Plugins/Validation/validate#toptions)
+
+Create config/initializers/client_side_validations.rb
+
+An example set of default options can look like:
+
+    ClientSideValidations.default_options = {
+      :onkeyup    => "false",
+      :errorClass => %{"validation_errors"}
+    }
+    
+You'll notice that for :errorClass a string is being set inside of a string. This is necessary so everything gets translated to Javascript properly. (hopefully I can come up with something nicer soon)
+
 ### Model
 If you want to define only specific fields for client side validations just override the validation_fields method on each model
 
@@ -106,6 +120,22 @@ If you want to define only specific fields for client side validations just over
     end
     
 
+### View
+You can override the default options set in the initializer for each form:
+
+    <% form_for @book, :validations => { :options => { :errorClass => %{"bad-field"} } } do |b| %>
+      ...
+      
+Same rules apply of a string inside a string for proper conversion to Javascript.
+
+If you are not using an instance variable for form_for or for some reason want to use the validations from another class that can be done in two ways:
+
+    <% form_for :book, :validations => Book %>
+      ...
+      
+    <% form_for :book, :validations => { :class => Book } %>
+      ...
+      
 Written by Brian Cardarella
 
 Copyright (c) 2010 Democratic National Committee. See LICENSE for details.

data/lib/client_side_validations/adapters/active_model.rb

@@ -11,24 +11,26 @@ module DNCLabs
         def validation_to_hash(_attr, _options = {})
           validation_hash = {}
           base._validators[_attr.to_sym].each do |validation|
-            message = get_validation_message(validation, _options[:locale])
-            validation.options.delete(:message)
-            options = get_validation_options(validation.options)
-            method  = get_validation_method(validation.kind)
-            if conditional_method = remove_reserved_conditionals(options['if'])
-              if base.instance_eval(conditional_method.to_s)
+            if can_validate?(validation)
+              message = get_validation_message(validation, _options[:locale])
+              validation.options.delete(:message)
+              options = get_validation_options(validation.options)
+              method  = get_validation_method(validation.kind)
+              if conditional_method = remove_reserved_conditionals(options['if'])
+                if base.instance_eval(conditional_method.to_s)
+                  options.delete('if')
+                  validation_hash[method] = { 'message' => message }.merge(options)
+                end
+              elsif conditional_method = options['unless']
+                unless base.instance_eval(conditional_method.to_s)
+                  options.delete('unless')
+                  validation_hash[method] = { 'message' => message }.merge(options)
+                end
+              else
                 options.delete('if')
-                validation_hash[method] = { 'message' => message }.merge(options)
-              end
-            elsif conditional_method = options['unless']
-              unless base.instance_eval(conditional_method.to_s)
                 options.delete('unless')
                 validation_hash[method] = { 'message' => message }.merge(options)
               end
-            else
-              options.delete('if')
-              options.delete('unless')
-              validation_hash[method] = { 'message' => message }.merge(options)
             end
           end
 
@@ -40,6 +42,17 @@ module DNCLabs
         end
         
         private
+        
+        def can_validate?(validation)
+          if on = validation.options.delete(:on)
+            on = on.to_sym
+            (on == :save) ||
+            (on == :create && base.new_record?) ||
+            (on == :update && !base.new_record?)
+          else
+            true
+          end
+        end
 
         def get_validation_message(validation, locale)
           default = case validation.kind

data/lib/client_side_validations/adapters/active_record_2.rb

@@ -13,22 +13,24 @@ module DNCLabs
         def validation_to_hash(_attr, _options = {})
           validation_hash = {}
           base.class.reflect_on_validations_for(_attr).each do |validation|
-            message = get_validation_message(validation, _options[:locale])
-            validation.options.delete(:message)
-            options = get_validation_options(validation.options)
-            method  = get_validation_method(validation.macro)
-            if conditional_method = options['if']
-              if base.instance_eval(conditional_method.to_s)
-                options.delete('if')
+            if can_validate?(validation)
+              message = get_validation_message(validation, _options[:locale])
+              validation.options.delete(:message)
+              options = get_validation_options(validation.options)
+              method  = get_validation_method(validation.macro)
+              if conditional_method = options['if']
+                if base.instance_eval(conditional_method.to_s)
+                  options.delete('if')
+                  validation_hash[method] = { 'message' => message }.merge(options)
+                end
+              elsif conditional_method = options['unless']
+                unless base.instance_eval(conditional_method.to_s)
+                  options.delete('unless')
+                  validation_hash[method] = { 'message' => message }.merge(options)
+                end
+              else
                 validation_hash[method] = { 'message' => message }.merge(options)
               end
-            elsif conditional_method = options['unless']
-              unless base.instance_eval(conditional_method.to_s)
-                options.delete('unless')
-                validation_hash[method] = { 'message' => message }.merge(options)
-              end
-            else
-              validation_hash[method] = { 'message' => message }.merge(options)
             end
           end
 
@@ -40,6 +42,17 @@ module DNCLabs
         end
         
         private
+        
+        def can_validate?(validation)
+          if on = validation.options.delete(:on)
+            on = on.to_sym
+            (on == :save) ||
+            (on == :create && base.new_record?) ||
+            (on == :update && !base.new_record?)
+          else
+            true
+          end
+        end
 
         def get_validation_message(validation, locale)
           default = case validation.macro.to_s

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 3
+  - 4
   - 0
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors: 
 - Brian Cardarella
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-09 00:00:00 -04:00
+date: 2010-07-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency