client_side_validations 4.2.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74a0ec2fee1f73f4bbb10e8384609c16914c16e9
-  data.tar.gz: fdc6f78dd60b02930a4bfc876e090785c21f5206
+  metadata.gz: 62857994d1326cfb20a2c2d3c1c5fd746fa72065
+  data.tar.gz: 5d187e21b9b0b8935f3d5bfee8099095a128a389
 SHA512:
-  metadata.gz: 2c777cc7a0190546e612e7602e5dc578d5e30172d3b0393912ad8d2e5c2d48b36d9e3a5fe9cc5979e5ad3e8dada301d0f0eab51bca923fc8d02f63e3fcef0017
-  data.tar.gz: 795119c15633fb66e4b6091eb3e4a29698b49791855a64488de8c687f62fb2138924f4f849c2be99ae2cd78e8055f40bc2af3663aa935a9a431ee105ad1962c7
+  metadata.gz: 284d47098c63a20c73aad2d252028e54ecd7b519d6130d16170206440e4f70b6e28f70be895a71c4f71dc555acf65765f1137acbded5910aa5aea779bdf3862a
+  data.tar.gz: 4c0b3c38d2254184cd34841d87683a3c21e0e5c1805be57134b913078f96e964e920cf78b85efb41a214f9bb81721b24e3e78996ca82e2877e751d15717cb6b2

data/CHANGELOG.md

@@ -0,0 +1,71 @@
+# Changelog
+
+## 6.0.0 (2017-01-20)
+
+* Rails 5.0 compatibility
+
+## 4.2.12 (2017-01-19)
+
+* Add Changelog ([#688](https://github.com/DavyJonesLocker/client_side_validations/issues/688))
+* Test against jQuery from 1.7.2 to 3.1.1
+* Drop Ruby 2.0.0 support
+* Other minor changes
+
+## 4.2.11 (2016-12-08)
+
+* Fix conditional validators ([#686](https://github.com/DavyJonesLocker/client_side_validations/issues/686))
+
+## 4.2.10 (2016-11-16)
+
+* Fix dollar sign in regular expression ([#684](https://github.com/DavyJonesLocker/client_side_validations/issues/684))
+
+## 4.2.9 (2016-11-11)
+
+* Fix jQuery 3 compatibility
+
+## 4.2.8 (2016-11-11)
+
+* Fix numericality validator ([#679](https://github.com/DavyJonesLocker/client_side_validations/pull/679))
+
+## 4.2.7 (2016-10-08)
+
+* Fix: Prevent undesired `stopPropagation` on `focusout` event ([#675](https://github.com/DavyJonesLocker/client_side_validations/pull/675))
+
+## 4.2.6 (2016-09-10)
+
+* Add some clarity to the `copy_assets` command ([#671](https://github.com/DavyJonesLocker/client_side_validations/pull/671))
+* Other minor changes
+
+## 4.2.5 (2016-07-06)
+
+* Fix: Make helpers consistent with their Rails counterparts ([#665](https://github.com/DavyJonesLocker/client_side_validations/issues/665))
+* Other minor changes
+
+## 4.2.4 (2016-06-14)
+
+* Add Turbolinks 5 compatibility
+* Drop Ruby 1.9 support
+* Test against Ruby 2.1.10, 2.2.5 and 2.3.1
+* Test against jQuery 1.12.4
+
+## 4.2.3 (2016-03-14)
+
+* Test against jQuery 1.12.1
+* Other minor changes
+
+## 4.2.2 (2016-02-28)
+
+* Fix uniqueness validator data disclosure ([#648](https://github.com/DavyJonesLocker/client_side_validations/issues/648))
+* Fix config.root_path to work in middleware ([#598](https://github.com/DavyJonesLocker/client_side_validations/pull/598))
+* Other minor changes
+
+## 4.2.1 (2016-01-15)
+
+* Test against jQuery 1.12.0
+* Other minor changes
+
+## 4.2.0 (2016-01-07)
+
+* First Rails 4.x compatible version
+
+For older versions, please refer to [GitHub releases](https://github.com/DavyJonesLocker/client_side_validations/releases)

data/README.md

@@ -4,13 +4,13 @@
 [![Build Status](https://secure.travis-ci.org/DavyJonesLocker/client_side_validations.svg?branch=master)](https://travis-ci.org/DavyJonesLocker/client_side_validations)
 [![Dependency Status](https://gemnasium.com/DavyJonesLocker/client_side_validations.svg)](https://gemnasium.com/DavyJonesLocker/client_side_validations)
 [![Code Climate](https://codeclimate.com/github/DavyJonesLocker/client_side_validations/badges/gpa.svg)](https://codeclimate.com/github/DavyJonesLocker/client_side_validations)
-[![Coverage Status](https://coveralls.io/repos/DavyJonesLocker/client_side_validations/badge.svg?branch=master)](https://coveralls.io/r/DavyJonesLocker/client_side_validations?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/DavyJonesLocker/client_side_validations/badge.svg?branch=master)](https://coveralls.io/github/DavyJonesLocker/client_side_validations?branch=master)
 
-`ClientSideValidations` made easy for your Rails 4 applications!
+`ClientSideValidations` made easy for your Rails 5 applications!
 
 ## Project Goals ##
 
-1. Follow the best practices for client side validations developed by [Luke Wroblewski](http://www.alistapart.com/articles/inline-validation-in-web-forms/)
+1. Follow the best practices for client side validations developed by [Luke Wroblewski](http://alistapart.com/article/inline-validation-in-web-forms)
 2. Automatically extract and apply validation rules defined on the
    server to the client.
 3. In the cases where a server-side validation rule would not work on
@@ -46,11 +46,12 @@ This will install the initializer:
 config/initializers/client_side_validations.rb
 ```
 
-If you want to copy the asset files from the gem into your project:
+If you need to copy the asset files from the gem into your project:
 
 ```
 rails g client_side_validations:copy_assets
 ```
+Note: If you run `copy_assets`, you will need to run it again each time you update this project.
 
 ## Initializer ##
 
@@ -70,10 +71,10 @@ There is additional support for other `ActiveModel` based ORMs and other
 Rails `FormBuilders`. Please see the [Plugin wiki page](https://github.com/DavyJonesLocker/client_side_validations/wiki/Plugins)
 (feel free to add your own)
 
-* [SimpleForm](https://github.com/DockYard/client_side_validations-simple_form)
-* [Formtastic](https://github.com/DockYard/client_side_validations-formtastic)
-* [Mongoid](https://github.com/DockYard/client_side_validations-mongoid)
-* [MongoMapper](https://github.com/DockYard/client_side_validations-mongo_mapper)
+* [SimpleForm](https://github.com/DavyJonesLocker/client_side_validations-simple_form)
+* [Formtastic](https://github.com/DavyJonesLocker/client_side_validations-formtastic)
+* [Mongoid](https://github.com/DavyJonesLocker/client_side_validations-mongoid)
+* [MongoMapper](https://github.com/DavyJonesLocker/client_side_validations-mongo_mapper)
 
 ## Usage ##
 
@@ -142,7 +143,24 @@ 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).
+
+**NOTE:** when `:if` conditional includes a symbol or a string with
+`changed?` in it, validator will forced automatically.
+
+```ruby
+class Person < ActiveRecord::Base
+  validates :name, presence: true, if: :name_changed?
+end
+```
+
+The presence of name in the example above will be validated
+without explicit forcing.
+
+This is done because it is always assumed the value will change on the
+form.
+
+Conditionals defined with `:unless` key do not have this optimization.
 
 ### Turning off validators ###
 
@@ -504,9 +522,9 @@ Note that the `FormBuilder` will automatically skip building validators that are
 
 ## Authors ##
 
-[Brian Cardarella](http://twitter.com/bcardarella)
+[Brian Cardarella](https://twitter.com/bcardarella)
 
-[Geremia Taglialatela](http://twitter.com/gtagliala)
+[Geremia Taglialatela](https://twitter.com/gtagliala)
 
 [We are very thankful for the many contributors](https://github.com/DavyJonesLocker/client_side_validations/graphs/contributors)
 
@@ -514,17 +532,6 @@ Note that the `FormBuilder` will automatically skip building validators that are
 
 This gem follows [Semantic Versioning](http://semver.org)
 
-Major and minor version numbers will follow `Rails`'s major and
-minor version numbers. For example,
-`client_side_validations-4.2.0` will be compatible up to
-`~> rails-4.2.0`
-
-We will maintain compatibility with one minor version back. So the 4.2.0 version of `client_side_validations`
-will be compatible with `~> rails-4.1.0`. We will not drop support
-to older versions if not necessary.
-
-Only two versions minor versions will be actively maintained.
-
 ## Want to help? ##
 
 Please do! We are always looking to improve this gem. Please see our
@@ -533,8 +540,8 @@ on how to properly submit issues and pull requests.
 
 ## Legal ##
 
-[DockYard](http://dockyard.com), LLC &copy; 2012-2015
+[DockYard](https://dockyard.com/), LLC &copy; 2012-2017
 
-[@dockyard](http://twitter.com/dockyard)
+[@dockyard](https://twitter.com/dockyard)
 
-[Licensed under the MIT license](http://www.opensource.org/licenses/mit-license.php)
+[Licensed under the MIT license](https://opensource.org/licenses/mit-license.php)

data/lib/client_side_validations/action_view/form_builder.rb

@@ -2,30 +2,21 @@ module ClientSideValidations
   module ActionView
     module Helpers
       module FormBuilder
-        def self.included(base)
+        def self.prepended(base)
           (base.field_helpers.map(&:to_s) - %w(apply_form_for_options! label check_box radio_button fields_for hidden_field)).each do |selector|
             base.class_eval <<-RUBY_EVAL
-              def #{selector}_with_client_side_validations(method, options = {})
+              def #{selector}(method, options = {})
                 build_validation_options(method, options)
                 options.delete(:validate)
-                #{selector}_without_client_side_validations(method, options)
+
+                # Cannot call super here, override the whole method
+                @template.send(                      #   @template.send(
+                  #{selector.inspect},               #     "text_field",
+                  @object_name,                      #     @object_name,
+                  method,                            #     method,
+                  objectify_options(options))        #     objectify_options(options))
               end
             RUBY_EVAL
-
-            base.class_eval { alias_method_chain selector, :client_side_validations }
-          end
-
-          base.class_eval do
-            alias_method_chain :initialize,                :client_side_validations
-            alias_method_chain :fields_for,                :client_side_validations
-            alias_method_chain :check_box,                 :client_side_validations
-            alias_method_chain :radio_button,              :client_side_validations
-            alias_method_chain :select,                    :client_side_validations
-            alias_method_chain :collection_select,         :client_side_validations
-            alias_method_chain :collection_check_boxes,    :client_side_validations
-            alias_method_chain :collection_radio_buttons,  :client_side_validations
-            alias_method_chain :grouped_collection_select, :client_side_validations
-            alias_method_chain :time_zone_select,          :client_side_validations
           end
         end
 
@@ -45,63 +36,58 @@ module ClientSideValidations
           nil
         end
 
-        def initialize_with_client_side_validations(object_name, object, *args)
-          initialize_without_client_side_validations(object_name, object, *args)
+        def initialize(object_name, object, template, options)
+          super(object_name, object, template, options)
           @options[:validators] = { object => {} }
         end
 
-        def fields_for_with_client_side_validations(record_or_name_or_array, *args, &block)
-          options = args.extract_options!
-          options[:validate] ||= @options[:validate] if @options[:validate] && !options.key?(:validate)
-          fields_for_without_client_side_validations(record_or_name_or_array, *(args << options), &block)
+        def fields_for(record_name, record_object = nil, fields_options = {}, &block)
+          fields_options[:validate] ||= @options[:validate] if @options[:validate] && !fields_options.key?(:validate)
+          super(record_name, record_object, fields_options, &block)
         end
 
-        def check_box_with_client_side_validations(method, options = {}, checked_value = '1', unchecked_value = '0')
+        def check_box(method, options = {}, checked_value = '1', unchecked_value = '0')
           build_validation_options(method, options)
           options.delete(:validate)
-          check_box_without_client_side_validations(method, options, checked_value, unchecked_value)
+          super(method, options, checked_value, unchecked_value)
         end
 
-        def radio_button_with_client_side_validations(method, tag_value, options = {})
+        def radio_button(method, tag_value, options = {})
           build_validation_options(method, options)
           options.delete(:validate)
-          radio_button_without_client_side_validations(method, tag_value, options)
-        end
-
-        def select_with_client_side_validations(method, choices, options = {}, html_options = {}, &block)
-          build_validation_options(method, html_options.merge(name: options[:name]))
-          html_options.delete(:validate)
-          select_without_client_side_validations(method, choices, options, html_options, &block)
+          super(method, tag_value, options)
         end
 
-        def collection_select_with_client_side_validations(method, collection, value_method, text_method, options = {}, html_options = {})
+        def select(method, choices = nil, options = {}, html_options = {}, &block)
           build_validation_options(method, html_options.merge(name: options[:name]))
           html_options.delete(:validate)
-          collection_select_without_client_side_validations(method, collection, value_method, text_method, options, html_options)
+          super(method, choices, options, html_options, &block)
         end
 
-        def collection_check_boxes_with_client_side_validations(method, collection, value_method, text_method, options = {}, html_options = {}, &block)
+        def collection_select(method, collection, value_method, text_method, options = {}, html_options = {})
           build_validation_options(method, html_options.merge(name: options[:name]))
           html_options.delete(:validate)
-          collection_check_boxes_without_client_side_validations(method, collection, value_method, text_method, options, html_options, &block)
+          super(method, collection, value_method, text_method, options, html_options)
         end
 
-        def collection_radio_buttons_with_client_side_validations(method, collection, value_method, text_method, options = {}, html_options = {}, &block)
-          build_validation_options(method, html_options.merge(name: options[:name]))
-          html_options.delete(:validate)
-          collection_radio_buttons_without_client_side_validations(method, collection, value_method, text_method, options, html_options, &block)
+        %i(collection_check_boxes collection_radio_buttons).each do |method_name|
+          define_method method_name do |method, collection, value_method, text_method, options = {}, html_options = {}, &block|
+            build_validation_options(method, html_options.merge(name: options[:name]))
+            html_options.delete(:validate)
+            super(method, collection, value_method, text_method, options, html_options, &block)
+          end
         end
 
-        def grouped_collection_select_with_client_side_validations(method, collection, group_method, group_label_method, option_key_method, option_value_method, options = {}, html_options = {})
+        def grouped_collection_select(method, collection, group_method, group_label_method, option_key_method, option_value_method, options = {}, html_options = {})
           build_validation_options(method, html_options.merge(name: options[:name]))
           html_options.delete(:validate)
-          grouped_collection_select_without_client_side_validations(method, collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options)
+          super(method, collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options)
         end
 
-        def time_zone_select_with_client_side_validations(method, priority_zones = nil, options = {}, html_options = {})
+        def time_zone_select(method, priority_zones = nil, options = {}, html_options = {})
           build_validation_options(method, html_options.merge(name: options[:name]))
           html_options.delete(:validate)
-          time_zone_select_without_client_side_validations(method, priority_zones, options, html_options)
+          super(method, priority_zones, options, html_options)
         end
 
         private
@@ -109,11 +95,13 @@ module ClientSideValidations
         def build_validation_options(method, options = {})
           return unless @options[:validate]
 
-          index = @default_options[:index].present? ? "[#{@default_options[:index]}]" : ''
-          name = options[:name] || "#{@object_name}#{index}[#{method}]"
+          index       = @default_options[:index].present? ? "[#{@default_options[:index]}]" : ''
           child_index = @options[:child_index] ? "(\\d+|#{Regexp.escape(@options[:child_index].to_s)})" : '\\d+'
+
+          name = options[:name] || "#{@object_name}#{index}[#{method}]"
           name = name.to_s.gsub(/_attributes\]\[#{child_index}\]/, '_attributes][]')
-          name = "#{name}#{options[:multiple] ? '[]' : nil}"
+          name << '[]' if options[:multiple]
+
           @options[:validators][@object][method] = { name: name, options: options[:validate] }
         end
       end

data/lib/client_side_validations/action_view/form_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ClientSideValidations
   module ActionView
     module Helpers
@@ -6,7 +7,7 @@ module ClientSideValidations
         end
 
         def form_for(record, options = {}, &block)
-          fail ArgumentError, 'Missing block' unless block_given?
+          raise ArgumentError, 'Missing block' unless block_given?
           if options[:validate]
 
             # Always turn off HTML5 Validations
@@ -15,7 +16,7 @@ module ClientSideValidations
 
             case record
             when String, Symbol
-              fail ClientSideValidations::ActionView::Helpers::FormHelper::Error, 'Using form_for(:name, @resource) is not supported with ClientSideValidations. Please use form_for(@resource, as: :name) instead.'
+              raise ClientSideValidations::ActionView::Helpers::FormHelper::Error, 'Using form_for(:name, @resource) is not supported with ClientSideValidations. Please use form_for(@resource, as: :name) instead.'
             else
               object = record.is_a?(Array) ? record.last : record
               object_name = options[:as] || model_name_from_record_or_class(object).param_key
@@ -37,17 +38,23 @@ module ClientSideValidations
           # Would be nice to not do this
           script = insert_validators_into_script(script)
 
+          # rubocop:disable OutputSafety
+          # TODO: check if html_safe is really needed here
           if assign_script_to_content_for(options[:validate], script)
             form.html_safe
           else
             "#{form}#{script}".html_safe
           end
+          # rubocop:enable OutputSafety
         end
 
         def assign_script_to_content_for(name, script)
+          # rubocop:disable OutputSafety
+          # TODO: check if html_safe is really needed here
           return unless name && name != true
-          content_for(name) { script.html_safe }
+          content_for name, script.html_safe
           true
+          # rubocop:enable OutputSafety
         end
 
         def apply_form_for_options!(record, object, options)
@@ -91,11 +98,12 @@ module ClientSideValidations
               result[attr[0]] = attr[1][:options]
             end
 
-            if object_opts[0].respond_to?(:client_side_validation_hash)
-              validation_hash = object_opts[0].client_side_validation_hash(option_hash)
-            else
-              validation_hash = {}
-            end
+            validation_hash =
+              if object_opts[0].respond_to?(:client_side_validation_hash)
+                object_opts[0].client_side_validation_hash(option_hash)
+              else
+                {}
+              end
 
             option_hash.each_key do |attr|
               if validation_hash[attr]
@@ -107,27 +115,25 @@ module ClientSideValidations
 
         def client_side_form_settings(object, options, builder)
           return unless options[:validate]
-          if options[:id]
-            var_name = options[:id]
-          else
-            var_name =
-              if object.respond_to?(:persisted?) && object.persisted?
-                options[:as] ? "edit_#{options[:as]}" : [options[:namespace], dom_id(object, :edit)].compact.join('_'.freeze)
-              else
-                options[:as] ? "new_#{options[:as]}" : [options[:namespace], dom_id(object)].compact.join('_'.freeze)
-              end
-          end
+          var_name =
+            if options[:id]
+              options[:id]
+            elsif object.respond_to?(:persisted?) && object.persisted?
+              options[:as] ? "edit_#{options[:as]}" : [options[:namespace], dom_id(object, :edit)].compact.join('_'.freeze)
+            else
+              options[:as] ? "new_#{options[:as]}" : [options[:namespace], dom_id(object)].compact.join('_'.freeze)
+            end
+
+          number_format =
+            if ClientSideValidations::Config.number_format_with_locale && defined?(I18n)
+              I18n.t('number.format').slice(:separator, :delimiter)
+            else
+              { separator: '.', delimiter: ',' }
+            end
 
-          if ClientSideValidations::Config.number_format_with_locale && defined?(I18n)
-            number_format = I18n.t('number.format').slice(:separator, :delimiter)
-          else
-            number_format = { separator: '.', delimiter: ',' }
-          end
           patterns = { numericality: "/^(-|\\+)?(?:\\d+|\\d{1,3}(?:\\#{number_format[:delimiter]}\\d{3})+)(?:\\#{number_format[:separator]}\\d*)?$/" }
 
-          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(%r{/+\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
+          javascript_tag "if(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(%r{/+\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};"
         end
       end
     end

data/lib/client_side_validations/action_view.rb

@@ -12,4 +12,4 @@ require 'client_side_validations/action_view/form_builder'
 
 ActionView::Base.send(:include, ClientSideValidations::ActionView::Helpers::FormHelper)
 ActionView::Base.send(:include, ClientSideValidations::ActionView::Helpers::FormTagHelper)
-ActionView::Helpers::FormBuilder.send(:include, ClientSideValidations::ActionView::Helpers::FormBuilder)
+ActionView::Helpers::FormBuilder.send(:prepend, ClientSideValidations::ActionView::Helpers::FormBuilder)

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 Security/Eval'
+          l = eval "lambda { |value| #{conditional} }"
+          # rubocop:enable Security/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/active_model/format.rb

@@ -4,19 +4,13 @@ module ClientSideValidations
       def client_side_hash(model, attribute, force = nil)
         options = self.options.dup
         if options[:with].respond_to?(:call)
-          if force
-            options[:with] = options[:with].call(model)
-            build_client_side_hash(model, attribute, options)
-          else
-            return
-          end
+          return unless force
+          options[:with] = options[:with].call(model)
+          build_client_side_hash(model, attribute, options)
         elsif options[:without].respond_to?(:call)
-          if force
-            options[:without] = options[:without].call(model)
-            build_client_side_hash(model, attribute, options)
-          else
-            return
-          end
+          return unless force
+          options[:without] = options[:without].call(model)
+          build_client_side_hash(model, attribute, options)
         else
           super
         end

data/lib/client_side_validations/active_model/numericality.rb

@@ -1,10 +1,10 @@
 module ClientSideValidations
   module ActiveModel
     module Numericality
-      OPTION_MAP = {}
+      @@option_map = {}
 
       def self.included(base)
-        OPTION_MAP.merge!(base::CHECKS.keys.inject({}) { |a, e| a.merge!(e => e) })
+        @@option_map.merge!(base::CHECKS.keys.inject({}) { |acc, elem| acc.merge!(elem => elem) })
       end
 
       def client_side_hash(model, attribute, force = nil)
@@ -18,16 +18,13 @@ module ClientSideValidations
 
         hash[:allow_blank] = true if options[:allow_nil] || options[:allow_blank]
 
-        OPTION_MAP.each do |option, message_type|
+        @@option_map.each do |option, message_type|
           count = options[option]
           next unless count
 
           if count.respond_to?(:call)
-            if force
-              count = count.call(model)
-            else
-              next
-            end
+            next unless force
+            count = count.call(model)
           end
 
           hash[:messages][option] = model.errors.generate_message(attribute, message_type, options.merge(count: count))

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,6 +24,8 @@ 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])
@@ -59,7 +62,7 @@ module ClientSideValidations
         return false if validator_turned_off?(attr, validator, force)
 
         # Yeah yeah, #new_record? is not part of ActiveModel :p
-        result = ((self.respond_to?(:new_record?) && validator.options[:on] == (self.new_record? ? :create : :update)) || validator.options[:on].nil?)
+        result = ((respond_to?(:new_record?) && validator.options[:on] == (new_record? ? :create : :update)) || validator.options[:on].nil?)
         result &&= validator.kind != :block
 
         if validator.options[:if] || validator.options[:unless]
@@ -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,15 +82,8 @@ 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
         when FalseClass
           true
@@ -101,7 +97,7 @@ module ClientSideValidations
             false
           end
         else
-          ::ClientSideValidations::Config.disabled_validators.include?(validator.kind)
+          false
         end
       end
 
@@ -127,17 +123,14 @@ module ClientSideValidations
     module EnumerableValidator
       def client_side_hash(model, attribute, force = nil)
         options = self.options.dup
+
         if options[:in].respond_to?(:call)
-          if force
-            options[:in] = options[:in].call(model)
-            hash = build_client_side_hash(model, attribute, options)
-          else
-            return
-          end
-        else
-          hash = build_client_side_hash(model, attribute, options)
+          return unless force
+          options[:in] = options[:in].call(model)
         end
 
+        hash = build_client_side_hash(model, attribute, options)
+
         if hash[:in].is_a?(Range)
           hash[:range] = hash[:in]
           hash.delete(:in)
@@ -152,8 +145,7 @@ end
 ActiveModel::Validator.send(:include, ClientSideValidations::ActiveModel::Validator)
 ActiveModel::Validations.send(:include, ClientSideValidations::ActiveModel::Validations)
 
-%w(absence acceptance exclusion inclusion length format numericality presence).each do |validator|
-  require "client_side_validations/active_model/#{validator}"
-  validator.capitalize!
+%w(Absence Acceptance Exclusion Format Inclusion Length Numericality Presence).each do |validator|
+  require "client_side_validations/active_model/#{validator.downcase}"
   ActiveModel::Validations.const_get("#{validator}Validator").send :include, ClientSideValidations::ActiveModel.const_get(validator)
 end