client_side_validations 4.2.10 → 4.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3815d50af1d432488773ed5a27e0392c6c07d239
-  data.tar.gz: 995f9c98958cbcae9c130cf798a10c015aa7d0e8
+  metadata.gz: 1e8b7b85a661425cfac3b38f15b96a273561c4f0
+  data.tar.gz: 325fa1311d5d869af1a0da27217ad4f64df5f226
 SHA512:
-  metadata.gz: 827bfafbc7334a09397601c991c5549bac46e1f0f5d8b5ef50574cc4ce3b2d978771096927eeca650f9063aa8182b74e3e8a2b3a5979d58455485a45325e91cd
-  data.tar.gz: acbb3113992799c6be12c2624b01a78fa0682e1f122a5cc471414a200056eaed0cb3d6aed60fc2c73eab6de0efa8b7b9a2ac5f54b2f074bb0a4a1d3e75d9fbad
+  metadata.gz: fc6e52713b743f1cd307b8531718ab1076158c478d463bff62a5dedbb0a5a9ff38e2b2bd81c974fa1cd3129abc05d0f8999e60314b8115598e62a794bed8bb32
+  data.tar.gz: 23983f27530ca135ba03380a05ed237f528f66c8f242301be38329b3785c561242c6ee27ce539b2fca28f57d155770b7b11e79fb3cf8e36a6bd4911b440c6eac

data/README.md

@@ -143,7 +143,7 @@ individual validators:
 
 In the above case only the `presence` validator will be passed to the client.
 
-This is also the case with Procs, or any object that responds to `#call`
+This is also the case with [other supported conditional validations](http://guides.rubyonrails.org/v4.2.0/active_record_validations.html#conditional-validation) (such as Procs, Arrays or Strings).
 
 ### Turning off validators ###
 

data/lib/client_side_validations/active_model.rb

@@ -1,4 +1,5 @@
 require 'client_side_validations/core_ext'
+require 'client_side_validations/active_model/conditionals'
 
 module ClientSideValidations
   module ActiveModel
@@ -23,12 +24,14 @@ module ClientSideValidations
     end
 
     module Validations
+      include ClientSideValidations::ActiveModel::Conditionals
+
       def client_side_validation_hash(force = nil)
         _validators.inject({}) do |attr_hash, attr|
           return attr_hash if [nil, :block].include?(attr[0])
 
           validator_hash = attr[1].each_with_object(Hash.new { |h, k| h[k] = [] }) do |validator, kind_hash|
-            next nil unless can_use_for_client_side_validation?(attr[0], validator, force)
+            next unless can_use_for_client_side_validation?(attr[0], validator, force)
 
             client_side_hash = validator.client_side_hash(self, attr[0], extract_force_option(attr[0], force))
             if client_side_hash
@@ -68,10 +71,10 @@ module ClientSideValidations
           else
             result = can_force_validator?(attr, validator, force)
             if validator.options[:if]
-              result &&= run_conditional(validator.options[:if])
+              result &&= run_conditionals(validator.options[:if], :if)
             end
             if validator.options[:unless]
-              result &&= !run_conditional(validator.options[:unless])
+              result &&= run_conditionals(validator.options[:unless], :unless)
             end
           end
         end
@@ -79,14 +82,6 @@ module ClientSideValidations
         result
       end
 
-      def run_conditional(method_name_value_or_proc)
-        if method_name_value_or_proc.respond_to?(:call)
-          method_name_value_or_proc.call self
-        else
-          send method_name_value_or_proc
-        end
-      end
-
       def validator_turned_off?(attr, validator, force)
         return true if ::ClientSideValidations::Config.disabled_validators.include?(validator.kind)
         case force

data/lib/client_side_validations/active_model/conditionals.rb

@@ -0,0 +1,41 @@
+module ClientSideValidations
+  module ActiveModel
+    module Conditionals
+      private
+
+      def run_conditionals(conditionals, conditional_type)
+        Array.wrap(conditionals).all? do |conditional|
+          value = run_one_conditional(conditional)
+          if conditional_type == :unless
+            !value
+          else
+            value
+          end
+        end
+      end
+
+      def run_one_conditional(conditional)
+        case conditional
+        when ::Proc
+          case conditional.arity
+          when 0
+            instance_exec(&conditional)
+          when 1
+            instance_exec(self, &conditional)
+          else
+            raise ArgumentError, 'Missing argument'
+          end
+        when String
+          # rubocop:disable Lint/Eval'
+          l = eval "lambda { |value| #{conditional} }"
+          # rubocop:enable Lint/Eval'
+          instance_exec(nil, &l)
+        when Symbol
+          send conditional
+        else
+          raise ArgumentError, "Unknown conditional #{conditional}. If supported by ActiveModel/ActiveRecord open a bug for client_side_validations gem."
+        end
+      end
+    end
+  end
+end

data/lib/client_side_validations/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ClientSideValidations
-  VERSION = '4.2.10'.freeze
+  VERSION = '4.2.11'.freeze
 end

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

@@ -1,6 +1,6 @@
 
 /*!
- * Client Side Validations - v4.2.10 (https://github.com/DavyJonesLocker/client_side_validations)
+ * Client Side Validations - v4.2.11 (https://github.com/DavyJonesLocker/client_side_validations)
  * Copyright (c) 2016 Geremia Taglialatela, Brian Cardarella
  * Licensed under MIT (http://opensource.org/licenses/mit-license.php)
  */

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: client_side_validations
 version: !ruby/object:Gem::Version
-  version: 4.2.10
+  version: 4.2.11
 platform: ruby
 authors:
 - Geremia Taglialatela
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-16 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,14 +105,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.15
+        version: 0.8.17
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.15
+        version: 0.8.17
 - !ruby/object:Gem::Dependency
   name: m
   requirement: !ruby/object:Gem::Requirement
@@ -167,28 +167,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.45.0
+        version: 0.46.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.45.0
+        version: 0.46.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -291,6 +291,7 @@ files:
 - lib/client_side_validations/active_model.rb
 - lib/client_side_validations/active_model/absence.rb
 - lib/client_side_validations/active_model/acceptance.rb
+- lib/client_side_validations/active_model/conditionals.rb
 - lib/client_side_validations/active_model/exclusion.rb
 - lib/client_side_validations/active_model/format.rb
 - lib/client_side_validations/active_model/inclusion.rb