client_side_validations 4.2.12 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d645b444078a494c8ee5cc8bfd309dbb0333e29
-  data.tar.gz: 9c9d3a9eb0a97533b8e1ee7c9330748769b45526
+  metadata.gz: 62857994d1326cfb20a2c2d3c1c5fd746fa72065
+  data.tar.gz: 5d187e21b9b0b8935f3d5bfee8099095a128a389
 SHA512:
-  metadata.gz: 723c05eda13d578f4da7970b096459709da53b08653e08d5cead6ac01c9170cc221465fe0cd63bd75b85e721a44928952477df7cf1762a50747277b13ca77bea
-  data.tar.gz: 2987e1b5145e88236dac5de8d6540f586177dc00840c302bb796a76b4ba7d22333858461c99cb600927ca1f1e42a06bba2720aaf05be3cddc0f99b468b48741a
+  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

@@ -6,7 +6,7 @@
 [![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/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 ##
 
@@ -532,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
@@ -551,7 +540,7 @@ on how to properly submit issues and pull requests.
 
 ## Legal ##
 
-[DockYard](https://dockyard.com/), LLC © 2012-2016
+[DockYard](https://dockyard.com/), LLC © 2012-2017
 
 [@dockyard](https://twitter.com/dockyard)
 

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/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,62 +36,58 @@ module ClientSideValidations
           nil
         end
 
-        def initialize_with_client_side_validations(object_name, object, template, options)
-          initialize_without_client_side_validations(object_name, object, template, options)
+        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_name, record_object = nil, fields_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)
-          fields_for_without_client_side_validations(record_name, record_object, fields_options, &block)
+          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)
+          super(method, tag_value, options)
         end
 
-        def select_with_client_side_validations(method, choices = nil, options = {}, html_options = {}, &block)
+        def select(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)
+          super(method, choices, options, html_options, &block)
         end
 
-        def collection_select_with_client_side_validations(method, collection, value_method, text_method, options = {}, html_options = {})
+        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_select_without_client_side_validations(method, collection, value_method, text_method, options, html_options)
+          super(method, collection, value_method, text_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 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

data/lib/client_side_validations/active_record/middleware.rb

@@ -6,22 +6,23 @@ module ClientSideValidations
       end
 
       def self.unique?(klass, attribute, value, params)
-        klass  = find_topmost_superclass(klass)
-        column = klass.columns_hash[attribute.to_s]
-        value  = type_cast_value(column, value)
+        klass      = find_topmost_superclass(klass)
+        connection = klass.connection
+        column     = klass.columns_hash[attribute.to_s]
+        value      = type_cast_value(connection, column, value)
 
-        sql      = sql_statement(klass, attribute, value, params)
+        sql      = sql_statement(klass, connection, attribute, value, params)
         relation = Arel::Nodes::SqlLiteral.new(sql)
 
         klass.where(relation).empty?
       end
 
-      def self.sql_statement(klass, attribute, value, params)
+      def self.sql_statement(klass, connection, attribute, value, params)
         sql = []
         t   = klass.arel_table
 
         if params[:case_sensitive] == 'true'
-          sql << 'BINARY' if t.engine.connection.adapter_name =~ /^mysql/i
+          sql << 'BINARY' if connection.adapter_name =~ /^mysql/i
           sql << t[attribute].eq(value).to_sql
         else
           escaped_value = value.gsub(/[%_]/, '\\\\\0')
@@ -31,20 +32,16 @@ module ClientSideValidations
         sql << "AND #{t[klass.primary_key].not_eq(params[:id]).to_sql}" if params[:id]
 
         (params[:scope] || {}).each do |scope_attribute, scope_value|
-          scope_value = type_cast_value(klass.columns_hash[scope_attribute], scope_value)
+          scope_value = type_cast_value(connection, klass.columns_hash[scope_attribute], scope_value)
           sql << "AND #{t[scope_attribute].eq(scope_value).to_sql}"
         end
 
         sql.join ' '
       end
 
-      def self.type_cast_value(column, value)
-        value =
-          if column.respond_to?(:type_cast)
-            column.type_cast(value)
-          else
-            column.type_cast_from_database(value)
-          end
+      def self.type_cast_value(connection, column, value)
+        type  = connection.lookup_cast_type_from_column(column)
+        value = type.deserialize(value)
 
         if column.limit && value.is_a?(String)
           value.mb_chars[0, column.limit]

data/lib/client_side_validations/version.rb

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

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

@@ -1,6 +1,6 @@
 
 /*!
- * Client Side Validations - v4.2.12 (https://github.com/DavyJonesLocker/client_side_validations)
+ * Client Side Validations - v6.0.0 (https://github.com/DavyJonesLocker/client_side_validations)
  * Copyright (c) 2017 Geremia Taglialatela, Brian Cardarella
  * Licensed under MIT (http://opensource.org/licenses/mit-license.php)
  */
@@ -469,7 +469,9 @@
         }
       },
       confirmation: function(element, options) {
-        if (element.val() !== $("#" + (element.attr('id')) + "_confirmation").val()) {
+        var regex;
+        regex = new RegExp("^" + (element.val()) + "$", options.case_sensitive ? '' : 'i');
+        if (!regex.test($("#" + (element.attr('id')) + "_confirmation").val())) {
           return options.message;
         }
       },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: client_side_validations
 version: !ruby/object:Gem::Version
-  version: 4.2.12
+  version: 6.0.0
 platform: ruby
 authors:
 - Geremia Taglialatela
@@ -9,68 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
-    - - "<"
+        version: 5.0.0
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 5.0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
-    - - "<"
+        version: 5.0.0
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 5.0.0.1
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: js_regex
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.19
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.19
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -223,14 +211,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 2.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 2.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: shotgun
   requirement: !ruby/object:Gem::Requirement
@@ -273,7 +261,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
-description: Client Side Validations made easy for your Rails 4 applications
+description: Client Side Validations made easy for your Rails 5 applications
 email:
 - tagliala.dev@gmail.com
 - bcardarella@gmail.com
@@ -281,6 +269,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - README.md
 - lib/client_side_validations.rb
 - lib/client_side_validations/action_view.rb
@@ -334,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Client Side Validations