client_side_validations 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74a0ec2fee1f73f4bbb10e8384609c16914c16e9
-  data.tar.gz: fdc6f78dd60b02930a4bfc876e090785c21f5206
+  metadata.gz: 1365fb3dbcb3cc78e1ff81c55ca7bae68562a36a
+  data.tar.gz: 929f39e3d25915e36ee0857c28cd366d4ed66a3e
 SHA512:
-  metadata.gz: 2c777cc7a0190546e612e7602e5dc578d5e30172d3b0393912ad8d2e5c2d48b36d9e3a5fe9cc5979e5ad3e8dada301d0f0eab51bca923fc8d02f63e3fcef0017
-  data.tar.gz: 795119c15633fb66e4b6091eb3e4a29698b49791855a64488de8c687f62fb2138924f4f849c2be99ae2cd78e8055f40bc2af3663aa935a9a431ee105ad1962c7
+  metadata.gz: 3aa912a26a995bf9863abb7e7b1384c1d071c8301088f7723c9e24b3863b5d8b6f345226874d811c82263ff16f620153155699f9a5ebca7a7331db33256bc801
+  data.tar.gz: 7f63fd221eb2699d19ca1a4cabe5be3598fd76973f314137fdcaea9b76f704de3c2a5379fce95cb28dae2d4b3f7b182243942bc9d5b364f3e45de8d8aae8d390

data/HISTORY.md

@@ -2,6 +2,7 @@
 
 ## Version 4.2
 
+* [v4.2.1](https://github.com/DavyJonesLocker/client_side_validations/compare/v4.2.0...v4.2.1)
 * [v4.2.0](https://github.com/DavyJonesLocker/client_side_validations/compare/v3.2.6...v4.2.0)
 
 ## Version 3.2

data/lib/client_side_validations/action_view/form_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ClientSideValidations
   module ActionView
     module Helpers
@@ -91,11 +92,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,26 +109,26 @@ 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
+            "//<![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

data/lib/client_side_validations/active_model.rb

@@ -28,7 +28,7 @@ module ClientSideValidations
           return attr_hash if [nil, :block].include?(attr[0])
 
           validator_hash = attr[1].each_with_object(Hash.new { |h, k| h[k] = [] }) do |validator, kind_hash|
-            next unless can_use_for_client_side_validation?(attr[0], validator, force)
+            next nil unless can_use_for_client_side_validation?(attr[0], validator, force)
 
             client_side_hash = validator.client_side_hash(self, attr[0], extract_force_option(attr[0], force))
             if client_side_hash
@@ -59,7 +59,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]
@@ -127,17 +127,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)

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({}) { |a, e| a.merge!(e => e) })
       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/generators.rb

@@ -1,9 +1,13 @@
 module ClientSideValidations
   module Generators
-    ASSETS = []
+    @@assets = []
 
     def self.register_assets(klass)
-      ASSETS.push(*klass.assets)
+      @@assets.push(*klass.assets)
+    end
+
+    def self.assets
+      @@assets
     end
   end
 end

data/lib/client_side_validations/middleware.rb

@@ -58,8 +58,8 @@ module ClientSideValidations
     end
 
     class Uniqueness < Base
-      IGNORE_PARAMS = %w(case_sensitive id scope)
-      REGISTERED_ORMS = []
+      IGNORE_PARAMS = %w(case_sensitive id scope).freeze
+      @@registered_orms = []
       class NotValidatable < StandardError; end
 
       def response
@@ -83,7 +83,7 @@ module ClientSideValidations
       end
 
       def self.registered_orms
-        REGISTERED_ORMS
+        @@registered_orms
       end
 
       def registered_orms

data/lib/client_side_validations/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ClientSideValidations
-  VERSION = '4.2.0'.freeze
+  VERSION = '4.2.1'.freeze
 end

data/lib/generators/client_side_validations/copy_assets_generator.rb

@@ -9,8 +9,6 @@ module ClientSideValidations
         end
       end
 
-      private
-
       def self.asset_directory
         if asset_pipeline_enabled?
           "app#{Rails.configuration.assets.prefix}/javascripts"
@@ -19,16 +17,8 @@ module ClientSideValidations
         end
       end
 
-      def asset_directory
-        CopyAssetsGenerator.asset_directory
-      end
-
       def self.assets
-        ASSETS
-      end
-
-      def assets
-        CopyAssetsGenerator.assets
+        ClientSideValidations::Generators.assets
       end
 
       def self.asset_file_names
@@ -40,15 +30,25 @@ module ClientSideValidations
         defined?(Sprockets).present?
       end
 
-      def asset_pipeline_enabled?
-        self.class.asset_pipeline_enabled?
-      end
-
       def self.installation_message
         "Copies #{asset_file_names} to #{asset_directory}"
       end
 
       desc installation_message
+
+      private
+
+      def asset_directory
+        CopyAssetsGenerator.asset_directory
+      end
+
+      def assets
+        CopyAssetsGenerator.assets
+      end
+
+      def asset_pipeline_enabled?
+        self.class.asset_pipeline_enabled?
+      end
     end
   end
 end

data/lib/generators/client_side_validations/install_generator.rb

@@ -8,8 +8,6 @@ module ClientSideValidations
         copy_file 'initializer.rb', 'config/initializers/client_side_validations.rb'
       end
 
-      private
-
       def self.installation_message
         "Copies initializer into config/initializers and #{super.downcase}"
       end

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

@@ -1,3 +1,10 @@
+
+/*!
+ * Client Side Validations - v4.2.1 (https://github.com/DavyJonesLocker/client_side_validations)
+ * Copyright (c) 2016 Brian Cardarella
+ * Licensed under MIT (http://opensource.org/licenses/mit-license.php)
+ */
+
 (function() {
   var $, validateElement, validateForm, validatorsFor,
     indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: client_side_validations
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Brian Cardarella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -152,14 +152,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: 0.36.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: 0.36.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement