client_side_validations 3.2.2 → 3.2.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 315d850e3c4c93019d3cf6e4052e33e72c3aad67
+  data.tar.gz: 9a3d22a1a8ebd7aba6bbaa93c96cdc848e67927e
+SHA512:
+  metadata.gz: 4ee962238c0d65d24649fad3aa8cf2cf9369e0c285efe361a3d56ebc5204b8e1d73f8d299e58ebacf97985215b11ca147e64cff1a615523dc4e993a1664198ac
+  data.tar.gz: ec6dddc31912eda921f7c732aa99514b8d5fdce31afa07b4ad1407f5e38b8580314b4c1cb3b45625a776c55cf503292b0be90129da83162e02cb73f63c1b94de

data/client_side_validations.gemspec

@@ -27,4 +27,6 @@ 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_helper.rb

@@ -2,7 +2,7 @@ module ClientSideValidations::ActionView::Helpers
   module FormHelper
     class Error < StandardError; end
 
-    def form_for(record, *args, &proc)
+    def form_for(record, *args, &block)
       options = args.extract_options!
       if options[:validate]
 
@@ -22,7 +22,8 @@ module ClientSideValidations::ActionView::Helpers
 
       # Order matters here. Rails mutates the options object
       html_id = options[:html][:id] if options[:html]
-      form   = super(record, *(args << options), &proc)
+      form   = super(record, *(args << options), &block)
+      build_bound_validators(options)
       options[:id] = html_id if html_id
       script = client_side_form_settings(object, options)
 
@@ -51,6 +52,13 @@ module ClientSideValidations::ActionView::Helpers
 
     def fields_for(record_or_name_or_array, record_object = nil, options = {}, &block)
       output = super
+      build_bound_validators(options)
+      output
+    end
+
+    private
+
+    def build_bound_validators(options)
       if @validators
         options[:validators].each do |key, value|
           if @validators.key?(key)
@@ -60,11 +68,8 @@ module ClientSideValidations::ActionView::Helpers
           end
         end
       end
-      output
     end
 
-    private
-
     def insert_validators_into_script(script)
       # There is probably a more performant way of doing this
       # But using String#sub has some issues. Undocumented "features"

data/lib/client_side_validations/active_record/middleware.rb

@@ -2,7 +2,7 @@ module ClientSideValidations::ActiveRecord
   class Middleware
 
     def self.is_class?(klass)
-      klass < ::ActiveRecord::Base
+      klass.abstract_class.blank? && klass < ::ActiveRecord::Base
     end
 
     def self.is_unique?(klass, attribute, value, params)

data/lib/client_side_validations/middleware.rb

@@ -80,11 +80,8 @@ module ClientSideValidations
 
       def is_unique?
         convert_scope_value_from_null_to_nil
-        resource         = extract_resource
-        klass            = resource.classify.constantize
-        attribute        = request.params[resource].keys.first
-        value            = request.params[resource][attribute]
-        middleware_class = nil
+        klass, attribute, value = extract_resources
+        middleware_class        = nil
 
         unless Array.wrap(klass._validators[attribute.to_sym]).find { |v| v.kind == :uniqueness }
           raise NotValidatable
@@ -110,11 +107,44 @@ module ClientSideValidations
         end
       end
 
-      def extract_resource
+      def extract_resources
         parent_key = (request.params.keys - IGNORE_PARAMS).first
+   
+        if nested?(request.params[parent_key], 1) 
+          klass, attribute, value = uproot(request.params[parent_key])
+          klass = klass.classify.constantize
+        else
+          klass            = parent_key.classify.constantize
+          attribute        = request.params[parent_key].keys.first
+          value            = request.params[parent_key][attribute]
+        end
+
+        [klass, attribute, value]
+      end
+
+      def uproot(nested_hash = nil)
+        uproot_helper(nested_hash)[-3..-1]
+      end
+
+      def uproot_helper(nested_hash = nil, keys = [])
+        if nested_hash.respond_to?(:keys)
+          keys << nested_hash.keys.first
+          uproot_helper(nested_hash[nested_hash.keys.first], keys)
+        else
+          keys << nested_hash
+        end
       end
+
+      def nested?(hash = nil, levels = 0)
+        i = 0
+        until !(hash.respond_to? :keys)
+          hash = hash[hash.keys.first]
+          i += 1
+        end
+        i > levels
+      end
+
     end
   end
-
 end
 

data/lib/client_side_validations/version.rb

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

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

@@ -321,6 +321,7 @@
           }
           return options.messages.numericality;
         }
+        val = val.replace(new RegExp("\\" + ClientSideValidations.number_format.delimiter, 'g'), "").replace(new RegExp("\\" + ClientSideValidations.number_format.separator, 'g'), ".");
         if (options.only_integer && !/^[+-]?\d+$/.test(val)) {
           return options.messages.only_integer;
         }
@@ -344,7 +345,6 @@
           } else {
             return;
           }
-          val = val.replace(new RegExp("\\" + ClientSideValidations.number_format.delimiter, 'g'), "").replace(new RegExp("\\" + ClientSideValidations.number_format.separator, 'g'), ".");
           fn = new Function("return " + val + " " + operator + " " + check_value);
           if (!fn()) {
             return options.messages[check];
@@ -533,11 +533,8 @@
           name = options['class'] + '[' + name.split('[')[1];
         }
         data[name] = element.val();
-        if (ClientSideValidations.remote_validators_prefix == null) {
-          ClientSideValidations.remote_validators_prefix = "";
-        }
         if (jQuery.ajax({
-          url: "" + ClientSideValidations.remote_validators_prefix + "/validators/uniqueness",
+          url: ClientSideValidations.remote_validators_url_for('uniqueness'),
           data: data,
           async: false,
           cache: false
@@ -548,6 +545,14 @@
     }
   };
 
+  window.ClientSideValidations.remote_validators_url_for = function(validator) {
+    if (ClientSideValidations.remote_validators_prefix != null) {
+      return "//" + window.location.host + "/" + ClientSideValidations.remote_validators_prefix + "/validators/" + validator;
+    } else {
+      return "//" + window.location.host + "/validators/" + validator;
+    }
+  };
+
   window.ClientSideValidations.disableValidators = function() {
     var func, validator, _ref, _results;
     if (window.ClientSideValidations.disabled_validators === void 0) {

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: client_side_validations
 version: !ruby/object:Gem::Version
-  version: 3.2.2
-  prerelease: 
+  version: 3.2.5
 platform: ruby
 authors:
 - Brian Cardarella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,55 +27,48 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: m
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,81 +83,85 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: shotgun
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !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
@@ -211,27 +204,25 @@ files:
 - vendor/assets/javascripts/rails.validations.js
 homepage: https://github.com/bcardarella/client_side_validations
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Client Side Validations
 test_files: []
-has_rdoc: