client_side_validations 3.2.8 → 4.2.0

data/lib/client_side_validations.rb

@@ -10,4 +10,3 @@ if defined?(::Rails)
   require 'client_side_validations/middleware'
   require 'client_side_validations/engine'
 end
-

data/lib/client_side_validations/action_view.rb

@@ -1,5 +1,7 @@
-module ClientSideValidations::ActionView
-  module Helpers
+module ClientSideValidations
+  module ActionView
+    module Helpers
+    end
   end
 end
 
@@ -11,4 +13,3 @@ 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)
-

data/lib/client_side_validations/action_view/form_builder.rb

@@ -1,104 +1,121 @@
-module ClientSideValidations::ActionView::Helpers
-  module FormBuilder
-
-    def self.included(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 = {})
-            build_validation_options(method, options)
-            options.delete(:validate)
-            #{selector}_without_client_side_validations(method, options)
+module ClientSideValidations
+  module ActionView
+    module Helpers
+      module FormBuilder
+        def self.included(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 = {})
+                build_validation_options(method, options)
+                options.delete(:validate)
+                #{selector}_without_client_side_validations(method, options)
+              end
+            RUBY_EVAL
+
+            base.class_eval { alias_method_chain selector, :client_side_validations }
           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
 
-      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 :grouped_collection_select, :client_side_validations
-        alias_method_chain :time_zone_select,          :client_side_validations
-
-        def client_side_form_settings(options, form_helper)
+        def client_side_form_settings(_options, form_helper)
           {
-            :type => self.class.to_s,
-            :input_tag => form_helper.class.field_error_proc.call(%{<span id="input_tag" />},  Struct.new(:error_message, :tag_id).new([], "")),
-            :label_tag => form_helper.class.field_error_proc.call(%{<label id="label_tag" />}, Struct.new(:error_message, :tag_id).new([], ""))
+            type: self.class.to_s,
+            input_tag: form_helper.class.field_error_proc.call(%(<span id="input_tag" />),  Struct.new(:error_message, :tag_id).new([], '')),
+            label_tag: form_helper.class.field_error_proc.call(%(<label id="label_tag" />), Struct.new(:error_message, :tag_id).new([], ''))
           }
         end
-      end
-    end
 
-    def validate(*attrs)
-      options = attrs.pop if attrs.last.is_a?(Hash)
-      (attrs.present? ? attrs : @object._validators.keys).each do |attr|
-        build_validation_options(attr, :validate => options)
-      end
-      nil
-    end
+        def validate(*attrs)
+          options = attrs.pop if attrs.last.is_a?(Hash)
+          (attrs.present? ? attrs : @object._validators.keys).each do |attr|
+            build_validation_options(attr, validate: options)
+          end
+          nil
+        end
 
-    def initialize_with_client_side_validations(object_name, object, template, options, proc)
-      initialize_without_client_side_validations(object_name, object, template, options, proc)
-      @options[:validators] = { object => {} }
-    end
+        def initialize_with_client_side_validations(object_name, object, *args)
+          initialize_without_client_side_validations(object_name, object, *args)
+          @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)
-    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)
+        end
 
-    def check_box_with_client_side_validations(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)
-    end
+        def check_box_with_client_side_validations(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)
+        end
 
-    def radio_button_with_client_side_validations(method, tag_value, options = {})
-      build_validation_options(method, options)
-      options.delete(:validate)
-      radio_button_without_client_side_validations(method, tag_value, options)
-    end
+        def radio_button_with_client_side_validations(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 = {})
-      build_validation_options(method, html_options.merge(:name => options[:name]))
-      html_options.delete(:validate)
-      select_without_client_side_validations(method, choices, options, html_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)
+        end
 
-    def collection_select_with_client_side_validations(method, collection, value_method, text_method, options = {}, html_options = {})
-      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)
-    end
+        def collection_select_with_client_side_validations(method, collection, value_method, text_method, options = {}, html_options = {})
+          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)
+        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 = {})
-      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)
-    end
+        def collection_check_boxes_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_check_boxes_without_client_side_validations(method, collection, value_method, text_method, options, html_options, &block)
+        end
 
-    def time_zone_select_with_client_side_validations(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)
-    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)
+        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 = {})
+          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)
+        end
 
-  private
+        def time_zone_select_with_client_side_validations(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)
+        end
+
+        private
 
-    def build_validation_options(method, options = {})
-      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].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] }
+        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}]"
+          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] }
+        end
       end
     end
   end

data/lib/client_side_validations/action_view/form_helper.rb

@@ -1,146 +1,135 @@
-module ClientSideValidations::ActionView::Helpers
-  module FormHelper
-    class Error < StandardError; end
-
-    def form_for(record, *args, &block)
-      options = args.extract_options!
-      if options[:validate]
-
-        # Always turn off HTML5 Validations
-        options[:html] ||= {}
-        options[:html][:novalidate] = 'novalidate'
-
-        case record
-        when String, Symbol
-          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
+module ClientSideValidations
+  module ActionView
+    module Helpers
+      module FormHelper
+        class Error < StandardError
         end
-      end
 
-      @validators = {}
+        def form_for(record, options = {}, &block)
+          fail ArgumentError, 'Missing block' unless block_given?
+          if options[:validate]
 
-      # Order matters here. Rails mutates the options object
-      html_id = options[:html][:id] if options[:html]
-      form   = super(record, *(args << options), &block)
-      build_bound_validators(options)
-      options[:id] = html_id if html_id
-      script = client_side_form_settings(object, options)
+            # Always turn off HTML5 Validations
+            options[:html] ||= {}
+            options[:html][:novalidate] = 'novalidate'
 
-      # Because of the load order requirement above this sub is necessary
-      # Would be nice to not do this
-      script = insert_validators_into_script(script)
+            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.'
+            else
+              object = record.is_a?(Array) ? record.last : record
+              object_name = options[:as] || model_name_from_record_or_class(object).param_key
+            end
+          end
 
-      if assign_script_to_content_for(options[:validate], script)
-        form.html_safe
-      else
-        "#{form}#{script}".html_safe
-      end
-    end
+          @validators = {}
 
-    def assign_script_to_content_for(name, script)
-      if name && name != true
-        content_for(name) { script.html_safe }
-        true
-      end
-    end
+          # Order matters here. Rails mutates the options object
+          html_id = options[:html][:id] if options[:html]
+          form = super(record, options, &block)
+          options[:id] = html_id if html_id
 
-    def apply_form_for_options!(object_or_array, options)
-      super
-      options[:html][:validate] = true if options[:validate]
-    end
+          build_bound_validators options
+          builder = instantiate_builder(object_name, object, options) if object_name && object
+          script = client_side_form_settings(object, options, builder)
 
-    def fields_for(record_or_name_or_array, record_object = nil, options = {}, &block)
-      output = super
-      build_bound_validators(options)
-      output
-    end
+          # Because of the load order requirement above this sub is necessary
+          # Would be nice to not do this
+          script = insert_validators_into_script(script)
 
-    private
-
-    def build_bound_validators(options)
-      if @validators
-        options[:validators].each do |key, value|
-          if @validators.key?(key)
-            @validators[key].merge! value
+          if assign_script_to_content_for(options[:validate], script)
+            form.html_safe
           else
-            @validators[key] = value
+            "#{form}#{script}".html_safe
           end
         end
-      end
-    end
-
-    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"
-      if script
-        script = script.split(/"validator_hash"/)
-        script = "#{script[0]}#{construct_validators.to_json}#{script[1]}"
-      end
 
-      script
-    end
+        def assign_script_to_content_for(name, script)
+          return unless name && name != true
+          content_for(name) { script.html_safe }
+          true
+        end
 
-    def construct_validators
-      @validators.inject({}) do |validator_hash, object_opts|
-        option_hash = object_opts[1].inject({}) do |option_hash, attr|
-          option_hash.merge!(attr[0] => attr[1][:options])
+        def apply_form_for_options!(record, object, options)
+          super
+          options[:html][:validate] = true if options[:validate]
         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 = {}
+        def fields_for(record_or_name_or_array, record_object = nil, options = {}, &block)
+          output = super
+          build_bound_validators options
+          output
         end
 
-        option_hash.each_key do |attr|
-          if validation_hash[attr]
-            validator_hash.merge!(object_opts[1][attr][:name] => validation_hash[attr])
+        private
+
+        def build_bound_validators(options)
+          return unless @validators
+          options[:validators].each do |key, value|
+            if @validators.key?(key)
+              @validators[key].merge! value
+            else
+              @validators[key] = value
+            end
           end
         end
 
-        validator_hash
-      end
-    end
+        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"
+          if script
+            script = script.split(/"validator_hash"/)
+            script = "#{script[0]}#{construct_validators.to_json}#{script[1]}"
+          end
 
-    def client_side_form_settings(object, options)
-      if options[:validate]
-        builder = options[:parent_builder]
+          script
+        end
 
-        if options[:id]
-          var_name = options[:id]
-        else
-          if Rails.version >= '3.2.0'
-            var_name = if object.respond_to?(:persisted?) && object.persisted?
-              options[:as] ? "edit_#{options[:as]}" : [options[:namespace], dom_id(object, :edit)].compact.join("_")
-            else
-              options[:as] ? "new_#{options[:as]}" : [options[:namespace], dom_id(object)].compact.join("_")
+        def construct_validators
+          @validators.each_with_object({}) do |object_opts, validator_hash|
+            option_hash = object_opts[1].each_with_object({}) do |attr, result|
+              result[attr[0]] = attr[1][:options]
             end
-          else
-            # This is to maintain backward compatibility with Rails 3.1
-            # see: https://github.com/rails/rails/commit/e29773f885fd500189ffd964550ae20061d745ba#commitcomment-948052
-            var_name = if object.respond_to?(:persisted?) && object.persisted?
-              options[:as] ? "#{options[:as]}_edit" : dom_id(object, :edit)
+
+            if object_opts[0].respond_to?(:client_side_validation_hash)
+              validation_hash = object_opts[0].client_side_validation_hash(option_hash)
             else
-              options[:as] ? "#{options[:as]}_new" : dom_id(object)
+              validation_hash = {}
+            end
+
+            option_hash.each_key do |attr|
+              if validation_hash[attr]
+                validator_hash.merge!(object_opts[1][attr][:name] => validation_hash[attr])
+              end
             end
           end
         end
 
-        if ClientSideValidations::Config.number_format_with_locale and 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*)?$/"}
+        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
 
+          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(/\/+\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
+          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
         end
       end
     end
-
   end
 end
-