client_side_validations 7.0.1 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a667f554594c134de2b2ab3e77679337a8bfcb22
-  data.tar.gz: fd9fd106426a734c79c9a6f9e3bc96877b4bd152
+  metadata.gz: f49979931218b2246d124cd4a5e1829cb86443de
+  data.tar.gz: 9b4587a126d31aa338aed01dbf98df62445724be
 SHA512:
-  metadata.gz: 378f957247dbfab1182963dadb3adf802cb4e79b2a2570af0d9507f3e94b2c7d87fe93002300542f4613b5d7a235f52dded3e906d358fdade2903ae36842ba4d
-  data.tar.gz: 04f88efc2d59603ea7189d1aefeda34f3e7678cbecfffed791df36612f35582c940ed4ef6df82b0db1d6e4da1d54023dc2d3722a99dda6ccbd4ebb72b608a790
+  metadata.gz: b60d2af0e7c814f60930d6b82fa18185c13e38c8939ca23c1396e1ecaf9881054d1bef455196302daaa7b0e73245adf8d3e3462a77531225978ae6d4e77891ed
+  data.tar.gz: d6a4c75565e0bf8343a7c07e7935c135e76fb8bce76623702a583ff021aa849da91547d086f4f75b6f509ebc46311d7cb19e38d7c10edcd2fe722ce5dcc10d29

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 8.0.0 (2017-01-22)
+
+* Change internals to get 4.0 score on Code Climate
+
 ## 7.0.1 (2017-01-22)
 
 * Fix `rails.validations` asset not found error

data/lib/client_side_validations/action_view/form_helper.rb

@@ -7,54 +7,46 @@ module ClientSideValidations
         end
 
         def form_for(record, options = {}, &block)
-          raise ArgumentError, 'Missing block' unless block_given?
-          if options[:validate]
+          return super unless options[:validate]
 
-            # Always turn off HTML5 Validations
-            options[:html] ||= {}
-            options[:html][:novalidate] = 'novalidate'
+          # 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
-              object_name = options[:as] || model_name_from_record_or_class(object).param_key
-            end
+          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
+            object_name = options[:as] || model_name_from_record_or_class(object).param_key
           end
 
           @validators = {}
 
-          # 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
+          # Order matters here. Rails mutates the `options` object
+          form = super
 
-          build_bound_validators options
-          builder = instantiate_builder(object_name, object, options) if object_name && object
-          script = client_side_form_settings(object, options, builder)
+          build_bound_validators! options
+          builder = instantiate_builder(object_name, object, options)
+          script = client_side_form_settings(options, builder)
 
-          # Because of the load order requirement above this sub is necessary
-          # 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
+            form
           else
-            "#{form}#{script}".html_safe
+            # rubocop:disable OutputSafety
+            [form, script].join.html_safe
+            # rubocop:enable OutputSafety
           end
-          # rubocop:enable OutputSafety
         end
 
         def assign_script_to_content_for(name, script)
+          return false unless name && name != true
+
           # rubocop:disable OutputSafety
-          # TODO: check if html_safe is really needed here
-          return unless name && name != true
           content_for name, script.html_safe
-          true
           # rubocop:enable OutputSafety
+
+          true
         end
 
         def apply_form_for_options!(record, object, options)
@@ -63,15 +55,19 @@ module ClientSideValidations
         end
 
         def fields_for(record_or_name_or_array, record_object = nil, options = {}, &block)
+          # Order matters here. Rails mutates the `options` object
           output = super
-          build_bound_validators options
+
+          build_bound_validators! options
+
           output
         end
 
         private
 
-        def build_bound_validators(options)
+        def build_bound_validators!(options)
           return unless @validators
+
           options[:validators].each do |key, value|
             if @validators.key?(key)
               @validators[key].merge! value
@@ -81,17 +77,6 @@ module ClientSideValidations
           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 construct_validators
           @validators.each_with_object({}) do |object_opts, validator_hash|
             option_hash = object_opts[1].each_with_object({}) do |attr, result|
@@ -113,27 +98,21 @@ module ClientSideValidations
           end
         end
 
-        def client_side_form_settings(object, options, builder)
-          return unless options[:validate]
-          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
+        def client_side_form_settings(options, builder)
+          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=#{numericality_patterns};#{"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['#{options[:html]['id']}'] = #{builder.client_side_form_settings(options, self).merge(validators: construct_validators).to_json};"
+        end
 
-          number_format =
+        def number_format
+          @number_format ||=
             if ClientSideValidations::Config.number_format_with_locale && defined?(I18n)
-              I18n.t('number.format').slice(:separator, :delimiter)
+              I18n.t('number.format').slice :separator, :delimiter
             else
               { separator: '.', delimiter: ',' }
             end
+        end
 
-          patterns = { numericality: "/^(-|\\+)?(?:\\d+|\\d{1,3}(?:\\#{number_format[:delimiter]}\\d{3})+)(?:\\#{number_format[:separator]}\\d*)?$/" }
-
-          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};"
+        def numericality_patterns
+          "/^(-|\\+)?(?:\\d+|\\d{1,3}(?:\\#{number_format[:delimiter]}\\d{3})+)(?:\\#{number_format[:separator]}\\d*)?$/"
         end
       end
     end

data/lib/client_side_validations/active_model.rb

@@ -62,22 +62,32 @@ module ClientSideValidations
       def can_use_for_client_side_validation?(attr, validator, force)
         return false if validator_turned_off?(attr, validator, force)
 
-        # Yeah yeah, #new_record? is not part of ActiveModel :p
-        result = ((respond_to?(:new_record?) && validator.options[:on] == (new_record? ? :create : :update)) || validator.options[:on].nil?)
+        result = check_new_record(validator)
         result &&= validator.kind != :block
 
         if validator.options[:if] || validator.options[:unless]
-          if validator.options[:if] && validator.options[:if] =~ /changed\?/
-            result = true
-          else
-            result = can_force_validator?(attr, validator, force)
-            if validator.options[:if]
-              result &&= run_conditionals(validator.options[:if], :if)
-            end
-            if validator.options[:unless]
-              result &&= run_conditionals(validator.options[:unless], :unless)
-            end
-          end
+          check_conditionals attr, validator, force
+        else
+          result
+        end
+      end
+
+      # Yeah yeah, #new_record? is not part of ActiveModel :p
+      def check_new_record(validator)
+        (respond_to?(:new_record?) && validator.options[:on] == (new_record? ? :create : :update)) || validator.options[:on].nil?
+      end
+
+      def check_conditionals(attr, validator, force)
+        return true if validator.options[:if] && validator.options[:if] =~ /changed\?/
+
+        result = can_force_validator?(attr, validator, force)
+
+        if validator.options[:if]
+          result &&= run_conditionals(validator.options[:if], :if)
+        end
+
+        if validator.options[:unless]
+          result &&= run_conditionals(validator.options[:unless], :unless)
         end
 
         result

data/lib/client_side_validations/active_record/uniqueness.rb

@@ -8,23 +8,30 @@ module ClientSideValidations
         hash[:id]             = model.id unless model.new_record?
         hash[:allow_blank]    = true if options[:allow_blank]
 
+        apply_class_option! hash, model
+        apply_scope_option! hash, model
+
+        hash
+      end
+
+      private
+
+      def apply_class_option!(hash, model)
         if options.key?(:client_validations) && options[:client_validations].key?(:class)
           hash[:class] = options[:client_validations][:class].underscore
         elsif model.class.name.demodulize != model.class.name
           hash[:class] = model.class.name.underscore
         end
+      end
 
-        if options.key?(:scope) && options[:scope].present?
-          hash[:scope] = Array.wrap(options[:scope]).inject({}) do |scope_hash, scope_item|
-            scope_hash.merge!(scope_item => model.send(scope_item))
-          end
-        end
+      def apply_scope_option!(hash, model)
+        return unless options.key?(:scope) && options[:scope].present?
 
-        hash
+        hash[:scope] = Array.wrap(options[:scope]).inject({}) do |scope_hash, scope_item|
+          scope_hash.merge!(scope_item => model.send(scope_item))
+        end
       end
 
-      private
-
       def message_type
         :taken
       end

data/lib/client_side_validations/version.rb

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

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

@@ -1,6 +1,6 @@
 
 /*!
- * Client Side Validations - v7.0.1 (https://github.com/DavyJonesLocker/client_side_validations)
+ * Client Side Validations - v8.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)
  */

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: client_side_validations
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 8.0.0
 platform: ruby
 authors:
 - Geremia Taglialatela