client_side_validations 3.2.5 → 3.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 315d850e3c4c93019d3cf6e4052e33e72c3aad67
-  data.tar.gz: 9a3d22a1a8ebd7aba6bbaa93c96cdc848e67927e
+  metadata.gz: 45901353d1622b2e772baa28710eba7455927cf2
+  data.tar.gz: 1029d710ab65f47ad806ed3509948586882d0e92
 SHA512:
-  metadata.gz: 4ee962238c0d65d24649fad3aa8cf2cf9369e0c285efe361a3d56ebc5204b8e1d73f8d299e58ebacf97985215b11ca147e64cff1a615523dc4e993a1664198ac
-  data.tar.gz: ec6dddc31912eda921f7c732aa99514b8d5fdce31afa07b4ad1407f5e38b8580314b4c1cb3b45625a776c55cf503292b0be90129da83162e02cb73f63c1b94de
+  metadata.gz: 6f02c2df76f05b36265271ba582bc35cd0fd38859c72f1b96a002a012c8017750d8efa4563d8262dd44cd595cebfb55f5defe2240fd8a9b3f1e3cf1597b5c762
+  data.tar.gz: 79bbcab6259cdcecbbca630b2557575e229ce7fb8123aaa64c61a6d5887a8b9d9bf7736ddc9acb8b507413761a9d6a200eecd8a467e294cb9c7db6bccb59bd2c

data/client_side_validations.gemspec

@@ -27,6 +27,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'json'
   s.add_development_dependency 'coffee-script'
   s.add_development_dependency 'jquery-rails'
-
-  s.add_development_dependency 'coveralls'
 end

data/lib/client_side_validations/action_view/form_builder.rb

@@ -95,7 +95,7 @@ module ClientSideValidations::ActionView::Helpers
       if @options[:validate]
         index = @default_options[:index].present? ? "[#{@default_options[:index]}]" : ''
         name = options[:name] || "#{@object_name}#{index}[#{method}]"
-        child_index = @options[:child_index] ? "(\\d+|#{Regexp.escape(@options[:child_index])})" : "\\d+"
+        child_index = @options[:child_index] ? "(\\d+|#{Regexp.escape(@options[:child_index].to_s)})" : "\\d+"
         name = name.to_s.gsub(/_attributes\]\[#{child_index}\]/, '_attributes][]')
         name = "#{name}#{options[:multiple] ? "[]" : nil}"
         @options[:validators][@object][method] = { :name => name, :options => options[:validate] }

data/lib/client_side_validations/action_view/form_helper.rb

@@ -128,7 +128,7 @@ module ClientSideValidations::ActionView::Helpers
         end
 
         if ClientSideValidations::Config.number_format_with_locale and defined?(I18n)
-          number_format = I18n.t("number.format").extract!(:separator, :delimiter)
+          number_format = I18n.t("number.format").slice(:separator, :delimiter)
         else
           number_format = {:separator=>".", :delimiter=>","}
         end
@@ -136,7 +136,7 @@ module ClientSideValidations::ActionView::Helpers
 
 
         content_tag(:script) do
-          "//<![CDATA[\nif(window.ClientSideValidations===undefined)window.ClientSideValidations={};window.ClientSideValidations.disabled_validators=#{ClientSideValidations::Config.disabled_validators.to_json};window.ClientSideValidations.number_format=#{number_format.to_json};if(window.ClientSideValidations.patterns===undefined)window.ClientSideValidations.patterns = {};window.ClientSideValidations.patterns.numericality=#{patterns[:numericality]};if(window.ClientSideValidations.remote_validators_prefix===undefined)window.ClientSideValidations.remote_validators_prefix='#{(ClientSideValidations::Config.root_path||"").sub(/\/+\Z/,'')}';if(window.ClientSideValidations.forms===undefined)window.ClientSideValidations.forms={};window.ClientSideValidations.forms['#{var_name}'] = #{builder.client_side_form_settings(options, self).merge(:validators => 'validator_hash').to_json};\n//]]>".html_safe
+          "//<![CDATA[\nif(window.ClientSideValidations===undefined)window.ClientSideValidations={};window.ClientSideValidations.disabled_validators=#{ClientSideValidations::Config.disabled_validators.to_json};window.ClientSideValidations.number_format=#{number_format.to_json};if(window.ClientSideValidations.patterns===undefined)window.ClientSideValidations.patterns = {};window.ClientSideValidations.patterns.numericality=#{patterns[:numericality]};#{"if(window.ClientSideValidations.remote_validators_prefix===undefined)window.ClientSideValidations.remote_validators_prefix='#{(ClientSideValidations::Config.root_path).sub(/\/+\Z/,'')}';" if ClientSideValidations::Config.root_path.present? }if(window.ClientSideValidations.forms===undefined)window.ClientSideValidations.forms={};window.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_record/uniqueness.rb

@@ -6,16 +6,19 @@ module ClientSideValidations::ActiveRecord
       hash[:case_sensitive] = options[:case_sensitive]
       hash[:id]             = model.id unless model.new_record?
       hash[:allow_blank]    = true if options[:allow_blank]
+
+      if options.key?(:client_validations) && options[:client_validations].key?(:class)
+        hash[:class] = options[:client_validations][:class].underscore
+      elsif model.class.name.demodulize != model.class.name
+        hash[:class] = model.class.name.underscore
+      end
+
       if options.key?(:scope) && options[:scope].present?
         hash[:scope] = Array.wrap(options[:scope]).inject({}) do |scope_hash, scope_item|
           scope_hash.merge!(scope_item => model.send(scope_item))
         end
       end
 
-      unless model.class.name.demodulize == model.class.name
-        hash[:class] = model.class.name.underscore
-      end
-
       hash
     end
 

data/lib/client_side_validations/middleware.rb

@@ -11,16 +11,32 @@ module ClientSideValidations
       end
 
       def call(env)
-        if matches = /^\/validators\/(\w+)$/.match(env['PATH_INFO'])
-          if ClientSideValidations::Config.disabled_validators.include?(matches[1].to_sym)
-            [500, {'Content-Type' => 'application/json', 'Content-Length' => '0'}, ['']]
-          else
-            "::ClientSideValidations::Middleware::#{matches[1].camelize}".constantize.new(env).response
-          end
+        if matches = /\A\/validators\/(\w+)\z/.match(env['PATH_INFO'])
+          process_request(matches.captures.first, env)
         else
           @app.call(env)
         end
       end
+
+      def process_request(validation, env)
+        if disabled_validators.include?(validation)
+          error_resp
+        else
+          klass_name = validation.camelize
+          klass_name = "::ClientSideValidations::Middleware::#{klass_name}"
+          klass_name.constantize.new(env).response
+        end
+      rescue => e
+        error_resp
+      end
+
+      def disabled_validators
+        ClientSideValidations::Config.disabled_validators.map(&:to_s)
+      end
+
+      def error_resp
+        [500, {'Content-Type' => 'application/json', 'Content-Length' => '0'}, ['']]
+      end
     end
 
     class Base
@@ -109,8 +125,8 @@ module ClientSideValidations
 
       def extract_resources
         parent_key = (request.params.keys - IGNORE_PARAMS).first
-   
-        if nested?(request.params[parent_key], 1) 
+
+        if nested?(request.params[parent_key], 1)
           klass, attribute, value = uproot(request.params[parent_key])
           klass = klass.classify.constantize
         else

data/lib/client_side_validations/version.rb

@@ -1,3 +1,3 @@
 module ClientSideValidations
-  VERSION = '3.2.5'
+  VERSION = '3.2.6'
 end

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

@@ -7,6 +7,10 @@
 # ClientSideValidations::Config.number_format_with_locale = true
 
 # Uncomment the following block if you want each input field to have the validation messages attached.
+#
+# Note: client_side_validation requires the error to be encapsulated within
+# <label for="#{instance.send(:tag_id)}" class="message"></label>
+#
 # ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
 #   unless html_tag =~ /^<label/
 #     %{<div class="field_with_errors">#{html_tag}<label for="#{instance.send(:tag_id)}" class="message">#{instance.error_message.first}</label></div>}.html_safe

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

@@ -44,7 +44,15 @@
   };
 
   validatorsFor = function(name, validators) {
-    name = name.replace(/_attributes\]\[\w+\]\[(\w+)\]/g, "_attributes][][$1]");
+    var captures, validator, validator_name;
+    if (captures = name.match(/\[(\w+_attributes)\].*\[(\w+)\]$/)) {
+      for (validator_name in validators) {
+        validator = validators[validator_name];
+        if (validator_name.match("\\[" + captures[1] + "\\].*\\[\\]\\[" + captures[2] + "\\]$")) {
+          name = name.replace(/\[[\da-z_]+\]\[(\w+)\]$/g, "[][$1]");
+        }
+      }
+    }
     return validators[name] || {};
   };
 
@@ -562,7 +570,7 @@
     _results = [];
     for (validator in _ref) {
       func = _ref[validator];
-      if (window.ClientSideValidations.disabled_validators.indexOf(validator) !== -1) {
+      if (__indexOf.call(window.ClientSideValidations.disabled_validators, validator) >= 0) {
         _results.push(delete window.ClientSideValidations.validators.remote[validator]);
       } else {
         _results.push(void 0);
@@ -576,7 +584,7 @@
       add: function(element, settings, message) {
         var form, inputErrorField, label, labelErrorField;
         form = $(element[0].form);
-        if (element.data('valid') !== false && !(form.find("label.message[for='" + (element.attr('id')) + "']")[0] != null)) {
+        if (element.data('valid') !== false && (form.find("label.message[for='" + (element.attr('id')) + "']")[0] == null)) {
           inputErrorField = jQuery(settings.input_tag);
           labelErrorField = jQuery(settings.label_tag);
           label = form.find("label[for='" + (element.attr('id')) + "']:not(.message)");

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: client_side_validations
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  version: 3.2.6
 platform: ruby
 authors:
 - Brian Cardarella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -150,20 +150,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Client Side Validations
 email:
 - bcardarella@gmail.com
@@ -221,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Client Side Validations