client_side_validations 8.0.0 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f49979931218b2246d124cd4a5e1829cb86443de
-  data.tar.gz: 9b4587a126d31aa338aed01dbf98df62445724be
+  metadata.gz: 58bb726eb3177b25d2b654c6f876fd012927ed44
+  data.tar.gz: 99f29f39c7336b9346a30978e8151bb846240022
 SHA512:
-  metadata.gz: b60d2af0e7c814f60930d6b82fa18185c13e38c8939ca23c1396e1ecaf9881054d1bef455196302daaa7b0e73245adf8d3e3462a77531225978ae6d4e77891ed
-  data.tar.gz: d6a4c75565e0bf8343a7c07e7935c135e76fb8bce76623702a583ff021aa849da91547d086f4f75b6f509ebc46311d7cb19e38d7c10edcd2fe722ce5dcc10d29
+  metadata.gz: 1d1cf22aa5f09915484bf014081e3676856b2b3b65ac8db187340a58a7511eeb3a4d658ddf2731dee8e2d4ad30734fe4f1879ca519c8aa30b3fc3d9204892285
+  data.tar.gz: c8b8c742525848a3779d7a7326791f520901dbf0dcabc54873284775e368464ce075a843c66dc57957cf16382dd4c7fe1ac59d6407fcd5cb2bb37ef8cd9e6449

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 8.0.1 (2017-01-26)
+
+* Under the hood improvements to the form helper
+* Include license in the gem
+
 ## 8.0.0 (2017-01-22)
 
 * Change internals to get 4.0 score on Code Climate

data/LICENSE.md

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Geremia Taglialatela, Brian Cardarella
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/client_side_validations/action_view/form_helper.rb

@@ -9,9 +9,7 @@ module ClientSideValidations
         def form_for(record, options = {}, &block)
           return super unless options[:validate]
 
-          # Always turn off HTML5 Validations
-          options[:html] ||= {}
-          options[:html][:novalidate] = 'novalidate'
+          turn_off_html5_validations! options
 
           case record
           when String, Symbol
@@ -33,14 +31,12 @@ module ClientSideValidations
           if assign_script_to_content_for(options[:validate], script)
             form
           else
-            # rubocop:disable OutputSafety
-            [form, script].join.html_safe
-            # rubocop:enable OutputSafety
+            form << script
           end
         end
 
         def assign_script_to_content_for(name, script)
-          return false unless name && name != true
+          return false if name == true
 
           # rubocop:disable OutputSafety
           content_for name, script.html_safe
@@ -54,7 +50,7 @@ module ClientSideValidations
           options[:html][:validate] = true if options[:validate]
         end
 
-        def fields_for(record_or_name_or_array, record_object = nil, options = {}, &block)
+        def fields_for(record_name, record_object = nil, options = {}, &block)
           # Order matters here. Rails mutates the `options` object
           output = super
 
@@ -79,21 +75,17 @@ module ClientSideValidations
 
         def construct_validators
           @validators.each_with_object({}) do |object_opts, validator_hash|
+            next unless object_opts[0].respond_to?(:client_side_validation_hash)
+
             option_hash = object_opts[1].each_with_object({}) do |attr, result|
               result[attr[0]] = attr[1][:options]
             end
 
-            validation_hash =
-              if object_opts[0].respond_to?(:client_side_validation_hash)
-                object_opts[0].client_side_validation_hash(option_hash)
-              else
-                {}
-              end
+            validation_hash = object_opts[0].client_side_validation_hash(option_hash)
 
             option_hash.each_key do |attr|
-              if validation_hash[attr]
-                validator_hash.merge!(object_opts[1][attr][:name] => validation_hash[attr])
-              end
+              next unless validation_hash.key?(attr)
+              validator_hash[object_opts[1][attr][:name]] = validation_hash[attr]
             end
           end
         end
@@ -114,6 +106,11 @@ module ClientSideValidations
         def numericality_patterns
           "/^(-|\\+)?(?:\\d+|\\d{1,3}(?:\\#{number_format[:delimiter]}\\d{3})+)(?:\\#{number_format[:separator]}\\d*)?$/"
         end
+
+        def turn_off_html5_validations!(options)
+          options[:html] ||= {}
+          options[:html][:novalidate] = 'novalidate'
+        end
       end
     end
   end

data/lib/client_side_validations/version.rb

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

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

@@ -1,6 +1,6 @@
 
 /*!
- * Client Side Validations - v8.0.0 (https://github.com/DavyJonesLocker/client_side_validations)
+ * Client Side Validations - v8.0.1 (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: 8.0.0
+  version: 8.0.1
 platform: ruby
 authors:
 - Geremia Taglialatela
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-22 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -264,6 +264,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
+- LICENSE.md
 - README.md
 - lib/client_side_validations.rb
 - lib/client_side_validations/action_view.rb