client_side_validations 4.2.4 → 4.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc3095ada6d732f685ae5a89448fb73f0bf67d2b
-  data.tar.gz: 0a7a366e16a11fda003e4cc5a5e5fb1b88ed13f3
+  metadata.gz: e89eee9df86b52cd88e9502fb4586c8be6172702
+  data.tar.gz: 7454460a7844579521618c65aac3bfabd9516cf7
 SHA512:
-  metadata.gz: 52b2a3c40f0f9ff9c165303989bd9a7ed52bbe0cf86ae019d56ed3f8b98e325672acb5bf239b70b5bfb33dd1134dbf56534389e2dddb46aed26f87602c70e0c0
-  data.tar.gz: dca548a1b975ba6c80ed4c8e6726e8020dd7e3ffa13b807ae4f6245cd670247c5f4707467db238582c8a590398ea0ecfa131f84c0f9ef9f261c21f58111c8b8f
+  metadata.gz: f3cdbfecf0e2a4309b87fd50b6a2a03ab136cd091c5ae6fe6f343654bbfb907b7ec3382541b39558f8cfcbe7d3246b76543734ac69eb8366f1be0943c3b6d3c5
+  data.tar.gz: c45bdfbb956fbe411cd71faa370f071882d64ca4f8281fe636831ad43e587a107acb7b349cbcf22edce9f95248cf4c34d75aa15450c5866b4f1e632e3a3adfeb

data/HISTORY.md

@@ -2,6 +2,7 @@
 
 ## Version 4.2
 
+* [v4.2.5](https://github.com/DavyJonesLocker/client_side_validations/compare/v4.2.4...v4.2.5)
 * [v4.2.4](https://github.com/DavyJonesLocker/client_side_validations/compare/v4.2.3...v4.2.4)
 * [v4.2.3](https://github.com/DavyJonesLocker/client_side_validations/compare/v4.2.2...v4.2.3)
 * [v4.2.2](https://github.com/DavyJonesLocker/client_side_validations/compare/v4.2.1...v4.2.2)

data/lib/client_side_validations/action_view/form_builder.rb

@@ -45,15 +45,14 @@ 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_with_client_side_validations(object_name, object, template, options)
+          initialize_without_client_side_validations(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_with_client_side_validations(record_name, record_object = nil, fields_options = {}, &block)
+          fields_options[:validate] ||= @options[:validate] if @options[:validate] && !fields_options.key?(:validate)
+          fields_for_without_client_side_validations(record_name, record_object, fields_options, &block)
         end
 
         def check_box_with_client_side_validations(method, options = {}, checked_value = '1', unchecked_value = '0')
@@ -68,7 +67,7 @@ module ClientSideValidations
           radio_button_without_client_side_validations(method, tag_value, options)
         end
 
-        def select_with_client_side_validations(method, choices, options = {}, html_options = {}, &block)
+        def select_with_client_side_validations(method, choices = nil, 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)

data/lib/client_side_validations/action_view/form_helper.rb

@@ -38,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)
@@ -127,9 +133,7 @@ module ClientSideValidations
 
           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/generators.rb

@@ -3,7 +3,7 @@ module ClientSideValidations
     @@assets = []
 
     def self.register_assets(klass)
-      @@assets.push(*klass.assets)
+      @@assets.concat(klass.assets)
     end
 
     def self.assets

data/lib/client_side_validations/version.rb

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

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

@@ -1,6 +1,6 @@
 
 /*!
- * Client Side Validations - v4.2.4 (https://github.com/DavyJonesLocker/client_side_validations)
+ * Client Side Validations - v4.2.5 (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.4
+  version: 4.2.5
 platform: ruby
 authors:
 - Geremia Taglialatela
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -85,20 +85,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '9.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.13
+        version: 0.8.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.13
+        version: 0.8.14
 - !ruby/object:Gem::Dependency
   name: m
   requirement: !ruby/object:Gem::Requirement
@@ -167,28 +181,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.41.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.41.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -203,20 +217,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '9.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -259,20 +259,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement