client_side_validations 3.2.0.beta.5 → 3.2.0.beta.6

data/lib/client_side_validations/action_view/form_builder.rb

@@ -90,59 +90,66 @@ module ClientSideValidations::ActionView::Helpers
     def filter_validators(method, filters)
       if validators = @object.client_side_validation_hash[method]
         unfiltered_validators = validators.inject({}) do |unfiltered_validators, validator|
-          unfiltered_validators[validator.first] = validator.last
-          if has_filter_for_validator?(validator, filters)
-            if filter_validator?(validator, filters)
-              unfiltered_validators.delete(validator.first)
-            elsif force_validator_despite_conditional?(validator, filters) && !can_run_validator?(validator, method)
-              unfiltered_validators.delete(validator.first)
-            end
-          else
-            if (conditional = (validator.last[:if] || validator.last[:unless]))
-              result = case conditional
-                when Symbol
-                  if @object.respond_to?(conditional)
-                    @object.send(conditional)
-                  else
-                    raise(ArgumentError, "unknown method called '#{conditional}'")
+          kind = validator.first
+          unfiltered_validators[kind] = validator.last.inject([]) do |validators_array, validator_hash|
+            if has_filter_for_validator?(kind, filters)
+              if filter_validator?(kind, filters)
+                next
+              elsif force_validator_despite_conditional?(kind, filters) && !can_run_validator?(validator_hash, method)
+                next
+              end
+            else
+              if (conditional = (validator_hash[:if] || validator_hash[:unless]))
+                result = case conditional
+                  when Symbol
+                    if @object.respond_to?(conditional)
+                      @object.send(conditional)
+                    else
+                      raise(ArgumentError, "unknown method called '#{conditional}'")
+                    end
+                  when String
+                    eval(conditional)
+                  when Proc
+                    conditional.call(@object)
                   end
-                when String
-                  eval(conditional)
-                when Proc
-                  conditional.call(@object)
-                end
 
-              # :if was specified and result is false OR :unless was specified and result was true
-              if (validator.last[:if] && !result) || (validator.last[:unless] && result)
-                unfiltered_validators.delete(validator.first)
+                # :if was specified and result is false OR :unless was specified and result was true
+                if (validator_hash[:if] && !result) || (validator_hash[:unless] && result)
+                  next
+                end
               end
+
             end
+
+            validators_array << validator_hash.clone
+            validators_array.last.delete_if { |key, value| key == :if || key == :unless }
+            validators_array
           end
-          unfiltered_validators[validator.first].delete(:if)     if unfiltered_validators[validator.first]
-          unfiltered_validators[validator.first].delete(:unless) if unfiltered_validators[validator.first]
+
           unfiltered_validators
         end
 
+        unfiltered_validators.delete_if { |k, v| v.nil? }
         unfiltered_validators.empty? ? nil : unfiltered_validators
       end
     end
 
-    def has_filter_for_validator?(validator, filters)
-      filters && (filters == true || filters.key?(validator.first))
+    def has_filter_for_validator?(kind, filters)
+      filters && (filters == true || filters.key?(kind))
     end
 
-    def filter_validator?(validator, filters)
-      filters != true && filters[validator.first] == false
+    def filter_validator?(kind, filters)
+      filters != true && filters[kind] == false
     end
 
-    def force_validator_despite_conditional?(validator, filters)
-      filters == true || filters[validator.first] == true
+    def force_validator_despite_conditional?(kind, filters)
+      filters == true || filters[kind] == true
     end
 
-    def can_run_validator?(validator, method)
+    def can_run_validator?(validator_hash, method)
       result        = true
-      if_result     = run_if_validator(validator.last[:if], method)
-      unless_result = run_unless_validator(validator.last[:unless], method)
+      if_result     = run_if_validator(validator_hash[:if], method)
+      unless_result = run_unless_validator(validator_hash[:unless], method)
       result        = result && if_result unless if_result.nil?
       result        = result && unless_result unless unless_result.nil?
       result
@@ -173,4 +180,3 @@ module ClientSideValidations::ActionView::Helpers
     end
   end
 end
-

data/lib/client_side_validations/version.rb

@@ -1,3 +1,3 @@
 module ClientSideValidations
-  VERSION = '3.2.0.beta.5'
+  VERSION = '3.2.0.beta.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: client_side_validations
 version: !ruby/object:Gem::Version
-  version: 3.2.0.beta.5
+  version: 3.2.0.beta.6
   prerelease: 6
 platform: ruby
 authors:
@@ -206,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 467030908926839385
+      hash: -2310212985539069704
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: